Skip to content

Commit 6cdefbb

Browse files
opsifflanlanxiyiji
authored andcommitted
net: netpoll: Fix kabi in netpoll by using KABI_EXTEND
deepin inclusion category: kabi When DEEPIN_KABI_RESERVE=y, struct net_device is kabi whitelist, commit dc67d67a995e ("net: netpoll: Individualize the skb pool") upstream introduce skb_pool in every struct netpoll which "modify the netpoll system to assign a skb pool to each target instead of using a global one." and be backport to v6.6.117 stable version for it is Stable-dep-of commit 49c8d2c ("net: netpoll: fix incorrect refcount handling causing incorrect cleanup") change struct netpoll { ... +struct sk_buff_head skb_pool; } ->change netpoll_info { ... struct netpoll *netpoll; } ->change net_device { struct netpoll_info *npinfo; } ->change some EXPORT_SYMBOL such as free_netdev etc ... in our KABI whitelist. The struct sk_buff_head { struct sk_buff *next; struct sk_buff *prev; .. } is larger than KABI reverse in the struct, so cannot use KABI_USE in this situation. For netpoll pointer after change is same as before and use internal. We can use DEEPIN_KABI_EXTEND to fix it. Fixes: ca946ee ("net: netpoll: Individualize the skb pool") Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent ab0f9b7 commit 6cdefbb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/linux/netpoll.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ struct netpoll {
3232
bool ipv6;
3333
u16 local_port, remote_port;
3434
u8 remote_mac[ETH_ALEN];
35-
struct sk_buff_head skb_pool;
3635

3736
DEEPIN_KABI_RESERVE(1)
3837
DEEPIN_KABI_RESERVE(2)
38+
DEEPIN_KABI_EXTEND(struct sk_buff_head skb_pool)
3939
};
4040

4141
struct netpoll_info {

0 commit comments

Comments
 (0)