From 4684516d40ebb3312082312d0401f78f860cbc03 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 7 Oct 2022 08:50:59 +0200 Subject: [PATCH] 5.15-stable patches added patches: xsk-inherit-need_wakeup-flag-for-shared-sockets.patch --- queue-5.15/series | 1 + ...-need_wakeup-flag-for-shared-sockets.patch | 73 +++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 queue-5.15/xsk-inherit-need_wakeup-flag-for-shared-sockets.patch diff --git a/queue-5.15/series b/queue-5.15/series index 096c3c91197..7e24ba78f7a 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -1,5 +1,6 @@ makefile.extrawarn-move-wcast-function-type-strict-to-w-1.patch docs-update-mediator-information-in-coc-docs.patch +xsk-inherit-need_wakeup-flag-for-shared-sockets.patch mm-gup-fix-the-fast-gup-race-against-thp-collapse.patch powerpc-64s-radix-don-t-need-to-broadcast-ipi-for-radix-pmd-collapse-flush.patch wait_on_bit-add-an-acquire-memory-barrier.patch diff --git a/queue-5.15/xsk-inherit-need_wakeup-flag-for-shared-sockets.patch b/queue-5.15/xsk-inherit-need_wakeup-flag-for-shared-sockets.patch new file mode 100644 index 00000000000..4b2573c90e0 --- /dev/null +++ b/queue-5.15/xsk-inherit-need_wakeup-flag-for-shared-sockets.patch @@ -0,0 +1,73 @@ +From 60240bc26114543fcbfcd8a28466e67e77b20388 Mon Sep 17 00:00:00 2001 +From: Jalal Mostafa +Date: Wed, 21 Sep 2022 13:57:01 +0000 +Subject: xsk: Inherit need_wakeup flag for shared sockets + +From: Jalal Mostafa + +commit 60240bc26114543fcbfcd8a28466e67e77b20388 upstream. + +The flag for need_wakeup is not set for xsks with `XDP_SHARED_UMEM` +flag and of different queue ids and/or devices. They should inherit +the flag from the first socket buffer pool since no flags can be +specified once `XDP_SHARED_UMEM` is specified. + +Fixes: b5aea28dca134 ("xsk: Add shared umem support between queue ids") +Signed-off-by: Jalal Mostafa +Signed-off-by: Daniel Borkmann +Acked-by: Magnus Karlsson +Link: https://lore.kernel.org/bpf/20220921135701.10199-1-jalal.a.mostapha@gmail.com +Signed-off-by: Greg Kroah-Hartman +--- + include/net/xsk_buff_pool.h | 2 +- + net/xdp/xsk.c | 4 ++-- + net/xdp/xsk_buff_pool.c | 5 +++-- + 3 files changed, 6 insertions(+), 5 deletions(-) + +--- a/include/net/xsk_buff_pool.h ++++ b/include/net/xsk_buff_pool.h +@@ -87,7 +87,7 @@ struct xsk_buff_pool *xp_create_and_assi + struct xdp_umem *umem); + int xp_assign_dev(struct xsk_buff_pool *pool, struct net_device *dev, + u16 queue_id, u16 flags); +-int xp_assign_dev_shared(struct xsk_buff_pool *pool, struct xdp_umem *umem, ++int xp_assign_dev_shared(struct xsk_buff_pool *pool, struct xdp_sock *umem_xs, + struct net_device *dev, u16 queue_id); + int xp_alloc_tx_descs(struct xsk_buff_pool *pool, struct xdp_sock *xs); + void xp_destroy(struct xsk_buff_pool *pool); +--- a/net/xdp/xsk.c ++++ b/net/xdp/xsk.c +@@ -968,8 +968,8 @@ static int xsk_bind(struct socket *sock, + goto out_unlock; + } + +- err = xp_assign_dev_shared(xs->pool, umem_xs->umem, +- dev, qid); ++ err = xp_assign_dev_shared(xs->pool, umem_xs, dev, ++ qid); + if (err) { + xp_destroy(xs->pool); + xs->pool = NULL; +--- a/net/xdp/xsk_buff_pool.c ++++ b/net/xdp/xsk_buff_pool.c +@@ -206,17 +206,18 @@ err_unreg_pool: + return err; + } + +-int xp_assign_dev_shared(struct xsk_buff_pool *pool, struct xdp_umem *umem, ++int xp_assign_dev_shared(struct xsk_buff_pool *pool, struct xdp_sock *umem_xs, + struct net_device *dev, u16 queue_id) + { + u16 flags; ++ struct xdp_umem *umem = umem_xs->umem; + + /* One fill and completion ring required for each queue id. */ + if (!pool->fq || !pool->cq) + return -EINVAL; + + flags = umem->zc ? XDP_ZEROCOPY : XDP_COPY; +- if (pool->uses_need_wakeup) ++ if (umem_xs->pool->uses_need_wakeup) + flags |= XDP_USE_NEED_WAKEUP; + + return xp_assign_dev(pool, dev, queue_id, flags); -- 2.47.3