diff options
| author |   Maciej Fijalkowski <maciej.fijalkowski@intel.com> | 2024-01-24 20:15:52 +0100 |
|---|---|---|
| committer |   Alexei Starovoitov <ast@kernel.org> | 2024-01-24 16:24:06 -0800 |
| commit | 269009893146c495f41e9572dd9319e787c2eba9 (patch) | |
| tree | 4bdc9418027ca9b29740434f7f94059e8dca6847 /net/xdp | |
| parent | riscv, bpf: Fix unpredictable kernel crash about RV64 struct_ops (diff) | |
| download | wireguard-linux-269009893146c495f41e9572dd9319e787c2eba9.tar.xz wireguard-linux-269009893146c495f41e9572dd9319e787c2eba9.zip | |
xsk: recycle buffer in case Rx queue was full
Add missing xsk_buff_free() call when __xsk_rcv_zc() failed to produce
descriptor to XSK Rx queue.
Fixes: 24ea50127ecf ("xsk: support mbuf on ZC RX")
Acked-by: Magnus Karlsson <magnus.karlsson@intel.com>
Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Link: https://lore.kernel.org/r/20240124191602.566724-2-maciej.fijalkowski@intel.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'net/xdp')
| -rw-r--r-- | net/xdp/xsk.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index 9f13aa3353e3..1eadfac03cc4 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -167,8 +167,10 @@ static int xsk_rcv_zc(struct xdp_sock *xs, struct xdp_buff *xdp, u32 len) contd = XDP_PKT_CONTD; err = __xsk_rcv_zc(xs, xskb, len, contd); - if (err || likely(!frags)) - goto out; + if (err) + goto err; + if (likely(!frags)) + return 0; xskb_list = &xskb->pool->xskb_list; list_for_each_entry_safe(pos, tmp, xskb_list, xskb_list_node) { @@ -177,11 +179,13 @@ static int xsk_rcv_zc(struct xdp_sock *xs, struct xdp_buff *xdp, u32 len) len = pos->xdp.data_end - pos->xdp.data; err = __xsk_rcv_zc(xs, pos, len, contd); if (err) - return err; + goto err; list_del(&pos->xskb_list_node); } -out: + return 0; +err: + xsk_buff_free(xdp); return err; } |