vdpa: refactor vdpa_feature_bits array
cover vdpa: refactor vdpa_feature_bits array
This patchset removes the duplicated VIRTIO_NET_F_RSS entry in vdpa_feature_bits array and reorganizes the vdpa_feature_bits array in ascending order based on its value to avoid future duplicates.
Note that this patchset conflicts with the [1], but conflict can be easily resolved by inserting the VIRTIO_NET_F_CTRL_GUEST_OFFLOADS entry into vdpa_feature_bits array in order.
[1]. https://lists.nongnu.org/archive/html/qemu-devel/2023-06/msg00601.html
Hawkins Jiawei (2):
vdpa: delete duplicated VIRTIO_NET_F_RSS in vdpa_feature_bits
vdpa: order vdpa_feature_bits array
net/vhost-vdpa.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
Signature · 1 line
2.25.1
RFC PATCH 1/2 vdpa: delete duplicated VIRTIO_NET_F_RSS in vdpa_feature_bits
This entry was duplicated on referenced commit. Removing it.
--- net/vhost-vdpa.c | 1 - 1 file changed, 1 deletion(-)
net/vhost-vdpa.c +0 -1
@@ -69,7 +69,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
RFC PATCH 2/2 vdpa: order vdpa_feature_bits array
In reply to Hawkins JiaweiThis patch reorganizes the vdpa_feature_bits array
in ascending order based on its value to avoid future duplicates.
--- net/vhost-vdpa.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
net/vhost-vdpa.c +12 -11
@@ -47,13 +47,9 @@ typedef struct VhostVDPAState { } VhostVDPAState;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_VERSION_1 ,VIRTIO_NET_F_CSUM ,VIRTIO_NET_F_GUEST_CSUM , +VIRTIO_NET_F_MTU ,VIRTIO_NET_F_GSO ,VIRTIO_NET_F_GUEST_TSO4 ,VIRTIO_NET_F_GUEST_TSO6 ,
@@ -64,19 +60,24 @@ const int vdpa_feature_bits[] = {VIRTIO_NET_F_HOST_ECN ,VIRTIO_NET_F_HOST_UFO ,VIRTIO_NET_F_MRG_RXBUF , -VIRTIO_NET_F_MTU , +VIRTIO_NET_F_STATUS , +VIRTIO_NET_F_CTRL_VQ ,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_CTRL_RX_EXTRA ,VIRTIO_NET_F_MQ , -VIRTIO_NET_F_CTRL_VQ , +VIRTIO_NET_F_CTRL_MAC_ADDR , +VIRTIO_F_NOTIFY_ON_EMPTY , +VIRTIO_F_ANY_LAYOUT , +VIRTIO_RING_F_INDIRECT_DESC , +VIRTIO_RING_F_EVENT_IDX , +VIRTIO_F_VERSION_1 ,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_NET_F_RSS , +/* VHOST_INVALID_FEATURE_BIT should always be the last entry */ VHOST_INVALID_FEATURE_BIT };
Signature · 1 line
2.25.1