* [PATCH net v1 2/2] virtio_net: Close queue pairs using helper function
@ 2023-04-28 22:43 Feng Liu via Virtualization
[not found] ` <ZE+0RsBYDTgnauOX@corigine.com>
2023-05-01 14:14 ` Michael S. Tsirkin
0 siblings, 2 replies; 5+ messages in thread
From: Feng Liu via Virtualization @ 2023-04-28 22:43 UTC (permalink / raw)
To: virtualization, netdev, linux-kernel, bpf
Cc: Xuan Zhuo, Michael S . Tsirkin, William Tu
Use newly introduced helper function that exactly does the same of
closing the queue pairs.
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 | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index fc6ee833a09f..5cd78e154d14 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2319,11 +2319,8 @@ static int virtnet_close(struct net_device *dev)
/* Make sure refill_work doesn't re-enable napi! */
cancel_delayed_work_sync(&vi->refill);
- for (i = 0; i < vi->max_queue_pairs; i++) {
- virtnet_napi_tx_disable(&vi->sq[i].napi);
- napi_disable(&vi->rq[i].napi);
- xdp_rxq_info_unreg(&vi->rq[i].xdp_rxq);
- }
+ for (i = 0; i < vi->max_queue_pairs; i++)
+ virtnet_disable_qp(vi, i);
return 0;
}
--
2.37.1 (Apple Git-137.1)
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net v1 2/2] virtio_net: Close queue pairs using helper function
[not found] ` <ZE+0RsBYDTgnauOX@corigine.com>
@ 2023-05-01 13:58 ` Feng Liu via Virtualization
2023-05-01 14:14 ` Michael S. Tsirkin
0 siblings, 1 reply; 5+ messages in thread
From: Feng Liu via Virtualization @ 2023-05-01 13:58 UTC (permalink / raw)
To: Simon Horman
Cc: Xuan Zhuo, Michael S . Tsirkin, netdev, linux-kernel,
virtualization, William Tu, bpf
On 2023-05-01 a.m.8:44, Simon Horman wrote:
> External email: Use caution opening links or attachments
>
>
> On Fri, Apr 28, 2023 at 06:43:46PM -0400, Feng Liu wrote:
>> Use newly introduced helper function that exactly does the same of
>> closing the queue pairs.
>>
>> Signed-off-by: Feng Liu <feliu@nvidia.com>
>> Reviewed-by: William Tu <witu@nvidia.com>
>> Reviewed-by: Parav Pandit <parav@nvidia.com>
>
> I guess this was put in a separate patch to 1/2, as it's more
> net-next material, as opposed to 1/2 which seems to be net material.
> FWIIW, I'd lean to putting 1/2 in net. And holding this one for net-next.
>
> That aside, this looks good to me.
>
> Reviewed-by: Simon Horman <simon.horman@corigine.com>
Will do, thanks Simon
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net v1 2/2] virtio_net: Close queue pairs using helper function
2023-05-01 13:58 ` Feng Liu via Virtualization
@ 2023-05-01 14:14 ` Michael S. Tsirkin
2023-05-01 16:53 ` Feng Liu via Virtualization
0 siblings, 1 reply; 5+ messages in thread
From: Michael S. Tsirkin @ 2023-05-01 14:14 UTC (permalink / raw)
To: Feng Liu
Cc: Xuan Zhuo, Simon Horman, linux-kernel, virtualization, netdev,
William Tu, bpf
On Mon, May 01, 2023 at 09:58:18AM -0400, Feng Liu wrote:
>
>
> On 2023-05-01 a.m.8:44, Simon Horman wrote:
> > External email: Use caution opening links or attachments
> >
> >
> > On Fri, Apr 28, 2023 at 06:43:46PM -0400, Feng Liu wrote:
> > > Use newly introduced helper function that exactly does the same of
> > > closing the queue pairs.
> > >
> > > Signed-off-by: Feng Liu <feliu@nvidia.com>
> > > Reviewed-by: William Tu <witu@nvidia.com>
> > > Reviewed-by: Parav Pandit <parav@nvidia.com>
> >
> > I guess this was put in a separate patch to 1/2, as it's more
> > net-next material, as opposed to 1/2 which seems to be net material.
> > FWIIW, I'd lean to putting 1/2 in net. And holding this one for net-next.
> >
> > That aside, this looks good to me.
> >
> > Reviewed-by: Simon Horman <simon.horman@corigine.com>
>
> Will do, thanks Simon
Nah, I think you should just squash these two patches together.
It's early in the merge window.
--
MST
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net v1 2/2] virtio_net: Close queue pairs using helper function
2023-04-28 22:43 [PATCH net v1 2/2] virtio_net: Close queue pairs using helper function Feng Liu via Virtualization
[not found] ` <ZE+0RsBYDTgnauOX@corigine.com>
@ 2023-05-01 14:14 ` Michael S. Tsirkin
1 sibling, 0 replies; 5+ messages in thread
From: Michael S. Tsirkin @ 2023-05-01 14:14 UTC (permalink / raw)
To: Feng Liu; +Cc: Xuan Zhuo, netdev, linux-kernel, virtualization, William Tu, bpf
On Fri, Apr 28, 2023 at 06:43:46PM -0400, Feng Liu wrote:
> Use newly introduced helper function that exactly does the same of
> closing the queue pairs.
>
> 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>
> ---
> drivers/net/virtio_net.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index fc6ee833a09f..5cd78e154d14 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -2319,11 +2319,8 @@ static int virtnet_close(struct net_device *dev)
> /* Make sure refill_work doesn't re-enable napi! */
> cancel_delayed_work_sync(&vi->refill);
>
> - for (i = 0; i < vi->max_queue_pairs; i++) {
> - virtnet_napi_tx_disable(&vi->sq[i].napi);
> - napi_disable(&vi->rq[i].napi);
> - xdp_rxq_info_unreg(&vi->rq[i].xdp_rxq);
> - }
> + for (i = 0; i < vi->max_queue_pairs; i++)
> + virtnet_disable_qp(vi, i);
>
> return 0;
> }
> --
> 2.37.1 (Apple Git-137.1)
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net v1 2/2] virtio_net: Close queue pairs using helper function
2023-05-01 14:14 ` Michael S. Tsirkin
@ 2023-05-01 16:53 ` Feng Liu via Virtualization
0 siblings, 0 replies; 5+ messages in thread
From: Feng Liu via Virtualization @ 2023-05-01 16:53 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Xuan Zhuo, Simon Horman, linux-kernel, virtualization, netdev,
William Tu, bpf
On 2023-05-01 a.m.10:14, Michael S. Tsirkin wrote:
> External email: Use caution opening links or attachments
>
>
> On Mon, May 01, 2023 at 09:58:18AM -0400, Feng Liu wrote:
>>
>>
>> On 2023-05-01 a.m.8:44, Simon Horman wrote:
>>> External email: Use caution opening links or attachments
>>>
>>>
>>> On Fri, Apr 28, 2023 at 06:43:46PM -0400, Feng Liu wrote:
>>>> Use newly introduced helper function that exactly does the same of
>>>> closing the queue pairs.
>>>>
>>>> Signed-off-by: Feng Liu <feliu@nvidia.com>
>>>> Reviewed-by: William Tu <witu@nvidia.com>
>>>> Reviewed-by: Parav Pandit <parav@nvidia.com>
>>>
>>> I guess this was put in a separate patch to 1/2, as it's more
>>> net-next material, as opposed to 1/2 which seems to be net material.
>>> FWIIW, I'd lean to putting 1/2 in net. And holding this one for net-next.
>>>
>>> That aside, this looks good to me.
>>>
>>> Reviewed-by: Simon Horman <simon.horman@corigine.com>
>>
>> Will do, thanks Simon
>
> Nah, I think you should just squash these two patches together.
> It's early in the merge window.
>
> --
> MST
>
OK, will do , thx
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-05-01 16:53 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-28 22:43 [PATCH net v1 2/2] virtio_net: Close queue pairs using helper function Feng Liu via Virtualization
[not found] ` <ZE+0RsBYDTgnauOX@corigine.com>
2023-05-01 13:58 ` Feng Liu via Virtualization
2023-05-01 14:14 ` Michael S. Tsirkin
2023-05-01 16:53 ` Feng Liu via Virtualization
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).