lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <20231107031227.100015-16-xuanzhuo@linux.alibaba.com> Date: Tue, 7 Nov 2023 11:12:21 +0800 From: Xuan Zhuo <xuanzhuo@...ux.alibaba.com> To: netdev@...r.kernel.org Cc: "David S. Miller" <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>, "Michael S. Tsirkin" <mst@...hat.com>, Jason Wang <jasowang@...hat.com>, Xuan Zhuo <xuanzhuo@...ux.alibaba.com>, Alexei Starovoitov <ast@...nel.org>, Daniel Borkmann <daniel@...earbox.net>, Jesper Dangaard Brouer <hawk@...nel.org>, John Fastabend <john.fastabend@...il.com>, virtualization@...ts.linux-foundation.org, bpf@...r.kernel.org Subject: [PATCH net-next v2 15/21] virtio_net: xsk: tx: virtnet_sq_free_unused_buf() check xsk buffer virtnet_sq_free_unused_buf() check xsk buffer. Signed-off-by: Xuan Zhuo <xuanzhuo@...ux.alibaba.com> Acked-by: Jason Wang <jasowang@...hat.com> --- drivers/net/virtio/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio/main.c b/drivers/net/virtio/main.c index 6a5e74c482f3..6210a6e37396 100644 --- a/drivers/net/virtio/main.c +++ b/drivers/net/virtio/main.c @@ -3919,16 +3919,18 @@ void virtnet_sq_free_unused_buf(struct virtqueue *vq, void *buf) sq = &vi->sq[i]; - if (!virtnet_is_xdp_frame(buf)) { + if (virtnet_is_skb_ptr(buf)) { if (sq->do_dma) buf = virtnet_sq_unmap(sq, buf); dev_kfree_skb(buf); - } else { + } else if (virtnet_is_xdp_frame(buf)) { if (sq->do_dma) buf = virtnet_sq_unmap(sq, buf); xdp_return_frame(virtnet_ptr_to_xdp(buf)); + } else { + xsk_tx_completed(sq->xsk.pool, 1); } } -- 2.32.0.3.g01195cf9f
Powered by blists - more mailing lists