From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1BC23A0524 for ; Fri, 5 Feb 2021 12:23:06 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 148D44067B; Fri, 5 Feb 2021 12:23:06 +0100 (CET) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mails.dpdk.org (Postfix) with ESMTP id CD3584067B for ; Fri, 5 Feb 2021 12:23:04 +0100 (CET) Received: by mail-wr1-f42.google.com with SMTP id u14so7305548wri.3 for ; Fri, 05 Feb 2021 03:23:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bcPvFwgTdxLGG1eAKbZtu42QhA2s8Rv9WbseY5d6LIo=; b=hVzHthfY3BTUsux/2WSVr2q6egjNNFRpjkk44IQ+RDVzcol86EAej0yNQYMMoS1Opj C2r1hOBR1Ta2bGte8rs72SHUZg2lObf+0HgEQsN1xKOS0uZ5YlyOP/h07BQB1x6/ZznC 52BHtk1AOlhu//IZtKje38kUSxucor4oDmXLcIwJCXbrZiIYGqdMXZC8AgD8/qdWhL5/ kuYvp1rGD563aO+O9ETs2FRkNHY97uCv1vMtL8huRDXjvMLw/m19TV1aSxoj2DPg05KP m+1XKz6npHOUe25CqxHboeSSU9A7uTWOjFRMyl2NsLVOnUuztXwJSjrcw9OWO8hhbfof XhRA== 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=bcPvFwgTdxLGG1eAKbZtu42QhA2s8Rv9WbseY5d6LIo=; b=oPv97tSE/8F4s6I0OBeSxxQZ0XZqzxs3ocgsWyatdi0JHnodJD2ZyYI3ezHVBiSiAc siCi5ym2rsYZ+zYd0u4rTmjfjepflFngY+JHMr0lTqD5Jj0+RTQ/cZVcK1RN21a7Y+7D ipOCWqrcL8s7/wSWunbXZsyvXysjT1LTVf0AqxKdVu+Ye4g54mSkQZO8Hz1vngNHBxCk w7YCQMOFJXQ88xQU529Po/qPNfM0TjWAugY2GEP1ws8FvVItXpbtsmAyuK/rsN0L7nL0 jjFJYGAntV+yQgiwIbviQNPCZGMA9bzjqPRX6ZQxDNtoBNSNTGA1V/cgPYMGLKKb03sj bhpw== X-Gm-Message-State: AOAM53362L4yyMDavkx6ANkNAz/rRLVM5eW4J21WhO3xSfUoZLwGc0Bm YfsGbH/7WBS173sPxGvdYeM3Uv5rWExgdLEA X-Google-Smtp-Source: ABdhPJwdJRRLG69FuamckWSdYNPtQ5mBNA0xyYAh1N55TLshR/RvqBMqe3EEbUQ7tOFjFniuSgh7ng== X-Received: by 2002:a5d:6842:: with SMTP id o2mr4622642wrw.310.1612524184664; Fri, 05 Feb 2021 03:23:04 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id b18sm12111800wrm.57.2021.02.05.03.23.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:23:04 -0800 (PST) From: luca.boccassi@gmail.com To: Alvin Zhang Cc: Zhimin Huang , Qi Zhang , dpdk stable Date: Fri, 5 Feb 2021 11:15:52 +0000 Message-Id: <20210205111920.1272063-66-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/iavf: fix queue pairs configuration' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/f8779d9a362955e703963487356e264528740091 Thanks. Luca Boccassi --- >From f8779d9a362955e703963487356e264528740091 Mon Sep 17 00:00:00 2001 From: Alvin Zhang Date: Wed, 23 Dec 2020 13:29:36 +0800 Subject: [PATCH] net/iavf: fix queue pairs configuration [ upstream commit 403aebc44c04952f98fc7501e26eb77098d74bc8 ] Check if there are enough queue pairs currently allocated, and if not, request PF to allocate them. Fixes: e436cd43835b ("net/iavf: negotiate large VF and request more queues") Signed-off-by: Alvin Zhang Tested-by: Zhimin Huang Acked-by: Qi Zhang --- drivers/net/iavf/iavf_ethdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 7e3c26a94e..f0151215e6 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -372,8 +372,10 @@ iavf_dev_configure(struct rte_eth_dev *dev) } else { /* Check if large VF is already enabled. If so, disable and * release redundant queue resource. + * Or check if enough queue pairs. If not, request them from PF. */ - if (vf->lv_enabled) { + if (vf->lv_enabled || + num_queue_pairs > vf->vsi_res->num_queue_pairs) { ret = iavf_queues_req_reset(dev, num_queue_pairs); if (ret) return ret; -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:32.236339725 +0000 +++ 0066-net-iavf-fix-queue-pairs-configuration.patch 2021-02-05 11:18:28.826691493 +0000 @@ -1 +1 @@ -From 403aebc44c04952f98fc7501e26eb77098d74bc8 Mon Sep 17 00:00:00 2001 +From f8779d9a362955e703963487356e264528740091 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 403aebc44c04952f98fc7501e26eb77098d74bc8 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index d2fa168256..7bf31d4f4e 100644 +index 7e3c26a94e..f0151215e6 100644 @@ -23 +24 @@ -@@ -375,8 +375,10 @@ iavf_dev_configure(struct rte_eth_dev *dev) +@@ -372,8 +372,10 @@ iavf_dev_configure(struct rte_eth_dev *dev)