* [PATCH net v1 1/2] virtio_net: Fix error unwinding of XDP initialization
@ 2023-04-28 22:37 Feng Liu
2023-05-01 12:27 ` Simon Horman
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Feng Liu @ 2023-04-28 22:37 UTC (permalink / raw)
To: virtualization, netdev, linux-kernel, bpf
Cc: Jason Wang, Michael S . Tsirkin, Xuan Zhuo, Feng Liu, William Tu,
Parav Pandit
When initializing XDP in virtnet_open(), some rq xdp initialization
may hit an error causing net device open failed. However, previous
rqs have already initialized XDP and enabled NAPI, which is not the
expected behavior. Need to roll back the previous rq initialization
to avoid leaks in error unwinding of init code.
Fixes: 754b8a21a96d ("virtio_net: setup xdp_rxq_info")
Signed-off-by: Feng Liu <feliu@nvidia.com>
Reviewed-by: William Tu <witu@nvidia.com>
Reviewed-by: Parav Pandit <parav@nvidia.com>
---
drivers/net/virtio_net.c | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 8d8038538fc4..fc6ee833a09f 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1868,6 +1868,13 @@ static int virtnet_poll(struct napi_struct *napi, int budget)
return received;
}
+static void virtnet_disable_qp(struct virtnet_info *vi, int qp_index)
+{
+ virtnet_napi_tx_disable(&vi->sq[qp_index].napi);
+ napi_disable(&vi->rq[qp_index].napi);
+ xdp_rxq_info_unreg(&vi->rq[qp_index].xdp_rxq);
+}
+
static int virtnet_open(struct net_device *dev)
{
struct virtnet_info *vi = netdev_priv(dev);
@@ -1883,20 +1890,27 @@ static int virtnet_open(struct net_device *dev)
err = xdp_rxq_info_reg(&vi->rq[i].xdp_rxq, dev, i, vi->rq[i].napi.napi_id);
if (err < 0)
- return err;
+ goto err_xdp_info_reg;
err = xdp_rxq_info_reg_mem_model(&vi->rq[i].xdp_rxq,
MEM_TYPE_PAGE_SHARED, NULL);
- if (err < 0) {
- xdp_rxq_info_unreg(&vi->rq[i].xdp_rxq);
- return err;
- }
+ if (err < 0)
+ goto err_xdp_reg_mem_model;
virtnet_napi_enable(vi->rq[i].vq, &vi->rq[i].napi);
virtnet_napi_tx_enable(vi, vi->sq[i].vq, &vi->sq[i].napi);
}
return 0;
+
+ /* error unwinding of xdp init */
+err_xdp_reg_mem_model:
+ xdp_rxq_info_unreg(&vi->rq[i].xdp_rxq);
+err_xdp_info_reg:
+ for (i = i - 1; i >= 0; i--)
+ virtnet_disable_qp(vi, i);
+
+ return err;
}
static int virtnet_poll_tx(struct napi_struct *napi, int budget)
--
2.37.1 (Apple Git-137.1)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net v1 1/2] virtio_net: Fix error unwinding of XDP initialization
2023-04-28 22:37 [PATCH net v1 1/2] virtio_net: Fix error unwinding of XDP initialization Feng Liu
@ 2023-05-01 12:27 ` Simon Horman
2023-05-01 12:42 ` Simon Horman
2023-05-01 14:14 ` Michael S. Tsirkin
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2023-05-01 12:27 UTC (permalink / raw)
To: Feng Liu
Cc: virtualization, netdev, linux-kernel, bpf, Jason Wang,
Michael S . Tsirkin, Xuan Zhuo, William Tu, Parav Pandit
On Fri, Apr 28, 2023 at 06:37:12PM -0400, Feng Liu wrote:
> When initializing XDP in virtnet_open(), some rq xdp initialization
> may hit an error causing net device open failed. However, previous
> rqs have already initialized XDP and enabled NAPI, which is not the
> expected behavior. Need to roll back the previous rq initialization
> to avoid leaks in error unwinding of init code.
>
> Fixes: 754b8a21a96d ("virtio_net: setup xdp_rxq_info")
> Signed-off-by: Feng Liu <feliu@nvidia.com>
> Reviewed-by: William Tu <witu@nvidia.com>
> Reviewed-by: Parav Pandit <parav@nvidia.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net v1 1/2] virtio_net: Fix error unwinding of XDP initialization
2023-04-28 22:37 [PATCH net v1 1/2] virtio_net: Fix error unwinding of XDP initialization Feng Liu
2023-05-01 12:27 ` Simon Horman
@ 2023-05-01 12:42 ` Simon Horman
2023-05-01 14:14 ` Michael S. Tsirkin
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2023-05-01 12:42 UTC (permalink / raw)
To: Feng Liu
Cc: virtualization, netdev, linux-kernel, bpf, Jason Wang,
Michael S . Tsirkin, Xuan Zhuo, William Tu, Parav Pandit
On Fri, Apr 28, 2023 at 06:37:12PM -0400, Feng Liu wrote:
> When initializing XDP in virtnet_open(), some rq xdp initialization
> may hit an error causing net device open failed. However, previous
> rqs have already initialized XDP and enabled NAPI, which is not the
> expected behavior. Need to roll back the previous rq initialization
> to avoid leaks in error unwinding of init code.
>
> Fixes: 754b8a21a96d ("virtio_net: setup xdp_rxq_info")
> Signed-off-by: Feng Liu <feliu@nvidia.com>
> Reviewed-by: William Tu <witu@nvidia.com>
> Reviewed-by: Parav Pandit <parav@nvidia.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net v1 1/2] virtio_net: Fix error unwinding of XDP initialization
2023-04-28 22:37 [PATCH net v1 1/2] virtio_net: Fix error unwinding of XDP initialization Feng Liu
2023-05-01 12:27 ` Simon Horman
2023-05-01 12:42 ` Simon Horman
@ 2023-05-01 14:14 ` Michael S. Tsirkin
2 siblings, 0 replies; 4+ messages in thread
From: Michael S. Tsirkin @ 2023-05-01 14:14 UTC (permalink / raw)
To: Feng Liu
Cc: virtualization, netdev, linux-kernel, bpf, Jason Wang, Xuan Zhuo,
William Tu, Parav Pandit
On Fri, Apr 28, 2023 at 06:37:12PM -0400, Feng Liu wrote:
> When initializing XDP in virtnet_open(), some rq xdp initialization
> may hit an error causing net device open failed. However, previous
> rqs have already initialized XDP and enabled NAPI, which is not the
> expected behavior. Need to roll back the previous rq initialization
> to avoid leaks in error unwinding of init code.
>
> Fixes: 754b8a21a96d ("virtio_net: setup xdp_rxq_info")
> Signed-off-by: Feng Liu <feliu@nvidia.com>
> Reviewed-by: William Tu <witu@nvidia.com>
> Reviewed-by: Parav Pandit <parav@nvidia.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Post with 2/2 in the same thread or better just squashed.
> ---
> drivers/net/virtio_net.c | 24 +++++++++++++++++++-----
> 1 file changed, 19 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 8d8038538fc4..fc6ee833a09f 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -1868,6 +1868,13 @@ static int virtnet_poll(struct napi_struct *napi, int budget)
> return received;
> }
>
> +static void virtnet_disable_qp(struct virtnet_info *vi, int qp_index)
> +{
> + virtnet_napi_tx_disable(&vi->sq[qp_index].napi);
> + napi_disable(&vi->rq[qp_index].napi);
> + xdp_rxq_info_unreg(&vi->rq[qp_index].xdp_rxq);
> +}
> +
> static int virtnet_open(struct net_device *dev)
> {
> struct virtnet_info *vi = netdev_priv(dev);
> @@ -1883,20 +1890,27 @@ static int virtnet_open(struct net_device *dev)
>
> err = xdp_rxq_info_reg(&vi->rq[i].xdp_rxq, dev, i, vi->rq[i].napi.napi_id);
> if (err < 0)
> - return err;
> + goto err_xdp_info_reg;
>
> err = xdp_rxq_info_reg_mem_model(&vi->rq[i].xdp_rxq,
> MEM_TYPE_PAGE_SHARED, NULL);
> - if (err < 0) {
> - xdp_rxq_info_unreg(&vi->rq[i].xdp_rxq);
> - return err;
> - }
> + if (err < 0)
> + goto err_xdp_reg_mem_model;
>
> virtnet_napi_enable(vi->rq[i].vq, &vi->rq[i].napi);
> virtnet_napi_tx_enable(vi, vi->sq[i].vq, &vi->sq[i].napi);
> }
>
> return 0;
> +
> + /* error unwinding of xdp init */
> +err_xdp_reg_mem_model:
> + xdp_rxq_info_unreg(&vi->rq[i].xdp_rxq);
> +err_xdp_info_reg:
> + for (i = i - 1; i >= 0; i--)
> + virtnet_disable_qp(vi, i);
> +
> + return err;
> }
>
> static int virtnet_poll_tx(struct napi_struct *napi, int budget)
> --
> 2.37.1 (Apple Git-137.1)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-05-01 14:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-28 22:37 [PATCH net v1 1/2] virtio_net: Fix error unwinding of XDP initialization Feng Liu
2023-05-01 12:27 ` Simon Horman
2023-05-01 12:42 ` Simon Horman
2023-05-01 14:14 ` Michael S. Tsirkin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).