hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I903T2
--------------------------------
Signed-off-by: Wang Yufen wangyufen@huawei.com --- include/linux/inetdevice.h | 4 ++++ include/net/if_inet6.h | 8 ++++++++ include/net/netns/sctp.h | 2 ++ include/net/sock_reuseport.h | 2 ++ include/rdma/ib_verbs.h | 12 ++++++++++++ 5 files changed, 28 insertions(+)
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h index ddb27fc..19b3677 100644 --- a/include/linux/inetdevice.h +++ b/include/linux/inetdevice.h @@ -50,6 +50,8 @@ struct in_device { struct neigh_parms *arp_parms; struct ipv4_devconf cnf; struct rcu_head rcu_head; + KABI_RESERVE(1) + KABI_RESERVE(2) };
#define IPV4_DEVCONF(cnf, attr) ((cnf).data[IPV4_DEVCONF_ ## attr - 1]) @@ -159,6 +161,8 @@ struct in_ifaddr { __u32 ifa_preferred_lft; unsigned long ifa_cstamp; /* created timestamp */ unsigned long ifa_tstamp; /* updated timestamp */ + KABI_RESERVE(1) + KABI_RESERVE(2) };
struct in_validator_info { diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h index c849072..1199310 100644 --- a/include/net/if_inet6.h +++ b/include/net/if_inet6.h @@ -111,6 +111,8 @@ struct ip6_sf_list { unsigned char sf_oldin; /* change state */ unsigned char sf_crcount; /* retrans. left to send */ struct rcu_head rcu; + KABI_RESERVE(1) + KABI_RESERVE(2) };
#define MAF_TIMER_RUNNING 0x01 @@ -135,6 +137,10 @@ struct ifmcaddr6 { unsigned long mca_cstamp; unsigned long mca_tstamp; struct rcu_head rcu; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) };
/* Anycast stuff */ @@ -223,6 +229,8 @@ struct inet6_dev { struct rcu_head rcu;
unsigned int ra_mtu; + KABI_RESERVE(1) + KABI_RESERVE(2) };
static inline void ipv6_eth_mc_map(const struct in6_addr *addr, char *buf) diff --git a/include/net/netns/sctp.h b/include/net/netns/sctp.h index 7eff3d9..b812c1b 100644 --- a/include/net/netns/sctp.h +++ b/include/net/netns/sctp.h @@ -179,6 +179,8 @@ struct netns_sctp { #ifdef CONFIG_NET_L3_MASTER_DEV int l3mdev_accept; #endif + KABI_RESERVE(1) + KABI_RESERVE(2) };
#endif /* __NETNS_SCTP_H__ */ diff --git a/include/net/sock_reuseport.h b/include/net/sock_reuseport.h index 6ec140b..9458cc5 100644 --- a/include/net/sock_reuseport.h +++ b/include/net/sock_reuseport.h @@ -26,6 +26,8 @@ struct sock_reuseport { unsigned int bind_inany:1; unsigned int has_conns:1; struct bpf_prog __rcu *prog; /* optional BPF sock selector */ + KABI_RESERVE(1) + KABI_RESERVE(2) struct sock *socks[]; /* array of sock pointers */ };
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 62f9d12..3e006a7 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -450,6 +450,8 @@ struct ib_device_attr { u64 max_dm_size; /* Max entries for sgl for optimized performance per READ */ u32 max_sgl_rd; + KABI_RESERVE(1) + KABI_RESERVE(2) };
enum ib_mtu { @@ -608,6 +610,8 @@ struct rdma_hw_stats { unsigned long *is_disabled; int num_counters; u64 value[]; + KABI_RESERVE(1) + KABI_RESERVE(2) };
#define RDMA_HW_STATS_DEFAULT_LIFESPAN 10 @@ -1642,6 +1646,8 @@ struct ib_srq { * Implementation details of the RDMA core, don't use in drivers: */ struct rdma_restrack_entry res; + KABI_RESERVE(1) + KABI_RESERVE(2) };
enum ib_raw_packet_caps { @@ -2217,6 +2223,8 @@ struct ib_port_data { struct hlist_node ndev_hash_link; struct rdma_port_counter port_counter; struct ib_port *sysfs; + KABI_RESERVE(1) + KABI_RESERVE(2) };
/* rdma netdev type - specifies protocol type */ @@ -2684,6 +2692,8 @@ struct ib_device_ops { DECLARE_RDMA_OBJ_SIZE(ib_srq); DECLARE_RDMA_OBJ_SIZE(ib_ucontext); DECLARE_RDMA_OBJ_SIZE(ib_xrcd); + KABI_RESERVE(1) + KABI_RESERVE(2) };
struct ib_core_device { @@ -2784,6 +2794,8 @@ struct ib_device { char iw_ifname[IFNAMSIZ]; u32 iw_driver_flags; u32 lag_flags; + KABI_RESERVE(1) + KABI_RESERVE(2) };
static inline void *rdma_zalloc_obj(struct ib_device *dev, size_t size,
-
Wang Yufen