Skip to contentSkip to conversation

Some fixes for virtio and vhost

PATCH Applied Tiwei Bie 2 participants 6 messages Oct 25, 2018 – Oct 30, 2018 Network drivers

lore
Share & tools
lore

Tiwei Bie

author
#0 lore raw

cover Some fixes for virtio and vhost

Tiwei Bie (2):
net/virtio: drop duplicated reset method
net/vhost: fix parameters string

 drivers/net/vhost/rte_eth_vhost.c       |  6 +++++-
 drivers/net/virtio/virtio_pci.c         | 15 ---------------
 drivers/net/virtio/virtio_pci.h         |  1 -
 drivers/net/virtio/virtio_user_ethdev.c |  1 -
 4 files changed, 5 insertions(+), 18 deletions(-)
Signature · 1 line
2.19.1
author
#1 lore raw

PATCH 1/2 net/virtio: drop duplicated reset method

Drop the duplicated reset() method in virtio_pci_ops. Currently vtpci_reset() is implemented on set_status() and get_status() directly. The reset() method in virtio_pci_ops isn't used and its implementation in the legacy device isn't right.

---
 drivers/net/virtio/virtio_pci.c         | 15 ---------------
 drivers/net/virtio/virtio_pci.h         |  1 -
 drivers/net/virtio/virtio_user_ethdev.c |  1 -
 3 files changed, 17 deletions(-)
drivers/net/virtio/virtio_pci.c +0 -15
index 6bd22e54a..6a3abcd26 100644
@@ -166,12 +166,6 @@ legacy_set_status(struct virtio_hw *hw, uint8_t status)
 	rte_pci_ioport_write(VTPCI_IO(hw), &status, 1, VIRTIO_PCI_STATUS);
 }
 
