* [PATCH v2 1/1] virtio-blk: remove unneeded "likely" statements
@ 2021-09-05 8:57 Max Gurtovoy
2021-09-05 9:02 ` Chaitanya Kulkarni
2021-09-06 5:35 ` Pankaj Gupta
0 siblings, 2 replies; 3+ messages in thread
From: Max Gurtovoy @ 2021-09-05 8:57 UTC (permalink / raw)
To: mst, virtualization, kvm, stefanha; +Cc: linux-block, axboe, Max Gurtovoy
Usually we use "likely/unlikely" to optimize the fast path. Remove
redundant "likely/unlikely" statements in the control path to simplify
the code and make it easier to read.
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com>
---
changes from v1:
- added "Reviewed-by" (Stefan)
- commit description update (Stefan)
---
drivers/block/virtio_blk.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index afb37aac09e8..e574fbf5e6df 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -765,7 +765,7 @@ static int virtblk_probe(struct virtio_device *vdev)
goto out_free_vblk;
/* Default queue sizing is to fill the ring. */
- if (likely(!virtblk_queue_depth)) {
+ if (!virtblk_queue_depth) {
queue_depth = vblk->vqs[0].vq->num_free;
/* ... but without indirect descs, we use 2 descs per req */
if (!virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC))
@@ -839,7 +839,7 @@ static int virtblk_probe(struct virtio_device *vdev)
else
blk_size = queue_logical_block_size(q);
- if (unlikely(blk_size < SECTOR_SIZE || blk_size > PAGE_SIZE)) {
+ if (blk_size < SECTOR_SIZE || blk_size > PAGE_SIZE) {
dev_err(&vdev->dev,
"block size is changed unexpectedly, now is %u\n",
blk_size);
--
2.18.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2 1/1] virtio-blk: remove unneeded "likely" statements
2021-09-05 8:57 [PATCH v2 1/1] virtio-blk: remove unneeded "likely" statements Max Gurtovoy
@ 2021-09-05 9:02 ` Chaitanya Kulkarni
2021-09-06 5:35 ` Pankaj Gupta
1 sibling, 0 replies; 3+ messages in thread
From: Chaitanya Kulkarni @ 2021-09-05 9:02 UTC (permalink / raw)
To: Max Gurtovoy, mst, virtualization, kvm, stefanha; +Cc: linux-block, axboe
On 9/5/2021 1:57 AM, Max Gurtovoy wrote:
> Usually we use "likely/unlikely" to optimize the fast path. Remove
> redundant "likely/unlikely" statements in the control path to simplify
> the code and make it easier to read.
>
> Reviewed-by: Stefan Hajnoczi<stefanha@redhat.com>
> Signed-off-by: Max Gurtovoy<mgurtovoy@nvidia.com>
Reviewed-by: Chaitanya Kulkarni <ckulkarnilinux@gmail.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2 1/1] virtio-blk: remove unneeded "likely" statements
2021-09-05 8:57 [PATCH v2 1/1] virtio-blk: remove unneeded "likely" statements Max Gurtovoy
2021-09-05 9:02 ` Chaitanya Kulkarni
@ 2021-09-06 5:35 ` Pankaj Gupta
1 sibling, 0 replies; 3+ messages in thread
From: Pankaj Gupta @ 2021-09-06 5:35 UTC (permalink / raw)
To: Max Gurtovoy
Cc: Michael S . Tsirkin, virtualization, kvm, Stefan Hajnoczi,
linux-block, Jens Axboe
> Usually we use "likely/unlikely" to optimize the fast path. Remove
> redundant "likely/unlikely" statements in the control path to simplify
> the code and make it easier to read.
>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com>
> ---
>
> changes from v1:
> - added "Reviewed-by" (Stefan)
> - commit description update (Stefan)
>
> ---
> drivers/block/virtio_blk.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
> index afb37aac09e8..e574fbf5e6df 100644
> --- a/drivers/block/virtio_blk.c
> +++ b/drivers/block/virtio_blk.c
> @@ -765,7 +765,7 @@ static int virtblk_probe(struct virtio_device *vdev)
> goto out_free_vblk;
>
> /* Default queue sizing is to fill the ring. */
> - if (likely(!virtblk_queue_depth)) {
> + if (!virtblk_queue_depth) {
> queue_depth = vblk->vqs[0].vq->num_free;
> /* ... but without indirect descs, we use 2 descs per req */
> if (!virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC))
> @@ -839,7 +839,7 @@ static int virtblk_probe(struct virtio_device *vdev)
> else
> blk_size = queue_logical_block_size(q);
>
> - if (unlikely(blk_size < SECTOR_SIZE || blk_size > PAGE_SIZE)) {
> + if (blk_size < SECTOR_SIZE || blk_size > PAGE_SIZE) {
> dev_err(&vdev->dev,
> "block size is changed unexpectedly, now is %u\n",
> blk_size);
> --
Reviewed-by: Pankaj Gupta <pankaj.gupta@ionos.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-06 5:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-05 8:57 [PATCH v2 1/1] virtio-blk: remove unneeded "likely" statements Max Gurtovoy
2021-09-05 9:02 ` Chaitanya Kulkarni
2021-09-06 5:35 ` Pankaj Gupta
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).