On Mon, Oct 16, 2023 at 8:00 PM Xuan Zhuo <xuanzhuo@xxxxxxxxxxxxxxxxx> wrote: > > This patch separates two sub-functions from virtnet_rx_resize(): > > * virtnet_rx_pause > * virtnet_rx_resume > > Then the subsequent reset rx for xsk can share these two functions. > > Signed-off-by: Xuan Zhuo <xuanzhuo@xxxxxxxxxxxxxxxxx> Acked-by: Jason Wang <jasowang@xxxxxxxxxx> Thanks > --- > drivers/net/virtio/main.c | 29 +++++++++++++++++++++-------- > drivers/net/virtio/virtio_net.h | 3 +++ > 2 files changed, 24 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/virtio/main.c b/drivers/net/virtio/main.c > index ba38b6078e1d..e6b262341619 100644 > --- a/drivers/net/virtio/main.c > +++ b/drivers/net/virtio/main.c > @@ -2120,26 +2120,39 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev) > return NETDEV_TX_OK; > } > > -static int virtnet_rx_resize(struct virtnet_info *vi, > - struct virtnet_rq *rq, u32 ring_num) > +void virtnet_rx_pause(struct virtnet_info *vi, struct virtnet_rq *rq) > { > bool running = netif_running(vi->dev); > - int err, qindex; > - > - qindex = rq - vi->rq; > > if (running) > napi_disable(&rq->napi); > +} > > - err = virtqueue_resize(rq->vq, ring_num, virtnet_rq_free_unused_buf); > - if (err) > - netdev_err(vi->dev, "resize rx fail: rx queue index: %d err: %d\n", qindex, err); > +void virtnet_rx_resume(struct virtnet_info *vi, struct virtnet_rq *rq) > +{ > + bool running = netif_running(vi->dev); > > if (!try_fill_recv(vi, rq, GFP_KERNEL)) > schedule_delayed_work(&vi->refill, 0); > > if (running) > virtnet_napi_enable(rq->vq, &rq->napi); > +} > + > +static int virtnet_rx_resize(struct virtnet_info *vi, > + struct virtnet_rq *rq, u32 ring_num) > +{ > + int err, qindex; > + > + qindex = rq - vi->rq; > + > + virtnet_rx_pause(vi, rq); > + > + err = virtqueue_resize(rq->vq, ring_num, virtnet_rq_free_unused_buf); > + if (err) > + netdev_err(vi->dev, "resize rx fail: rx queue index: %d err: %d\n", qindex, err); > + > + virtnet_rx_resume(vi, rq); > return err; > } > > diff --git a/drivers/net/virtio/virtio_net.h b/drivers/net/virtio/virtio_net.h > index 282504d6639a..70eea23adba6 100644 > --- a/drivers/net/virtio/virtio_net.h > +++ b/drivers/net/virtio/virtio_net.h > @@ -253,4 +253,7 @@ static inline bool virtnet_is_xdp_raw_buffer_queue(struct virtnet_info *vi, int > else > return false; > } > + > +void virtnet_rx_pause(struct virtnet_info *vi, struct virtnet_rq *rq); > +void virtnet_rx_resume(struct virtnet_info *vi, struct virtnet_rq *rq); > #endif > -- > 2.32.0.3.g01195cf9f > _______________________________________________ Virtualization mailing list Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linuxfoundation.org/mailman/listinfo/virtualization