[PATCH v3 0/2] vdpa: Refactor vdpa_feature_bits array

[PATCH v3 0/2] vdpa: Refactor vdpa_feature_bits array

[Hawkins Jiawei]

This patchset removes the duplicated VIRTIO_NET_F_RSS entry
in vdpa_feature_bits array and sorts the vdpa_feature_bits array
alphabetically in ascending order to avoid future duplicates.

Changelog
=========
v3:
  - sort array alphabetically suggested by Philippe

v2: https://lists.nongnu.org/archive/html/qemu-devel/2023-06/msg06764.html
  - resolve conflicts with the master branch

v1: https://lists.nongnu.org/archive/html/qemu-devel/2023-06/msg01583.html

Hawkins Jiawei (2):
  vdpa: Delete duplicated VIRTIO_NET_F_RSS in vdpa_feature_bits
  vdpa: Sort vdpa_feature_bits array alphabetically

 net/vhost-vdpa.c | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

-- 
2.25.1

[PATCH v3 1/2] vdpa: Delete duplicated VIRTIO_NET_F_RSS in vdpa_feature_bits

[Hawkins Jiawei]

This entry was duplicated on referenced commit. Removing it.

Fixes: 402378407dbd ("vhost-vdpa: multiqueue support")
Signed-off-by: Hawkins Jiawei <yin31149@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 net/vhost-vdpa.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index e19ab063fa..0479988a79 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -74,7 +74,6 @@ const int vdpa_feature_bits[] = {
     VIRTIO_NET_F_CTRL_RX_EXTRA,
     VIRTIO_NET_F_CTRL_VLAN,
     VIRTIO_NET_F_CTRL_MAC_ADDR,
-    VIRTIO_NET_F_RSS,
     VIRTIO_NET_F_MQ,
     VIRTIO_NET_F_CTRL_VQ,
     VIRTIO_F_IOMMU_PLATFORM,
-- 
2.25.1

[PATCH v3 2/2] vdpa: Sort vdpa_feature_bits array alphabetically

[Hawkins Jiawei]

This patch sorts the vdpa_feature_bits array
alphabetically in ascending order to avoid future duplicates.

Signed-off-by: Hawkins Jiawei <yin31149@gmail.com>
---
v3:
  - sort array alphabetically suggested by Philippe

v2: https://lists.nongnu.org/archive/html/qemu-devel/2023-06/msg06766.html
   - resolve conflicts with the master branch

v1: https://lists.nongnu.org/archive/html/qemu-devel/2023-06/msg01585.html

 net/vhost-vdpa.c | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 0479988a79..c0e93ce568 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -50,38 +50,45 @@ typedef struct VhostVDPAState {
     bool started;
 } VhostVDPAState;
 
+/*
+ * The array is sorted alphabetically in ascending order,
+ * with the exception of VHOST_INVALID_FEATURE_BIT,
+ * which should always be the last entry.
+ */
 const int vdpa_feature_bits[] = {
-    VIRTIO_F_NOTIFY_ON_EMPTY,
-    VIRTIO_RING_F_INDIRECT_DESC,
-    VIRTIO_RING_F_EVENT_IDX,
     VIRTIO_F_ANY_LAYOUT,
+    VIRTIO_F_IOMMU_PLATFORM,
+    VIRTIO_F_NOTIFY_ON_EMPTY,
+    VIRTIO_F_RING_PACKED,
+    VIRTIO_F_RING_RESET,
     VIRTIO_F_VERSION_1,
     VIRTIO_NET_F_CSUM,
-    VIRTIO_NET_F_GUEST_CSUM,
     VIRTIO_NET_F_CTRL_GUEST_OFFLOADS,
+    VIRTIO_NET_F_CTRL_MAC_ADDR,
+    VIRTIO_NET_F_CTRL_RX,
+    VIRTIO_NET_F_CTRL_RX_EXTRA,
+    VIRTIO_NET_F_CTRL_VLAN,
+    VIRTIO_NET_F_CTRL_VQ,
     VIRTIO_NET_F_GSO,
+    VIRTIO_NET_F_GUEST_CSUM,
+    VIRTIO_NET_F_GUEST_ECN,
     VIRTIO_NET_F_GUEST_TSO4,
     VIRTIO_NET_F_GUEST_TSO6,
-    VIRTIO_NET_F_GUEST_ECN,
     VIRTIO_NET_F_GUEST_UFO,
+    VIRTIO_NET_F_HASH_REPORT,
+    VIRTIO_NET_F_HOST_ECN,
     VIRTIO_NET_F_HOST_TSO4,
     VIRTIO_NET_F_HOST_TSO6,
-    VIRTIO_NET_F_HOST_ECN,
     VIRTIO_NET_F_HOST_UFO,
+    VIRTIO_NET_F_MQ,
     VIRTIO_NET_F_MRG_RXBUF,
     VIRTIO_NET_F_MTU,
-    VIRTIO_NET_F_CTRL_RX,
-    VIRTIO_NET_F_CTRL_RX_EXTRA,
-    VIRTIO_NET_F_CTRL_VLAN,
-    VIRTIO_NET_F_CTRL_MAC_ADDR,
-    VIRTIO_NET_F_MQ,
-    VIRTIO_NET_F_CTRL_VQ,
-    VIRTIO_F_IOMMU_PLATFORM,
-    VIRTIO_F_RING_PACKED,
-    VIRTIO_F_RING_RESET,
     VIRTIO_NET_F_RSS,
-    VIRTIO_NET_F_HASH_REPORT,
     VIRTIO_NET_F_STATUS,
+    VIRTIO_RING_F_EVENT_IDX,
+    VIRTIO_RING_F_INDIRECT_DESC,
+
+    /* VHOST_INVALID_FEATURE_BIT should always be the last entry */
     VHOST_INVALID_FEATURE_BIT
 };
 
-- 
2.25.1

Re: [PATCH v3 0/2] vdpa: Refactor vdpa_feature_bits array

[Michael Tokarev]

30.06.2023 16:21, Hawkins Jiawei wrote:
> This patchset removes the duplicated VIRTIO_NET_F_RSS entry
> in vdpa_feature_bits array and sorts the vdpa_feature_bits array
> alphabetically in ascending order to avoid future duplicates.
> 
> Changelog
> =========
> v3:
>    - sort array alphabetically suggested by Philippe
> 
> v2: https://lists.nongnu.org/archive/html/qemu-devel/2023-06/msg06764.html
>    - resolve conflicts with the master branch
> 
> v1: https://lists.nongnu.org/archive/html/qemu-devel/2023-06/msg01583.html
> 
> Hawkins Jiawei (2):
>    vdpa: Delete duplicated VIRTIO_NET_F_RSS in vdpa_feature_bits
>    vdpa: Sort vdpa_feature_bits array alphabetically
> 
>   net/vhost-vdpa.c | 40 +++++++++++++++++++++++-----------------
>   1 file changed, 23 insertions(+), 17 deletions(-)

Applied both to my trivial-patches tree, thank you!

/mjt

Re: [PATCH v3 0/2] vdpa: Refactor vdpa_feature_bits array

[Lei Yang]

QE tested this series with regression tests and live migration test on
the vhost_vdpa device, there are no new problems.

Tested-by: Lei Yang <leiyang@redhat.com>


On Fri, Jun 30, 2023 at 9:27 PM Hawkins Jiawei <yin31149@gmail.com> wrote:
>
> This patchset removes the duplicated VIRTIO_NET_F_RSS entry
> in vdpa_feature_bits array and sorts the vdpa_feature_bits array
> alphabetically in ascending order to avoid future duplicates.
>
> Changelog
> =========
> v3:
>   - sort array alphabetically suggested by Philippe
>
> v2: https://lists.nongnu.org/archive/html/qemu-devel/2023-06/msg06764.html
>   - resolve conflicts with the master branch
>
> v1: https://lists.nongnu.org/archive/html/qemu-devel/2023-06/msg01583.html
>
> Hawkins Jiawei (2):
>   vdpa: Delete duplicated VIRTIO_NET_F_RSS in vdpa_feature_bits
>   vdpa: Sort vdpa_feature_bits array alphabetically
>
>  net/vhost-vdpa.c | 40 +++++++++++++++++++++++-----------------
>  1 file changed, 23 insertions(+), 17 deletions(-)
>
> --
> 2.25.1
>
>