Merge: CNB101: devlink: add kabi padding

MR: https://gitlab.com/redhat/rhel/src/kernel/rhel-10/-/merge_requests/340

JIRA: https://issues.redhat.com/browse/RHEL-111907
Upstream Status: mostly RHEL-only patches

This series adds reserved fields to devlink structs. These reserved fields are only needed during backports to z-stream.

Signed-off-by: Ivan Vecera <[email protected]>

Approved-by: Michal Schmidt <[email protected]>
Approved-by: Davide Caratti <[email protected]>
Approved-by: CKI KWF Bot <[email protected]>

Merged-by: Jan Stancek <[email protected]>

Author: jstancek

include/net/devlink.h

@@ -21,6 +21,8 @@
 #include <linux/xarray.h>
 #include <linux/firmware.h>
 
+#include <linux/rh_kabi.h>
+
 struct devlink;
 struct devlink_linecard;
 
@@ -156,6 +158,23 @@ struct devlink_port {
 	struct devlink_rate *devlink_rate;
 	struct devlink_linecard *linecard;
 	u32 rel_index;
+
+	RH_KABI_RESERVE(1)
+	RH_KABI_RESERVE(2)
+	RH_KABI_RESERVE(3)
+	RH_KABI_RESERVE(4)
+	RH_KABI_RESERVE(5)
+	RH_KABI_RESERVE(6)
+	RH_KABI_RESERVE(7)
+	RH_KABI_RESERVE(8)
+	RH_KABI_RESERVE(9)
+	RH_KABI_RESERVE(10)
+	RH_KABI_RESERVE(11)
+	RH_KABI_RESERVE(12)
+	RH_KABI_RESERVE(13)
+	RH_KABI_RESERVE(14)
+	RH_KABI_RESERVE(15)
+	RH_KABI_RESERVE(16)
 };
 
 struct devlink_port_new_attrs {
@@ -201,6 +220,9 @@ struct devlink_linecard_ops {
 	void (*types_get)(struct devlink_linecard *linecard,
 			  void *priv, unsigned int index, const char **type,
 			  const void **type_priv);
+
+        RH_KABI_RESERVE(1)
+        RH_KABI_RESERVE(2)
 };
 
 struct devlink_sb_pool_info {
@@ -378,6 +400,9 @@ struct devlink_dpipe_table_ops {
 			    struct devlink_dpipe_dump_ctx *dump_ctx);
 	int (*counters_set_update)(void *priv, bool enable);
 	u64 (*size_get)(void *priv);
+
+        RH_KABI_RESERVE(1)
+        RH_KABI_RESERVE(2)
 };
 
 /**
@@ -495,6 +520,9 @@ struct devlink_param {
 	int (*validate)(struct devlink *devlink, u32 id,
 			union devlink_param_value val,
 			struct netlink_ext_ack *extack);
+
+        RH_KABI_RESERVE(1)
+        RH_KABI_RESERVE(2)
 };
 
 struct devlink_param_item {
@@ -697,6 +725,9 @@ struct devlink_region_ops {
 		    struct netlink_ext_ack *extack,
 		    u64 offset, u32 size, u8 *data);
 	void *priv;
+
+        RH_KABI_RESERVE(1)
+        RH_KABI_RESERVE(2)
 };
 
 /**
@@ -725,6 +756,9 @@ struct devlink_port_region_ops {
 		    struct netlink_ext_ack *extack,
 		    u64 offset, u32 size, u8 *data);
 	void *priv;
+
+        RH_KABI_RESERVE(1)
+        RH_KABI_RESERVE(2)
 };
 
 struct devlink_fmsg;
@@ -758,6 +792,9 @@ struct devlink_health_reporter_ops {
 			struct netlink_ext_ack *extack);
 	int (*test)(struct devlink_health_reporter *reporter,
 		    struct netlink_ext_ack *extack);
+
+        RH_KABI_RESERVE(1)
+        RH_KABI_RESERVE(2)
 };
 
 /**
@@ -1537,6 +1574,15 @@ struct devlink_ops {
 	enum devlink_selftest_status
 	(*selftest_run)(struct devlink *devlink, unsigned int id,
 			struct netlink_ext_ack *extack);
+
+	RH_KABI_RESERVE(1)
+	RH_KABI_RESERVE(2)
+	RH_KABI_RESERVE(3)
+	RH_KABI_RESERVE(4)
+	RH_KABI_RESERVE(5)
+	RH_KABI_RESERVE(6)
+	RH_KABI_RESERVE(7)
+	RH_KABI_RESERVE(8)
 };
 
 void *devlink_priv(struct devlink *devlink);
@@ -1696,6 +1742,15 @@ struct devlink_port_ops {
 	int (*port_fn_max_io_eqs_set)(struct devlink_port *devlink_port,
 				      u32 max_eqs,
 				      struct netlink_ext_ack *extack);
+
+        RH_KABI_RESERVE(1)
+        RH_KABI_RESERVE(2)
+        RH_KABI_RESERVE(3)
+        RH_KABI_RESERVE(4)
+        RH_KABI_RESERVE(5)
+        RH_KABI_RESERVE(6)
+        RH_KABI_RESERVE(7)
+        RH_KABI_RESERVE(8)
 };
 
 void devlink_port_init(struct devlink *devlink,