Vhost-vdpa Shadow Virtqueue _F_CTRL_RX commands support
RFC PATCH v2 1/4 vdpa: Use iovec for vhost_vdpa_net_load_cmd()
In reply to Hawkins JiaweiAccording to VirtIO standard, "The driver MUST follow the VIRTIO_NET_CTRL_MAC_TABLE_SET command by a le32 number, followed by that number of non-multicast MAC addresses, followed by another le32 number, followed by that number of multicast addresses."
Considering that these data is not stored in contiguous memory, this patch refactors vhost_vdpa_net_load_cmd() to accept scattered data, eliminating the need for an addtional data copy or packing the data into s->cvq_cmd_out_buffer outside of vhost_vdpa_net_load_cmd().
---
v2:
- refactor vhost_vdpa_load_cmd() to accept iovec suggested by
Eugenio
net/vhost-vdpa.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-)
net/vhost-vdpa.c +32 -10
@@ -620,29 +620,43 @@ static ssize_t vhost_vdpa_net_cvq_add(VhostVDPAState *s, size_t out_len, }static ssize_t vhost_vdpa_net_load_cmd (VhostVDPAState *s,uint8_t class, -uint8_t cmd,const void *data, -size_t data_size) +uint8_t cmd,const struct iovec *data, +size_t data_len) {const struct virtio_net_ctrl_hdr ctrl = { .class = class, .cmd = cmd, }; +void *cursor = s->cvq_cmd_out_buffer; -assert (data_size <vhost_vdpa_net_cvq_cmd_page_len () -sizeof (ctrl)); +/* pack the CVQ command header */ +assert (sizeof (ctrl) <vhost_vdpa_net_cvq_cmd_page_len () - + (cursor - s->cvq_cmd_out_buffer)); +memcpy (cursor, &ctrl,sizeof (ctrl)); + cursor +=sizeof (ctrl); -memcpy (s->cvq_cmd_out_buffer, &ctrl,sizeof (ctrl)); -memcpy (s->cvq_cmd_out_buffer +sizeof (ctrl), data, data_size); +/* pack the CVQ command command-specific-data */ +for (int i =0 ; i < data_len; ++i) { +assert (data[i].iov_len <vhost_vdpa_net_cvq_cmd_page_len () - + (cursor - s->cvq_cmd_out_buffer)); +memcpy (cursor, data[i].iov_base, data[i].iov_len); + cursor += data[i].iov_len; + } -return vhost_vdpa_net_cvq_add (s,sizeof (ctrl) + data_size, +return vhost_vdpa_net_cvq_add (s, cursor - s->cvq_cmd_out_buffer,sizeof (virtio_net_ctrl_ack)); }static int vhost_vdpa_net_load_mac (VhostVDPAState *s,const VirtIONet *n) {if (virtio_vdev_has_feature (&n->parent_obj,VIRTIO_NET_F_CTRL_MAC_ADDR )) { +const struct iovec data = { + .iov_base = (void *)n->mac, + .iov_len =sizeof (n->mac), + };ssize_t dev_written =vhost_vdpa_net_load_cmd (s,VIRTIO_NET_CTRL_MAC ,VIRTIO_NET_CTRL_MAC_ADDR_SET , - n->mac,sizeof (n->mac)); + &data,1 );if (unlikely (dev_written <0 )) {return dev_written; }
@@ -665,9 +679,13 @@ static int vhost_vdpa_net_load_mq(VhostVDPAState *s, } mq.virtqueue_pairs =cpu_to_le16 (n->curr_queue_pairs); +const struct iovec data = { + .iov_base = &mq, + .iov_len =sizeof (mq), + }; dev_written =vhost_vdpa_net_load_cmd (s,VIRTIO_NET_CTRL_MQ , -VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET , &mq, -sizeof (mq)); +VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET , + &data,1 );if (unlikely (dev_written <0 )) {return dev_written; }
@@ -706,9 +724,13 @@ static int vhost_vdpa_net_load_offloads(VhostVDPAState *s, } offloads =cpu_to_le64 (n->curr_guest_offloads); +const struct iovec data = { + .iov_base = &offloads, + .iov_len =sizeof (offloads), + }; dev_written =vhost_vdpa_net_load_cmd (s,VIRTIO_NET_CTRL_GUEST_OFFLOADS ,VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET , - &offloads,sizeof (offloads)); + &data,1 );if (unlikely (dev_written <0 )) {return dev_written; }
Signature · 1 line
2.25.1
v2 cover Vhost-vdpa Shadow Virtqueue _F_CTRL_RX commands support
This series enables shadowed CVQ to intercept rx commands related to VIRTIO_NET_F_CTRL_RX feature through shadowed CVQ, update the virtio NIC device model so qemu send it in a migration, and the restore of that rx state in the destination.
Note that this patch should be based on [1], which have not been merged. I will submit a new version of patch after it is merged.
[1]. https://lists.nongnu.org/archive/html/qemu-devel/2023-06/msg05909.html
Changelog
=========
v2:
- refactor vhost_vdpa_net_load_cmd() to accept iovec suggested by
Eugenio
- avoid sending CVQ command in default state suggested by Eugenio
v1: https://lists.nongnu.org/archive/html/qemu-devel/2023-06/msg04423.html
Hawkins Jiawei (4):
vdpa: Use iovec for vhost_vdpa_net_load_cmd()
vdpa: Restore MAC address filtering state
vdpa: Restore packet receive filtering state relative with _F_CTRL_RX
feature
vdpa: Allow VIRTIO_NET_F_CTRL_RX in SVQ
net/vhost-vdpa.c | 198 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 188 insertions(+), 10 deletions(-)
Signature · 1 line
2.25.1
RFC PATCH v2 2/4 vdpa: Restore MAC address filtering state
This patch refactors vhost_vdpa_net_load_mac() to restore the MAC address filtering state at device's startup.
---
v2:
- use iovec suggested by Eugenio
- avoid sending CVQ command in default state
net/vhost-vdpa.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
net/vhost-vdpa.c +51 -0
@@ -665,6 +665,57 @@ static int vhost_vdpa_net_load_mac(VhostVDPAState *s, const VirtIONet *n) } } +if (virtio_vdev_has_feature (&n->parent_obj,VIRTIO_NET_F_CTRL_RX )) { +if (n->mac_table.in_use !=0 ) { +/* +* According to virtio_net_reset(), device uses an empty MAC filter +* table as its default state. +* +* Therefore, there is no need to send this CVQ command if the +* driver also sets an empty MAC filter table, which aligns with +* the device's defaults. +* +* Note that the device's defaults can mismatch the driver's +* configuration only at live migration. +*/ +uint32_t uni_entries = n->mac_table.first_multi, + uni_macs_size = uni_entries *ETH_ALEN , + mul_entries = n->mac_table.in_use - uni_entries, + mul_macs_size = mul_entries *ETH_ALEN ; +struct virtio_net_ctrl_mac uni = { + .entries =cpu_to_le32 (uni_entries), + }; +struct virtio_net_ctrl_mac mul = { + .entries =cpu_to_le32 (mul_entries), + }; +const struct iovec data[] = { + { + .iov_base = &uni, + .iov_len =sizeof (uni), + }, { + .iov_base = n->mac_table.macs, + .iov_len = uni_macs_size, + }, { + .iov_base = &mul, + .iov_len =sizeof (mul), + }, { + .iov_base = &n->mac_table.macs[uni_macs_size], + .iov_len = mul_macs_size, + }, + }; +ssize_t dev_written =vhost_vdpa_net_load_cmd (s, +VIRTIO_NET_CTRL_MAC , +VIRTIO_NET_CTRL_MAC_TABLE_SET , + data,ARRAY_SIZE (data)); +if (unlikely (dev_written <0 )) { +return dev_written; + } +if (*s->status !=VIRTIO_NET_OK ) { +return -EINVAL ; + } + } + } +return 0 ; }
Signature · 1 line
2.25.1
RFC PATCH v2 3/4 vdpa: Restore packet receive filtering state relative with _F_CTRL_RX feature
In reply to Hawkins JiaweiThis patch introduces vhost_vdpa_net_load_rx_mode() and vhost_vdpa_net_load_rx() to restore the packet receive filtering state in relation to VIRTIO_NET_F_CTRL_RX feature at device's startup.
---
v2:
- avoid sending CVQ command in default state suggested by Eugenio
net/vhost-vdpa.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+)
net/vhost-vdpa.c +104 -0
@@ -792,6 +792,106 @@ static int vhost_vdpa_net_load_offloads(VhostVDPAState *s,return 0 ; } +static int vhost_vdpa_net_load_rx_mode (VhostVDPAState *s, +uint8_t cmd, +uint8_t on) +{ +ssize_t dev_written; +const struct iovec data = { + .iov_base = &on, + .iov_len =sizeof (on), + }; + dev_written =vhost_vdpa_net_load_cmd (s,VIRTIO_NET_CTRL_RX , + cmd, &data,1 ); +if (unlikely (dev_written <0 )) { +return dev_written; + } +if (*s->status !=VIRTIO_NET_OK ) { +return -EINVAL ; + } + +return 0 ; +} + +static int vhost_vdpa_net_load_rx (VhostVDPAState *s, +const VirtIONet *n) +{ +uint8_t on; +int r; + +if (virtio_vdev_has_feature (&n->parent_obj,VIRTIO_NET_F_CTRL_RX )) { +/* Load the promiscous mode */ +if (n->mac_table.uni_overflow) { +/* +* According to VirtIO standard, "Since there are no guarantees, +* it can use a hash filter or silently switch to +* allmulti or promiscuous mode if it is given too many addresses." +* +* QEMU ignores non-multicast(unicast) MAC addresses and +* marks `uni_overflow` for the device internal state +* if guest sets too many non-multicast(unicast) MAC addresses. +* Therefore, we should turn promiscous mode on in this case. +*/ + on =1 ; + }else { + on = n->promisc; + } +if (on !=1 ) { +/* +* According to virtio_net_reset(), device turns promiscuous mode on +* by default. +* +* Therefore, there is no need to send this CVQ command if the +* driver also sets promiscuous mode on, which aligns with +* the device's defaults. +* +* Note that the device's defaults can mismatch the driver's +* configuration only at live migration. +*/ + r =vhost_vdpa_net_load_rx_mode (s,VIRTIO_NET_CTRL_RX_PROMISC , on); +if (r <0 ) { +return r; + } + } + +/* Load the all-multicast mode */ +if (n->mac_table.multi_overflow) { +/* +* According to VirtIO standard, "Since there are no guarantees, +* it can use a hash filter or silently switch to +* allmulti or promiscuous mode if it is given too many addresses." +* +* QEMU ignores multicast MAC addresses and +* marks `multi_overflow` for the device internal state +* if guest sets too many multicast MAC addresses. +* Therefore, we should turn all-multicast mode on in this case. +*/ + on =1 ; + }else { + on = n->allmulti; + } +if (on !=0 ) { +/* +* According to virtio_net_reset(), device turns all-multicast mode +* off by default. +* +* Therefore, there is no need to send this CVQ command if the +* driver also sets all-multicast mode off, which aligns with +* the device's defaults. +* +* Note that the device's defaults can mismatch the driver's +* configuration only at live migration. +*/ + r =vhost_vdpa_net_load_rx_mode (s,VIRTIO_NET_CTRL_RX_ALLMULTI , on); +if (r <0 ) { +return r; + } + } + } + +return 0 ; +} +static int vhost_vdpa_net_load (NetClientState *nc) {VhostVDPAState *s =DO_UPCAST (VhostVDPAState, nc, nc);
@@ -818,6 +918,10 @@ static int vhost_vdpa_net_load(NetClientState *nc)if (unlikely (r)) {return r; } + r =vhost_vdpa_net_load_rx (s, n); +if (unlikely (r)) { +return r; + }return 0 ; }
Signature · 1 line
2.25.1
RFC PATCH v2 4/4 vdpa: Allow VIRTIO_NET_F_CTRL_RX in SVQ
In reply to Hawkins JiaweiEnable SVQ with VIRTIO_NET_F_CTRL_RX feature.
--- net/vhost-vdpa.c | 1 + 1 file changed, 1 insertion(+)
net/vhost-vdpa.c +1 -0
@@ -104,6 +104,7 @@ static const uint64_t vdpa_svq_device_features =BIT_ULL (VIRTIO_NET_F_MRG_RXBUF ) |BIT_ULL (VIRTIO_NET_F_STATUS ) |BIT_ULL (VIRTIO_NET_F_CTRL_VQ ) | +BIT_ULL (VIRTIO_NET_F_CTRL_RX ) |BIT_ULL (VIRTIO_NET_F_MQ ) |BIT_ULL (VIRTIO_F_ANY_LAYOUT ) | BIT_ULL(VIRTIO_NET_F_CTRL_MAC_ADDR) |
Signature · 1 line
2.25.1
Re: [PATCH RFC v2 1/4] vdpa: Use iovec for vhost_vdpa_net_load_cmd()
In reply to Hawkins JiaweiQuoted 47 lines · Hawkins Jiawei
According to VirtIO standard, "The driver MUST follow the
VIRTIO_NET_CTRL_MAC_TABLE_SETcommand by a le32 number, followed by that number of non-multicast MAC addresses, followed by another le32 number, followed by that number of multicast addresses."Considering that these data is not stored in contiguous memory, this patch refactors
vhost_vdpa_net_load_cmd()to accept scattered data, eliminating the need for an addtional data copy or packing the data intos->cvq_cmd_out_bufferoutside ofvhost_vdpa_net_load_cmd().Signed-off-by Hawkins Jiawei <[email protected]>---
v2:
- refactorvhost_vdpa_load_cmd()to accept iovec suggested by
Eugenionet/vhost-vdpa.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-)net/vhost-vdpa.c +8
-3@@ -620,29 +620,43 @@ static ssize_t vhost_vdpa_net_cvq_add(VhostVDPAState *s, size_t out_len, }static ssize_t vhost_vdpa_net_load_cmd (VhostVDPAState *s,uint8_t class, -uint8_t cmd,const void *data, -size_t data_size) +uint8_t cmd,const struct iovec *data, +size_t data_len) {const struct virtio_net_ctrl_hdr ctrl = { .class = class, .cmd = cmd, }; +void *cursor = s->cvq_cmd_out_buffer; -assert (data_size <vhost_vdpa_net_cvq_cmd_page_len () -sizeof (ctrl)); +/* pack the CVQ command header */ +assert (sizeof (ctrl) <vhost_vdpa_net_cvq_cmd_page_len () - + (cursor - s->cvq_cmd_out_buffer)); +memcpy (cursor, &ctrl,sizeof (ctrl)); + cursor +=sizeof (ctrl);
net/vhost-vdpa.c static ssize_t vhost_vdpa_net_cvq_add(VhostVDPAState *s, size_t out_len, · line 644
Quoted 10 lines
net/vhost-vdpa.c +7
-2-memcpy (s->cvq_cmd_out_buffer, &ctrl,sizeof (ctrl)); -memcpy (s->cvq_cmd_out_buffer +sizeof (ctrl), data, data_size); +/* pack the CVQ command command-specific-data */ +for (int i =0 ; i < data_len; ++i) { +assert (data[i].iov_len <vhost_vdpa_net_cvq_cmd_page_len () - + (cursor - s->cvq_cmd_out_buffer)); +memcpy (cursor, data[i].iov_base, data[i].iov_len); + cursor += data[i].iov_len; + }
Can we replace all of the above by iov_to_buf?
Quoted 54 lines
net/vhost-vdpa.c +17
-6-return vhost_vdpa_net_cvq_add (s,sizeof (ctrl) + data_size, +return vhost_vdpa_net_cvq_add (s, cursor - s->cvq_cmd_out_buffer,sizeof (virtio_net_ctrl_ack)); }static int vhost_vdpa_net_load_mac (VhostVDPAState *s,const VirtIONet *n) {if (virtio_vdev_has_feature (&n->parent_obj,VIRTIO_NET_F_CTRL_MAC_ADDR )) { +const struct iovec data = { + .iov_base = (void *)n->mac, + .iov_len =sizeof (n->mac), + };ssize_t dev_written =vhost_vdpa_net_load_cmd (s,VIRTIO_NET_CTRL_MAC ,VIRTIO_NET_CTRL_MAC_ADDR_SET , - n->mac,sizeof (n->mac)); + &data,1 );if (unlikely (dev_written <0 )) {return dev_written; }@@ -665,9 +679,13 @@ static int vhost_vdpa_net_load_mq(VhostVDPAState *s, } mq.virtqueue_pairs =cpu_to_le16 (n->curr_queue_pairs); +const struct iovec data = { + .iov_base = &mq, + .iov_len =sizeof (mq), + }; dev_written =vhost_vdpa_net_load_cmd (s,VIRTIO_NET_CTRL_MQ , -VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET , &mq, -sizeof (mq)); +VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET , + &data,1 );if (unlikely (dev_written <0 )) {return dev_written; }@@ -706,9 +724,13 @@ static int vhost_vdpa_net_load_offloads(VhostVDPAState *s, } offloads =cpu_to_le64 (n->curr_guest_offloads); +const struct iovec data = { + .iov_base = &offloads, + .iov_len =sizeof (offloads), + }; dev_written =vhost_vdpa_net_load_cmd (s,VIRTIO_NET_CTRL_GUEST_OFFLOADS ,VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET , - &offloads,sizeof (offloads)); + &data,1 );if (unlikely (dev_written <0 )) {return dev_written; } --2.25.1
Re: [PATCH RFC v2 2/4] vdpa: Restore MAC address filtering state
In reply to Hawkins JiaweiQuoted 20 lines · Hawkins Jiawei
This patch refactors
vhost_vdpa_net_load_mac()to restore the MAC address filtering state at device's startup.Signed-off-by Hawkins Jiawei <[email protected]>---
v2:
- use iovec suggested by Eugenio
- avoid sending CVQ command in default statenet/vhost-vdpa.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)net/vhost-vdpa.c +0
-0
net/vhost-vdpa.c static int vhost_vdpa_net_load_mac(VhostVDPAState *s, const VirtIONet *n) · line 669
Quoted 5 lines
net/vhost-vdpa.c +2
-0@@ -665,6 +665,57 @@ static int vhost_vdpa_net_load_mac(VhostVDPAState *s, const VirtIONet *n) } } +if (virtio_vdev_has_feature (&n->parent_obj,VIRTIO_NET_F_CTRL_RX )) { +if (n->mac_table.in_use !=0 ) {
This may be just style nitpicking, but I find it more clear to return early if conditions are not met and then send the CVQ command. Something like:
/*
* According to ...
*/
if (!virtio_vdev_has_feature(&n->parent_obj, VIRTIO_NET_F_CTRL_RX)) || (n->mac_table.in_use == 0)) {
return 0
}
uni_entries = n->mac_table.first_multi,
...
---
Now I just realized vhost_vdpa_net_load_mac does not follow this for checking VIRTIO_NET_F_CTRL_MAC_ADDR.
I'm ok if you leave it this way though.
Thanks!
Quoted 55 lines
net/vhost-vdpa.c +49
-1+/* +* According to virtio_net_reset(), device uses an empty MAC filter +* table as its default state. +* +* Therefore, there is no need to send this CVQ command if the +* driver also sets an empty MAC filter table, which aligns with +* the device's defaults. +* +* Note that the device's defaults can mismatch the driver's +* configuration only at live migration. +*/ +uint32_t uni_entries = n->mac_table.first_multi, + uni_macs_size = uni_entries *ETH_ALEN , + mul_entries = n->mac_table.in_use - uni_entries, + mul_macs_size = mul_entries *ETH_ALEN ; +struct virtio_net_ctrl_mac uni = { + .entries =cpu_to_le32 (uni_entries), + }; +struct virtio_net_ctrl_mac mul = { + .entries =cpu_to_le32 (mul_entries), + }; +const struct iovec data[] = { + { + .iov_base = &uni, + .iov_len =sizeof (uni), + }, { + .iov_base = n->mac_table.macs, + .iov_len = uni_macs_size, + }, { + .iov_base = &mul, + .iov_len =sizeof (mul), + }, { + .iov_base = &n->mac_table.macs[uni_macs_size], + .iov_len = mul_macs_size, + }, + }; +ssize_t dev_written =vhost_vdpa_net_load_cmd (s, +VIRTIO_NET_CTRL_MAC , +VIRTIO_NET_CTRL_MAC_TABLE_SET , + data,ARRAY_SIZE (data)); +if (unlikely (dev_written <0 )) { +return dev_written; + } +if (*s->status !=VIRTIO_NET_OK ) { +return -EINVAL ; + } + } + } +return 0 ; } --2.25.1
Re: [PATCH RFC v2 3/4] vdpa: Restore packet receive filtering state relative with _F_CTRL_RX feature
In reply to Hawkins JiaweiQuoted 42 lines · Hawkins Jiawei
This patch introduces
vhost_vdpa_net_load_rx_mode()andvhost_vdpa_net_load_rx()to restore the packet receive filtering state in relation toVIRTIO_NET_F_CTRL_RXfeature at device's startup.Signed-off-by Hawkins Jiawei <[email protected]>---
v2:
- avoid sending CVQ command in default state suggested by Eugenionet/vhost-vdpa.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+)net/vhost-vdpa.c +18
-0@@ -792,6 +792,106 @@ static int vhost_vdpa_net_load_offloads(VhostVDPAState *s,return 0 ; } +static int vhost_vdpa_net_load_rx_mode (VhostVDPAState *s, +uint8_t cmd, +uint8_t on) +{ +ssize_t dev_written; +const struct iovec data = { + .iov_base = &on, + .iov_len =sizeof (on), + }; + dev_written =vhost_vdpa_net_load_cmd (s,VIRTIO_NET_CTRL_RX , + cmd, &data,1 ); +if (unlikely (dev_written <0 )) { +return dev_written; + } +if (*s->status !=VIRTIO_NET_OK ) { +return -EINVAL ; + } +
net/vhost-vdpa.c static int vhost_vdpa_net_load_offloads(VhostVDPAState *s, · line 822
Quoted 10 lines
net/vhost-vdpa.c +10
-0+return 0 ; +} + +static int vhost_vdpa_net_load_rx (VhostVDPAState *s, +const VirtIONet *n) +{ +uint8_t on; +int r; + +if (virtio_vdev_has_feature (&n->parent_obj,VIRTIO_NET_F_CTRL_RX )) {
Also suggesting early returns here.
Quoted 6 lines
net/vhost-vdpa.c +6
-0+/* Load the promiscous mode */ +if (n->mac_table.uni_overflow) { +/* +* According to VirtIO standard, "Since there are no guarantees, +* it can use a hash filter or silently switch to +* allmulti or promiscuous mode if it is given too many addresses."
net/vhost-vdpa.c static int vhost_vdpa_net_load_offloads(VhostVDPAState *s, · line 838
Quoted 10 lines
net/vhost-vdpa.c +10
-0+* +* QEMU ignores non-multicast(unicast) MAC addresses and +* marks `uni_overflow` for the device internal state +* if guest sets too many non-multicast(unicast) MAC addresses. +* Therefore, we should turn promiscous mode on in this case. +*/ + on =1 ; + }else { + on = n->promisc; + }
I think we can remove the "on" variable and just do:
/*
* According to ...
*/
if (n->mac_table.uni_overflow || n->promisc) {
r = vhost_vdpa_net_load_rx_mode(s, VIRTIO_NET_CTRL_RX_PROMISC, on);
if (r < 0) {
return r; }
---
And the equivalent for multicast.
Would that make sense?
Thanks!
Quoted 73 lines
net/vhost-vdpa.c +60
-1+if (on !=1 ) { +/* +* According to virtio_net_reset(), device turns promiscuous mode on +* by default. +* +* Therefore, there is no need to send this CVQ command if the +* driver also sets promiscuous mode on, which aligns with +* the device's defaults. +* +* Note that the device's defaults can mismatch the driver's +* configuration only at live migration. +*/ + r =vhost_vdpa_net_load_rx_mode (s,VIRTIO_NET_CTRL_RX_PROMISC , on); +if (r <0 ) { +return r; + } + } + +/* Load the all-multicast mode */ +if (n->mac_table.multi_overflow) { +/* +* According to VirtIO standard, "Since there are no guarantees, +* it can use a hash filter or silently switch to +* allmulti or promiscuous mode if it is given too many addresses." +* +* QEMU ignores multicast MAC addresses and +* marks `multi_overflow` for the device internal state +* if guest sets too many multicast MAC addresses. +* Therefore, we should turn all-multicast mode on in this case. +*/ + on =1 ; + }else { + on = n->allmulti; + } +if (on !=0 ) { +/* +* According to virtio_net_reset(), device turns all-multicast mode +* off by default. +* +* Therefore, there is no need to send this CVQ command if the +* driver also sets all-multicast mode off, which aligns with +* the device's defaults. +* +* Note that the device's defaults can mismatch the driver's +* configuration only at live migration. +*/ + r =vhost_vdpa_net_load_rx_mode (s,VIRTIO_NET_CTRL_RX_ALLMULTI , on); +if (r <0 ) { +return r; + } + } + } + +return 0 ; +} +static int vhost_vdpa_net_load (NetClientState *nc) {VhostVDPAState *s =DO_UPCAST (VhostVDPAState, nc, nc);@@ -818,6 +918,10 @@ static int vhost_vdpa_net_load(NetClientState *nc)if (unlikely (r)) {return r; } + r =vhost_vdpa_net_load_rx (s, n); +if (unlikely (r)) { +return r; + }return 0 ; } --2.25.1
Re: [PATCH RFC v2 1/4] vdpa: Use iovec for vhost_vdpa_net_load_cmd()
In reply to Eugenio Perez MartinQuoted 49 lines · Eugenio Perez Martin
Quoted 48 lines · Hawkins Jiawei
According to VirtIO standard, "The driver MUST follow the
VIRTIO_NET_CTRL_MAC_TABLE_SETcommand by a le32 number, followed by that number of non-multicast MAC addresses, followed by another le32 number, followed by that number of multicast addresses."Considering that these data is not stored in contiguous memory, this patch refactors
vhost_vdpa_net_load_cmd()to accept scattered data, eliminating the need for an addtional data copy or packing the data intos->cvq_cmd_out_bufferoutside ofvhost_vdpa_net_load_cmd().Signed-off-by Hawkins Jiawei <[email protected]>---
v2:
- refactorvhost_vdpa_load_cmd()to accept iovec suggested by
Eugenionet/vhost-vdpa.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-)net/vhost-vdpa.c +8
-3@@ -620,29 +620,43 @@ static ssize_t vhost_vdpa_net_cvq_add(VhostVDPAState *s, size_t out_len, }static ssize_t vhost_vdpa_net_load_cmd (VhostVDPAState *s,uint8_t class, -uint8_t cmd,const void *data, -size_t data_size) +uint8_t cmd,const struct iovec *data, +size_t data_len) {const struct virtio_net_ctrl_hdr ctrl = { .class = class, .cmd = cmd, }; +void *cursor = s->cvq_cmd_out_buffer; -assert (data_size <vhost_vdpa_net_cvq_cmd_page_len () -sizeof (ctrl)); +/* pack the CVQ command header */ +assert (sizeof (ctrl) <vhost_vdpa_net_cvq_cmd_page_len () - + (cursor - s->cvq_cmd_out_buffer)); +memcpy (cursor, &ctrl,sizeof (ctrl)); + cursor +=sizeof (ctrl);
Quoted 11 lines
net/vhost-vdpa.c static ssize_t vhost_vdpa_net_cvq_add(VhostVDPAState *s, size_t out_len, · line 644
Quoted 9 lines
net/vhost-vdpa.c +7
-2-memcpy (s->cvq_cmd_out_buffer, &ctrl,sizeof (ctrl)); -memcpy (s->cvq_cmd_out_buffer +sizeof (ctrl), data, data_size); +/* pack the CVQ command command-specific-data */ +for (int i =0 ; i < data_len; ++i) { +assert (data[i].iov_len <vhost_vdpa_net_cvq_cmd_page_len () - + (cursor - s->cvq_cmd_out_buffer)); +memcpy (cursor, data[i].iov_base, data[i].iov_len); + cursor += data[i].iov_len; + }Can we replace all of the above by
iov_to_buf?
Yes, you are right.
We should use iov_to_buf() here. I will refactor this patch according to your suggestion.
Thanks!
Quoted 56 lines
Quoted 55 lines
net/vhost-vdpa.c +17
-6-return vhost_vdpa_net_cvq_add (s,sizeof (ctrl) + data_size, +return vhost_vdpa_net_cvq_add (s, cursor - s->cvq_cmd_out_buffer,sizeof (virtio_net_ctrl_ack)); }static int vhost_vdpa_net_load_mac (VhostVDPAState *s,const VirtIONet *n) {if (virtio_vdev_has_feature (&n->parent_obj,VIRTIO_NET_F_CTRL_MAC_ADDR )) { +const struct iovec data = { + .iov_base = (void *)n->mac, + .iov_len =sizeof (n->mac), + };ssize_t dev_written =vhost_vdpa_net_load_cmd (s,VIRTIO_NET_CTRL_MAC ,VIRTIO_NET_CTRL_MAC_ADDR_SET , - n->mac,sizeof (n->mac)); + &data,1 );if (unlikely (dev_written <0 )) {return dev_written; }@@ -665,9 +679,13 @@ static int vhost_vdpa_net_load_mq(VhostVDPAState *s, } mq.virtqueue_pairs =cpu_to_le16 (n->curr_queue_pairs); +const struct iovec data = { + .iov_base = &mq, + .iov_len =sizeof (mq), + }; dev_written =vhost_vdpa_net_load_cmd (s,VIRTIO_NET_CTRL_MQ , -VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET , &mq, -sizeof (mq)); +VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET , + &data,1 );if (unlikely (dev_written <0 )) {return dev_written; }@@ -706,9 +724,13 @@ static int vhost_vdpa_net_load_offloads(VhostVDPAState *s, } offloads =cpu_to_le64 (n->curr_guest_offloads); +const struct iovec data = { + .iov_base = &offloads, + .iov_len =sizeof (offloads), + }; dev_written =vhost_vdpa_net_load_cmd (s,VIRTIO_NET_CTRL_GUEST_OFFLOADS ,VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET , - &offloads,sizeof (offloads)); + &data,1 );if (unlikely (dev_written <0 )) {return dev_written; } --2.25.1
Re: [PATCH RFC v2 2/4] vdpa: Restore MAC address filtering state
In reply to Eugenio Perez MartinQuoted 24 lines · Eugenio Perez Martin
Quoted 23 lines · Hawkins Jiawei
This patch refactors
vhost_vdpa_net_load_mac()to restore the MAC address filtering state at device's startup.Signed-off-by Hawkins Jiawei <[email protected]>---
v2:
- use iovec suggested by Eugenio
- avoid sending CVQ command in default statenet/vhost-vdpa.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)net/vhost-vdpa.c +0
-0@@ -665,6 +665,57 @@ static int vhost_vdpa_net_load_mac(VhostVDPAState *s, const VirtIONet *n) } }
Quoted 5 lines
net/vhost-vdpa.c static int vhost_vdpa_net_load_mac(VhostVDPAState *s, const VirtIONet *n) · line 669
Quoted 2 lines
net/vhost-vdpa.c +2
-0+if (virtio_vdev_has_feature (&n->parent_obj,VIRTIO_NET_F_CTRL_RX )) { +if (n->mac_table.in_use !=0 ) {This may be just style nitpicking, but I find it more clear to return early if conditions are not met and then send the CVQ command.
Yes, this makes code more clear to read.
But it appears that we may meet a problem if the function vhost_vdpa_net_load_x() sends multiple CVQ commands. It is possible that we might not meet the condition for one of the CVQ commands, but we could still meet the conditions for other CVQ commands.
Therefore, in the case of vhost_vdpa_net_load_x() sending multiple CVQ commands, if we still hope to use this style, should we split the function into multiple functions, with each function responsible for sending only one CVQ command? Or should we jump to the next CVQ command instead of returning from the function if the conditions are not met?
Thanks!
Quoted 76 lines
Something like:
/*
* According to ...
*/
if (!virtio_vdev_has_feature(&n->parent_obj,VIRTIO_NET_F_CTRL_RX)) || (n->mac_table.in_use== 0)) {
return 0
}
uni_entries=n->mac_table.first_multi,
...
---Now I just realized
vhost_vdpa_net_load_macdoes not follow this for checkingVIRTIO_NET_F_CTRL_MAC_ADDR.I'm ok if you leave it this way though.
Thanks!
Quoted 55 lines
net/vhost-vdpa.c +49
-1+/* +* According to virtio_net_reset(), device uses an empty MAC filter +* table as its default state. +* +* Therefore, there is no need to send this CVQ command if the +* driver also sets an empty MAC filter table, which aligns with +* the device's defaults. +* +* Note that the device's defaults can mismatch the driver's +* configuration only at live migration. +*/ +uint32_t uni_entries = n->mac_table.first_multi, + uni_macs_size = uni_entries *ETH_ALEN , + mul_entries = n->mac_table.in_use - uni_entries, + mul_macs_size = mul_entries *ETH_ALEN ; +struct virtio_net_ctrl_mac uni = { + .entries =cpu_to_le32 (uni_entries), + }; +struct virtio_net_ctrl_mac mul = { + .entries =cpu_to_le32 (mul_entries), + }; +const struct iovec data[] = { + { + .iov_base = &uni, + .iov_len =sizeof (uni), + }, { + .iov_base = n->mac_table.macs, + .iov_len = uni_macs_size, + }, { + .iov_base = &mul, + .iov_len =sizeof (mul), + }, { + .iov_base = &n->mac_table.macs[uni_macs_size], + .iov_len = mul_macs_size, + }, + }; +ssize_t dev_written =vhost_vdpa_net_load_cmd (s, +VIRTIO_NET_CTRL_MAC , +VIRTIO_NET_CTRL_MAC_TABLE_SET , + data,ARRAY_SIZE (data)); +if (unlikely (dev_written <0 )) { +return dev_written; + } +if (*s->status !=VIRTIO_NET_OK ) { +return -EINVAL ; + } + } + } +return 0 ; } --2.25.1
Re: [PATCH RFC v2 3/4] vdpa: Restore packet receive filtering state relative with _F_CTRL_RX feature
In reply to Eugenio Perez MartinQuoted 47 lines · Eugenio Perez Martin
Quoted 46 lines · Hawkins Jiawei
This patch introduces
vhost_vdpa_net_load_rx_mode()andvhost_vdpa_net_load_rx()to restore the packet receive filtering state in relation toVIRTIO_NET_F_CTRL_RXfeature at device's startup.Signed-off-by Hawkins Jiawei <[email protected]>---
v2:
- avoid sending CVQ command in default state suggested by Eugenionet/vhost-vdpa.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+)net/vhost-vdpa.c +22
-0@@ -792,6 +792,106 @@ static int vhost_vdpa_net_load_offloads(VhostVDPAState *s,return 0 ; } +static int vhost_vdpa_net_load_rx_mode (VhostVDPAState *s, +uint8_t cmd, +uint8_t on) +{ +ssize_t dev_written; +const struct iovec data = { + .iov_base = &on, + .iov_len =sizeof (on), + }; + dev_written =vhost_vdpa_net_load_cmd (s,VIRTIO_NET_CTRL_RX , + cmd, &data,1 ); +if (unlikely (dev_written <0 )) { +return dev_written; + } +if (*s->status !=VIRTIO_NET_OK ) { +return -EINVAL ; + } + +return 0 ; +} + +static int vhost_vdpa_net_load_rx(VhostVDPAState *s,
Quoted 8 lines
net/vhost-vdpa.c static int vhost_vdpa_net_load_offloads(VhostVDPAState *s, · line 822
Quoted 6 lines
net/vhost-vdpa.c +6
-0+ const VirtIONet *n) +{ +uint8_t on; +int r; + +if (virtio_vdev_has_feature (&n->parent_obj,VIRTIO_NET_F_CTRL_RX )) {Also suggesting early returns here.
So, for CVQ commands related to VIRTIO_NET_F_CTRL_EXTRA_RX, would it be more appropriate to create a new function, maybe vhost_vdpa_net_load_rx_extra, to handle them instead of sending those CVQ commands within this function, if we choose to return early?
Quoted 28 lines
Quoted 7 lines
net/vhost-vdpa.c +6
-0+/* Load the promiscous mode */ +if (n->mac_table.uni_overflow) { +/* +* According to VirtIO standard, "Since there are no guarantees, +* it can use a hash filter or silently switch to +* allmulti or promiscuous mode if it is given too many addresses." net/vhost-vdpa.c static int vhost_vdpa_net_load_offloads(VhostVDPAState *s, · line 838
Quoted 10 lines
net/vhost-vdpa.c +10
-0+* +* QEMU ignores non-multicast(unicast) MAC addresses and +* marks `uni_overflow` for the device internal state +* if guest sets too many non-multicast(unicast) MAC addresses. +* Therefore, we should turn promiscous mode on in this case. +*/ + on =1 ; + }else { + on = n->promisc; + }I think we can remove the "on" variable and just do:
/*
* According to ...
*/if (n->mac_table.uni_overflow || n->promisc) { r = vhost_vdpa_net_load_rx_mode(s, VIRTIO_NET_CTRL_RX_PROMISC, on); if (r < 0) { return r; }
Quoted 5 lines
---
And the equivalent for multicast.
Would that make sense?
Yes, I will refactor these according to your suggestion.
Thanks!
Quoted 77 lines
Thanks!
Quoted 73 lines
net/vhost-vdpa.c +60
-1+if (on !=1 ) { +/* +* According to virtio_net_reset(), device turns promiscuous mode on +* by default. +* +* Therefore, there is no need to send this CVQ command if the +* driver also sets promiscuous mode on, which aligns with +* the device's defaults. +* +* Note that the device's defaults can mismatch the driver's +* configuration only at live migration. +*/ + r =vhost_vdpa_net_load_rx_mode (s,VIRTIO_NET_CTRL_RX_PROMISC , on); +if (r <0 ) { +return r; + } + } + +/* Load the all-multicast mode */ +if (n->mac_table.multi_overflow) { +/* +* According to VirtIO standard, "Since there are no guarantees, +* it can use a hash filter or silently switch to +* allmulti or promiscuous mode if it is given too many addresses." +* +* QEMU ignores multicast MAC addresses and +* marks `multi_overflow` for the device internal state +* if guest sets too many multicast MAC addresses. +* Therefore, we should turn all-multicast mode on in this case. +*/ + on =1 ; + }else { + on = n->allmulti; + } +if (on !=0 ) { +/* +* According to virtio_net_reset(), device turns all-multicast mode +* off by default. +* +* Therefore, there is no need to send this CVQ command if the +* driver also sets all-multicast mode off, which aligns with +* the device's defaults. +* +* Note that the device's defaults can mismatch the driver's +* configuration only at live migration. +*/ + r =vhost_vdpa_net_load_rx_mode (s,VIRTIO_NET_CTRL_RX_ALLMULTI , on); +if (r <0 ) { +return r; + } + } + } + +return 0 ; +} +static int vhost_vdpa_net_load (NetClientState *nc) {VhostVDPAState *s =DO_UPCAST (VhostVDPAState, nc, nc);@@ -818,6 +918,10 @@ static int vhost_vdpa_net_load(NetClientState *nc)if (unlikely (r)) {return r; } + r =vhost_vdpa_net_load_rx (s, n); +if (unlikely (r)) { +return r; + }return 0 ; } --2.25.1
Re: [PATCH RFC v2 2/4] vdpa: Restore MAC address filtering state
In reply to Hawkins JiaweiQuoted 39 lines · Hawkins Jiawei
Quoted 24 lines · Eugenio Perez Martin
Quoted 23 lines · Hawkins Jiawei
This patch refactors
vhost_vdpa_net_load_mac()to restore the MAC address filtering state at device's startup.Signed-off-by Hawkins Jiawei <[email protected]>---
v2:
- use iovec suggested by Eugenio
- avoid sending CVQ command in default statenet/vhost-vdpa.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)net/vhost-vdpa.c +0
-0@@ -665,6 +665,57 @@ static int vhost_vdpa_net_load_mac(VhostVDPAState *s, const VirtIONet *n) } }Quoted 5 lines
net/vhost-vdpa.c static int vhost_vdpa_net_load_mac(VhostVDPAState *s, const VirtIONet *n) · line 669
Quoted 2 lines
net/vhost-vdpa.c +2
-0+if (virtio_vdev_has_feature (&n->parent_obj,VIRTIO_NET_F_CTRL_RX )) { +if (n->mac_table.in_use !=0 ) {This may be just style nitpicking, but I find it more clear to return early if conditions are not met and then send the CVQ command.
Yes, this makes code more clear to read.
But it appears that we may meet a problem if the function
vhost_vdpa_net_load_x()sends multiple CVQ commands. It is possible that we might not meet the condition for one of the CVQ commands, but we could still meet the conditions for other CVQ commands.
Quoted 6 lines
Therefore, in the case of
vhost_vdpa_net_load_x()sending multiple CVQ commands, if we still hope to use this style, should we split the function into multiple functions, with each function responsible for sending only one CVQ command? Or should we jump to the next CVQ command instead of returning from the function if the conditions are not met?
In that case I'd suggest using multiples if() {}, as each ctrl command processing code is very small.
But for VIRTIO_NET_F_CTRL_RX particular case your patch propose:
if (x) {
if (y) {
... }
}
So in my opinion it makes sense to convert to:
if (!x || !y) {
return;
}
...
We can always change later if needed.
Thanks!
Quoted 80 lines
Thanks!
Quoted 76 lines
Something like:
/*
* According to ...
*/
if (!virtio_vdev_has_feature(&n->parent_obj,VIRTIO_NET_F_CTRL_RX)) || (n->mac_table.in_use== 0)) {
return 0
}
uni_entries=n->mac_table.first_multi,
...
---Now I just realized
vhost_vdpa_net_load_macdoes not follow this for checkingVIRTIO_NET_F_CTRL_MAC_ADDR.I'm ok if you leave it this way though.
Thanks!
Quoted 55 lines
net/vhost-vdpa.c +49
-1+/* +* According to virtio_net_reset(), device uses an empty MAC filter +* table as its default state. +* +* Therefore, there is no need to send this CVQ command if the +* driver also sets an empty MAC filter table, which aligns with +* the device's defaults. +* +* Note that the device's defaults can mismatch the driver's +* configuration only at live migration. +*/ +uint32_t uni_entries = n->mac_table.first_multi, + uni_macs_size = uni_entries *ETH_ALEN , + mul_entries = n->mac_table.in_use - uni_entries, + mul_macs_size = mul_entries *ETH_ALEN ; +struct virtio_net_ctrl_mac uni = { + .entries =cpu_to_le32 (uni_entries), + }; +struct virtio_net_ctrl_mac mul = { + .entries =cpu_to_le32 (mul_entries), + }; +const struct iovec data[] = { + { + .iov_base = &uni, + .iov_len =sizeof (uni), + }, { + .iov_base = n->mac_table.macs, + .iov_len = uni_macs_size, + }, { + .iov_base = &mul, + .iov_len =sizeof (mul), + }, { + .iov_base = &n->mac_table.macs[uni_macs_size], + .iov_len = mul_macs_size, + }, + }; +ssize_t dev_written =vhost_vdpa_net_load_cmd (s, +VIRTIO_NET_CTRL_MAC , +VIRTIO_NET_CTRL_MAC_TABLE_SET , + data,ARRAY_SIZE (data)); +if (unlikely (dev_written <0 )) { +return dev_written; + } +if (*s->status !=VIRTIO_NET_OK ) { +return -EINVAL ; + } + } + } +return 0 ; } --2.25.1
Re: [PATCH RFC v2 3/4] vdpa: Restore packet receive filtering state relative with _F_CTRL_RX feature
In reply to Hawkins JiaweiQuoted 58 lines · Hawkins Jiawei
Quoted 47 lines · Eugenio Perez Martin
Quoted 46 lines · Hawkins Jiawei
This patch introduces
vhost_vdpa_net_load_rx_mode()andvhost_vdpa_net_load_rx()to restore the packet receive filtering state in relation toVIRTIO_NET_F_CTRL_RXfeature at device's startup.Signed-off-by Hawkins Jiawei <[email protected]>---
v2:
- avoid sending CVQ command in default state suggested by Eugenionet/vhost-vdpa.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+)net/vhost-vdpa.c +22
-0@@ -792,6 +792,106 @@ static int vhost_vdpa_net_load_offloads(VhostVDPAState *s,return 0 ; } +static int vhost_vdpa_net_load_rx_mode (VhostVDPAState *s, +uint8_t cmd, +uint8_t on) +{ +ssize_t dev_written; +const struct iovec data = { + .iov_base = &on, + .iov_len =sizeof (on), + }; + dev_written =vhost_vdpa_net_load_cmd (s,VIRTIO_NET_CTRL_RX , + cmd, &data,1 ); +if (unlikely (dev_written <0 )) { +return dev_written; + } +if (*s->status !=VIRTIO_NET_OK ) { +return -EINVAL ; + } + +return 0 ; +} + +static int vhost_vdpa_net_load_rx(VhostVDPAState *s,Quoted 8 lines
net/vhost-vdpa.c static int vhost_vdpa_net_load_offloads(VhostVDPAState *s, · line 822
Quoted 6 lines
net/vhost-vdpa.c +6
-0+ const VirtIONet *n) +{ +uint8_t on; +int r; + +if (virtio_vdev_has_feature (&n->parent_obj,VIRTIO_NET_F_CTRL_RX )) {Also suggesting early returns here.
Quoted 5 lines
So, for CVQ commands related to
VIRTIO_NET_F_CTRL_EXTRA_RX, would it be more appropriate to create a new function, maybevhost_vdpa_net_load_rx_extra, to handle them instead of sending those CVQ commands within this function, if we choose to return early?
My understanding is that VIRTIO_NET_F_CTRL_RX_EXTRA depends on VIRTIO_NET_F_CTRL_RX, so we can do:
if (!virtio_vdev_has_feature(&n->parent_obj, VIRTIO_NET_F_CTRL_RX)) {
return;
}
// Process CTRL_RX commands
if (!virtio_vdev_has_feature(&n->parent_obj, VIRTIO_NET_F_CTRL_RX)) {
return;
}
// process CTRL_RX_EXTRA commands
Quoted 117 lines
Quoted 28 lines
Quoted 7 lines
net/vhost-vdpa.c +6
-0+/* Load the promiscous mode */ +if (n->mac_table.uni_overflow) { +/* +* According to VirtIO standard, "Since there are no guarantees, +* it can use a hash filter or silently switch to +* allmulti or promiscuous mode if it is given too many addresses." net/vhost-vdpa.c static int vhost_vdpa_net_load_offloads(VhostVDPAState *s, · line 838
Quoted 10 lines
net/vhost-vdpa.c +10
-0+* +* QEMU ignores non-multicast(unicast) MAC addresses and +* marks `uni_overflow` for the device internal state +* if guest sets too many non-multicast(unicast) MAC addresses. +* Therefore, we should turn promiscous mode on in this case. +*/ + on =1 ; + }else { + on = n->promisc; + }I think we can remove the "on" variable and just do:
/*
* According to ...
*/if (n->mac_table.uni_overflow || n->promisc) { r = vhost_vdpa_net_load_rx_mode(s, VIRTIO_NET_CTRL_RX_PROMISC, on); if (r < 0) { return r; }Quoted 5 lines
---
And the equivalent for multicast.
Would that make sense?
Yes, I will refactor these according to your suggestion.
Thanks!
Quoted 77 lines
Thanks!
Quoted 73 lines
net/vhost-vdpa.c +60
-1+if (on !=1 ) { +/* +* According to virtio_net_reset(), device turns promiscuous mode on +* by default. +* +* Therefore, there is no need to send this CVQ command if the +* driver also sets promiscuous mode on, which aligns with +* the device's defaults. +* +* Note that the device's defaults can mismatch the driver's +* configuration only at live migration. +*/ + r =vhost_vdpa_net_load_rx_mode (s,VIRTIO_NET_CTRL_RX_PROMISC , on); +if (r <0 ) { +return r; + } + } + +/* Load the all-multicast mode */ +if (n->mac_table.multi_overflow) { +/* +* According to VirtIO standard, "Since there are no guarantees, +* it can use a hash filter or silently switch to +* allmulti or promiscuous mode if it is given too many addresses." +* +* QEMU ignores multicast MAC addresses and +* marks `multi_overflow` for the device internal state +* if guest sets too many multicast MAC addresses. +* Therefore, we should turn all-multicast mode on in this case. +*/ + on =1 ; + }else { + on = n->allmulti; + } +if (on !=0 ) { +/* +* According to virtio_net_reset(), device turns all-multicast mode +* off by default. +* +* Therefore, there is no need to send this CVQ command if the +* driver also sets all-multicast mode off, which aligns with +* the device's defaults. +* +* Note that the device's defaults can mismatch the driver's +* configuration only at live migration. +*/ + r =vhost_vdpa_net_load_rx_mode (s,VIRTIO_NET_CTRL_RX_ALLMULTI , on); +if (r <0 ) { +return r; + } + } + } + +return 0 ; +} +static int vhost_vdpa_net_load (NetClientState *nc) {VhostVDPAState *s =DO_UPCAST (VhostVDPAState, nc, nc);@@ -818,6 +918,10 @@ static int vhost_vdpa_net_load(NetClientState *nc)if (unlikely (r)) {return r; } + r =vhost_vdpa_net_load_rx (s, n); +if (unlikely (r)) { +return r; + }return 0 ; } --2.25.1
Re: [PATCH RFC v2 3/4] vdpa: Restore packet receive filtering state relative with _F_CTRL_RX feature
Quoted 72 lines · Eugenio Perez Martin
Quoted 58 lines · Hawkins Jiawei
Quoted 47 lines · Eugenio Perez Martin
Quoted 46 lines · Hawkins Jiawei
This patch introduces
vhost_vdpa_net_load_rx_mode()andvhost_vdpa_net_load_rx()to restore the packet receive filtering state in relation toVIRTIO_NET_F_CTRL_RXfeature at device's startup.Signed-off-by Hawkins Jiawei <[email protected]>---
v2:
- avoid sending CVQ command in default state suggested by Eugenionet/vhost-vdpa.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+)net/vhost-vdpa.c +22
-0@@ -792,6 +792,106 @@ static int vhost_vdpa_net_load_offloads(VhostVDPAState *s,return 0 ; } +static int vhost_vdpa_net_load_rx_mode (VhostVDPAState *s, +uint8_t cmd, +uint8_t on) +{ +ssize_t dev_written; +const struct iovec data = { + .iov_base = &on, + .iov_len =sizeof (on), + }; + dev_written =vhost_vdpa_net_load_cmd (s,VIRTIO_NET_CTRL_RX , + cmd, &data,1 ); +if (unlikely (dev_written <0 )) { +return dev_written; + } +if (*s->status !=VIRTIO_NET_OK ) { +return -EINVAL ; + } + +return 0 ; +} + +static int vhost_vdpa_net_load_rx(VhostVDPAState *s,Quoted 8 lines
net/vhost-vdpa.c static int vhost_vdpa_net_load_offloads(VhostVDPAState *s, · line 822
Quoted 6 lines
net/vhost-vdpa.c +6
-0+ const VirtIONet *n) +{ +uint8_t on; +int r; + +if (virtio_vdev_has_feature (&n->parent_obj,VIRTIO_NET_F_CTRL_RX )) {Also suggesting early returns here.
Quoted 5 lines
So, for CVQ commands related to
VIRTIO_NET_F_CTRL_EXTRA_RX, would it be more appropriate to create a new function, maybevhost_vdpa_net_load_rx_extra, to handle them instead of sending those CVQ commands within this function, if we choose to return early?My understanding is that
VIRTIO_NET_F_CTRL_RX_EXTRAdepends onVIRTIO_NET_F_CTRL_RX, so we can do:if (!virtio_vdev_has_feature(&n->parent_obj, VIRTIO_NET_F_CTRL_RX)) { return; }
Quoted 7 lines
// Process
CTRL_RXcommandsif (!virtio_vdev_has_feature(&n->parent_obj, VIRTIO_NET_F_CTRL_RX)) { return; }// process
CTRL_RX_EXTRAcommands
Thanks for your explanation, it makes sense.
I will send the v3 patch based on your suggestion.
Thanks!
Quoted 119 lines
Quoted 118 lines
Quoted 29 lines
Quoted 8 lines
net/vhost-vdpa.c +6
-0+/* Load the promiscous mode */ +if (n->mac_table.uni_overflow) { +/* +* According to VirtIO standard, "Since there are no guarantees, +* it can use a hash filter or silently switch to +* allmulti or promiscuous mode if it is given too many addresses." net/vhost-vdpa.c static int vhost_vdpa_net_load_offloads(VhostVDPAState *s, · line 838
Quoted 10 lines
net/vhost-vdpa.c +10
-0+* +* QEMU ignores non-multicast(unicast) MAC addresses and +* marks `uni_overflow` for the device internal state +* if guest sets too many non-multicast(unicast) MAC addresses. +* Therefore, we should turn promiscous mode on in this case. +*/ + on =1 ; + }else { + on = n->promisc; + }I think we can remove the "on" variable and just do:
/*
* According to ...
*/if (n->mac_table.uni_overflow || n->promisc) { r = vhost_vdpa_net_load_rx_mode(s, VIRTIO_NET_CTRL_RX_PROMISC, on); if (r < 0) { return r; }Quoted 5 lines
---
And the equivalent for multicast.
Would that make sense?
Yes, I will refactor these according to your suggestion.
Thanks!
Quoted 77 lines
Thanks!
Quoted 73 lines
net/vhost-vdpa.c +60
-1+if (on !=1 ) { +/* +* According to virtio_net_reset(), device turns promiscuous mode on +* by default. +* +* Therefore, there is no need to send this CVQ command if the +* driver also sets promiscuous mode on, which aligns with +* the device's defaults. +* +* Note that the device's defaults can mismatch the driver's +* configuration only at live migration. +*/ + r =vhost_vdpa_net_load_rx_mode (s,VIRTIO_NET_CTRL_RX_PROMISC , on); +if (r <0 ) { +return r; + } + } + +/* Load the all-multicast mode */ +if (n->mac_table.multi_overflow) { +/* +* According to VirtIO standard, "Since there are no guarantees, +* it can use a hash filter or silently switch to +* allmulti or promiscuous mode if it is given too many addresses." +* +* QEMU ignores multicast MAC addresses and +* marks `multi_overflow` for the device internal state +* if guest sets too many multicast MAC addresses. +* Therefore, we should turn all-multicast mode on in this case. +*/ + on =1 ; + }else { + on = n->allmulti; + } +if (on !=0 ) { +/* +* According to virtio_net_reset(), device turns all-multicast mode +* off by default. +* +* Therefore, there is no need to send this CVQ command if the +* driver also sets all-multicast mode off, which aligns with +* the device's defaults. +* +* Note that the device's defaults can mismatch the driver's +* configuration only at live migration. +*/ + r =vhost_vdpa_net_load_rx_mode (s,VIRTIO_NET_CTRL_RX_ALLMULTI , on); +if (r <0 ) { +return r; + } + } + } + +return 0 ; +} +static int vhost_vdpa_net_load (NetClientState *nc) {VhostVDPAState *s =DO_UPCAST (VhostVDPAState, nc, nc);@@ -818,6 +918,10 @@ static int vhost_vdpa_net_load(NetClientState *nc)if (unlikely (r)) {return r; } + r =vhost_vdpa_net_load_rx (s, n); +if (unlikely (r)) { +return r; + }return 0 ; } --2.25.1
Re: [PATCH RFC v2 2/4] vdpa: Restore MAC address filtering state
In reply to Eugenio Perez MartinQuoted 57 lines · Eugenio Perez Martin
Quoted 39 lines · Hawkins Jiawei
Quoted 24 lines · Eugenio Perez Martin
Quoted 23 lines · Hawkins Jiawei
This patch refactors
vhost_vdpa_net_load_mac()to restore the MAC address filtering state at device's startup.Signed-off-by Hawkins Jiawei <[email protected]>---
v2:
- use iovec suggested by Eugenio
- avoid sending CVQ command in default statenet/vhost-vdpa.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)net/vhost-vdpa.c +0
-0@@ -665,6 +665,57 @@ static int vhost_vdpa_net_load_mac(VhostVDPAState *s, const VirtIONet *n) } }Quoted 5 lines
net/vhost-vdpa.c static int vhost_vdpa_net_load_mac(VhostVDPAState *s, const VirtIONet *n) · line 669
Quoted 2 lines
net/vhost-vdpa.c +2
-0+if (virtio_vdev_has_feature (&n->parent_obj,VIRTIO_NET_F_CTRL_RX )) { +if (n->mac_table.in_use !=0 ) {This may be just style nitpicking, but I find it more clear to return early if conditions are not met and then send the CVQ command.
Yes, this makes code more clear to read.
But it appears that we may meet a problem if the function
vhost_vdpa_net_load_x()sends multiple CVQ commands. It is possible that we might not meet the condition for one of the CVQ commands, but we could still meet the conditions for other CVQ commands.Quoted 6 lines
Therefore, in the case of
vhost_vdpa_net_load_x()sending multiple CVQ commands, if we still hope to use this style, should we split the function into multiple functions, with each function responsible for sending only one CVQ command? Or should we jump to the next CVQ command instead of returning from the function if the conditions are not met?In that case I'd suggest using multiples
if(){}, as each ctrl command processing code is very small.But for
VIRTIO_NET_F_CTRL_RXparticular case your patch propose:if (x) { if (y) { ... } }
Quoted 5 lines
So in my opinion it makes sense to convert to:
if (!x || !y) { return; }...
Thanks for your explanation.
I will refactor the patch according to your suggestion.
Thanks!
Quoted 86 lines
We can always change later if needed.
Thanks!
Quoted 80 lines
Thanks!
Quoted 76 lines
Something like:
/*
* According to ...
*/
if (!virtio_vdev_has_feature(&n->parent_obj,VIRTIO_NET_F_CTRL_RX)) || (n->mac_table.in_use== 0)) {
return 0
}
uni_entries=n->mac_table.first_multi,
...
---Now I just realized
vhost_vdpa_net_load_macdoes not follow this for checkingVIRTIO_NET_F_CTRL_MAC_ADDR.I'm ok if you leave it this way though.
Thanks!
Quoted 55 lines
net/vhost-vdpa.c +49
-1+/* +* According to virtio_net_reset(), device uses an empty MAC filter +* table as its default state. +* +* Therefore, there is no need to send this CVQ command if the +* driver also sets an empty MAC filter table, which aligns with +* the device's defaults. +* +* Note that the device's defaults can mismatch the driver's +* configuration only at live migration. +*/ +uint32_t uni_entries = n->mac_table.first_multi, + uni_macs_size = uni_entries *ETH_ALEN , + mul_entries = n->mac_table.in_use - uni_entries, + mul_macs_size = mul_entries *ETH_ALEN ; +struct virtio_net_ctrl_mac uni = { + .entries =cpu_to_le32 (uni_entries), + }; +struct virtio_net_ctrl_mac mul = { + .entries =cpu_to_le32 (mul_entries), + }; +const struct iovec data[] = { + { + .iov_base = &uni, + .iov_len =sizeof (uni), + }, { + .iov_base = n->mac_table.macs, + .iov_len = uni_macs_size, + }, { + .iov_base = &mul, + .iov_len =sizeof (mul), + }, { + .iov_base = &n->mac_table.macs[uni_macs_size], + .iov_len = mul_macs_size, + }, + }; +ssize_t dev_written =vhost_vdpa_net_load_cmd (s, +VIRTIO_NET_CTRL_MAC , +VIRTIO_NET_CTRL_MAC_TABLE_SET , + data,ARRAY_SIZE (data)); +if (unlikely (dev_written <0 )) { +return dev_written; + } +if (*s->status !=VIRTIO_NET_OK ) { +return -EINVAL ; + } + } + } +return 0 ; } --2.25.1