All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tiwei Bie <tiwei.bie@intel.com>
To: Marvin Liu <yong.liu@intel.com>
Cc: maxime.coquelin@redhat.com, zhihong.wang@intel.com, dev@dpdk.org,
	stable@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v3] net/virtio: fix multicast and promisc mode enable failure
Date: Tue, 29 Oct 2019 20:27:37 +0800	[thread overview]
Message-ID: <20191029122737.GA7883@___> (raw)
In-Reply-To: <20191028164220.14196-1-yong.liu@intel.com>

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
> 

  reply	other threads:[~2019-10-29 12:26 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-28 15:40 [dpdk-dev] [PATCH] net/virtio: fix promisc mode enable failure Marvin Liu
2019-10-28 16:24 ` [dpdk-dev] [PATCH v2] net/virtio: fix multicast and " Marvin Liu
2019-10-28 16:42   ` [dpdk-dev] [PATCH v3] " Marvin Liu
2019-10-29 12:27     ` Tiwei Bie [this message]
2019-10-30  2:41       ` Liu, Yong
2019-10-30 10:30     ` [dpdk-dev] [PATCH v4] " Marvin Liu
2019-10-30 15:25       ` [dpdk-dev] [PATCH v5] " Marvin Liu
2019-11-06  9:02         ` [dpdk-dev] [PATCH v6] net/virtio-user: fix failures when setting filters Marvin Liu
2019-11-06 19:54           ` Maxime Coquelin
2019-11-06 21:00           ` Maxime Coquelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191029122737.GA7883@___ \
    --to=tiwei.bie@intel.com \
    --cc=dev@dpdk.org \
    --cc=maxime.coquelin@redhat.com \
    --cc=stable@dpdk.org \
    --cc=yong.liu@intel.com \
    --cc=zhihong.wang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.