Skip to contentSkip to conversation

vdpa: Refactor vdpa_feature_bits array

PATCH Applied Hawkins Jiawei 3 participants 5 messages Jun 30, 2023 – Jul 3, 2023 Networking

lore
Share & tools
lore
#0 lore raw

v3 cover vdpa: Refactor vdpa_feature_bits array

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(-)
Signature · 1 line
2.25.1
#2 lore raw

PATCH v3 2/2 vdpa: Sort vdpa_feature_bits array alphabetically

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

---
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(-)
net/vhost-vdpa.c +23 -16
index 0479988a79..c0e93ce568 100644
@@ -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
 };
 
Signature · 1 line
2.25.1
#1 lore raw

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

In reply to Hawkins Jiawei

This entry was duplicated on referenced commit. Removing it.

Fixes 402378407dbd ("vhost-vdpa: multiqueue support")
---
 net/vhost-vdpa.c | 1 -
 1 file changed, 1 deletion(-)
net/vhost-vdpa.c +0 -1
index e19ab063fa..0479988a79 100644
@@ -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,
Signature · 1 line
2.25.1
#3 lore raw
In reply to Hawkins Jiawei
Quoted 12 lines · 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

Quoted 8 lines

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

Tested-by on the v3 series
#4 lore raw
In reply to Hawkins Jiawei

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

Quoted 26 lines · 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