Skip to content

Commit ca3d60f

Browse files
committed
Merge: CNB97: devlink: add kabi padding
MR: https://gitlab.com/redhat/rhel/src/kernel/rhel-9/-/merge_requests/4438 JIRA: https://issues.redhat.com/browse/RHEL-111906 Structure devlink_port_ops is protected by kABI, add reserved fields to them to make them extensible. Signed-off-by: Petr Oros <[email protected]> Closes RHEL-111906 Approved-by: Ivan Vecera <[email protected]> Approved-by: Čestmír Kalina <[email protected]> Approved-by: CKI KWF Bot <[email protected]> Merged-by: Augusto Caringi <[email protected]>
2 parents d518348 + bc0c6b0 commit ca3d60f

File tree

1 file changed

+27
-0
lines changed

1 file changed

+27
-0
lines changed

include/net/devlink.h

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,9 @@ struct devlink_linecard_ops {
220220
void (*types_get)(struct devlink_linecard *linecard,
221221
void *priv, unsigned int index, const char **type,
222222
const void **type_priv);
223+
224+
RH_KABI_RESERVE(1)
225+
RH_KABI_RESERVE(2)
223226
};
224227

225228
struct devlink_sb_pool_info {
@@ -397,6 +400,9 @@ struct devlink_dpipe_table_ops {
397400
struct devlink_dpipe_dump_ctx *dump_ctx);
398401
int (*counters_set_update)(void *priv, bool enable);
399402
u64 (*size_get)(void *priv);
403+
404+
RH_KABI_RESERVE(1)
405+
RH_KABI_RESERVE(2)
400406
};
401407

402408
/**
@@ -514,6 +520,9 @@ struct devlink_param {
514520
int (*validate)(struct devlink *devlink, u32 id,
515521
union devlink_param_value val,
516522
struct netlink_ext_ack *extack);
523+
524+
RH_KABI_RESERVE(1)
525+
RH_KABI_RESERVE(2)
517526
};
518527

519528
struct devlink_param_item {
@@ -716,6 +725,9 @@ struct devlink_region_ops {
716725
struct netlink_ext_ack *extack,
717726
u64 offset, u32 size, u8 *data);
718727
void *priv;
728+
729+
RH_KABI_RESERVE(1)
730+
RH_KABI_RESERVE(2)
719731
};
720732

721733
/**
@@ -744,6 +756,9 @@ struct devlink_port_region_ops {
744756
struct netlink_ext_ack *extack,
745757
u64 offset, u32 size, u8 *data);
746758
void *priv;
759+
760+
RH_KABI_RESERVE(1)
761+
RH_KABI_RESERVE(2)
747762
};
748763

749764
struct devlink_fmsg;
@@ -777,6 +792,9 @@ struct devlink_health_reporter_ops {
777792
struct netlink_ext_ack *extack);
778793
int (*test)(struct devlink_health_reporter *reporter,
779794
struct netlink_ext_ack *extack);
795+
796+
RH_KABI_RESERVE(1)
797+
RH_KABI_RESERVE(2)
780798
};
781799

782800
/**
@@ -1724,6 +1742,15 @@ struct devlink_port_ops {
17241742
int (*port_fn_max_io_eqs_set)(struct devlink_port *devlink_port,
17251743
u32 max_eqs,
17261744
struct netlink_ext_ack *extack);
1745+
1746+
RH_KABI_RESERVE(1)
1747+
RH_KABI_RESERVE(2)
1748+
RH_KABI_RESERVE(3)
1749+
RH_KABI_RESERVE(4)
1750+
RH_KABI_RESERVE(5)
1751+
RH_KABI_RESERVE(6)
1752+
RH_KABI_RESERVE(7)
1753+
RH_KABI_RESERVE(8)
17271754
};
17281755

17291756
void devlink_port_init(struct devlink *devlink,

0 commit comments

Comments
 (0)