From: JiangJieHua <jiangjiehua1@huawei.com> hulk inclusion category: feature bugzilla: https://atomgit.com/openeuler/kernel/issues/10109 ---------------------------------------- This patch fixes the breakage of KABI due to queue<->napi association, use the reserved domain segment of KABI 1 for netdev_queue and KABI 2 for netdev_rx_queue. Signed-off-by: JiangJieHua <jiangjiehua1@huawei.com> --- include/linux/netdevice.h | 9 ++++----- include/net/netdev_rx_queue.h | 6 ++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 43cb840f0f2b..f4b74ad63328 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -661,10 +661,6 @@ struct netdev_queue { #ifdef CONFIG_XDP_SOCKETS struct xsk_buff_pool *pool; #endif - /* NAPI instance for the queue - * Readers and writers must hold RTNL - */ - struct napi_struct *napi; /* * write-mostly part */ @@ -681,7 +677,10 @@ struct netdev_queue { struct dql dql; #endif - KABI_RESERVE(1) + /* NAPI instance for the queue + * Readers and writers must hold RTNL + */ + KABI_USE(1, struct napi_struct *napi) KABI_RESERVE(2) KABI_RESERVE(3) KABI_RESERVE(4) diff --git a/include/net/netdev_rx_queue.h b/include/net/netdev_rx_queue.h index 444e6b4e4f3c..5b70eabc5c8e 100644 --- a/include/net/netdev_rx_queue.h +++ b/include/net/netdev_rx_queue.h @@ -22,13 +22,11 @@ struct netdev_rx_queue { struct xsk_buff_pool *pool; #endif + KABI_USE(1, void *__rcu oecls_ftb) /* NAPI instance for the queue * Readers and writers must hold RTNL */ - struct napi_struct *napi; - - KABI_USE(1, void *__rcu oecls_ftb) - KABI_RESERVE(2) + KABI_USE(2, struct napi_struct *napi) KABI_RESERVE(3) KABI_RESERVE(4) } ____cacheline_aligned_in_smp; -- 2.18.0.huawei.25