summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Kicinski <jakub.kicinski@netronome.com>2018-07-27 20:20:08 -0700
committerDaniel Borkmann <daniel@iogearbox.net>2018-07-31 02:03:19 +0200
commit2d55d614fcf58187e2937dba11643b9471cd64d7 (patch)
tree13e619294a4c02605b7f4f8782bfa9fea4058f5a
parent573b3aa6940661dc50c383213d428c27df78be7c (diff)
downloadlinux-2d55d614fcf58187e2937dba11643b9471cd64d7.tar.gz
linux-2d55d614fcf58187e2937dba11643b9471cd64d7.tar.bz2
linux-2d55d614fcf58187e2937dba11643b9471cd64d7.zip
net: xsk: don't return frames via the allocator on error
xdp_return_buff() is used when frame has been successfully handled (transmitted) or if an error occurred during delayed processing and there is no way to report it back to xdp_do_redirect(). In case of __xsk_rcv_zc() error is propagated all the way back to the driver, so there is no need to call xdp_return_buff(). Driver will recycle the frame anyway after seeing that error happened. Fixes: 173d3adb6f43 ("xsk: add zero-copy support for Rx") Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Acked-by: Björn Töpel <bjorn.topel@intel.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-rw-r--r--net/xdp/xsk.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
index 72335c2e8108..4e937cd7c17d 100644
--- a/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@ -84,10 +84,8 @@ static int __xsk_rcv_zc(struct xdp_sock *xs, struct xdp_buff *xdp, u32 len)
{
int err = xskq_produce_batch_desc(xs->rx, (u64)xdp->handle, len);
- if (err) {
- xdp_return_buff(xdp);
+ if (err)
xs->rx_dropped++;
- }
return err;
}