Re: [PATCH 2/2] virtio_ring: use helper function is_power_of_2()

From: Philippe Mathieu-Daudé
Date: Fri Oct 21 2022 - 04:53:15 EST


On 21/10/22 08:27, shaoqin.huang@xxxxxxxxx wrote:
From: Shaoqin Huang <shaoqin.huang@xxxxxxxxx>

Use helper function is_power_of_2() to check if num is power of two.
Minor readability improvement.

Signed-off-by: Shaoqin Huang <shaoqin.huang@xxxxxxxxx>
---
drivers/virtio/virtio_ring.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 2e7689bb933b..723c4e29e1d3 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -1052,7 +1052,7 @@ static int vring_alloc_queue_split(struct vring_virtqueue_split *vring_split,
dma_addr_t dma_addr;
/* We assume num is a power of 2. */
- if (num & (num - 1)) {
+ if (!is_power_of_2(num)) {
dev_warn(&vdev->dev, "Bad virtqueue length %u\n", num);
return -EINVAL;
}

This makes the following code unreachable:

if (!num)
return -ENOMEM;

Do we want to move it earlier or remove it?

Regards,

Phil.