-static void
-legacy_reset(struct virtio_hw *hw)
-{
-	legacy_set_status(hw, VIRTIO_CONFIG_STATUS_RESET);
-}
-
 static uint8_t
 legacy_get_isr(struct virtio_hw *hw)
 {
@@ -250,7 +244,6 @@ legacy_notify_queue(struct virtio_hw *hw, struct virtqueue *vq)
 const struct virtio_pci_ops legacy_ops = {
 	.read_dev_cfg	= legacy_read_dev_config,
 	.write_dev_cfg	= legacy_write_dev_config,
-	.reset		= legacy_reset,
 	.get_status	= legacy_get_status,
 	.set_status	= legacy_set_status,
 	.get_features	= legacy_get_features,
@@ -339,13 +332,6 @@ modern_set_status(struct virtio_hw *hw, uint8_t status)
 	rte_write8(status, &hw->common_cfg->device_status);
 }
 
-static void
-modern_reset(struct virtio_hw *hw)
-{
-	modern_set_status(hw, VIRTIO_CONFIG_STATUS_RESET);
-	modern_get_status(hw);
-}
-
 static uint8_t
 modern_get_isr(struct virtio_hw *hw)
 {
@@ -438,7 +424,6 @@ modern_notify_queue(struct virtio_hw *hw __rte_unused, struct virtqueue *vq)
 const struct virtio_pci_ops modern_ops = {
 	.read_dev_cfg	= modern_read_dev_config,
 	.write_dev_cfg	= modern_write_dev_config,
-	.reset		= modern_reset,
 	.get_status	= modern_get_status,
 	.set_status	= modern_set_status,
 	.get_features	= modern_get_features,
drivers/net/virtio/virtio_pci.h +0 -1
index 58fdd3d45..64ba6ecbc 100644
@@ -204,7 +204,6 @@ struct virtio_pci_ops {
 			     void *dst, int len);
 	void (*write_dev_cfg)(struct virtio_hw *hw, size_t offset,
 			      const void *src, int len);
-	void (*reset)(struct virtio_hw *hw);
 
 	uint8_t (*get_status)(struct virtio_hw *hw);
 	void    (*set_status)(struct virtio_hw *hw, uint8_t status);
drivers/net/virtio/virtio_user_ethdev.c +0 -1
index 525d16cab..80af3539d 100644
@@ -331,7 +331,6 @@ virtio_user_notify_queue(struct virtio_hw *hw, struct virtqueue *vq)
 const struct virtio_pci_ops virtio_user_ops = {
 	.read_dev_cfg	= virtio_user_read_dev_config,
 	.write_dev_cfg	= virtio_user_write_dev_config,
-	.reset		= virtio_user_reset,
 	.get_status	= virtio_user_get_status,
 	.set_status	= virtio_user_set_status,
 	.get_features	= virtio_user_get_features,
Signature · 1 line
2.19.1
Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] net/virtio: drop duplicated reset method

Quoted 5 lines · Tiwei Bie

Drop the duplicated reset() method in virtio_pci_ops. Currently vtpci_reset() is implemented on set_status() and get_status() directly. The reset() method in virtio_pci_ops isn't used and its implementation in the legacy device isn't right.

Quoted 7 lines
---
  drivers/net/virtio/virtio_pci.c         | 15 ---------------
  drivers/net/virtio/virtio_pci.h         |  1 -
  drivers/net/virtio/virtio_user_ethdev.c |  1 -
  3 files changed, 17 deletions(-)

Thanks,
Maxime

author
#3 lore raw

PATCH 2/2 net/vhost: fix parameters string

In reply to Tiwei Bie

Add the missing params to the param string.

Fixes 39cac2adcad0 ("net/vhost: add client option")
Fixes 4ce97c6f6b4f ("net/vhost: add an option to enable dequeue zero copy")
Fixes 447e0d379756 ("net/vhost: add parameter to enable IOMMU feature")
Fixes 6d6e95cec455 ("net/vhost: add parameter to enable postcopy")
---
 drivers/net/vhost/rte_eth_vhost.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/vhost/rte_eth_vhost.c +5 -1
index 55e51c89a..07a9c2598 100644
@@ -1470,7 +1470,11 @@ RTE_PMD_REGISTER_VDEV(net_vhost, pmd_vhost_drv);
 RTE_PMD_REGISTER_ALIAS(net_vhost, eth_vhost);
 RTE_PMD_REGISTER_PARAM_STRING(net_vhost,
 	"iface=<ifc> "
-	"queues=<int>");
+	"queues=<int> "
+	"client=<0|1> "
+	"dequeue-zero-copy=<0|1> "
+	"iommu-support=<0|1> "
+	"postcopy-support=<0|1>");
 
 RTE_INIT(vhost_init_log)
 {
Signature · 1 line
2.19.1
Reviewed-by on v1 2/2
#4 lore raw

Re: [PATCH 2/2] net/vhost: fix parameters string

Quoted 21 lines · Tiwei Bie

Add the missing params to the param string.

Fixes 39cac2adcad0 ("net/vhost: add client option")
Fixes 4ce97c6f6b4f ("net/vhost: add an option to enable dequeue zero copy")
Fixes 447e0d379756 ("net/vhost: add parameter to enable IOMMU feature")
Fixes 6d6e95cec455 ("net/vhost: add parameter to enable postcopy")
---
  drivers/net/vhost/rte_eth_vhost.c | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/vhost/rte_eth_vhost.c +0 -0
index 55e51c89a..07a9c2598 100644
@@ -1470,7 +1470,11 @@ RTE_PMD_REGISTER_VDEV(net_vhost, pmd_vhost_drv);
  RTE_PMD_REGISTER_ALIAS(net_vhost, eth_vhost);
  RTE_PMD_REGISTER_PARAM_STRING(net_vhost,

drivers/net/vhost/rte_eth_vhost.c RTE_PMD_REGISTER_VDEV(net_vhost, pmd_vhost_drv); · line 1480

Quoted 10 lines
drivers/net/vhost/rte_eth_vhost.c +5 -1
  	"iface=<ifc> "
-	"queues=<int>");
+	"queues=<int> "
+	"client=<0|1> "
+	"dequeue-zero-copy=<0|1> "
+	"iommu-support=<0|1> "
+	"postcopy-support=<0|1>");
 
  RTE_INIT(vhost_init_log)
  {

Thanks,
Maxime

#5 lore raw
In reply to Tiwei Bie
Quoted 10 lines · Tiwei Bie

Tiwei Bie (2):
net/virtio: drop duplicated reset method
net/vhost: fix parameters string

  drivers/net/vhost/rte_eth_vhost.c       |  6 +++++-
  drivers/net/virtio/virtio_pci.c         | 15 ---------------
  drivers/net/virtio/virtio_pci.h         |  1 -
  drivers/net/virtio/virtio_user_ethdev.c |  1 -
  4 files changed, 5 insertions(+), 18 deletions(-)

Applied to dpdk-next-virtio/master

Thanks,
Maxime