Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32793f71 authored by Yunjian Wang's avatar Yunjian Wang Committed by Greg Kroah-Hartman
Browse files

tun: Fix xdp_rxq_info's queue_index when detaching 



[ Upstream commit 2a770cdc4382b457ca3d43d03f0f0064f905a0d0 ]

When a queue(tfile) is detached, we only update tfile's queue_index,
but do not update xdp_rxq_info's queue_index. This patch fixes it.

Fixes: 8bf5c4ee ("tun: setup xdp_rxq_info")
Signed-off-by: default avatarYunjian Wang <wangyunjian@huawei.com>
Link: https://lore.kernel.org/r/1708398727-46308-1-git-send-email-wangyunjian@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ec343a55

drivers/net/tun.c

+1 −0
Original line number Diff line number Diff line
@@ -729,6 +729,7 @@ static void __tun_detach(struct tun_file *tfile, bool clean) 
				   tun->tfiles[tun->numqueues - 1]);

		ntfile = rtnl_dereference(tun->tfiles[index]);

		ntfile->queue_index = index;

		ntfile->xdp_rxq.queue_index = index;

		rcu_assign_pointer(tun->tfiles[tun->numqueues - 1],

				   NULL);