From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 91C93A0679 for ; Tue, 30 Apr 2019 20:12:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8C9035911; Tue, 30 Apr 2019 20:12:31 +0200 (CEST) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by dpdk.org (Postfix) with ESMTP id 5AA2458CB for ; Tue, 30 Apr 2019 20:12:29 +0200 (CEST) Received: by mail-pg1-f194.google.com with SMTP id i21so3759992pgi.12 for ; Tue, 30 Apr 2019 11:12:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GBfwROpRn1A3EvCiDHFVOFv9FQA/Vfy9DII+/71GiMw=; b=bN4fNtSCWIIlbptkZvv0V2Y39OI3KoHJQuLS5NVDUVRYt0iy8xNtw1eJk+0o0t1TcV uXxknzLIA6v0lh7AJNnqUI8GXuCvpACH9f1fALUoYmUIM4pwVslC0U1kgP7bP8AGCw3V B9YNpot/6S+X0WFL5kVUmSgN3cdANA3Nm51wndv9U1HsLu4rnDjVmIw+aOuS++M9ZGEf 4TTQP+GZJfy+4mQ80hPjcMd23rncMiOcwQgEby7fafLYdUNICNwYiDh0Ahf2gE3Rogvs Z5IAqm6iFm/rU01hqA7sQDPRfdg1GV26IdC+8FUhlEwVW19h+90o71UkXSoZu6bPDuto pVGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GBfwROpRn1A3EvCiDHFVOFv9FQA/Vfy9DII+/71GiMw=; b=VT0MaAjkxbAV42WbU/+RvFPrYJ527ogKamW9nzGsqwENOCvWEjHIU8A15bmi6v1Yst Tx1z0PlLxFgZEIGqCi2jWwiGwPbD2yD5O01khpxOBsxz02RCH/uI68dZ7sUniGJ9pi18 NqyAHGg/W3ziUcq9GxqrvvyXhOD2XGR0S7cOnlNR6821II9cCCKoaU2SVdxkiBwKzzsN ZMPud8SbiQOpz2gYtWnma8tBrvvG7PbOjzcpC6py50QF9yKZ5+vP38MHSg6gc/PLuaW+ Ehde/+MS2poWtEXN62HsaDkwFWwdXfUQKG90joNges6AjM54ulbOYgt2TDHmvexf+TNT 6w2Q== X-Gm-Message-State: APjAAAVl4CBrmwxjixevsaK1nbIg6JPCIEQMEVdVebe7Sc8MrTiiBvGx t29Q5CMQ5mW67IMcWck//jH/aPq1myc= X-Google-Smtp-Source: APXvYqxvQ0fHDlf4dS8teQS2kG7IHoDig+wdZY5VIDMKKR4flRpwJgkMoS9Ol6rEXYwImTTPK1tQrg== X-Received: by 2002:aa7:8589:: with SMTP id w9mr72570985pfn.97.1556647947921; Tue, 30 Apr 2019 11:12:27 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id z7sm68660462pgh.81.2019.04.30.11.12.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Apr 2019 11:12:26 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 30 Apr 2019 11:12:16 -0700 Message-Id: <20190430181217.20875-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190430181217.20875-1-stephen@networkplumber.org> References: <20190429203325.10696-1-stephen@networkplumber.org> <20190430181217.20875-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 1/2] net/netvsc: reset mbuf port on VF receive X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Content-Type: text/plain; charset="UTF-8" Message-ID: <20190430181216.cWFuF5NOEZxRzGu96VJkx5Xgbt36X4RWZ9Scszk25cA@z> From: Stephen Hemminger Redo the receive logic to set m->port on packets received on VF. When using VF, still need to check for packets and completions arriving on the VMBus path even if application is not doing bursting (ie n_rx == 0). Also, fix comment. Signed-off-by: Stephen Hemminger Fixes: dc7680e8597c ("net/netvsc: support integrated VF") --- v2 - add fixes drivers/net/netvsc/hn_rxtx.c | 47 +++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c index c67e9ae25376..7856f7e6ec48 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -1393,6 +1393,24 @@ hn_xmit_pkts(void *ptxq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) return nb_tx; } +static uint16_t +hn_recv_vf(uint16_t vf_port, const struct hn_rx_queue *rxq, + struct rte_mbuf **rx_pkts, uint16_t nb_pkts) +{ + uint16_t i, n; + + if (unlikely(nb_pkts == 0)) + return 0; + + n = rte_eth_rx_burst(vf_port, rxq->queue_id, rx_pkts, nb_pkts); + + /* relabel the received mbufs */ + for (i = 0; i < n; i++) + rx_pkts[i]->port = rxq->port_id; + + return n; +} + uint16_t hn_recv_pkts(void *prxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) { @@ -1404,30 +1422,21 @@ hn_recv_pkts(void *prxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) if (unlikely(hv->closed)) return 0; - /* Transmit over VF if present and up */ + /* Receive from VF if present and up */ vf_dev = hn_get_vf_dev(hv); - if (vf_dev && vf_dev->data->dev_started) { - /* Normally, with SR-IOV the ring buffer will be empty */ + /* Check for new completions */ + if (likely(rte_ring_count(rxq->rx_ring) < nb_pkts)) hn_process_events(hv, rxq->queue_id, 0); - /* Get mbufs some bufs off of staging ring */ - nb_rcv = rte_ring_sc_dequeue_burst(rxq->rx_ring, - (void **)rx_pkts, - nb_pkts / 2, NULL); - /* And rest off of VF */ - nb_rcv += rte_eth_rx_burst(vf_dev->data->port_id, - rxq->queue_id, - rx_pkts + nb_rcv, nb_pkts - nb_rcv); - } else { - /* If receive ring is not full then get more */ - if (rte_ring_count(rxq->rx_ring) < nb_pkts) - hn_process_events(hv, rxq->queue_id, 0); + /* Always check the vmbus path for multicast and new flows */ + nb_rcv = rte_ring_sc_dequeue_burst(rxq->rx_ring, + (void **)rx_pkts, nb_pkts, NULL); - nb_rcv = rte_ring_sc_dequeue_burst(rxq->rx_ring, - (void **)rx_pkts, - nb_pkts, NULL); - } + /* If VF is available, check that as well */ + if (vf_dev && vf_dev->data->dev_started) + nb_rcv += hn_recv_vf(vf_dev->data->port_id, rxq, + rx_pkts + nb_rcv, nb_pkts - nb_rcv); return nb_rcv; } -- 2.20.1