From patchwork Tue Mar 31 17:13:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 67510 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1C549A0562; Tue, 31 Mar 2020 19:14:35 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4452A1C0BD; Tue, 31 Mar 2020 19:14:24 +0200 (CEST) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by dpdk.org (Postfix) with ESMTP id C517A1C0B3 for ; Tue, 31 Mar 2020 19:14:18 +0200 (CEST) Received: by mail-pl1-f195.google.com with SMTP id w3so8351201plz.5 for ; Tue, 31 Mar 2020 10:14:18 -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=69DDz4/vG4oGSwLpYSfJUUGqnJ8PAp3rYp/b+qIzf3A=; b=Nw78t6TguKQuGvKa0h64xbTYcq1T9kIPkteHVYWWj+V6WkDG1ewfFyDMpvAG1aUQxI w6l4GXGTGYm6gjM8fcgUZILw7T5wsd7jrsbvCvZekTJob/S3A8k9qqElU6T5c3ViW/bk L66bN+16Q08Se1STbjgE+dv4z8YBZuu1SSmKQdkpAN8T/n0qEHyAoQBFDwyasNokXnr+ 0+QPLLptdSgYkTIbXuIqj+Z5UkqNngdQMUTws10Vu0A9G0A5phqvUpDP4/4Nk4Cz74z5 QHVduQY9uM0gy3CVTZCiC+EvNu+u+IaMhhMnhZ68jxIbtHVLEmldV7SnjqYEOgnmV8J5 1FiA== 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=69DDz4/vG4oGSwLpYSfJUUGqnJ8PAp3rYp/b+qIzf3A=; b=k6RcNuQe1Vmc3oiJvyCD2pegXn4Rs5FxPAGMouT0vKxgtETz3HXgnQ7anR9SInuleC E0LhDW3+1VUfi9AAdU1gl/KYDVFe0pSJuUyTogmDCDS1xm+H/gpbLrdu42W7kopRULLC K3f4bTydLjUL9apJcIi/4Q0ARYpvImsTyFKK4xR61t8luoI1lxFgu5v1uXMd8p6+0qfa BBVJHbGGwiS2CEWhiGUC1oSlbigN2cfzhb+NlRgRkKpNe3za576GX7weOHjLAHDO+U8n eq5I9oqG7LDd+XuK/SWK4ehTcigHr9fChRrtIVl3hlE8zNlVt1OEMUIUq4CZ0njGlotB J/og== X-Gm-Message-State: ANhLgQ3qQy9AO9NhAJTUD47oi8MwgTXBqPCqhVT/jXmPNGLzZMFM8U2W pqFV+U9QIo8HvJC5CfsuBzBYnlQuLY5Y/w== X-Google-Smtp-Source: ADFU+vu7bpvCrCOKRgxpimwhMfKEG++F1Udsc6bgIFnE4gF0464wmGIwuH5WW8XP5mv7Ahs7lp+5tA== X-Received: by 2002:a17:902:76ca:: with SMTP id j10mr18189268plt.184.1585674857409; Tue, 31 Mar 2020 10:14:17 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id i124sm12869764pfg.14.2020.03.31.10.14.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2020 10:14:16 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , stable@dpdk.org Date: Tue, 31 Mar 2020 10:13:58 -0700 Message-Id: <20200331171404.23596-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200331171404.23596-1-stephen@networkplumber.org> References: <20200316235612.29854-1-stephen@networkplumber.org> <20200331171404.23596-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 2/8] net/netvsc: handle receive packets during multi-channel setup 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" It is possible for a packet to arrive during the configuration process when setting up multiple queue mode. This would cause configure to fail; fix by just ignoring receive packets while waiting for control commands. Use the receive ring lock to avoid possible races between oddly behaved applications doing rx_burst and control operations concurrently. Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device") Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger --- drivers/net/netvsc/hn_nvs.c | 41 +++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/drivers/net/netvsc/hn_nvs.c b/drivers/net/netvsc/hn_nvs.c index 6b518685ab6f..477202b2a0b7 100644 --- a/drivers/net/netvsc/hn_nvs.c +++ b/drivers/net/netvsc/hn_nvs.c @@ -54,7 +54,7 @@ static int hn_nvs_req_send(struct hn_data *hv, } static int -hn_nvs_execute(struct hn_data *hv, +__hn_nvs_execute(struct hn_data *hv, void *req, uint32_t reqlen, void *resp, uint32_t resplen, uint32_t type) @@ -62,6 +62,7 @@ hn_nvs_execute(struct hn_data *hv, struct vmbus_channel *chan = hn_primary_chan(hv); char buffer[NVS_RESPSIZE_MAX]; const struct hn_nvs_hdr *hdr; + uint64_t xactid; uint32_t len; int ret; @@ -77,7 +78,7 @@ hn_nvs_execute(struct hn_data *hv, retry: len = sizeof(buffer); - ret = rte_vmbus_chan_recv(chan, buffer, &len, NULL); + ret = rte_vmbus_chan_recv(chan, buffer, &len, &xactid); if (ret == -EAGAIN) { rte_delay_us(HN_CHAN_INTERVAL_US); goto retry; @@ -88,7 +89,20 @@ hn_nvs_execute(struct hn_data *hv, return ret; } + if (len < sizeof(*hdr)) { + PMD_DRV_LOG(ERR, "response missing NVS header"); + return -EINVAL; + } + hdr = (struct hn_nvs_hdr *)buffer; + + /* Silently drop received packets while waiting for response */ + if (hdr->type == NVS_TYPE_RNDIS) { + hn_nvs_ack_rxbuf(chan, xactid); + --hv->rxbuf_outstanding; + goto retry; + } + if (hdr->type != type) { PMD_DRV_LOG(ERR, "unexpected NVS resp %#x, expect %#x", hdr->type, type); @@ -108,6 +122,29 @@ hn_nvs_execute(struct hn_data *hv, return 0; } + +/* + * Execute one control command and get the response. + * Only one command can be active on a channel at once + * Unlike BSD, DPDK does not have an interrupt context + * so the polling is required to wait for response. + */ +static int +hn_nvs_execute(struct hn_data *hv, + void *req, uint32_t reqlen, + void *resp, uint32_t resplen, + uint32_t type) +{ + struct hn_rx_queue *rxq = hv->primary; + int ret; + + rte_spinlock_lock(&rxq->ring_lock); + ret = __hn_nvs_execute(hv, req, reqlen, resp, resplen, type); + rte_spinlock_unlock(&rxq->ring_lock); + + return ret; +} + static int hn_nvs_doinit(struct hn_data *hv, uint32_t nvs_ver) {