xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xsk: Inherit need_wakeup flag for shared sockets

Browse Source 
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: b5aea28dca ("xsk: Add shared umem support between queue ids")
Signed-off-by: Jalal Mostafa <jalal.a.mostapha@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Magnus Karlsson <magnus.karlsson@intel.com>
Link: https://lore.kernel.org/bpf/20220921135701.10199-1-jalal.a.mostapha@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jalal Mostafa
2022-09-21 13:57:01 +00:00
committed by Greg Kroah-Hartman
parent beffc38dc6
commit 132590d776
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/xsk_buff_pool.h
View File

@@ -86,7 +86,7 @@ struct xsk_buff_pool *xp_create_and_assign_umem(struct xdp_sock *xs,
struct xdp_umem *umem); struct xdp_umem *umem);
int xp_assign_dev(struct xsk_buff_pool *pool, struct net_device *dev, int xp_assign_dev(struct xsk_buff_pool *pool, struct net_device *dev,
u16 queue_id, u16 flags); 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); struct net_device *dev, u16 queue_id);
void xp_destroy(struct xsk_buff_pool *pool); void xp_destroy(struct xsk_buff_pool *pool);
void xp_release(struct xdp_buff_xsk *xskb); void xp_release(struct xdp_buff_xsk *xskb);

4
net/xdp/xsk.c
View File

@@ -742,8 +742,8 @@ static int xsk_bind(struct socket *sock, struct sockaddr *addr, int addr_len)
goto out_unlock; goto out_unlock;
} }
err = xp_assign_dev_shared(xs->pool, umem_xs->umem, err = xp_assign_dev_shared(xs->pool, umem_xs, dev,
dev, qid); qid);
if (err) { if (err) {
xp_destroy(xs->pool); xp_destroy(xs->pool);
xs->pool = NULL; xs->pool = NULL;

5
net/xdp/xsk_buff_pool.c
View File

@@ -198,17 +198,18 @@ int xp_assign_dev(struct xsk_buff_pool *pool, struct net_device *dev,
return __xp_assign_dev(pool, dev, queue_id, flags); return __xp_assign_dev(pool, dev, queue_id, 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) struct net_device *dev, u16 queue_id)
{ {
u16 flags; u16 flags;
struct xdp_umem *umem = umem_xs->umem;
/* One fill and completion ring required for each queue id. */ /* One fill and completion ring required for each queue id. */
if (!pool->fq || !pool->cq) if (!pool->fq || !pool->cq)
return -EINVAL; return -EINVAL;
flags = umem->zc ? XDP_ZEROCOPY : XDP_COPY; flags = umem->zc ? XDP_ZEROCOPY : XDP_COPY;
if (pool->uses_need_wakeup) if (umem_xs->pool->uses_need_wakeup)
flags |= XDP_USE_NEED_WAKEUP; flags |= XDP_USE_NEED_WAKEUP;
return __xp_assign_dev(pool, dev, queue_id, flags); return __xp_assign_dev(pool, dev, queue_id, flags);