2022-08-11 09:03:42

by Stefano Garzarella

Subject: [PATCH] vdpa: fix warning casts when building with C=2

Use __virtio16_to_cpu() to read `max_virtqueue_pairs` field in
virtio_net_config since its type is __virtio16.

This silences the following warning when building with `make C=2`:

../drivers/vdpa/vdpa.c:811:19: warning: cast to restricted __le16
../drivers/vdpa/vdpa.c:811:19: warning: cast from restricted __virtio16

Signed-off-by: Stefano Garzarella <[email protected]>
---
drivers/vdpa/vdpa.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c
index c06c02704461..2466d5087478 100644
--- a/drivers/vdpa/vdpa.c
+++ b/drivers/vdpa/vdpa.c
@@ -808,7 +808,7 @@ static int vdpa_dev_net_mq_config_fill(struct vdpa_device *vdev,
if ((features & BIT_ULL(VIRTIO_NET_F_MQ)) == 0)
return 0;

- val_u16 = le16_to_cpu(config->max_virtqueue_pairs);
+ val_u16 = __virtio16_to_cpu(true, config->max_virtqueue_pairs);
return nla_put_u16(msg, VDPA_ATTR_DEV_NET_CFG_MAX_VQP, val_u16);
}

--
2.37.1

2022-10-05 10:23:53

by Stefano Garzarella

Subject: Re: [PATCH] vdpa: fix warning casts when building with C=2

On Thu, Aug 11, 2022 at 10:47 AM Stefano Garzarella <[email protected]> wrote:
>
> Use __virtio16_to_cpu() to read `max_virtqueue_pairs` field in
> virtio_net_config since its type is __virtio16.
>
> This silences the following warning when building with `make C=2`:
>
> ../drivers/vdpa/vdpa.c:811:19: warning: cast to restricted __le16
> ../drivers/vdpa/vdpa.c:811:19: warning: cast from restricted __virtio16
>

I just noticed that we still have these warnings, maybe this patch has
fallen through the cracks, so I just ping kindly to include it in this
merge window :-)

Thanks,
Stefano

> Signed-off-by: Stefano Garzarella <[email protected]>
> ---
> drivers/vdpa/vdpa.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c
> index c06c02704461..2466d5087478 100644
> --- a/drivers/vdpa/vdpa.c
> +++ b/drivers/vdpa/vdpa.c
> @@ -808,7 +808,7 @@ static int vdpa_dev_net_mq_config_fill(struct vdpa_device *vdev,
> if ((features & BIT_ULL(VIRTIO_NET_F_MQ)) == 0)
> return 0;
>
> - val_u16 = le16_to_cpu(config->max_virtqueue_pairs);
> + val_u16 = __virtio16_to_cpu(true, config->max_virtqueue_pairs);
> return nla_put_u16(msg, VDPA_ATTR_DEV_NET_CFG_MAX_VQP, val_u16);
> }
>
> --
> 2.37.1
>

2022-10-07 18:03:38

by Eugenio Perez Martin

Subject: Re: [PATCH] vdpa: fix warning casts when building with C=2

On Thu, Aug 11, 2022 at 10:48 AM Stefano Garzarella <[email protected]> wrote:
>
> Use __virtio16_to_cpu() to read `max_virtqueue_pairs` field in
> virtio_net_config since its type is __virtio16.
>
> This silences the following warning when building with `make C=2`:
>
> ../drivers/vdpa/vdpa.c:811:19: warning: cast to restricted __le16
> ../drivers/vdpa/vdpa.c:811:19: warning: cast from restricted __virtio16
>
> Signed-off-by: Stefano Garzarella <[email protected]>

Acked-by: Eugenio Pérez <[email protected]>

> ---
> drivers/vdpa/vdpa.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c
> index c06c02704461..2466d5087478 100644
> --- a/drivers/vdpa/vdpa.c
> +++ b/drivers/vdpa/vdpa.c
> @@ -808,7 +808,7 @@ static int vdpa_dev_net_mq_config_fill(struct vdpa_device *vdev,
> if ((features & BIT_ULL(VIRTIO_NET_F_MQ)) == 0)
> return 0;
>
> - val_u16 = le16_to_cpu(config->max_virtqueue_pairs);
> + val_u16 = __virtio16_to_cpu(true, config->max_virtqueue_pairs);
> return nla_put_u16(msg, VDPA_ATTR_DEV_NET_CFG_MAX_VQP, val_u16);
> }
>
> --
> 2.37.1
>