diff mbox series

[v3] net/virtio: fix multicast and promisc mode enable failure

Message ID 20191028164220.14196-1-yong.liu@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Maxime Coquelin
Headers
Series [v3] net/virtio: fix multicast and promisc mode enable failure |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-compilation success Compile Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed
ci/Intel-compilation success Compilation OK

Commit Message

Marvin Liu Oct. 28, 2019, 4:42 p.m. UTC 
  As doc mentioned, promisc and multicast are by-default supported in
virtio pmd. Mac/vlan filter are supported by best effort. These control
messages should return pass.

Fixes: f9b9d1a55775 ("net/virtio-user: add multiple queues in device emulation")
Cc: stable@dpdk.org

Signed-off-by: Marvin Liu <yong.liu@intel.com>
---
 .../net/virtio/virtio_user/virtio_user_dev.c  | 37 ++++++++++++++-----
 drivers/net/virtio/virtio_user_ethdev.c       |  4 ++
 2 files changed, 31 insertions(+), 10 deletions(-)

Comments

Tiwei Bie Oct. 29, 2019, 12:27 p.m. UTC | #1 
On Tue, Oct 29, 2019 at 12:42:20AM +0800, Marvin Liu wrote:
> As doc mentioned, promisc and multicast are by-default supported in
> virtio pmd. Mac/vlan filter are supported by best effort. These control
> messages should return pass.
> 
> Fixes: f9b9d1a55775 ("net/virtio-user: add multiple queues in device emulation")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Marvin Liu <yong.liu@intel.com>
> ---
>  .../net/virtio/virtio_user/virtio_user_dev.c  | 37 ++++++++++++++-----
>  drivers/net/virtio/virtio_user_ethdev.c       |  4 ++
>  2 files changed, 31 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> index 1c575d0cd..b614dd0c0 100644
> --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
> +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> @@ -587,7 +587,7 @@ static uint32_t
>  virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *vring,
>  			    uint16_t idx_hdr)
>  {
> -	struct virtio_net_ctrl_hdr *hdr;
> +	struct virtio_pmd_ctrl *ctrl;

We shouldn't use virtio_pmd_ctrl here. The virtio_pmd_ctrl
is just a private structure defined in virtio PMD (upper layer).
And we won't put this structure as is in the buffer pointed
by the descriptor.

>  	virtio_net_ctrl_ack status = ~0;
>  	uint16_t i, idx_data, idx_status;
>  	uint32_t n_descs = 0;
> @@ -606,13 +606,22 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *vring,
>  	idx_status = i;
>  	n_descs++;
>  
> -	hdr = (void *)(uintptr_t)vring->desc[idx_hdr].addr;
> -	if (hdr->class == VIRTIO_NET_CTRL_MQ &&
> -	    hdr->cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) {
> +	ctrl = (void *)(uintptr_t)vring->desc[idx_hdr].addr;
> +	if (ctrl->hdr.class == VIRTIO_NET_CTRL_MQ &&
> +	    ctrl->hdr.cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) {
>  		uint16_t queues;
>  
>  		queues = *(uint16_t *)(uintptr_t)vring->desc[idx_data].addr;
>  		status = virtio_user_handle_mq(dev, queues);
> +	} else if (ctrl->hdr.class == VIRTIO_NET_CTRL_RX) {
> +		if (ctrl->hdr.cmd == VIRTIO_NET_CTRL_RX_PROMISC ||
> +		    ctrl->hdr.cmd == VIRTIO_NET_CTRL_RX_ALLMULTI) {
> +			if (ctrl->data[0])

Why do we need this check?


> +				status = 0;
> +		}
> +	} else if (ctrl->hdr.class == VIRTIO_NET_CTRL_MAC ||
> +		   ctrl->hdr.class == VIRTIO_NET_CTRL_VLAN) {
> +		status = 0;
>  	}
>  
>  	/* Update status */
> @@ -635,7 +644,7 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user_dev *dev,
>  				   struct vring_packed *vring,
>  				   uint16_t idx_hdr)
>  {
> -	struct virtio_net_ctrl_hdr *hdr;
> +	struct virtio_pmd_ctrl *ctrl;
>  	virtio_net_ctrl_ack status = ~0;
>  	uint16_t idx_data, idx_status;
>  	/* initialize to one, header is first */
> @@ -656,14 +665,22 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user_dev *dev,
>  		n_descs++;
>  	}
>  
> -	hdr = (void *)(uintptr_t)vring->desc[idx_hdr].addr;
> -	if (hdr->class == VIRTIO_NET_CTRL_MQ &&
> -	    hdr->cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) {
> +	ctrl = (void *)(uintptr_t)vring->desc[idx_hdr].addr;
> +	if (ctrl->hdr.class == VIRTIO_NET_CTRL_MQ &&
> +	    ctrl->hdr.cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) {
>  		uint16_t queues;
>  
> -		queues = *(uint16_t *)(uintptr_t)
> -				vring->desc[idx_data].addr;
> +		queues = *(uint16_t *)(uintptr_t)vring->desc[idx_data].addr;
>  		status = virtio_user_handle_mq(dev, queues);
> +	} else if (ctrl->hdr.class == VIRTIO_NET_CTRL_RX) {
> +		if (ctrl->hdr.cmd == VIRTIO_NET_CTRL_RX_PROMISC ||
> +		    ctrl->hdr.cmd == VIRTIO_NET_CTRL_RX_ALLMULTI) {
> +			if (ctrl->data[0])
> +				status = 0;
> +		}
> +	} else if (ctrl->hdr.class == VIRTIO_NET_CTRL_MAC ||
> +		   ctrl->hdr.class == VIRTIO_NET_CTRL_VLAN) {
> +		status = 0;
>  	}
>  
>  	/* Update status */
> diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
> index 3fc172573..18caf5e88 100644
> --- a/drivers/net/virtio/virtio_user_ethdev.c
> +++ b/drivers/net/virtio/virtio_user_ethdev.c
> @@ -660,6 +660,10 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
>  		goto end;
>  	}
>  
> +	/* multicast and promisc mode are always enabled */
> +	eth_dev->data->promiscuous = 1;
> +	eth_dev->data->all_multicast = 1;
> +
>  	hw = eth_dev->data->dev_private;
>  	if (virtio_user_dev_init(hw->virtio_user_dev, path, queues, cq,
>  			 queue_size, mac_addr, &ifname, server_mode,
> -- 
> 2.17.1
>
Marvin Liu Oct. 30, 2019, 2:41 a.m. UTC | #2 
> -----Original Message-----
> From: Bie, Tiwei
> Sent: Tuesday, October 29, 2019 8:28 PM
> To: Liu, Yong <yong.liu@intel.com>
> Cc: maxime.coquelin@redhat.com; Wang, Zhihong <zhihong.wang@intel.com>;
> dev@dpdk.org; stable@dpdk.org
> Subject: Re: [PATCH v3] net/virtio: fix multicast and promisc mode enable
> failure
> 
> On Tue, Oct 29, 2019 at 12:42:20AM +0800, Marvin Liu wrote:
> > As doc mentioned, promisc and multicast are by-default supported in
> > virtio pmd. Mac/vlan filter are supported by best effort. These control
> > messages should return pass.
> >
> > Fixes: f9b9d1a55775 ("net/virtio-user: add multiple queues in device
> emulation")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Marvin Liu <yong.liu@intel.com>
> > ---
> >  .../net/virtio/virtio_user/virtio_user_dev.c  | 37 ++++++++++++++-----
> >  drivers/net/virtio/virtio_user_ethdev.c       |  4 ++
> >  2 files changed, 31 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c
> b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> > index 1c575d0cd..b614dd0c0 100644
> > --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
> > +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> > @@ -587,7 +587,7 @@ static uint32_t
> >  virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring
> *vring,
> >  			    uint16_t idx_hdr)
> >  {
> > -	struct virtio_net_ctrl_hdr *hdr;
> > +	struct virtio_pmd_ctrl *ctrl;
> 
> We shouldn't use virtio_pmd_ctrl here. The virtio_pmd_ctrl
> is just a private structure defined in virtio PMD (upper layer).
> And we won't put this structure as is in the buffer pointed
> by the descriptor.

Thanks, will change in next version.

> 
> >  	virtio_net_ctrl_ack status = ~0;
> >  	uint16_t i, idx_data, idx_status;
> >  	uint32_t n_descs = 0;
> > @@ -606,13 +606,22 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev
> *dev, struct vring *vring,
> >  	idx_status = i;
> >  	n_descs++;
> >
> > -	hdr = (void *)(uintptr_t)vring->desc[idx_hdr].addr;
> > -	if (hdr->class == VIRTIO_NET_CTRL_MQ &&
> > -	    hdr->cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) {
> > +	ctrl = (void *)(uintptr_t)vring->desc[idx_hdr].addr;
> > +	if (ctrl->hdr.class == VIRTIO_NET_CTRL_MQ &&
> > +	    ctrl->hdr.cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) {
> >  		uint16_t queues;
> >
> >  		queues = *(uint16_t *)(uintptr_t)vring->desc[idx_data].addr;
> >  		status = virtio_user_handle_mq(dev, queues);
> > +	} else if (ctrl->hdr.class == VIRTIO_NET_CTRL_RX) {
> > +		if (ctrl->hdr.cmd == VIRTIO_NET_CTRL_RX_PROMISC ||
> > +		    ctrl->hdr.cmd == VIRTIO_NET_CTRL_RX_ALLMULTI) {
> > +			if (ctrl->data[0])
> 
> Why do we need this check?
> 
Promisc and multicast setting should be checked before return. Ctrl data is not the value should be checked. 
Will check the content in idx_data in next version.

> 
> > +				status = 0;
> > +		}
> > +	} else if (ctrl->hdr.class == VIRTIO_NET_CTRL_MAC ||
> > +		   ctrl->hdr.class == VIRTIO_NET_CTRL_VLAN) {
> > +		status = 0;
> >  	}
> >
> >  	/* Update status */
> > @@ -635,7 +644,7 @@ virtio_user_handle_ctrl_msg_packed(struct
> virtio_user_dev *dev,
> >  				   struct vring_packed *vring,
> >  				   uint16_t idx_hdr)
> >  {
> > -	struct virtio_net_ctrl_hdr *hdr;
> > +	struct virtio_pmd_ctrl *ctrl;
> >  	virtio_net_ctrl_ack status = ~0;
> >  	uint16_t idx_data, idx_status;
> >  	/* initialize to one, header is first */
> > @@ -656,14 +665,22 @@ virtio_user_handle_ctrl_msg_packed(struct
> virtio_user_dev *dev,
> >  		n_descs++;
> >  	}
> >
> > -	hdr = (void *)(uintptr_t)vring->desc[idx_hdr].addr;
> > -	if (hdr->class == VIRTIO_NET_CTRL_MQ &&
> > -	    hdr->cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) {
> > +	ctrl = (void *)(uintptr_t)vring->desc[idx_hdr].addr;
> > +	if (ctrl->hdr.class == VIRTIO_NET_CTRL_MQ &&
> > +	    ctrl->hdr.cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) {
> >  		uint16_t queues;
> >
> > -		queues = *(uint16_t *)(uintptr_t)
> > -				vring->desc[idx_data].addr;
> > +		queues = *(uint16_t *)(uintptr_t)vring->desc[idx_data].addr;
> >  		status = virtio_user_handle_mq(dev, queues);
> > +	} else if (ctrl->hdr.class == VIRTIO_NET_CTRL_RX) {
> > +		if (ctrl->hdr.cmd == VIRTIO_NET_CTRL_RX_PROMISC ||
> > +		    ctrl->hdr.cmd == VIRTIO_NET_CTRL_RX_ALLMULTI) {
> > +			if (ctrl->data[0])
> > +				status = 0;
> > +		}
> > +	} else if (ctrl->hdr.class == VIRTIO_NET_CTRL_MAC ||
> > +		   ctrl->hdr.class == VIRTIO_NET_CTRL_VLAN) {
> > +		status = 0;
> >  	}
> >
> >  	/* Update status */
> > diff --git a/drivers/net/virtio/virtio_user_ethdev.c
> b/drivers/net/virtio/virtio_user_ethdev.c
> > index 3fc172573..18caf5e88 100644
> > --- a/drivers/net/virtio/virtio_user_ethdev.c
> > +++ b/drivers/net/virtio/virtio_user_ethdev.c
> > @@ -660,6 +660,10 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
> >  		goto end;
> >  	}
> >
> > +	/* multicast and promisc mode are always enabled */
> > +	eth_dev->data->promiscuous = 1;
> > +	eth_dev->data->all_multicast = 1;
> > +
> >  	hw = eth_dev->data->dev_private;
> >  	if (virtio_user_dev_init(hw->virtio_user_dev, path, queues, cq,
> >  			 queue_size, mac_addr, &ifname, server_mode,
> > --
> > 2.17.1
> >
diff mbox series

Patch

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 1c575d0cd..b614dd0c0 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -587,7 +587,7 @@  static uint32_t
 virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *vring,
 			    uint16_t idx_hdr)
 {
-	struct virtio_net_ctrl_hdr *hdr;
+	struct virtio_pmd_ctrl *ctrl;
 	virtio_net_ctrl_ack status = ~0;
 	uint16_t i, idx_data, idx_status;
 	uint32_t n_descs = 0;
@@ -606,13 +606,22 @@  virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *vring,
 	idx_status = i;
 	n_descs++;
 
-	hdr = (void *)(uintptr_t)vring->desc[idx_hdr].addr;
-	if (hdr->class == VIRTIO_NET_CTRL_MQ &&
-	    hdr->cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) {
+	ctrl = (void *)(uintptr_t)vring->desc[idx_hdr].addr;
+	if (ctrl->hdr.class == VIRTIO_NET_CTRL_MQ &&
+	    ctrl->hdr.cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) {
 		uint16_t queues;
 
 		queues = *(uint16_t *)(uintptr_t)vring->desc[idx_data].addr;
 		status = virtio_user_handle_mq(dev, queues);
+	} else if (ctrl->hdr.class == VIRTIO_NET_CTRL_RX) {
+		if (ctrl->hdr.cmd == VIRTIO_NET_CTRL_RX_PROMISC ||
+		    ctrl->hdr.cmd == VIRTIO_NET_CTRL_RX_ALLMULTI) {
+			if (ctrl->data[0])
+				status = 0;
+		}
+	} else if (ctrl->hdr.class == VIRTIO_NET_CTRL_MAC ||
+		   ctrl->hdr.class == VIRTIO_NET_CTRL_VLAN) {
+		status = 0;
 	}
 
 	/* Update status */
@@ -635,7 +644,7 @@  virtio_user_handle_ctrl_msg_packed(struct virtio_user_dev *dev,
 				   struct vring_packed *vring,
 				   uint16_t idx_hdr)
 {
-	struct virtio_net_ctrl_hdr *hdr;
+	struct virtio_pmd_ctrl *ctrl;
 	virtio_net_ctrl_ack status = ~0;
 	uint16_t idx_data, idx_status;
 	/* initialize to one, header is first */
@@ -656,14 +665,22 @@  virtio_user_handle_ctrl_msg_packed(struct virtio_user_dev *dev,
 		n_descs++;
 	}
 
-	hdr = (void *)(uintptr_t)vring->desc[idx_hdr].addr;
-	if (hdr->class == VIRTIO_NET_CTRL_MQ &&
-	    hdr->cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) {
+	ctrl = (void *)(uintptr_t)vring->desc[idx_hdr].addr;
+	if (ctrl->hdr.class == VIRTIO_NET_CTRL_MQ &&
+	    ctrl->hdr.cmd == VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET) {
 		uint16_t queues;
 
-		queues = *(uint16_t *)(uintptr_t)
-				vring->desc[idx_data].addr;
+		queues = *(uint16_t *)(uintptr_t)vring->desc[idx_data].addr;
 		status = virtio_user_handle_mq(dev, queues);
+	} else if (ctrl->hdr.class == VIRTIO_NET_CTRL_RX) {
+		if (ctrl->hdr.cmd == VIRTIO_NET_CTRL_RX_PROMISC ||
+		    ctrl->hdr.cmd == VIRTIO_NET_CTRL_RX_ALLMULTI) {
+			if (ctrl->data[0])
+				status = 0;
+		}
+	} else if (ctrl->hdr.class == VIRTIO_NET_CTRL_MAC ||
+		   ctrl->hdr.class == VIRTIO_NET_CTRL_VLAN) {
+		status = 0;
 	}
 
 	/* Update status */
diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index 3fc172573..18caf5e88 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -660,6 +660,10 @@  virtio_user_pmd_probe(struct rte_vdev_device *dev)
 		goto end;
 	}
 
+	/* multicast and promisc mode are always enabled */
+	eth_dev->data->promiscuous = 1;
+	eth_dev->data->all_multicast = 1;
+
 	hw = eth_dev->data->dev_private;
 	if (virtio_user_dev_init(hw->virtio_user_dev, path, queues, cq,
 			 queue_size, mac_addr, &ifname, server_mode,