* Re: [PATCH] virtio_ring: remove unnecessary to_vvq call
@ 2022-06-07 8:08 Bo Liu (刘波)-浪潮信息
2022-06-07 10:36 ` Michael S. Tsirkin
0 siblings, 1 reply; 10+ messages in thread
From: Bo Liu (刘波)-浪潮信息 @ 2022-06-07 8:08 UTC (permalink / raw)
To: mst; +Cc: jasowang, virtualization, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 13413 bytes --]
This patch removes unnecessary code and generates smaller binary files.
Thanks
-----邮件原件-----
发件人: Michael S. Tsirkin <mst@redhat.com>
发送时间: 2022年6月7日 14:38
收件人: Bo Liu (刘波)-浪潮信息 <liubo03@inspur.com>
抄送: jasowang@redhat.com; virtualization@lists.linux-foundation.org;
linux-kernel@vger.kernel.org
主题: Re: [PATCH] virtio_ring: remove unnecessary to_vvq call
On Mon, Jun 06, 2022 at 08:59:51PM -0400, Bo Liu wrote:
> In many functions, the parameter passed in is "_vq", which still call
> to_vvq() to get 'vq'. It can avoid unnecessary call of to_vvq() by
> directly passing in the parameter "vq".
>
> Signed-off-by: Bo Liu <liubo03@inspur.com>
What does the patch accomplish? Is the generated binary faster? smaller?
> ---
> drivers/virtio/virtio_ring.c | 100
> ++++++++++++++---------------------
> 1 file changed, 41 insertions(+), 59 deletions(-)
>
> diff --git a/drivers/virtio/virtio_ring.c
> b/drivers/virtio/virtio_ring.c index 13a7348cedff..f82db59fdbdc 100644
> --- a/drivers/virtio/virtio_ring.c
> +++ b/drivers/virtio/virtio_ring.c
> @@ -648,9 +648,8 @@ static inline int virtqueue_add_split(struct virtqueue
*_vq,
> return -ENOMEM;
> }
>
> -static bool virtqueue_kick_prepare_split(struct virtqueue *_vq)
> +static bool virtqueue_kick_prepare_split(struct vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> u16 new, old;
> bool needs_kick;
>
> @@ -667,12 +666,12 @@ static bool virtqueue_kick_prepare_split(struct
virtqueue *_vq)
> LAST_ADD_TIME_INVALID(vq);
>
> if (vq->event) {
> - needs_kick = vring_need_event(virtio16_to_cpu(_vq->vdev,
> + needs_kick = vring_need_event(virtio16_to_cpu(vq->vq.vdev,
>
vring_avail_event(&vq->split.vring)),
> new, old);
> } else {
> needs_kick = !(vq->split.vring.used->flags &
> - cpu_to_virtio16(_vq->vdev,
> + cpu_to_virtio16(vq->vq.vdev,
> VRING_USED_F_NO_NOTIFY));
> }
> END_USE(vq);
> @@ -735,11 +734,10 @@ static inline bool more_used_split(const struct
vring_virtqueue *vq)
> vq->split.vring.used->idx);
> }
>
> -static void *virtqueue_get_buf_ctx_split(struct virtqueue *_vq,
> +static void *virtqueue_get_buf_ctx_split(struct vring_virtqueue *vq,
> unsigned int *len,
> void **ctx)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> void *ret;
> unsigned int i;
> u16 last_used;
> @@ -761,9 +759,9 @@ static void *virtqueue_get_buf_ctx_split(struct
virtqueue *_vq,
> virtio_rmb(vq->weak_barriers);
>
> last_used = (vq->last_used_idx & (vq->split.vring.num - 1));
> - i = virtio32_to_cpu(_vq->vdev,
> + i = virtio32_to_cpu(vq->vq.vdev,
> vq->split.vring.used->ring[last_used].id);
> - *len = virtio32_to_cpu(_vq->vdev,
> + *len = virtio32_to_cpu(vq->vq.vdev,
> vq->split.vring.used->ring[last_used].len);
>
> if (unlikely(i >= vq->split.vring.num)) { @@ -785,7 +783,7 @@ static
> void *virtqueue_get_buf_ctx_split(struct virtqueue *_vq,
> if (!(vq->split.avail_flags_shadow & VRING_AVAIL_F_NO_INTERRUPT))
> virtio_store_mb(vq->weak_barriers,
> &vring_used_event(&vq->split.vring),
> - cpu_to_virtio16(_vq->vdev,
vq->last_used_idx));
> + cpu_to_virtio16(vq->vq.vdev,
vq->last_used_idx));
>
> LAST_ADD_TIME_INVALID(vq);
>
> @@ -793,10 +791,8 @@ static void *virtqueue_get_buf_ctx_split(struct
virtqueue *_vq,
> return ret;
> }
>
> -static void virtqueue_disable_cb_split(struct virtqueue *_vq)
> +static void virtqueue_disable_cb_split(struct vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> -
> if (!(vq->split.avail_flags_shadow & VRING_AVAIL_F_NO_INTERRUPT)) {
> vq->split.avail_flags_shadow |= VRING_AVAIL_F_NO_INTERRUPT;
> if (vq->event)
> @@ -804,14 +800,13 @@ static void virtqueue_disable_cb_split(struct
virtqueue *_vq)
> vring_used_event(&vq->split.vring) = 0x0;
> else
> vq->split.vring.avail->flags =
> - cpu_to_virtio16(_vq->vdev,
> + cpu_to_virtio16(vq->vq.vdev,
>
vq->split.avail_flags_shadow);
> }
> }
>
> -static unsigned int virtqueue_enable_cb_prepare_split(struct
> virtqueue *_vq)
> +static unsigned int virtqueue_enable_cb_prepare_split(struct
> +vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> u16 last_used_idx;
>
> START_USE(vq);
> @@ -825,26 +820,23 @@ static unsigned int
virtqueue_enable_cb_prepare_split(struct virtqueue *_vq)
> vq->split.avail_flags_shadow &= ~VRING_AVAIL_F_NO_INTERRUPT;
> if (!vq->event)
> vq->split.vring.avail->flags =
> - cpu_to_virtio16(_vq->vdev,
> + cpu_to_virtio16(vq->vq.vdev,
>
vq->split.avail_flags_shadow);
> }
> - vring_used_event(&vq->split.vring) = cpu_to_virtio16(_vq->vdev,
> + vring_used_event(&vq->split.vring) = cpu_to_virtio16(vq->vq.vdev,
> last_used_idx = vq->last_used_idx);
> END_USE(vq);
> return last_used_idx;
> }
>
> -static bool virtqueue_poll_split(struct virtqueue *_vq, unsigned int
> last_used_idx)
> +static bool virtqueue_poll_split(struct vring_virtqueue *vq, unsigned
> +int last_used_idx)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> -
> - return (u16)last_used_idx != virtio16_to_cpu(_vq->vdev,
> + return (u16)last_used_idx != virtio16_to_cpu(vq->vq.vdev,
> vq->split.vring.used->idx);
> }
>
> -static bool virtqueue_enable_cb_delayed_split(struct virtqueue *_vq)
> +static bool virtqueue_enable_cb_delayed_split(struct vring_virtqueue
> +*vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> u16 bufs;
>
> START_USE(vq);
> @@ -858,7 +850,7 @@ static bool virtqueue_enable_cb_delayed_split(struct
virtqueue *_vq)
> vq->split.avail_flags_shadow &= ~VRING_AVAIL_F_NO_INTERRUPT;
> if (!vq->event)
> vq->split.vring.avail->flags =
> - cpu_to_virtio16(_vq->vdev,
> + cpu_to_virtio16(vq->vq.vdev,
>
vq->split.avail_flags_shadow);
> }
> /* TODO: tune this threshold */
> @@ -866,9 +858,9 @@ static bool
> virtqueue_enable_cb_delayed_split(struct virtqueue *_vq)
>
> virtio_store_mb(vq->weak_barriers,
> &vring_used_event(&vq->split.vring),
> - cpu_to_virtio16(_vq->vdev, vq->last_used_idx +
bufs));
> + cpu_to_virtio16(vq->vq.vdev, vq->last_used_idx +
bufs));
>
> - if (unlikely((u16)(virtio16_to_cpu(_vq->vdev,
vq->split.vring.used->idx)
> + if (unlikely((u16)(virtio16_to_cpu(vq->vq.vdev,
> +vq->split.vring.used->idx)
> - vq->last_used_idx) > bufs)) {
> END_USE(vq);
> return false;
> @@ -878,9 +870,8 @@ static bool virtqueue_enable_cb_delayed_split(struct
virtqueue *_vq)
> return true;
> }
>
> -static void *virtqueue_detach_unused_buf_split(struct virtqueue *_vq)
> +static void *virtqueue_detach_unused_buf_split(struct vring_virtqueue
> +*vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> unsigned int i;
> void *buf;
>
> @@ -893,7 +884,7 @@ static void *virtqueue_detach_unused_buf_split(struct
virtqueue *_vq)
> buf = vq->split.desc_state[i].data;
> detach_buf_split(vq, i, NULL);
> vq->split.avail_idx_shadow--;
> - vq->split.vring.avail->idx = cpu_to_virtio16(_vq->vdev,
> + vq->split.vring.avail->idx = cpu_to_virtio16(vq->vq.vdev,
> vq->split.avail_idx_shadow);
> END_USE(vq);
> return buf;
> @@ -1296,9 +1287,8 @@ static inline int virtqueue_add_packed(struct
virtqueue *_vq,
> return -EIO;
> }
>
> -static bool virtqueue_kick_prepare_packed(struct virtqueue *_vq)
> +static bool virtqueue_kick_prepare_packed(struct vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> u16 new, old, off_wrap, flags, wrap_counter, event_idx;
> bool needs_kick;
> union {
> @@ -1410,11 +1400,10 @@ static inline bool more_used_packed(const struct
vring_virtqueue *vq)
> vq->packed.used_wrap_counter);
> }
>
> -static void *virtqueue_get_buf_ctx_packed(struct virtqueue *_vq,
> +static void *virtqueue_get_buf_ctx_packed(struct vring_virtqueue *vq,
> unsigned int *len,
> void **ctx)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> u16 last_used, id;
> void *ret;
>
> @@ -1475,10 +1464,8 @@ static void *virtqueue_get_buf_ctx_packed(struct
virtqueue *_vq,
> return ret;
> }
>
> -static void virtqueue_disable_cb_packed(struct virtqueue *_vq)
> +static void virtqueue_disable_cb_packed(struct vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> -
> if (vq->packed.event_flags_shadow !=
VRING_PACKED_EVENT_FLAG_DISABLE) {
> vq->packed.event_flags_shadow =
VRING_PACKED_EVENT_FLAG_DISABLE;
> vq->packed.vring.driver->flags =
> @@ -1486,10 +1473,8 @@ static void virtqueue_disable_cb_packed(struct
virtqueue *_vq)
> }
> }
>
> -static unsigned int virtqueue_enable_cb_prepare_packed(struct
> virtqueue *_vq)
> +static unsigned int virtqueue_enable_cb_prepare_packed(struct
> +vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> -
> START_USE(vq);
>
> /*
> @@ -1522,9 +1507,8 @@ static unsigned int
virtqueue_enable_cb_prepare_packed(struct virtqueue *_vq)
> VRING_PACKED_EVENT_F_WRAP_CTR);
> }
>
> -static bool virtqueue_poll_packed(struct virtqueue *_vq, u16
> off_wrap)
> +static bool virtqueue_poll_packed(struct vring_virtqueue *vq, u16
> +off_wrap)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> bool wrap_counter;
> u16 used_idx;
>
> @@ -1534,9 +1518,8 @@ static bool virtqueue_poll_packed(struct virtqueue
*_vq, u16 off_wrap)
> return is_used_desc_packed(vq, used_idx, wrap_counter); }
>
> -static bool virtqueue_enable_cb_delayed_packed(struct virtqueue *_vq)
> +static bool virtqueue_enable_cb_delayed_packed(struct vring_virtqueue
> +*vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> u16 used_idx, wrap_counter;
> u16 bufs;
>
> @@ -1593,9 +1576,8 @@ static bool
virtqueue_enable_cb_delayed_packed(struct virtqueue *_vq)
> return true;
> }
>
> -static void *virtqueue_detach_unused_buf_packed(struct virtqueue
> *_vq)
> +static void *virtqueue_detach_unused_buf_packed(struct
> +vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> unsigned int i;
> void *buf;
>
> @@ -1906,8 +1888,8 @@ bool virtqueue_kick_prepare(struct virtqueue
> *_vq) {
> struct vring_virtqueue *vq = to_vvq(_vq);
>
> - return vq->packed_ring ? virtqueue_kick_prepare_packed(_vq) :
> - virtqueue_kick_prepare_split(_vq);
> + return vq->packed_ring ? virtqueue_kick_prepare_packed(vq) :
> + virtqueue_kick_prepare_split(vq);
> }
> EXPORT_SYMBOL_GPL(virtqueue_kick_prepare);
>
> @@ -1977,8 +1959,8 @@ void *virtqueue_get_buf_ctx(struct virtqueue
> *_vq, unsigned int *len, {
> struct vring_virtqueue *vq = to_vvq(_vq);
>
> - return vq->packed_ring ? virtqueue_get_buf_ctx_packed(_vq, len, ctx)
:
> - virtqueue_get_buf_ctx_split(_vq, len, ctx);
> + return vq->packed_ring ? virtqueue_get_buf_ctx_packed(vq, len, ctx)
:
> + virtqueue_get_buf_ctx_split(vq, len, ctx);
> }
> EXPORT_SYMBOL_GPL(virtqueue_get_buf_ctx);
>
> @@ -2007,9 +1989,9 @@ void virtqueue_disable_cb(struct virtqueue *_vq)
> return;
>
> if (vq->packed_ring)
> - virtqueue_disable_cb_packed(_vq);
> + virtqueue_disable_cb_packed(vq);
> else
> - virtqueue_disable_cb_split(_vq);
> + virtqueue_disable_cb_split(vq);
> }
> EXPORT_SYMBOL_GPL(virtqueue_disable_cb);
>
> @@ -2032,8 +2014,8 @@ unsigned int virtqueue_enable_cb_prepare(struct
virtqueue *_vq)
> if (vq->event_triggered)
> vq->event_triggered = false;
>
> - return vq->packed_ring ? virtqueue_enable_cb_prepare_packed(_vq) :
> - virtqueue_enable_cb_prepare_split(_vq);
> + return vq->packed_ring ? virtqueue_enable_cb_prepare_packed(vq) :
> + virtqueue_enable_cb_prepare_split(vq);
> }
> EXPORT_SYMBOL_GPL(virtqueue_enable_cb_prepare);
>
> @@ -2054,8 +2036,8 @@ bool virtqueue_poll(struct virtqueue *_vq, unsigned
int last_used_idx)
> return false;
>
> virtio_mb(vq->weak_barriers);
> - return vq->packed_ring ? virtqueue_poll_packed(_vq, last_used_idx) :
> - virtqueue_poll_split(_vq, last_used_idx);
> + return vq->packed_ring ? virtqueue_poll_packed(vq, last_used_idx) :
> + virtqueue_poll_split(vq, last_used_idx);
> }
> EXPORT_SYMBOL_GPL(virtqueue_poll);
>
> @@ -2098,8 +2080,8 @@ bool virtqueue_enable_cb_delayed(struct virtqueue
*_vq)
> if (vq->event_triggered)
> vq->event_triggered = false;
>
> - return vq->packed_ring ? virtqueue_enable_cb_delayed_packed(_vq) :
> - virtqueue_enable_cb_delayed_split(_vq);
> + return vq->packed_ring ? virtqueue_enable_cb_delayed_packed(vq) :
> + virtqueue_enable_cb_delayed_split(vq);
> }
> EXPORT_SYMBOL_GPL(virtqueue_enable_cb_delayed);
>
> @@ -2115,8 +2097,8 @@ void *virtqueue_detach_unused_buf(struct
> virtqueue *_vq) {
> struct vring_virtqueue *vq = to_vvq(_vq);
>
> - return vq->packed_ring ? virtqueue_detach_unused_buf_packed(_vq) :
> - virtqueue_detach_unused_buf_split(_vq);
> + return vq->packed_ring ? virtqueue_detach_unused_buf_packed(vq) :
> + virtqueue_detach_unused_buf_split(vq);
> }
> EXPORT_SYMBOL_GPL(virtqueue_detach_unused_buf);
>
> --
> 2.27.0
[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 3777 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] virtio_ring: remove unnecessary to_vvq call
2022-06-07 8:08 [PATCH] virtio_ring: remove unnecessary to_vvq call Bo Liu (刘波)-浪潮信息
@ 2022-06-07 10:36 ` Michael S. Tsirkin
0 siblings, 0 replies; 10+ messages in thread
From: Michael S. Tsirkin @ 2022-06-07 10:36 UTC (permalink / raw)
To: Bo Liu (刘波)-浪潮信息
Cc: jasowang, virtualization, linux-kernel
On Tue, Jun 07, 2022 at 08:08:58AM +0000, Bo Liu (刘波)-浪潮信息 wrote:
> This patch removes unnecessary code and generates smaller binary files.
> Thanks
Can you post info on which files are smaller an by how much please?
--
MST
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] virtio_ring: remove unnecessary to_vvq() call
2022-09-28 2:26 [PATCH] virtio_ring: remove unnecessary to_vvq() call Bo Liu (刘波)-浪潮信息
@ 2022-09-28 4:04 ` Michael S. Tsirkin
0 siblings, 0 replies; 10+ messages in thread
From: Michael S. Tsirkin @ 2022-09-28 4:04 UTC (permalink / raw)
To: Bo Liu (刘波)-浪潮信息
Cc: jasowang, virtualization, linux-kernel
On Wed, Sep 28, 2022 at 02:26:16AM +0000, Bo Liu (刘波)-浪潮信息 wrote:
> >On Mon, Sep 26, 2022 at 05:11:30AM -0400, Bo Liu wrote:
> >> It passes '_vq' to vring_free(), which still calls to_vvq() to get
> >> 'vq', let's directly pass 'vq'. It can avoid unnecessary call of
> >> to_vvq() in hot path.
> >>
> >> Signed-off-by: Bo Liu <liubo03@inspur.com>
> >
> >What is the point of this change?
> >
> >__vring_new_virtqueue returns struct virtqueue *, so vring_free matches
> that.
> >No?
> >
>
> Hi
> In function vring_free(), to_vvq() js unnecessary, we can directly pass
> struct vring_virtqueue * to avoid this and remove the unnecessary code.
And so? Is the resulting binary smaller?
> >> ---
> >> drivers/virtio/virtio_ring.c | 12 +++++-------
> >> 1 file changed, 5 insertions(+), 7 deletions(-)
> >>
> >> diff --git a/drivers/virtio/virtio_ring.c
> >> b/drivers/virtio/virtio_ring.c index 8974c34b40fd..d6d77bf58802 100644
> >> --- a/drivers/virtio/virtio_ring.c
> >> +++ b/drivers/virtio/virtio_ring.c
> >> @@ -221,7 +221,7 @@ static struct virtqueue
> >*__vring_new_virtqueue(unsigned int index,
> >> void (*callback)(struct
> virtqueue *),
> >> const char *name);
> >> static struct vring_desc_extra *vring_alloc_desc_extra(unsigned int
> >> num); -static void vring_free(struct virtqueue *_vq);
> >> +static void vring_free(struct vring_virtqueue *vq);
> >>
> >> /*
> >> * Helpers.
> >> @@ -1140,7 +1140,7 @@ static int virtqueue_resize_split(struct virtqueue
> >*_vq, u32 num)
> >> if (err)
> >> goto err_state_extra;
> >>
> >> - vring_free(&vq->vq);
> >> + vring_free(vq);
> >>
> >> virtqueue_vring_init_split(&vring_split, vq);
> >>
> >> @@ -2059,7 +2059,7 @@ static int virtqueue_resize_packed(struct virtqueue
> >*_vq, u32 num)
> >> if (err)
> >> goto err_state_extra;
> >>
> >> - vring_free(&vq->vq);
> >> + vring_free(vq);
> >>
> >> virtqueue_vring_init_packed(&vring_packed, !!vq->vq.callback);
> >>
> >> @@ -2649,10 +2649,8 @@ struct virtqueue *vring_new_virtqueue(unsigned
> >> int index, } EXPORT_SYMBOL_GPL(vring_new_virtqueue);
> >>
> >> -static void vring_free(struct virtqueue *_vq)
> >> +static void vring_free(struct vring_virtqueue *vq)
> >> {
> >> - struct vring_virtqueue *vq = to_vvq(_vq);
> >> -
> >> if (vq->we_own_ring) {
> >> if (vq->packed_ring) {
> >> vring_free_queue(vq->vq.vdev,
> >> @@ -2693,7 +2691,7 @@ void vring_del_virtqueue(struct virtqueue *_vq)
> >> list_del(&_vq->list);
> >> spin_unlock(&vq->vq.vdev->vqs_list_lock);
> >>
> >> - vring_free(_vq);
> >> + vring_free(vq);
> >>
> >> kfree(vq);
> >> }
> >> --
> >> 2.27.0
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] virtio_ring: remove unnecessary to_vvq() call
@ 2022-09-28 2:26 Bo Liu (刘波)-浪潮信息
2022-09-28 4:04 ` Michael S. Tsirkin
0 siblings, 1 reply; 10+ messages in thread
From: Bo Liu (刘波)-浪潮信息 @ 2022-09-28 2:26 UTC (permalink / raw)
To: mst; +Cc: jasowang, virtualization, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2368 bytes --]
>On Mon, Sep 26, 2022 at 05:11:30AM -0400, Bo Liu wrote:
>> It passes '_vq' to vring_free(), which still calls to_vvq() to get
>> 'vq', let's directly pass 'vq'. It can avoid unnecessary call of
>> to_vvq() in hot path.
>>
>> Signed-off-by: Bo Liu <liubo03@inspur.com>
>
>What is the point of this change?
>
>__vring_new_virtqueue returns struct virtqueue *, so vring_free matches
that.
>No?
>
Hi
In function vring_free(), to_vvq() js unnecessary, we can directly pass
struct vring_virtqueue * to avoid this and remove the unnecessary code.
>> ---
>> drivers/virtio/virtio_ring.c | 12 +++++-------
>> 1 file changed, 5 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/virtio/virtio_ring.c
>> b/drivers/virtio/virtio_ring.c index 8974c34b40fd..d6d77bf58802 100644
>> --- a/drivers/virtio/virtio_ring.c
>> +++ b/drivers/virtio/virtio_ring.c
>> @@ -221,7 +221,7 @@ static struct virtqueue
>*__vring_new_virtqueue(unsigned int index,
>> void (*callback)(struct
virtqueue *),
>> const char *name);
>> static struct vring_desc_extra *vring_alloc_desc_extra(unsigned int
>> num); -static void vring_free(struct virtqueue *_vq);
>> +static void vring_free(struct vring_virtqueue *vq);
>>
>> /*
>> * Helpers.
>> @@ -1140,7 +1140,7 @@ static int virtqueue_resize_split(struct virtqueue
>*_vq, u32 num)
>> if (err)
>> goto err_state_extra;
>>
>> - vring_free(&vq->vq);
>> + vring_free(vq);
>>
>> virtqueue_vring_init_split(&vring_split, vq);
>>
>> @@ -2059,7 +2059,7 @@ static int virtqueue_resize_packed(struct virtqueue
>*_vq, u32 num)
>> if (err)
>> goto err_state_extra;
>>
>> - vring_free(&vq->vq);
>> + vring_free(vq);
>>
>> virtqueue_vring_init_packed(&vring_packed, !!vq->vq.callback);
>>
>> @@ -2649,10 +2649,8 @@ struct virtqueue *vring_new_virtqueue(unsigned
>> int index, } EXPORT_SYMBOL_GPL(vring_new_virtqueue);
>>
>> -static void vring_free(struct virtqueue *_vq)
>> +static void vring_free(struct vring_virtqueue *vq)
>> {
>> - struct vring_virtqueue *vq = to_vvq(_vq);
>> -
>> if (vq->we_own_ring) {
>> if (vq->packed_ring) {
>> vring_free_queue(vq->vq.vdev,
>> @@ -2693,7 +2691,7 @@ void vring_del_virtqueue(struct virtqueue *_vq)
>> list_del(&_vq->list);
>> spin_unlock(&vq->vq.vdev->vqs_list_lock);
>>
>> - vring_free(_vq);
>> + vring_free(vq);
>>
>> kfree(vq);
>> }
>> --
>> 2.27.0
[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 3777 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] virtio_ring: remove unnecessary to_vvq() call
2022-09-26 9:11 Bo Liu
2022-09-27 4:03 ` Jason Wang
@ 2022-09-27 20:30 ` Michael S. Tsirkin
1 sibling, 0 replies; 10+ messages in thread
From: Michael S. Tsirkin @ 2022-09-27 20:30 UTC (permalink / raw)
To: Bo Liu; +Cc: jasowang, virtualization, linux-kernel
On Mon, Sep 26, 2022 at 05:11:30AM -0400, Bo Liu wrote:
> It passes '_vq' to vring_free(), which still calls to_vvq()
> to get 'vq', let's directly pass 'vq'. It can avoid
> unnecessary call of to_vvq() in hot path.
>
> Signed-off-by: Bo Liu <liubo03@inspur.com>
What is the point of this change?
__vring_new_virtqueue returns struct virtqueue *, so vring_free
matches that. No?
> ---
> drivers/virtio/virtio_ring.c | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
> index 8974c34b40fd..d6d77bf58802 100644
> --- a/drivers/virtio/virtio_ring.c
> +++ b/drivers/virtio/virtio_ring.c
> @@ -221,7 +221,7 @@ static struct virtqueue *__vring_new_virtqueue(unsigned int index,
> void (*callback)(struct virtqueue *),
> const char *name);
> static struct vring_desc_extra *vring_alloc_desc_extra(unsigned int num);
> -static void vring_free(struct virtqueue *_vq);
> +static void vring_free(struct vring_virtqueue *vq);
>
> /*
> * Helpers.
> @@ -1140,7 +1140,7 @@ static int virtqueue_resize_split(struct virtqueue *_vq, u32 num)
> if (err)
> goto err_state_extra;
>
> - vring_free(&vq->vq);
> + vring_free(vq);
>
> virtqueue_vring_init_split(&vring_split, vq);
>
> @@ -2059,7 +2059,7 @@ static int virtqueue_resize_packed(struct virtqueue *_vq, u32 num)
> if (err)
> goto err_state_extra;
>
> - vring_free(&vq->vq);
> + vring_free(vq);
>
> virtqueue_vring_init_packed(&vring_packed, !!vq->vq.callback);
>
> @@ -2649,10 +2649,8 @@ struct virtqueue *vring_new_virtqueue(unsigned int index,
> }
> EXPORT_SYMBOL_GPL(vring_new_virtqueue);
>
> -static void vring_free(struct virtqueue *_vq)
> +static void vring_free(struct vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> -
> if (vq->we_own_ring) {
> if (vq->packed_ring) {
> vring_free_queue(vq->vq.vdev,
> @@ -2693,7 +2691,7 @@ void vring_del_virtqueue(struct virtqueue *_vq)
> list_del(&_vq->list);
> spin_unlock(&vq->vq.vdev->vqs_list_lock);
>
> - vring_free(_vq);
> + vring_free(vq);
>
> kfree(vq);
> }
> --
> 2.27.0
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] virtio_ring: remove unnecessary to_vvq() call
2022-09-26 9:11 Bo Liu
@ 2022-09-27 4:03 ` Jason Wang
2022-09-27 20:30 ` Michael S. Tsirkin
1 sibling, 0 replies; 10+ messages in thread
From: Jason Wang @ 2022-09-27 4:03 UTC (permalink / raw)
To: Bo Liu; +Cc: mst, virtualization, linux-kernel
On Mon, Sep 26, 2022 at 5:11 PM Bo Liu <liubo03@inspur.com> wrote:
>
> It passes '_vq' to vring_free(), which still calls to_vvq()
> to get 'vq', let's directly pass 'vq'. It can avoid
> unnecessary call of to_vvq() in hot path.
>
> Signed-off-by: Bo Liu <liubo03@inspur.com>
Acked-by: Jason Wang <jasowang@redhat.com>
> ---
> drivers/virtio/virtio_ring.c | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
> index 8974c34b40fd..d6d77bf58802 100644
> --- a/drivers/virtio/virtio_ring.c
> +++ b/drivers/virtio/virtio_ring.c
> @@ -221,7 +221,7 @@ static struct virtqueue *__vring_new_virtqueue(unsigned int index,
> void (*callback)(struct virtqueue *),
> const char *name);
> static struct vring_desc_extra *vring_alloc_desc_extra(unsigned int num);
> -static void vring_free(struct virtqueue *_vq);
> +static void vring_free(struct vring_virtqueue *vq);
>
> /*
> * Helpers.
> @@ -1140,7 +1140,7 @@ static int virtqueue_resize_split(struct virtqueue *_vq, u32 num)
> if (err)
> goto err_state_extra;
>
> - vring_free(&vq->vq);
> + vring_free(vq);
>
> virtqueue_vring_init_split(&vring_split, vq);
>
> @@ -2059,7 +2059,7 @@ static int virtqueue_resize_packed(struct virtqueue *_vq, u32 num)
> if (err)
> goto err_state_extra;
>
> - vring_free(&vq->vq);
> + vring_free(vq);
>
> virtqueue_vring_init_packed(&vring_packed, !!vq->vq.callback);
>
> @@ -2649,10 +2649,8 @@ struct virtqueue *vring_new_virtqueue(unsigned int index,
> }
> EXPORT_SYMBOL_GPL(vring_new_virtqueue);
>
> -static void vring_free(struct virtqueue *_vq)
> +static void vring_free(struct vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> -
> if (vq->we_own_ring) {
> if (vq->packed_ring) {
> vring_free_queue(vq->vq.vdev,
> @@ -2693,7 +2691,7 @@ void vring_del_virtqueue(struct virtqueue *_vq)
> list_del(&_vq->list);
> spin_unlock(&vq->vq.vdev->vqs_list_lock);
>
> - vring_free(_vq);
> + vring_free(vq);
>
> kfree(vq);
> }
> --
> 2.27.0
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] virtio_ring: remove unnecessary to_vvq() call
@ 2022-09-26 9:11 Bo Liu
2022-09-27 4:03 ` Jason Wang
2022-09-27 20:30 ` Michael S. Tsirkin
0 siblings, 2 replies; 10+ messages in thread
From: Bo Liu @ 2022-09-26 9:11 UTC (permalink / raw)
To: mst, jasowang; +Cc: virtualization, linux-kernel, Bo Liu
It passes '_vq' to vring_free(), which still calls to_vvq()
to get 'vq', let's directly pass 'vq'. It can avoid
unnecessary call of to_vvq() in hot path.
Signed-off-by: Bo Liu <liubo03@inspur.com>
---
drivers/virtio/virtio_ring.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 8974c34b40fd..d6d77bf58802 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -221,7 +221,7 @@ static struct virtqueue *__vring_new_virtqueue(unsigned int index,
void (*callback)(struct virtqueue *),
const char *name);
static struct vring_desc_extra *vring_alloc_desc_extra(unsigned int num);
-static void vring_free(struct virtqueue *_vq);
+static void vring_free(struct vring_virtqueue *vq);
/*
* Helpers.
@@ -1140,7 +1140,7 @@ static int virtqueue_resize_split(struct virtqueue *_vq, u32 num)
if (err)
goto err_state_extra;
- vring_free(&vq->vq);
+ vring_free(vq);
virtqueue_vring_init_split(&vring_split, vq);
@@ -2059,7 +2059,7 @@ static int virtqueue_resize_packed(struct virtqueue *_vq, u32 num)
if (err)
goto err_state_extra;
- vring_free(&vq->vq);
+ vring_free(vq);
virtqueue_vring_init_packed(&vring_packed, !!vq->vq.callback);
@@ -2649,10 +2649,8 @@ struct virtqueue *vring_new_virtqueue(unsigned int index,
}
EXPORT_SYMBOL_GPL(vring_new_virtqueue);
-static void vring_free(struct virtqueue *_vq)
+static void vring_free(struct vring_virtqueue *vq)
{
- struct vring_virtqueue *vq = to_vvq(_vq);
-
if (vq->we_own_ring) {
if (vq->packed_ring) {
vring_free_queue(vq->vq.vdev,
@@ -2693,7 +2691,7 @@ void vring_del_virtqueue(struct virtqueue *_vq)
list_del(&_vq->list);
spin_unlock(&vq->vq.vdev->vqs_list_lock);
- vring_free(_vq);
+ vring_free(vq);
kfree(vq);
}
--
2.27.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] virtio_ring: remove unnecessary to_vvq call
@ 2022-06-08 0:57 Bo Liu (刘波)-浪潮信息
0 siblings, 0 replies; 10+ messages in thread
From: Bo Liu (刘波)-浪潮信息 @ 2022-06-08 0:57 UTC (permalink / raw)
To: mst; +Cc: jasowang, virtualization, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 404 bytes --]
On Tue, Jun 07, 2022 at 08:08:58AM +0000, Bo Liu (刘波)-浪潮信息 wrote:
> This patch removes unnecessary code and generates smaller binary files.
> Thanks
Can you post info on which files are smaller an by how much please?
--
MST
virtio_ring.c 64967B (before the patch) 64443B (after the patch)
virtio_ring.o 543088B(before the patch) 540120B(after the patch)
thanks
[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 3777 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] virtio_ring: remove unnecessary to_vvq call
2022-06-07 0:59 Bo Liu
@ 2022-06-07 6:38 ` Michael S. Tsirkin
0 siblings, 0 replies; 10+ messages in thread
From: Michael S. Tsirkin @ 2022-06-07 6:38 UTC (permalink / raw)
To: Bo Liu; +Cc: jasowang, virtualization, linux-kernel
On Mon, Jun 06, 2022 at 08:59:51PM -0400, Bo Liu wrote:
> In many functions, the parameter passed in is "_vq", which still call
> to_vvq() to get 'vq'. It can avoid unnecessary call of to_vvq() by directly
> passing in the parameter "vq".
>
> Signed-off-by: Bo Liu <liubo03@inspur.com>
What does the patch accomplish? Is the generated binary faster? smaller?
> ---
> drivers/virtio/virtio_ring.c | 100 ++++++++++++++---------------------
> 1 file changed, 41 insertions(+), 59 deletions(-)
>
> diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
> index 13a7348cedff..f82db59fdbdc 100644
> --- a/drivers/virtio/virtio_ring.c
> +++ b/drivers/virtio/virtio_ring.c
> @@ -648,9 +648,8 @@ static inline int virtqueue_add_split(struct virtqueue *_vq,
> return -ENOMEM;
> }
>
> -static bool virtqueue_kick_prepare_split(struct virtqueue *_vq)
> +static bool virtqueue_kick_prepare_split(struct vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> u16 new, old;
> bool needs_kick;
>
> @@ -667,12 +666,12 @@ static bool virtqueue_kick_prepare_split(struct virtqueue *_vq)
> LAST_ADD_TIME_INVALID(vq);
>
> if (vq->event) {
> - needs_kick = vring_need_event(virtio16_to_cpu(_vq->vdev,
> + needs_kick = vring_need_event(virtio16_to_cpu(vq->vq.vdev,
> vring_avail_event(&vq->split.vring)),
> new, old);
> } else {
> needs_kick = !(vq->split.vring.used->flags &
> - cpu_to_virtio16(_vq->vdev,
> + cpu_to_virtio16(vq->vq.vdev,
> VRING_USED_F_NO_NOTIFY));
> }
> END_USE(vq);
> @@ -735,11 +734,10 @@ static inline bool more_used_split(const struct vring_virtqueue *vq)
> vq->split.vring.used->idx);
> }
>
> -static void *virtqueue_get_buf_ctx_split(struct virtqueue *_vq,
> +static void *virtqueue_get_buf_ctx_split(struct vring_virtqueue *vq,
> unsigned int *len,
> void **ctx)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> void *ret;
> unsigned int i;
> u16 last_used;
> @@ -761,9 +759,9 @@ static void *virtqueue_get_buf_ctx_split(struct virtqueue *_vq,
> virtio_rmb(vq->weak_barriers);
>
> last_used = (vq->last_used_idx & (vq->split.vring.num - 1));
> - i = virtio32_to_cpu(_vq->vdev,
> + i = virtio32_to_cpu(vq->vq.vdev,
> vq->split.vring.used->ring[last_used].id);
> - *len = virtio32_to_cpu(_vq->vdev,
> + *len = virtio32_to_cpu(vq->vq.vdev,
> vq->split.vring.used->ring[last_used].len);
>
> if (unlikely(i >= vq->split.vring.num)) {
> @@ -785,7 +783,7 @@ static void *virtqueue_get_buf_ctx_split(struct virtqueue *_vq,
> if (!(vq->split.avail_flags_shadow & VRING_AVAIL_F_NO_INTERRUPT))
> virtio_store_mb(vq->weak_barriers,
> &vring_used_event(&vq->split.vring),
> - cpu_to_virtio16(_vq->vdev, vq->last_used_idx));
> + cpu_to_virtio16(vq->vq.vdev, vq->last_used_idx));
>
> LAST_ADD_TIME_INVALID(vq);
>
> @@ -793,10 +791,8 @@ static void *virtqueue_get_buf_ctx_split(struct virtqueue *_vq,
> return ret;
> }
>
> -static void virtqueue_disable_cb_split(struct virtqueue *_vq)
> +static void virtqueue_disable_cb_split(struct vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> -
> if (!(vq->split.avail_flags_shadow & VRING_AVAIL_F_NO_INTERRUPT)) {
> vq->split.avail_flags_shadow |= VRING_AVAIL_F_NO_INTERRUPT;
> if (vq->event)
> @@ -804,14 +800,13 @@ static void virtqueue_disable_cb_split(struct virtqueue *_vq)
> vring_used_event(&vq->split.vring) = 0x0;
> else
> vq->split.vring.avail->flags =
> - cpu_to_virtio16(_vq->vdev,
> + cpu_to_virtio16(vq->vq.vdev,
> vq->split.avail_flags_shadow);
> }
> }
>
> -static unsigned int virtqueue_enable_cb_prepare_split(struct virtqueue *_vq)
> +static unsigned int virtqueue_enable_cb_prepare_split(struct vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> u16 last_used_idx;
>
> START_USE(vq);
> @@ -825,26 +820,23 @@ static unsigned int virtqueue_enable_cb_prepare_split(struct virtqueue *_vq)
> vq->split.avail_flags_shadow &= ~VRING_AVAIL_F_NO_INTERRUPT;
> if (!vq->event)
> vq->split.vring.avail->flags =
> - cpu_to_virtio16(_vq->vdev,
> + cpu_to_virtio16(vq->vq.vdev,
> vq->split.avail_flags_shadow);
> }
> - vring_used_event(&vq->split.vring) = cpu_to_virtio16(_vq->vdev,
> + vring_used_event(&vq->split.vring) = cpu_to_virtio16(vq->vq.vdev,
> last_used_idx = vq->last_used_idx);
> END_USE(vq);
> return last_used_idx;
> }
>
> -static bool virtqueue_poll_split(struct virtqueue *_vq, unsigned int last_used_idx)
> +static bool virtqueue_poll_split(struct vring_virtqueue *vq, unsigned int last_used_idx)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> -
> - return (u16)last_used_idx != virtio16_to_cpu(_vq->vdev,
> + return (u16)last_used_idx != virtio16_to_cpu(vq->vq.vdev,
> vq->split.vring.used->idx);
> }
>
> -static bool virtqueue_enable_cb_delayed_split(struct virtqueue *_vq)
> +static bool virtqueue_enable_cb_delayed_split(struct vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> u16 bufs;
>
> START_USE(vq);
> @@ -858,7 +850,7 @@ static bool virtqueue_enable_cb_delayed_split(struct virtqueue *_vq)
> vq->split.avail_flags_shadow &= ~VRING_AVAIL_F_NO_INTERRUPT;
> if (!vq->event)
> vq->split.vring.avail->flags =
> - cpu_to_virtio16(_vq->vdev,
> + cpu_to_virtio16(vq->vq.vdev,
> vq->split.avail_flags_shadow);
> }
> /* TODO: tune this threshold */
> @@ -866,9 +858,9 @@ static bool virtqueue_enable_cb_delayed_split(struct virtqueue *_vq)
>
> virtio_store_mb(vq->weak_barriers,
> &vring_used_event(&vq->split.vring),
> - cpu_to_virtio16(_vq->vdev, vq->last_used_idx + bufs));
> + cpu_to_virtio16(vq->vq.vdev, vq->last_used_idx + bufs));
>
> - if (unlikely((u16)(virtio16_to_cpu(_vq->vdev, vq->split.vring.used->idx)
> + if (unlikely((u16)(virtio16_to_cpu(vq->vq.vdev, vq->split.vring.used->idx)
> - vq->last_used_idx) > bufs)) {
> END_USE(vq);
> return false;
> @@ -878,9 +870,8 @@ static bool virtqueue_enable_cb_delayed_split(struct virtqueue *_vq)
> return true;
> }
>
> -static void *virtqueue_detach_unused_buf_split(struct virtqueue *_vq)
> +static void *virtqueue_detach_unused_buf_split(struct vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> unsigned int i;
> void *buf;
>
> @@ -893,7 +884,7 @@ static void *virtqueue_detach_unused_buf_split(struct virtqueue *_vq)
> buf = vq->split.desc_state[i].data;
> detach_buf_split(vq, i, NULL);
> vq->split.avail_idx_shadow--;
> - vq->split.vring.avail->idx = cpu_to_virtio16(_vq->vdev,
> + vq->split.vring.avail->idx = cpu_to_virtio16(vq->vq.vdev,
> vq->split.avail_idx_shadow);
> END_USE(vq);
> return buf;
> @@ -1296,9 +1287,8 @@ static inline int virtqueue_add_packed(struct virtqueue *_vq,
> return -EIO;
> }
>
> -static bool virtqueue_kick_prepare_packed(struct virtqueue *_vq)
> +static bool virtqueue_kick_prepare_packed(struct vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> u16 new, old, off_wrap, flags, wrap_counter, event_idx;
> bool needs_kick;
> union {
> @@ -1410,11 +1400,10 @@ static inline bool more_used_packed(const struct vring_virtqueue *vq)
> vq->packed.used_wrap_counter);
> }
>
> -static void *virtqueue_get_buf_ctx_packed(struct virtqueue *_vq,
> +static void *virtqueue_get_buf_ctx_packed(struct vring_virtqueue *vq,
> unsigned int *len,
> void **ctx)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> u16 last_used, id;
> void *ret;
>
> @@ -1475,10 +1464,8 @@ static void *virtqueue_get_buf_ctx_packed(struct virtqueue *_vq,
> return ret;
> }
>
> -static void virtqueue_disable_cb_packed(struct virtqueue *_vq)
> +static void virtqueue_disable_cb_packed(struct vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> -
> if (vq->packed.event_flags_shadow != VRING_PACKED_EVENT_FLAG_DISABLE) {
> vq->packed.event_flags_shadow = VRING_PACKED_EVENT_FLAG_DISABLE;
> vq->packed.vring.driver->flags =
> @@ -1486,10 +1473,8 @@ static void virtqueue_disable_cb_packed(struct virtqueue *_vq)
> }
> }
>
> -static unsigned int virtqueue_enable_cb_prepare_packed(struct virtqueue *_vq)
> +static unsigned int virtqueue_enable_cb_prepare_packed(struct vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> -
> START_USE(vq);
>
> /*
> @@ -1522,9 +1507,8 @@ static unsigned int virtqueue_enable_cb_prepare_packed(struct virtqueue *_vq)
> VRING_PACKED_EVENT_F_WRAP_CTR);
> }
>
> -static bool virtqueue_poll_packed(struct virtqueue *_vq, u16 off_wrap)
> +static bool virtqueue_poll_packed(struct vring_virtqueue *vq, u16 off_wrap)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> bool wrap_counter;
> u16 used_idx;
>
> @@ -1534,9 +1518,8 @@ static bool virtqueue_poll_packed(struct virtqueue *_vq, u16 off_wrap)
> return is_used_desc_packed(vq, used_idx, wrap_counter);
> }
>
> -static bool virtqueue_enable_cb_delayed_packed(struct virtqueue *_vq)
> +static bool virtqueue_enable_cb_delayed_packed(struct vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> u16 used_idx, wrap_counter;
> u16 bufs;
>
> @@ -1593,9 +1576,8 @@ static bool virtqueue_enable_cb_delayed_packed(struct virtqueue *_vq)
> return true;
> }
>
> -static void *virtqueue_detach_unused_buf_packed(struct virtqueue *_vq)
> +static void *virtqueue_detach_unused_buf_packed(struct vring_virtqueue *vq)
> {
> - struct vring_virtqueue *vq = to_vvq(_vq);
> unsigned int i;
> void *buf;
>
> @@ -1906,8 +1888,8 @@ bool virtqueue_kick_prepare(struct virtqueue *_vq)
> {
> struct vring_virtqueue *vq = to_vvq(_vq);
>
> - return vq->packed_ring ? virtqueue_kick_prepare_packed(_vq) :
> - virtqueue_kick_prepare_split(_vq);
> + return vq->packed_ring ? virtqueue_kick_prepare_packed(vq) :
> + virtqueue_kick_prepare_split(vq);
> }
> EXPORT_SYMBOL_GPL(virtqueue_kick_prepare);
>
> @@ -1977,8 +1959,8 @@ void *virtqueue_get_buf_ctx(struct virtqueue *_vq, unsigned int *len,
> {
> struct vring_virtqueue *vq = to_vvq(_vq);
>
> - return vq->packed_ring ? virtqueue_get_buf_ctx_packed(_vq, len, ctx) :
> - virtqueue_get_buf_ctx_split(_vq, len, ctx);
> + return vq->packed_ring ? virtqueue_get_buf_ctx_packed(vq, len, ctx) :
> + virtqueue_get_buf_ctx_split(vq, len, ctx);
> }
> EXPORT_SYMBOL_GPL(virtqueue_get_buf_ctx);
>
> @@ -2007,9 +1989,9 @@ void virtqueue_disable_cb(struct virtqueue *_vq)
> return;
>
> if (vq->packed_ring)
> - virtqueue_disable_cb_packed(_vq);
> + virtqueue_disable_cb_packed(vq);
> else
> - virtqueue_disable_cb_split(_vq);
> + virtqueue_disable_cb_split(vq);
> }
> EXPORT_SYMBOL_GPL(virtqueue_disable_cb);
>
> @@ -2032,8 +2014,8 @@ unsigned int virtqueue_enable_cb_prepare(struct virtqueue *_vq)
> if (vq->event_triggered)
> vq->event_triggered = false;
>
> - return vq->packed_ring ? virtqueue_enable_cb_prepare_packed(_vq) :
> - virtqueue_enable_cb_prepare_split(_vq);
> + return vq->packed_ring ? virtqueue_enable_cb_prepare_packed(vq) :
> + virtqueue_enable_cb_prepare_split(vq);
> }
> EXPORT_SYMBOL_GPL(virtqueue_enable_cb_prepare);
>
> @@ -2054,8 +2036,8 @@ bool virtqueue_poll(struct virtqueue *_vq, unsigned int last_used_idx)
> return false;
>
> virtio_mb(vq->weak_barriers);
> - return vq->packed_ring ? virtqueue_poll_packed(_vq, last_used_idx) :
> - virtqueue_poll_split(_vq, last_used_idx);
> + return vq->packed_ring ? virtqueue_poll_packed(vq, last_used_idx) :
> + virtqueue_poll_split(vq, last_used_idx);
> }
> EXPORT_SYMBOL_GPL(virtqueue_poll);
>
> @@ -2098,8 +2080,8 @@ bool virtqueue_enable_cb_delayed(struct virtqueue *_vq)
> if (vq->event_triggered)
> vq->event_triggered = false;
>
> - return vq->packed_ring ? virtqueue_enable_cb_delayed_packed(_vq) :
> - virtqueue_enable_cb_delayed_split(_vq);
> + return vq->packed_ring ? virtqueue_enable_cb_delayed_packed(vq) :
> + virtqueue_enable_cb_delayed_split(vq);
> }
> EXPORT_SYMBOL_GPL(virtqueue_enable_cb_delayed);
>
> @@ -2115,8 +2097,8 @@ void *virtqueue_detach_unused_buf(struct virtqueue *_vq)
> {
> struct vring_virtqueue *vq = to_vvq(_vq);
>
> - return vq->packed_ring ? virtqueue_detach_unused_buf_packed(_vq) :
> - virtqueue_detach_unused_buf_split(_vq);
> + return vq->packed_ring ? virtqueue_detach_unused_buf_packed(vq) :
> + virtqueue_detach_unused_buf_split(vq);
> }
> EXPORT_SYMBOL_GPL(virtqueue_detach_unused_buf);
>
> --
> 2.27.0
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] virtio_ring: remove unnecessary to_vvq call
@ 2022-06-07 0:59 Bo Liu
2022-06-07 6:38 ` Michael S. Tsirkin
0 siblings, 1 reply; 10+ messages in thread
From: Bo Liu @ 2022-06-07 0:59 UTC (permalink / raw)
To: mst, jasowang; +Cc: virtualization, linux-kernel, Bo Liu
In many functions, the parameter passed in is "_vq", which still call
to_vvq() to get 'vq'. It can avoid unnecessary call of to_vvq() by directly
passing in the parameter "vq".
Signed-off-by: Bo Liu <liubo03@inspur.com>
---
drivers/virtio/virtio_ring.c | 100 ++++++++++++++---------------------
1 file changed, 41 insertions(+), 59 deletions(-)
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 13a7348cedff..f82db59fdbdc 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -648,9 +648,8 @@ static inline int virtqueue_add_split(struct virtqueue *_vq,
return -ENOMEM;
}
-static bool virtqueue_kick_prepare_split(struct virtqueue *_vq)
+static bool virtqueue_kick_prepare_split(struct vring_virtqueue *vq)
{
- struct vring_virtqueue *vq = to_vvq(_vq);
u16 new, old;
bool needs_kick;
@@ -667,12 +666,12 @@ static bool virtqueue_kick_prepare_split(struct virtqueue *_vq)
LAST_ADD_TIME_INVALID(vq);
if (vq->event) {
- needs_kick = vring_need_event(virtio16_to_cpu(_vq->vdev,
+ needs_kick = vring_need_event(virtio16_to_cpu(vq->vq.vdev,
vring_avail_event(&vq->split.vring)),
new, old);
} else {
needs_kick = !(vq->split.vring.used->flags &
- cpu_to_virtio16(_vq->vdev,
+ cpu_to_virtio16(vq->vq.vdev,
VRING_USED_F_NO_NOTIFY));
}
END_USE(vq);
@@ -735,11 +734,10 @@ static inline bool more_used_split(const struct vring_virtqueue *vq)
vq->split.vring.used->idx);
}
-static void *virtqueue_get_buf_ctx_split(struct virtqueue *_vq,
+static void *virtqueue_get_buf_ctx_split(struct vring_virtqueue *vq,
unsigned int *len,
void **ctx)
{
- struct vring_virtqueue *vq = to_vvq(_vq);
void *ret;
unsigned int i;
u16 last_used;
@@ -761,9 +759,9 @@ static void *virtqueue_get_buf_ctx_split(struct virtqueue *_vq,
virtio_rmb(vq->weak_barriers);
last_used = (vq->last_used_idx & (vq->split.vring.num - 1));
- i = virtio32_to_cpu(_vq->vdev,
+ i = virtio32_to_cpu(vq->vq.vdev,
vq->split.vring.used->ring[last_used].id);
- *len = virtio32_to_cpu(_vq->vdev,
+ *len = virtio32_to_cpu(vq->vq.vdev,
vq->split.vring.used->ring[last_used].len);
if (unlikely(i >= vq->split.vring.num)) {
@@ -785,7 +783,7 @@ static void *virtqueue_get_buf_ctx_split(struct virtqueue *_vq,
if (!(vq->split.avail_flags_shadow & VRING_AVAIL_F_NO_INTERRUPT))
virtio_store_mb(vq->weak_barriers,
&vring_used_event(&vq->split.vring),
- cpu_to_virtio16(_vq->vdev, vq->last_used_idx));
+ cpu_to_virtio16(vq->vq.vdev, vq->last_used_idx));
LAST_ADD_TIME_INVALID(vq);
@@ -793,10 +791,8 @@ static void *virtqueue_get_buf_ctx_split(struct virtqueue *_vq,
return ret;
}
-static void virtqueue_disable_cb_split(struct virtqueue *_vq)
+static void virtqueue_disable_cb_split(struct vring_virtqueue *vq)
{
- struct vring_virtqueue *vq = to_vvq(_vq);
-
if (!(vq->split.avail_flags_shadow & VRING_AVAIL_F_NO_INTERRUPT)) {
vq->split.avail_flags_shadow |= VRING_AVAIL_F_NO_INTERRUPT;
if (vq->event)
@@ -804,14 +800,13 @@ static void virtqueue_disable_cb_split(struct virtqueue *_vq)
vring_used_event(&vq->split.vring) = 0x0;
else
vq->split.vring.avail->flags =
- cpu_to_virtio16(_vq->vdev,
+ cpu_to_virtio16(vq->vq.vdev,
vq->split.avail_flags_shadow);
}
}
-static unsigned int virtqueue_enable_cb_prepare_split(struct virtqueue *_vq)
+static unsigned int virtqueue_enable_cb_prepare_split(struct vring_virtqueue *vq)
{
- struct vring_virtqueue *vq = to_vvq(_vq);
u16 last_used_idx;
START_USE(vq);
@@ -825,26 +820,23 @@ static unsigned int virtqueue_enable_cb_prepare_split(struct virtqueue *_vq)
vq->split.avail_flags_shadow &= ~VRING_AVAIL_F_NO_INTERRUPT;
if (!vq->event)
vq->split.vring.avail->flags =
- cpu_to_virtio16(_vq->vdev,
+ cpu_to_virtio16(vq->vq.vdev,
vq->split.avail_flags_shadow);
}
- vring_used_event(&vq->split.vring) = cpu_to_virtio16(_vq->vdev,
+ vring_used_event(&vq->split.vring) = cpu_to_virtio16(vq->vq.vdev,
last_used_idx = vq->last_used_idx);
END_USE(vq);
return last_used_idx;
}
-static bool virtqueue_poll_split(struct virtqueue *_vq, unsigned int last_used_idx)
+static bool virtqueue_poll_split(struct vring_virtqueue *vq, unsigned int last_used_idx)
{
- struct vring_virtqueue *vq = to_vvq(_vq);
-
- return (u16)last_used_idx != virtio16_to_cpu(_vq->vdev,
+ return (u16)last_used_idx != virtio16_to_cpu(vq->vq.vdev,
vq->split.vring.used->idx);
}
-static bool virtqueue_enable_cb_delayed_split(struct virtqueue *_vq)
+static bool virtqueue_enable_cb_delayed_split(struct vring_virtqueue *vq)
{
- struct vring_virtqueue *vq = to_vvq(_vq);
u16 bufs;
START_USE(vq);
@@ -858,7 +850,7 @@ static bool virtqueue_enable_cb_delayed_split(struct virtqueue *_vq)
vq->split.avail_flags_shadow &= ~VRING_AVAIL_F_NO_INTERRUPT;
if (!vq->event)
vq->split.vring.avail->flags =
- cpu_to_virtio16(_vq->vdev,
+ cpu_to_virtio16(vq->vq.vdev,
vq->split.avail_flags_shadow);
}
/* TODO: tune this threshold */
@@ -866,9 +858,9 @@ static bool virtqueue_enable_cb_delayed_split(struct virtqueue *_vq)
virtio_store_mb(vq->weak_barriers,
&vring_used_event(&vq->split.vring),
- cpu_to_virtio16(_vq->vdev, vq->last_used_idx + bufs));
+ cpu_to_virtio16(vq->vq.vdev, vq->last_used_idx + bufs));
- if (unlikely((u16)(virtio16_to_cpu(_vq->vdev, vq->split.vring.used->idx)
+ if (unlikely((u16)(virtio16_to_cpu(vq->vq.vdev, vq->split.vring.used->idx)
- vq->last_used_idx) > bufs)) {
END_USE(vq);
return false;
@@ -878,9 +870,8 @@ static bool virtqueue_enable_cb_delayed_split(struct virtqueue *_vq)
return true;
}
-static void *virtqueue_detach_unused_buf_split(struct virtqueue *_vq)
+static void *virtqueue_detach_unused_buf_split(struct vring_virtqueue *vq)
{
- struct vring_virtqueue *vq = to_vvq(_vq);
unsigned int i;
void *buf;
@@ -893,7 +884,7 @@ static void *virtqueue_detach_unused_buf_split(struct virtqueue *_vq)
buf = vq->split.desc_state[i].data;
detach_buf_split(vq, i, NULL);
vq->split.avail_idx_shadow--;
- vq->split.vring.avail->idx = cpu_to_virtio16(_vq->vdev,
+ vq->split.vring.avail->idx = cpu_to_virtio16(vq->vq.vdev,
vq->split.avail_idx_shadow);
END_USE(vq);
return buf;
@@ -1296,9 +1287,8 @@ static inline int virtqueue_add_packed(struct virtqueue *_vq,
return -EIO;
}
-static bool virtqueue_kick_prepare_packed(struct virtqueue *_vq)
+static bool virtqueue_kick_prepare_packed(struct vring_virtqueue *vq)
{
- struct vring_virtqueue *vq = to_vvq(_vq);
u16 new, old, off_wrap, flags, wrap_counter, event_idx;
bool needs_kick;
union {
@@ -1410,11 +1400,10 @@ static inline bool more_used_packed(const struct vring_virtqueue *vq)
vq->packed.used_wrap_counter);
}
-static void *virtqueue_get_buf_ctx_packed(struct virtqueue *_vq,
+static void *virtqueue_get_buf_ctx_packed(struct vring_virtqueue *vq,
unsigned int *len,
void **ctx)
{
- struct vring_virtqueue *vq = to_vvq(_vq);
u16 last_used, id;
void *ret;
@@ -1475,10 +1464,8 @@ static void *virtqueue_get_buf_ctx_packed(struct virtqueue *_vq,
return ret;
}
-static void virtqueue_disable_cb_packed(struct virtqueue *_vq)
+static void virtqueue_disable_cb_packed(struct vring_virtqueue *vq)
{
- struct vring_virtqueue *vq = to_vvq(_vq);
-
if (vq->packed.event_flags_shadow != VRING_PACKED_EVENT_FLAG_DISABLE) {
vq->packed.event_flags_shadow = VRING_PACKED_EVENT_FLAG_DISABLE;
vq->packed.vring.driver->flags =
@@ -1486,10 +1473,8 @@ static void virtqueue_disable_cb_packed(struct virtqueue *_vq)
}
}
-static unsigned int virtqueue_enable_cb_prepare_packed(struct virtqueue *_vq)
+static unsigned int virtqueue_enable_cb_prepare_packed(struct vring_virtqueue *vq)
{
- struct vring_virtqueue *vq = to_vvq(_vq);
-
START_USE(vq);
/*
@@ -1522,9 +1507,8 @@ static unsigned int virtqueue_enable_cb_prepare_packed(struct virtqueue *_vq)
VRING_PACKED_EVENT_F_WRAP_CTR);
}
-static bool virtqueue_poll_packed(struct virtqueue *_vq, u16 off_wrap)
+static bool virtqueue_poll_packed(struct vring_virtqueue *vq, u16 off_wrap)
{
- struct vring_virtqueue *vq = to_vvq(_vq);
bool wrap_counter;
u16 used_idx;
@@ -1534,9 +1518,8 @@ static bool virtqueue_poll_packed(struct virtqueue *_vq, u16 off_wrap)
return is_used_desc_packed(vq, used_idx, wrap_counter);
}
-static bool virtqueue_enable_cb_delayed_packed(struct virtqueue *_vq)
+static bool virtqueue_enable_cb_delayed_packed(struct vring_virtqueue *vq)
{
- struct vring_virtqueue *vq = to_vvq(_vq);
u16 used_idx, wrap_counter;
u16 bufs;
@@ -1593,9 +1576,8 @@ static bool virtqueue_enable_cb_delayed_packed(struct virtqueue *_vq)
return true;
}
-static void *virtqueue_detach_unused_buf_packed(struct virtqueue *_vq)
+static void *virtqueue_detach_unused_buf_packed(struct vring_virtqueue *vq)
{
- struct vring_virtqueue *vq = to_vvq(_vq);
unsigned int i;
void *buf;
@@ -1906,8 +1888,8 @@ bool virtqueue_kick_prepare(struct virtqueue *_vq)
{
struct vring_virtqueue *vq = to_vvq(_vq);
- return vq->packed_ring ? virtqueue_kick_prepare_packed(_vq) :
- virtqueue_kick_prepare_split(_vq);
+ return vq->packed_ring ? virtqueue_kick_prepare_packed(vq) :
+ virtqueue_kick_prepare_split(vq);
}
EXPORT_SYMBOL_GPL(virtqueue_kick_prepare);
@@ -1977,8 +1959,8 @@ void *virtqueue_get_buf_ctx(struct virtqueue *_vq, unsigned int *len,
{
struct vring_virtqueue *vq = to_vvq(_vq);
- return vq->packed_ring ? virtqueue_get_buf_ctx_packed(_vq, len, ctx) :
- virtqueue_get_buf_ctx_split(_vq, len, ctx);
+ return vq->packed_ring ? virtqueue_get_buf_ctx_packed(vq, len, ctx) :
+ virtqueue_get_buf_ctx_split(vq, len, ctx);
}
EXPORT_SYMBOL_GPL(virtqueue_get_buf_ctx);
@@ -2007,9 +1989,9 @@ void virtqueue_disable_cb(struct virtqueue *_vq)
return;
if (vq->packed_ring)
- virtqueue_disable_cb_packed(_vq);
+ virtqueue_disable_cb_packed(vq);
else
- virtqueue_disable_cb_split(_vq);
+ virtqueue_disable_cb_split(vq);
}
EXPORT_SYMBOL_GPL(virtqueue_disable_cb);
@@ -2032,8 +2014,8 @@ unsigned int virtqueue_enable_cb_prepare(struct virtqueue *_vq)
if (vq->event_triggered)
vq->event_triggered = false;
- return vq->packed_ring ? virtqueue_enable_cb_prepare_packed(_vq) :
- virtqueue_enable_cb_prepare_split(_vq);
+ return vq->packed_ring ? virtqueue_enable_cb_prepare_packed(vq) :
+ virtqueue_enable_cb_prepare_split(vq);
}
EXPORT_SYMBOL_GPL(virtqueue_enable_cb_prepare);
@@ -2054,8 +2036,8 @@ bool virtqueue_poll(struct virtqueue *_vq, unsigned int last_used_idx)
return false;
virtio_mb(vq->weak_barriers);
- return vq->packed_ring ? virtqueue_poll_packed(_vq, last_used_idx) :
- virtqueue_poll_split(_vq, last_used_idx);
+ return vq->packed_ring ? virtqueue_poll_packed(vq, last_used_idx) :
+ virtqueue_poll_split(vq, last_used_idx);
}
EXPORT_SYMBOL_GPL(virtqueue_poll);
@@ -2098,8 +2080,8 @@ bool virtqueue_enable_cb_delayed(struct virtqueue *_vq)
if (vq->event_triggered)
vq->event_triggered = false;
- return vq->packed_ring ? virtqueue_enable_cb_delayed_packed(_vq) :
- virtqueue_enable_cb_delayed_split(_vq);
+ return vq->packed_ring ? virtqueue_enable_cb_delayed_packed(vq) :
+ virtqueue_enable_cb_delayed_split(vq);
}
EXPORT_SYMBOL_GPL(virtqueue_enable_cb_delayed);
@@ -2115,8 +2097,8 @@ void *virtqueue_detach_unused_buf(struct virtqueue *_vq)
{
struct vring_virtqueue *vq = to_vvq(_vq);
- return vq->packed_ring ? virtqueue_detach_unused_buf_packed(_vq) :
- virtqueue_detach_unused_buf_split(_vq);
+ return vq->packed_ring ? virtqueue_detach_unused_buf_packed(vq) :
+ virtqueue_detach_unused_buf_split(vq);
}
EXPORT_SYMBOL_GPL(virtqueue_detach_unused_buf);
--
2.27.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-09-28 4:05 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-07 8:08 [PATCH] virtio_ring: remove unnecessary to_vvq call Bo Liu (刘波)-浪潮信息
2022-06-07 10:36 ` Michael S. Tsirkin
-- strict thread matches above, loose matches on Subject: below --
2022-09-28 2:26 [PATCH] virtio_ring: remove unnecessary to_vvq() call Bo Liu (刘波)-浪潮信息
2022-09-28 4:04 ` Michael S. Tsirkin
2022-09-26 9:11 Bo Liu
2022-09-27 4:03 ` Jason Wang
2022-09-27 20:30 ` Michael S. Tsirkin
2022-06-08 0:57 [PATCH] virtio_ring: remove unnecessary to_vvq call Bo Liu (刘波)-浪潮信息
2022-06-07 0:59 Bo Liu
2022-06-07 6:38 ` 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).