From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 8BC99A00BE;
Tue, 29 Oct 2019 13:26:51 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 67EAF1BEBE;
Tue, 29 Oct 2019 13:26:51 +0100 (CET)
Received: from mga06.intel.com (mga06.intel.com [134.134.136.31])
by dpdk.org (Postfix) with ESMTP id 7DC3B1BEAF;
Tue, 29 Oct 2019 13:26:49 +0100 (CET)
X-Amp-Result: UNKNOWN
X-Amp-Original-Verdict: FILE UNKNOWN
X-Amp-File-Uploaded: False
Received: from fmsmga002.fm.intel.com ([10.253.24.26])
by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
29 Oct 2019 05:26:48 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.68,243,1569308400"; d="scan'208";a="230039940"
Received: from dpdk-virtio-tbie-2.sh.intel.com (HELO ___) ([10.67.104.74])
by fmsmga002.fm.intel.com with ESMTP; 29 Oct 2019 05:26:46 -0700
Date: Tue, 29 Oct 2019 20:27:37 +0800
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
Message-ID: <20191029122737.GA7883@___>
References: <20191028162425.95853-1-yong.liu@intel.com>
<20191028164220.14196-1-yong.liu@intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20191028164220.14196-1-yong.liu@intel.com>
User-Agent: Mutt/1.9.4 (2018-02-28)
Subject: Re: [dpdk-dev] [PATCH v3] net/virtio: fix multicast and promisc
mode enable failure
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
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
>