Skip to content

R
raspberrypi-kernel

openeuler / raspberrypi-kernel

通知 14
Star 1
Fork 0
R
raspberrypi-kernel
提交 148a9c4f 编写于 作者: T Tan Xiaojun 提交者： Xie XiuQi
浏览文件
操作

kabi: reserve space for network subsystem related structure 

hulk inclusion
category: feature
bugzilla: 13276
CVE: NA

-------------------------------

Reserve space for the structure in network subsystem.
Signed-off-by: NTan Xiaojun <tanxiaojun@huawei.com>
Reviewed-by: NXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 d430ea6d
隐藏空白更改
内联 并排
Showing with 376 addition and 0 deletion
include/linux/ethtool.h
浏览文件 @ 148a9c4f
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#ifndef _LINUX_ETHTOOL_H #ifndef _LINUX_ETHTOOL_H
#define _LINUX_ETHTOOL_H #define _LINUX_ETHTOOL_H
#include <linux/kabi.h>
#include <linux/bitmap.h> #include <linux/bitmap.h>
#include <linux/compat.h> #include <linux/compat.h>
#include <uapi/linux/ethtool.h> #include <uapi/linux/ethtool.h>
...@@ -412,5 +413,38 @@ struct ethtool_ops { ...@@ -412,5 +413,38 @@ struct ethtool_ops {
struct ethtool_fecparam *); struct ethtool_fecparam *);
void (*get_ethtool_phy_stats)(struct net_device *, void (*get_ethtool_phy_stats)(struct net_device *,
struct ethtool_stats *, u64 *); struct ethtool_stats *, u64 *);
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
KABI_RESERVE(8)
KABI_RESERVE(9)
KABI_RESERVE(10)
KABI_RESERVE(11)
KABI_RESERVE(12)
KABI_RESERVE(13)
KABI_RESERVE(14)
KABI_RESERVE(15)
KABI_RESERVE(16)
KABI_RESERVE(17)
KABI_RESERVE(18)
KABI_RESERVE(19)
KABI_RESERVE(20)
KABI_RESERVE(21)
KABI_RESERVE(22)
KABI_RESERVE(23)
KABI_RESERVE(24)
KABI_RESERVE(25)
KABI_RESERVE(26)
KABI_RESERVE(27)
KABI_RESERVE(28)
KABI_RESERVE(29)
KABI_RESERVE(30)
KABI_RESERVE(31)
KABI_RESERVE(32)
}; };
#endif /* _LINUX_ETHTOOL_H */ #endif /* _LINUX_ETHTOOL_H */
include/linux/ipv6.h
浏览文件 @ 148a9c4f
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#ifndef _IPV6_H #ifndef _IPV6_H
#define _IPV6_H #define _IPV6_H
#include <linux/kabi.h>
#include <uapi/linux/ipv6.h> #include <uapi/linux/ipv6.h>
#define ipv6_optlen(p) (((p)->hdrlen+1) << 3) #define ipv6_optlen(p) (((p)->hdrlen+1) << 3)
...@@ -76,6 +77,23 @@ struct ipv6_devconf { ...@@ -76,6 +77,23 @@ struct ipv6_devconf {
__s32 ndisc_tclass; __s32 ndisc_tclass;
struct ctl_table_header *sysctl_header; struct ctl_table_header *sysctl_header;
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
KABI_RESERVE(8)
KABI_RESERVE(9)
KABI_RESERVE(10)
KABI_RESERVE(11)
KABI_RESERVE(12)
KABI_RESERVE(13)
KABI_RESERVE(14)
KABI_RESERVE(15)
KABI_RESERVE(16)
}; };
struct ipv6_params { struct ipv6_params {
......
include/linux/net.h
浏览文件 @ 148a9c4f
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#ifndef _LINUX_NET_H #ifndef _LINUX_NET_H
#define _LINUX_NET_H #define _LINUX_NET_H
#include <linux/kabi.h>
#include <linux/stringify.h> #include <linux/stringify.h>
#include <linux/random.h> #include <linux/random.h>
#include <linux/wait.h> #include <linux/wait.h>
...@@ -198,6 +199,14 @@ struct proto_ops { ...@@ -198,6 +199,14 @@ struct proto_ops {
int (*sendmsg_locked)(struct sock *sk, struct msghdr *msg, int (*sendmsg_locked)(struct sock *sk, struct msghdr *msg,
size_t size); size_t size);
int (*set_rcvlowat)(struct sock *sk, int val); int (*set_rcvlowat)(struct sock *sk, int val);
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
}; };
#define DECLARE_SOCKADDR(type, dst, src) \ #define DECLARE_SOCKADDR(type, dst, src) \
......
include/linux/netdevice.h
浏览文件 @ 148a9c4f
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#ifndef _LINUX_NETDEVICE_H #ifndef _LINUX_NETDEVICE_H
#define _LINUX_NETDEVICE_H #define _LINUX_NETDEVICE_H
#include <linux/kabi.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/bug.h> #include <linux/bug.h>
#include <linux/delay.h> #include <linux/delay.h>
...@@ -274,6 +275,10 @@ struct header_ops { ...@@ -274,6 +275,10 @@ struct header_ops {
const struct net_device *dev, const struct net_device *dev,
const unsigned char *haddr); const unsigned char *haddr);
bool (*validate)(const char *ll_header, unsigned int len); bool (*validate)(const char *ll_header, unsigned int len);
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
}; };
/* These flag bits are private to the generic network queueing /* These flag bits are private to the generic network queueing
...@@ -339,6 +344,14 @@ struct napi_struct { ...@@ -339,6 +344,14 @@ struct napi_struct {
struct list_head dev_list; struct list_head dev_list;
struct hlist_node napi_hash_node; struct hlist_node napi_hash_node;
unsigned int napi_id; unsigned int napi_id;
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
}; };
enum { enum {
...@@ -598,6 +611,15 @@ struct netdev_queue { ...@@ -598,6 +611,15 @@ struct netdev_queue {
#ifdef CONFIG_BQL #ifdef CONFIG_BQL
struct dql dql; struct dql dql;
#endif #endif
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
KABI_RESERVE(8)
} ____cacheline_aligned_in_smp; } ____cacheline_aligned_in_smp;
extern int sysctl_fb_tunnels_only_for_init_net; extern int sysctl_fb_tunnels_only_for_init_net;
...@@ -712,6 +734,15 @@ struct netdev_rx_queue { ...@@ -712,6 +734,15 @@ struct netdev_rx_queue {
struct kobject kobj; struct kobject kobj;
struct net_device *dev; struct net_device *dev;
struct xdp_rxq_info xdp_rxq; struct xdp_rxq_info xdp_rxq;
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
KABI_RESERVE(8)
} ____cacheline_aligned_in_smp; } ____cacheline_aligned_in_smp;
/* /*
...@@ -888,6 +919,14 @@ struct xfrmdev_ops { ...@@ -888,6 +919,14 @@ struct xfrmdev_ops {
bool (*xdo_dev_offload_ok) (struct sk_buff *skb, bool (*xdo_dev_offload_ok) (struct sk_buff *skb,
struct xfrm_state *x); struct xfrm_state *x);
void (*xdo_dev_state_advance_esn) (struct xfrm_state *x); void (*xdo_dev_state_advance_esn) (struct xfrm_state *x);
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
}; };
#endif #endif
...@@ -910,6 +949,14 @@ struct tlsdev_ops { ...@@ -910,6 +949,14 @@ struct tlsdev_ops {
enum tls_offload_ctx_dir direction); enum tls_offload_ctx_dir direction);
void (*tls_dev_resync_rx)(struct net_device *netdev, void (*tls_dev_resync_rx)(struct net_device *netdev,
struct sock *sk, u32 seq, u64 rcd_sn); struct sock *sk, u32 seq, u64 rcd_sn);
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
}; };
#endif #endif
...@@ -1410,6 +1457,54 @@ struct net_device_ops { ...@@ -1410,6 +1457,54 @@ struct net_device_ops {
u32 flags); u32 flags);
int (*ndo_xsk_async_xmit)(struct net_device *dev, int (*ndo_xsk_async_xmit)(struct net_device *dev,
u32 queue_id); u32 queue_id);
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
KABI_RESERVE(8)
KABI_RESERVE(9)
KABI_RESERVE(10)
KABI_RESERVE(11)
KABI_RESERVE(12)
KABI_RESERVE(13)
KABI_RESERVE(14)
KABI_RESERVE(15)
KABI_RESERVE(16)
KABI_RESERVE(17)
KABI_RESERVE(18)
KABI_RESERVE(19)
KABI_RESERVE(20)
KABI_RESERVE(21)
KABI_RESERVE(22)
KABI_RESERVE(23)
KABI_RESERVE(24)
KABI_RESERVE(25)
KABI_RESERVE(26)
KABI_RESERVE(27)
KABI_RESERVE(28)
KABI_RESERVE(29)
KABI_RESERVE(30)
KABI_RESERVE(31)
KABI_RESERVE(32)
KABI_RESERVE(33)
KABI_RESERVE(34)
KABI_RESERVE(35)
KABI_RESERVE(36)
KABI_RESERVE(37)
KABI_RESERVE(38)
KABI_RESERVE(39)
KABI_RESERVE(40)
KABI_RESERVE(41)
KABI_RESERVE(42)
KABI_RESERVE(43)
KABI_RESERVE(44)
KABI_RESERVE(45)
KABI_RESERVE(46)
KABI_RESERVE(47)
}; };
/** /**
...@@ -2020,6 +2115,37 @@ struct net_device { ...@@ -2020,6 +2115,37 @@ struct net_device {
struct lock_class_key *qdisc_running_key; struct lock_class_key *qdisc_running_key;
bool proto_down; bool proto_down;
unsigned wol_enabled:1; unsigned wol_enabled:1;
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
KABI_RESERVE(8)
KABI_RESERVE(9)
KABI_RESERVE(10)
KABI_RESERVE(11)
KABI_RESERVE(12)
KABI_RESERVE(13)
KABI_RESERVE(14)
KABI_RESERVE(15)
KABI_RESERVE(16)
KABI_RESERVE(17)
KABI_RESERVE(18)
KABI_RESERVE(19)
KABI_RESERVE(20)
KABI_RESERVE(21)
KABI_RESERVE(22)
KABI_RESERVE(23)
KABI_RESERVE(24)
KABI_RESERVE(25)
KABI_RESERVE(26)
KABI_RESERVE(27)
KABI_RESERVE(28)
KABI_RESERVE(29)
KABI_RESERVE(30)
}; };
#define to_net_dev(d) container_of(d, struct net_device, dev) #define to_net_dev(d) container_of(d, struct net_device, dev)
...@@ -2335,6 +2461,11 @@ struct packet_type { ...@@ -2335,6 +2461,11 @@ struct packet_type {
struct sock *sk); struct sock *sk);
void *af_packet_priv; void *af_packet_priv;
struct list_head list; struct list_head list;
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
}; };
struct offload_callbacks { struct offload_callbacks {
......
include/net/dcbnl.h
浏览文件 @ 148a9c4f
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#ifndef __NET_DCBNL_H__ #ifndef __NET_DCBNL_H__
#define __NET_DCBNL_H__ #define __NET_DCBNL_H__
#include <linux/kabi.h>
#include <linux/dcbnl.h> #include <linux/dcbnl.h>
struct dcb_app_type { struct dcb_app_type {
...@@ -118,6 +119,22 @@ struct dcbnl_rtnl_ops { ...@@ -118,6 +119,22 @@ struct dcbnl_rtnl_ops {
/* buffer settings */ /* buffer settings */
int (*dcbnl_getbuffer)(struct net_device *, struct dcbnl_buffer *); int (*dcbnl_getbuffer)(struct net_device *, struct dcbnl_buffer *);
int (*dcbnl_setbuffer)(struct net_device *, struct dcbnl_buffer *); int (*dcbnl_setbuffer)(struct net_device *, struct dcbnl_buffer *);
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
KABI_RESERVE(8)
KABI_RESERVE(9)
KABI_RESERVE(10)
KABI_RESERVE(11)
KABI_RESERVE(12)
KABI_RESERVE(13)
KABI_RESERVE(14)
KABI_RESERVE(15)
}; };
#endif /* __NET_DCBNL_H__ */ #endif /* __NET_DCBNL_H__ */
include/net/dst.h
浏览文件 @ 148a9c4f
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#ifndef _NET_DST_H #ifndef _NET_DST_H
#define _NET_DST_H #define _NET_DST_H
#include <linux/kabi.h>
#include <net/dst_ops.h> #include <net/dst_ops.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
...@@ -88,6 +89,17 @@ struct dst_entry { ...@@ -88,6 +89,17 @@ struct dst_entry {
#ifndef CONFIG_64BIT #ifndef CONFIG_64BIT
atomic_t __refcnt; /* 32-bit offset 64 */ atomic_t __refcnt; /* 32-bit offset 64 */
#endif #endif
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
KABI_RESERVE(8)
KABI_RESERVE(9)
KABI_RESERVE(10)
}; };
struct dst_metrics { struct dst_metrics {
......
include/net/dst_ops.h
浏览文件 @ 148a9c4f
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
#ifndef _NET_DST_OPS_H #ifndef _NET_DST_OPS_H
#define _NET_DST_OPS_H #define _NET_DST_OPS_H
#include <linux/kabi.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/percpu_counter.h> #include <linux/percpu_counter.h>
#include <linux/cache.h> #include <linux/cache.h>
...@@ -40,6 +41,15 @@ struct dst_ops { ...@@ -40,6 +41,15 @@ struct dst_ops {
struct kmem_cache *kmem_cachep; struct kmem_cache *kmem_cachep;
struct percpu_counter pcpuc_entries ____cacheline_aligned_in_smp; struct percpu_counter pcpuc_entries ____cacheline_aligned_in_smp;
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
KABI_RESERVE(8)
}; };
static inline int dst_entries_get_fast(struct dst_ops *dst) static inline int dst_entries_get_fast(struct dst_ops *dst)
......
include/net/fib_rules.h
浏览文件 @ 148a9c4f
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#ifndef __NET_FIB_RULES_H #ifndef __NET_FIB_RULES_H
#define __NET_FIB_RULES_H #define __NET_FIB_RULES_H
#include <linux/kabi.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
...@@ -43,6 +44,15 @@ struct fib_rule { ...@@ -43,6 +44,15 @@ struct fib_rule {
struct fib_rule_port_range sport_range; struct fib_rule_port_range sport_range;
struct fib_rule_port_range dport_range; struct fib_rule_port_range dport_range;
struct rcu_head rcu; struct rcu_head rcu;
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
KABI_RESERVE(8)
}; };
struct fib_lookup_arg { struct fib_lookup_arg {
......
include/net/flow.h
浏览文件 @ 148a9c4f
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#ifndef _NET_FLOW_H #ifndef _NET_FLOW_H
#define _NET_FLOW_H #define _NET_FLOW_H
#include <linux/kabi.h>
#include <linux/socket.h> #include <linux/socket.h>
#include <linux/in6.h> #include <linux/in6.h>
#include <linux/atomic.h> #include <linux/atomic.h>
...@@ -40,6 +41,9 @@ struct flowi_common { ...@@ -40,6 +41,9 @@ struct flowi_common {
__u32 flowic_secid; __u32 flowic_secid;
struct flowi_tunnel flowic_tun_key; struct flowi_tunnel flowic_tun_key;
kuid_t flowic_uid; kuid_t flowic_uid;
KABI_RESERVE(1)
KABI_RESERVE(2)
}; };
union flowi_uli { union flowi_uli {
...@@ -91,6 +95,9 @@ struct flowi4 { ...@@ -91,6 +95,9 @@ struct flowi4 {
#define fl4_ipsec_spi uli.spi #define fl4_ipsec_spi uli.spi
#define fl4_mh_type uli.mht.type #define fl4_mh_type uli.mht.type
#define fl4_gre_key uli.gre_key #define fl4_gre_key uli.gre_key
KABI_RESERVE(1)
KABI_RESERVE(2)
} __attribute__((__aligned__(BITS_PER_LONG/8))); } __attribute__((__aligned__(BITS_PER_LONG/8)));
static inline void flowi4_init_output(struct flowi4 *fl4, int oif, static inline void flowi4_init_output(struct flowi4 *fl4, int oif,
...@@ -151,6 +158,9 @@ struct flowi6 { ...@@ -151,6 +158,9 @@ struct flowi6 {
#define fl6_mh_type uli.mht.type #define fl6_mh_type uli.mht.type
#define fl6_gre_key uli.gre_key #define fl6_gre_key uli.gre_key
__u32 mp_hash; __u32 mp_hash;
KABI_RESERVE(1)
KABI_RESERVE(2)
} __attribute__((__aligned__(BITS_PER_LONG/8))); } __attribute__((__aligned__(BITS_PER_LONG/8)));
struct flowidn { struct flowidn {
......
include/net/genetlink.h
浏览文件 @ 148a9c4f
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#ifndef __NET_GENERIC_NETLINK_H #ifndef __NET_GENERIC_NETLINK_H
#define __NET_GENERIC_NETLINK_H #define __NET_GENERIC_NETLINK_H
#include <linux/kabi.h>
#include <linux/genetlink.h> #include <linux/genetlink.h>
#include <net/netlink.h> #include <net/netlink.h>
#include <net/net_namespace.h> #include <net/net_namespace.h>
...@@ -71,6 +72,15 @@ struct genl_family { ...@@ -71,6 +72,15 @@ struct genl_family {
unsigned int n_mcgrps; unsigned int n_mcgrps;
unsigned int mcgrp_offset; /* private */ unsigned int mcgrp_offset; /* private */
struct module *module; struct module *module;
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
KABI_RESERVE(8)
}; };
struct nlattr **genl_family_attrbuf(const struct genl_family *family); struct nlattr **genl_family_attrbuf(const struct genl_family *family);
...@@ -141,6 +151,14 @@ struct genl_ops { ...@@ -141,6 +151,14 @@ struct genl_ops {
u8 cmd; u8 cmd;
u8 internal_flags; u8 internal_flags;
u8 flags; u8 flags;
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
}; };
int genl_register_family(struct genl_family *family); int genl_register_family(struct genl_family *family);
......
include/net/l3mdev.h
浏览文件 @ 148a9c4f
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#ifndef _NET_L3MDEV_H_ #ifndef _NET_L3MDEV_H_
#define _NET_L3MDEV_H_ #define _NET_L3MDEV_H_
#include <linux/kabi.h>
#include <net/dst.h> #include <net/dst.h>
#include <net/fib_rules.h> #include <net/fib_rules.h>
...@@ -37,6 +38,14 @@ struct l3mdev_ops { ...@@ -37,6 +38,14 @@ struct l3mdev_ops {
/* IPv6 ops */ /* IPv6 ops */
struct dst_entry * (*l3mdev_link_scope_lookup)(const struct net_device *dev, struct dst_entry * (*l3mdev_link_scope_lookup)(const struct net_device *dev,
struct flowi6 *fl6); struct flowi6 *fl6);
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
}; };
#ifdef CONFIG_NET_L3_MASTER_DEV #ifdef CONFIG_NET_L3_MASTER_DEV
......
include/net/lwtunnel.h
浏览文件 @ 148a9c4f
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#ifndef __NET_LWTUNNEL_H #ifndef __NET_LWTUNNEL_H
#define __NET_LWTUNNEL_H 1 #define __NET_LWTUNNEL_H 1
#include <linux/kabi.h>
#include <linux/lwtunnel.h> #include <linux/lwtunnel.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
...@@ -30,6 +31,11 @@ struct lwtunnel_state { ...@@ -30,6 +31,11 @@ struct lwtunnel_state {
int (*orig_output)(struct net *net, struct sock *sk, struct sk_buff *skb); int (*orig_output)(struct net *net, struct sock *sk, struct sk_buff *skb);
int (*orig_input)(struct sk_buff *); int (*orig_input)(struct sk_buff *);
struct rcu_head rcu; struct rcu_head rcu;
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
__u8 data[0]; __u8 data[0];
}; };
......
include/net/neighbour.h
浏览文件 @ 148a9c4f
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#ifndef _NET_NEIGHBOUR_H #ifndef _NET_NEIGHBOUR_H
#define _NET_NEIGHBOUR_H #define _NET_NEIGHBOUR_H
#include <linux/kabi.h>
#include <linux/neighbour.h> #include <linux/neighbour.h>
/* /*
...@@ -156,6 +157,9 @@ struct neighbour { ...@@ -156,6 +157,9 @@ struct neighbour {
const struct neigh_ops *ops; const struct neigh_ops *ops;
struct rcu_head rcu; struct rcu_head rcu;
struct net_device *dev; struct net_device *dev;
KABI_RESERVE(1)
KABI_RESERVE(2)
u8 primary_key[0]; u8 primary_key[0];
} __randomize_layout; } __randomize_layout;
......
include/net/rtnetlink.h
浏览文件 @ 148a9c4f
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#ifndef __NET_RTNETLINK_H #ifndef __NET_RTNETLINK_H
#define __NET_RTNETLINK_H #define __NET_RTNETLINK_H
#include <linux/kabi.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <net/netlink.h> #include <net/netlink.h>
...@@ -110,6 +111,22 @@ struct rtnl_link_ops { ...@@ -110,6 +111,22 @@ struct rtnl_link_ops {
int (*fill_linkxstats)(struct sk_buff *skb, int (*fill_linkxstats)(struct sk_buff *skb,
const struct net_device *dev, const struct net_device *dev,
int *prividx, int attr); int *prividx, int attr);
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
KABI_RESERVE(8)
KABI_RESERVE(9)
KABI_RESERVE(10)
KABI_RESERVE(11)
KABI_RESERVE(12)
KABI_RESERVE(13)
KABI_RESERVE(14)
KABI_RESERVE(15)
}; };
int __rtnl_link_register(struct rtnl_link_ops *ops); int __rtnl_link_register(struct rtnl_link_ops *ops);
......
include/net/sock.h
浏览文件 @ 148a9c4f
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#ifndef _SOCK_H #ifndef _SOCK_H
#define _SOCK_H #define _SOCK_H
#include <linux/kabi.h>
#include <linux/hardirq.h> #include <linux/hardirq.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/list.h> #include <linux/list.h>
...@@ -509,6 +510,23 @@ struct sock { ...@@ -509,6 +510,23 @@ struct sock {
void (*sk_destruct)(struct sock *sk); void (*sk_destruct)(struct sock *sk);
struct sock_reuseport __rcu *sk_reuseport_cb; struct sock_reuseport __rcu *sk_reuseport_cb;
struct rcu_head sk_rcu; struct rcu_head sk_rcu;
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
KABI_RESERVE(8)
KABI_RESERVE(9)
KABI_RESERVE(10)
KABI_RESERVE(11)
KABI_RESERVE(12)
KABI_RESERVE(13)
KABI_RESERVE(14)
KABI_RESERVE(15)
KABI_RESERVE(16)
}; };
enum sk_pacing { enum sk_pacing {
...@@ -1170,6 +1188,23 @@ struct proto { ...@@ -1170,6 +1188,23 @@ struct proto {
atomic_t socks; atomic_t socks;
#endif #endif
int (*diag_destroy)(struct sock *sk, int err); int (*diag_destroy)(struct sock *sk, int err);
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
KABI_RESERVE(8)
KABI_RESERVE(9)
KABI_RESERVE(10)
KABI_RESERVE(11)
KABI_RESERVE(12)
KABI_RESERVE(13)
KABI_RESERVE(14)
KABI_RESERVE(15)
KABI_RESERVE(16)
} __randomize_layout; } __randomize_layout;
int proto_register(struct proto *prot, int alloc_slab); int proto_register(struct proto *prot, int alloc_slab);
......
include/net/switchdev.h
浏览文件 @ 148a9c4f
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#ifndef _LINUX_SWITCHDEV_H_ #ifndef _LINUX_SWITCHDEV_H_
#define _LINUX_SWITCHDEV_H_ #define _LINUX_SWITCHDEV_H_
#include <linux/kabi.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/list.h> #include <linux/list.h>
...@@ -85,6 +86,11 @@ struct switchdev_obj { ...@@ -85,6 +86,11 @@ struct switchdev_obj {
u32 flags; u32 flags;
void *complete_priv; void *complete_priv;
void (*complete)(struct net_device *dev, int err, void *priv); void (*complete)(struct net_device *dev, int err, void *priv);
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
}; };
/* SWITCHDEV_OBJ_ID_PORT_VLAN */ /* SWITCHDEV_OBJ_ID_PORT_VLAN */
...@@ -137,6 +143,14 @@ struct switchdev_ops { ...@@ -137,6 +143,14 @@ struct switchdev_ops {
struct switchdev_trans *trans); struct switchdev_trans *trans);
int (*switchdev_port_obj_del)(struct net_device *dev, int (*switchdev_port_obj_del)(struct net_device *dev,
const struct switchdev_obj *obj); const struct switchdev_obj *obj);
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
KABI_RESERVE(7)
}; };
enum switchdev_notifier_type { enum switchdev_notifier_type {
......
include/net/tls.h
浏览文件 @ 148a9c4f
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#ifndef _TLS_OFFLOAD_H #ifndef _TLS_OFFLOAD_H
#define _TLS_OFFLOAD_H #define _TLS_OFFLOAD_H
#include <linux/kabi.h>
#include <linux/types.h> #include <linux/types.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <linux/crypto.h> #include <linux/crypto.h>
...@@ -175,6 +176,11 @@ struct cipher_context { ...@@ -175,6 +176,11 @@ struct cipher_context {
char *iv; char *iv;
u16 rec_seq_size; u16 rec_seq_size;
char *rec_seq; char *rec_seq;
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
}; };
union tls_crypto_context { union tls_crypto_context {
......
include/net/xdp.h
浏览文件 @ 148a9c4f
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#ifndef __LINUX_NET_XDP_H__ #ifndef __LINUX_NET_XDP_H__
#define __LINUX_NET_XDP_H__ #define __LINUX_NET_XDP_H__
#include <linux/kabi.h>
/** /**
* DOC: XDP RX-queue information * DOC: XDP RX-queue information
* *
...@@ -61,6 +62,13 @@ struct xdp_rxq_info { ...@@ -61,6 +62,13 @@ struct xdp_rxq_info {
u32 queue_index; u32 queue_index;
u32 reg_state; u32 reg_state;
struct xdp_mem_info mem; struct xdp_mem_info mem;
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
KABI_RESERVE(5)
KABI_RESERVE(6)
} ____cacheline_aligned; /* perf critical, avoid false-sharing */ } ____cacheline_aligned; /* perf critical, avoid false-sharing */
struct xdp_buff { struct xdp_buff {
......
include/net/xfrm.h
浏览文件 @ 148a9c4f
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#ifndef _NET_XFRM_H #ifndef _NET_XFRM_H
#define _NET_XFRM_H #define _NET_XFRM_H
#include <linux/kabi.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/xfrm.h> #include <linux/xfrm.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
...@@ -123,6 +124,8 @@ struct xfrm_state_walk { ...@@ -123,6 +124,8 @@ struct xfrm_state_walk {
u8 proto; u8 proto;
u32 seq; u32 seq;
struct xfrm_address_filter *filter; struct xfrm_address_filter *filter;
KABI_RESERVE(1)
}; };
struct xfrm_state_offload { struct xfrm_state_offload {
...@@ -130,6 +133,11 @@ struct xfrm_state_offload { ...@@ -130,6 +133,11 @@ struct xfrm_state_offload {
unsigned long offload_handle; unsigned long offload_handle;
unsigned int num_exthdrs; unsigned int num_exthdrs;
u8 flags; u8 flags;
KABI_RESERVE(1)
KABI_RESERVE(2)
KABI_RESERVE(3)
KABI_RESERVE(4)
}; };
/* Full description of state of transformer. */ /* Full description of state of transformer. */
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或