* [PATCH] vdpa/mlx5: Fix wrong use of bit numbers
@ 2021-03-01 6:28 Eli Cohen
2021-03-01 7:52 ` Jason Wang
0 siblings, 1 reply; 5+ messages in thread
From: Eli Cohen @ 2021-03-01 6:28 UTC (permalink / raw)
To: mst, jasowang, linux-kernel, virtualization, netdev; +Cc: elic
VIRTIO_F_VERSION_1 is a bit number. Use BIT_ULL() with mask
conditionals.
Also, in mlx5_vdpa_is_little_endian() use BIT_ULL for consistency with
the rest of the code.
Fixes: 1a86b377aa21 ("vdpa/mlx5: Add VDPA driver for supported mlx5 devices")
Signed-off-by: Eli Cohen <elic@nvidia.com>
---
drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
index dc7031132fff..7d21b857a94a 100644
--- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
+++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
@@ -821,7 +821,7 @@ static int create_virtqueue(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtque
MLX5_SET(virtio_q, vq_ctx, event_qpn_or_msix, mvq->fwqp.mqp.qpn);
MLX5_SET(virtio_q, vq_ctx, queue_size, mvq->num_ent);
MLX5_SET(virtio_q, vq_ctx, virtio_version_1_0,
- !!(ndev->mvdev.actual_features & VIRTIO_F_VERSION_1));
+ !!(ndev->mvdev.actual_features & BIT_ULL(VIRTIO_F_VERSION_1)));
MLX5_SET64(virtio_q, vq_ctx, desc_addr, mvq->desc_addr);
MLX5_SET64(virtio_q, vq_ctx, used_addr, mvq->device_addr);
MLX5_SET64(virtio_q, vq_ctx, available_addr, mvq->driver_addr);
@@ -1578,7 +1578,7 @@ static void teardown_virtqueues(struct mlx5_vdpa_net *ndev)
static inline bool mlx5_vdpa_is_little_endian(struct mlx5_vdpa_dev *mvdev)
{
return virtio_legacy_is_little_endian() ||
- (mvdev->actual_features & (1ULL << VIRTIO_F_VERSION_1));
+ (mvdev->actual_features & BIT_ULL(VIRTIO_F_VERSION_1));
}
static __virtio16 cpu_to_mlx5vdpa16(struct mlx5_vdpa_dev *mvdev, u16 val)
--
2.30.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] vdpa/mlx5: Fix wrong use of bit numbers
2021-03-01 6:28 [PATCH] vdpa/mlx5: Fix wrong use of bit numbers Eli Cohen
@ 2021-03-01 7:52 ` Jason Wang
2021-03-01 15:33 ` Michael S. Tsirkin
0 siblings, 1 reply; 5+ messages in thread
From: Jason Wang @ 2021-03-01 7:52 UTC (permalink / raw)
To: Eli Cohen, mst, linux-kernel, virtualization, netdev
On 2021/3/1 2:28 下午, Eli Cohen wrote:
> VIRTIO_F_VERSION_1 is a bit number. Use BIT_ULL() with mask
> conditionals.
>
> Also, in mlx5_vdpa_is_little_endian() use BIT_ULL for consistency with
> the rest of the code.
>
> Fixes: 1a86b377aa21 ("vdpa/mlx5: Add VDPA driver for supported mlx5 devices")
> Signed-off-by: Eli Cohen <elic@nvidia.com>
Acked-by: Jason Wang <jasowang@redhat.com>
> ---
> drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> index dc7031132fff..7d21b857a94a 100644
> --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> @@ -821,7 +821,7 @@ static int create_virtqueue(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtque
> MLX5_SET(virtio_q, vq_ctx, event_qpn_or_msix, mvq->fwqp.mqp.qpn);
> MLX5_SET(virtio_q, vq_ctx, queue_size, mvq->num_ent);
> MLX5_SET(virtio_q, vq_ctx, virtio_version_1_0,
> - !!(ndev->mvdev.actual_features & VIRTIO_F_VERSION_1));
> + !!(ndev->mvdev.actual_features & BIT_ULL(VIRTIO_F_VERSION_1)));
> MLX5_SET64(virtio_q, vq_ctx, desc_addr, mvq->desc_addr);
> MLX5_SET64(virtio_q, vq_ctx, used_addr, mvq->device_addr);
> MLX5_SET64(virtio_q, vq_ctx, available_addr, mvq->driver_addr);
> @@ -1578,7 +1578,7 @@ static void teardown_virtqueues(struct mlx5_vdpa_net *ndev)
> static inline bool mlx5_vdpa_is_little_endian(struct mlx5_vdpa_dev *mvdev)
> {
> return virtio_legacy_is_little_endian() ||
> - (mvdev->actual_features & (1ULL << VIRTIO_F_VERSION_1));
> + (mvdev->actual_features & BIT_ULL(VIRTIO_F_VERSION_1));
> }
>
> static __virtio16 cpu_to_mlx5vdpa16(struct mlx5_vdpa_dev *mvdev, u16 val)
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] vdpa/mlx5: Fix wrong use of bit numbers
2021-03-01 7:52 ` Jason Wang
@ 2021-03-01 15:33 ` Michael S. Tsirkin
2021-03-02 5:23 ` Eli Cohen
0 siblings, 1 reply; 5+ messages in thread
From: Michael S. Tsirkin @ 2021-03-01 15:33 UTC (permalink / raw)
To: Jason Wang; +Cc: Eli Cohen, linux-kernel, virtualization, netdev
On Mon, Mar 01, 2021 at 03:52:45PM +0800, Jason Wang wrote:
>
> On 2021/3/1 2:28 下午, Eli Cohen wrote:
> > VIRTIO_F_VERSION_1 is a bit number. Use BIT_ULL() with mask
> > conditionals.
> >
> > Also, in mlx5_vdpa_is_little_endian() use BIT_ULL for consistency with
> > the rest of the code.
> >
> > Fixes: 1a86b377aa21 ("vdpa/mlx5: Add VDPA driver for supported mlx5 devices")
> > Signed-off-by: Eli Cohen <elic@nvidia.com>
>
>
> Acked-by: Jason Wang <jasowang@redhat.com>
And CC stable I guess?
>
> > ---
> > drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > index dc7031132fff..7d21b857a94a 100644
> > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > @@ -821,7 +821,7 @@ static int create_virtqueue(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtque
> > MLX5_SET(virtio_q, vq_ctx, event_qpn_or_msix, mvq->fwqp.mqp.qpn);
> > MLX5_SET(virtio_q, vq_ctx, queue_size, mvq->num_ent);
> > MLX5_SET(virtio_q, vq_ctx, virtio_version_1_0,
> > - !!(ndev->mvdev.actual_features & VIRTIO_F_VERSION_1));
> > + !!(ndev->mvdev.actual_features & BIT_ULL(VIRTIO_F_VERSION_1)));
> > MLX5_SET64(virtio_q, vq_ctx, desc_addr, mvq->desc_addr);
> > MLX5_SET64(virtio_q, vq_ctx, used_addr, mvq->device_addr);
> > MLX5_SET64(virtio_q, vq_ctx, available_addr, mvq->driver_addr);
> > @@ -1578,7 +1578,7 @@ static void teardown_virtqueues(struct mlx5_vdpa_net *ndev)
> > static inline bool mlx5_vdpa_is_little_endian(struct mlx5_vdpa_dev *mvdev)
> > {
> > return virtio_legacy_is_little_endian() ||
> > - (mvdev->actual_features & (1ULL << VIRTIO_F_VERSION_1));
> > + (mvdev->actual_features & BIT_ULL(VIRTIO_F_VERSION_1));
> > }
> > static __virtio16 cpu_to_mlx5vdpa16(struct mlx5_vdpa_dev *mvdev, u16 val)
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] vdpa/mlx5: Fix wrong use of bit numbers
2021-03-01 15:33 ` Michael S. Tsirkin
@ 2021-03-02 5:23 ` Eli Cohen
2021-03-02 11:24 ` Michael S. Tsirkin
0 siblings, 1 reply; 5+ messages in thread
From: Eli Cohen @ 2021-03-02 5:23 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: Jason Wang, linux-kernel, virtualization, netdev
On Mon, Mar 01, 2021 at 10:33:14AM -0500, Michael S. Tsirkin wrote:
> On Mon, Mar 01, 2021 at 03:52:45PM +0800, Jason Wang wrote:
> >
> > On 2021/3/1 2:28 下午, Eli Cohen wrote:
> > > VIRTIO_F_VERSION_1 is a bit number. Use BIT_ULL() with mask
> > > conditionals.
> > >
> > > Also, in mlx5_vdpa_is_little_endian() use BIT_ULL for consistency with
> > > the rest of the code.
> > >
> > > Fixes: 1a86b377aa21 ("vdpa/mlx5: Add VDPA driver for supported mlx5 devices")
> > > Signed-off-by: Eli Cohen <elic@nvidia.com>
> >
> >
> > Acked-by: Jason Wang <jasowang@redhat.com>
>
> And CC stable I guess?
Is this a question or a request? :-)
>
> >
> > > ---
> > > drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 ++--
> > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > > index dc7031132fff..7d21b857a94a 100644
> > > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > > @@ -821,7 +821,7 @@ static int create_virtqueue(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtque
> > > MLX5_SET(virtio_q, vq_ctx, event_qpn_or_msix, mvq->fwqp.mqp.qpn);
> > > MLX5_SET(virtio_q, vq_ctx, queue_size, mvq->num_ent);
> > > MLX5_SET(virtio_q, vq_ctx, virtio_version_1_0,
> > > - !!(ndev->mvdev.actual_features & VIRTIO_F_VERSION_1));
> > > + !!(ndev->mvdev.actual_features & BIT_ULL(VIRTIO_F_VERSION_1)));
> > > MLX5_SET64(virtio_q, vq_ctx, desc_addr, mvq->desc_addr);
> > > MLX5_SET64(virtio_q, vq_ctx, used_addr, mvq->device_addr);
> > > MLX5_SET64(virtio_q, vq_ctx, available_addr, mvq->driver_addr);
> > > @@ -1578,7 +1578,7 @@ static void teardown_virtqueues(struct mlx5_vdpa_net *ndev)
> > > static inline bool mlx5_vdpa_is_little_endian(struct mlx5_vdpa_dev *mvdev)
> > > {
> > > return virtio_legacy_is_little_endian() ||
> > > - (mvdev->actual_features & (1ULL << VIRTIO_F_VERSION_1));
> > > + (mvdev->actual_features & BIT_ULL(VIRTIO_F_VERSION_1));
> > > }
> > > static __virtio16 cpu_to_mlx5vdpa16(struct mlx5_vdpa_dev *mvdev, u16 val)
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] vdpa/mlx5: Fix wrong use of bit numbers
2021-03-02 5:23 ` Eli Cohen
@ 2021-03-02 11:24 ` Michael S. Tsirkin
0 siblings, 0 replies; 5+ messages in thread
From: Michael S. Tsirkin @ 2021-03-02 11:24 UTC (permalink / raw)
To: Eli Cohen; +Cc: Jason Wang, linux-kernel, virtualization, netdev
On Tue, Mar 02, 2021 at 07:23:06AM +0200, Eli Cohen wrote:
> On Mon, Mar 01, 2021 at 10:33:14AM -0500, Michael S. Tsirkin wrote:
> > On Mon, Mar 01, 2021 at 03:52:45PM +0800, Jason Wang wrote:
> > >
> > > On 2021/3/1 2:28 下午, Eli Cohen wrote:
> > > > VIRTIO_F_VERSION_1 is a bit number. Use BIT_ULL() with mask
> > > > conditionals.
> > > >
> > > > Also, in mlx5_vdpa_is_little_endian() use BIT_ULL for consistency with
> > > > the rest of the code.
> > > >
> > > > Fixes: 1a86b377aa21 ("vdpa/mlx5: Add VDPA driver for supported mlx5 devices")
> > > > Signed-off-by: Eli Cohen <elic@nvidia.com>
> > >
> > >
> > > Acked-by: Jason Wang <jasowang@redhat.com>
> >
> > And CC stable I guess?
>
> Is this a question or a request? :-)
A question. net patches are cc'd by net maintainer.
> >
> > >
> > > > ---
> > > > drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 ++--
> > > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > > > index dc7031132fff..7d21b857a94a 100644
> > > > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > > > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > > > @@ -821,7 +821,7 @@ static int create_virtqueue(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtque
> > > > MLX5_SET(virtio_q, vq_ctx, event_qpn_or_msix, mvq->fwqp.mqp.qpn);
> > > > MLX5_SET(virtio_q, vq_ctx, queue_size, mvq->num_ent);
> > > > MLX5_SET(virtio_q, vq_ctx, virtio_version_1_0,
> > > > - !!(ndev->mvdev.actual_features & VIRTIO_F_VERSION_1));
> > > > + !!(ndev->mvdev.actual_features & BIT_ULL(VIRTIO_F_VERSION_1)));
> > > > MLX5_SET64(virtio_q, vq_ctx, desc_addr, mvq->desc_addr);
> > > > MLX5_SET64(virtio_q, vq_ctx, used_addr, mvq->device_addr);
> > > > MLX5_SET64(virtio_q, vq_ctx, available_addr, mvq->driver_addr);
> > > > @@ -1578,7 +1578,7 @@ static void teardown_virtqueues(struct mlx5_vdpa_net *ndev)
> > > > static inline bool mlx5_vdpa_is_little_endian(struct mlx5_vdpa_dev *mvdev)
> > > > {
> > > > return virtio_legacy_is_little_endian() ||
> > > > - (mvdev->actual_features & (1ULL << VIRTIO_F_VERSION_1));
> > > > + (mvdev->actual_features & BIT_ULL(VIRTIO_F_VERSION_1));
> > > > }
> > > > static __virtio16 cpu_to_mlx5vdpa16(struct mlx5_vdpa_dev *mvdev, u16 val)
> >
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-03-03 4:10 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-01 6:28 [PATCH] vdpa/mlx5: Fix wrong use of bit numbers Eli Cohen
2021-03-01 7:52 ` Jason Wang
2021-03-01 15:33 ` Michael S. Tsirkin
2021-03-02 5:23 ` Eli Cohen
2021-03-02 11:24 ` 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).