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 4243842CBC for ; Thu, 15 Jun 2023 03:36:00 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 39ACE42D5C; Thu, 15 Jun 2023 03:36:00 +0200 (CEST) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id A7D4742D4B for ; Thu, 15 Jun 2023 03:35:59 +0200 (CEST) Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-30fc2b44281so3845906f8f.2 for ; Wed, 14 Jun 2023 18:35:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686792959; x=1689384959; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=97yybUD6X8IF8WAAODLxod4dGsPAk+yoEIgUGJupttE=; b=QaX3DgK2U+EfmPa/YP2jwiqM2KaasbHPkCLBZxEluz2t9X05s4OrrPXvsqMka3owel WinEcLkeuIzXFRRpKLJEwwTEY55ul+sXYe790opX3zLuCohmzNhWHEGuWv7RJq8pRu5t zq9IAu2RJ8E2PaTsB3w+KW29IVnPAIefKOXEOA0bDPtcwlyx+/rt0GT68aVOqD5W9JGm IhsJdqGboYVfRhy7Xntx1++PAOZNE8+jOxeuSdnBtNzkBo9LQV50t66Mr/eV66pAtfS9 0l9hP7ztSbhJ07nQAvI4d4uLOOFsbecUN6ZAQkl9LnZFsZyoriI+gPgmAF4q2q+4SZBA 3N8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686792959; x=1689384959; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=97yybUD6X8IF8WAAODLxod4dGsPAk+yoEIgUGJupttE=; b=LvQJrMz/D4+hgKcBsVDClHpYXoLjfJH8LZt2tbc6QA6VaLIlYBg6D+2UnY0PJYWk5o AoPcLfHZN+cXlt9KviPB6yOHTI8Q+rNiL3YDO9OOGdK6lDOuO2Wp7yJi/uwqApi2qJ8j Km2eokiD+xFdOwNIGThPQv+7N12n2E36bqGgB5d2IhTmjdZjZ1EQbKXgIkonzl8Qws3w 8GVzzoGPZNrxbPKMuYZ10q+KhPphpn6xakmpmC2B79KRUsy0MzsrLd+RKYIGw3BrD9sa 9B7CkzhHssVLF1XcevX1T9g87DZxijO7d4ljUdIYk74KaLPLSET7tjSsrXDXB4OHzV/Y 3AIQ== X-Gm-Message-State: AC+VfDyrxbLiyleaKD6p8kQpRn0I8wEUMcytRa6uPTYq75lNdRVBFXnH mGkFS7nM4BPVaSZK9FhBYLsIihNNkU15sg2J X-Google-Smtp-Source: ACHHUZ6eqEEb04356q1t565vOoOqTU1FhypQgl1mH6wdxiElAuwraMiWYI6bsTct/Yd9+Gtf1PJdPA== X-Received: by 2002:adf:db03:0:b0:311:17c5:3a9a with SMTP id s3-20020adfdb03000000b0031117c53a9amr17554wri.38.1686792959345; Wed, 14 Jun 2023 18:35:59 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id u13-20020adfeb4d000000b00301a351a8d6sm19518030wrn.84.2023.06.14.18.35.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 18:35:59 -0700 (PDT) From: luca.boccassi@gmail.com To: Shiyang He Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: release large VF when closing device' has been queued to stable release 20.11.9 Date: Thu, 15 Jun 2023 02:32:51 +0100 Message-Id: <20230615013258.1439718-56-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230615013258.1439718-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 20.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/17/23. 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/f6647f1993d0ec599ab9505a150bc0f23ee15a65 Thanks. Luca Boccassi --- >From f6647f1993d0ec599ab9505a150bc0f23ee15a65 Mon Sep 17 00:00:00 2001 From: Shiyang He Date: Mon, 8 May 2023 16:58:23 +0000 Subject: [PATCH] net/iavf: release large VF when closing device [ upstream commit cdd8d6dfd156709b05ce363d7c5f491cc927330a ] Multiple vfs created based on one PF. If one of the vf requests a large number of queues, the queue resources are not released when exiting the program, resulting in these queues cannot be available to other vfs. This commit fixes the issue by resetting the number of queues to default when closing the dev (refer to the kernel driver) . Fixes: e436cd43835b ("net/iavf: negotiate large VF and request more queues") Signed-off-by: Shiyang He Acked-by: Qi Zhang --- drivers/net/iavf/iavf_ethdev.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 0cb2a457a2..746f6fc335 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -2087,6 +2087,18 @@ iavf_dev_close(struct rte_eth_dev *dev) if (vf->promisc_unicast_enabled || vf->promisc_multicast_enabled) iavf_config_promisc(adapter, false, false); + /* + * Release redundant queue resource when close the dev + * so that other vfs can re-use the queues. + */ + if (vf->lv_enabled) { + ret = iavf_request_queues(dev, IAVF_MAX_NUM_QUEUES_DFLT); + if (ret) + PMD_DRV_LOG(ERR, "Reset the num of queues failed"); + + vf->max_rss_qregion = IAVF_MAX_NUM_QUEUES_DFLT; + } + iavf_shutdown_adminq(hw); /* disable uio intr before callback unregister */ rte_intr_disable(intr_handle); -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-15 01:56:37.525555025 +0100 +++ 0056-net-iavf-release-large-VF-when-closing-device.patch 2023-06-15 01:56:34.711544450 +0100 @@ -1 +1 @@ -From cdd8d6dfd156709b05ce363d7c5f491cc927330a Mon Sep 17 00:00:00 2001 +From f6647f1993d0ec599ab9505a150bc0f23ee15a65 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cdd8d6dfd156709b05ce363d7c5f491cc927330a ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index f6d68403ce..9c55eaa66e 100644 +index 0cb2a457a2..746f6fc335 100644 @@ -26 +27 @@ -@@ -2735,6 +2735,18 @@ iavf_dev_close(struct rte_eth_dev *dev) +@@ -2087,6 +2087,18 @@ iavf_dev_close(struct rte_eth_dev *dev) @@ -43,2 +44,2 @@ - if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_WB_ON_ITR) { - /* disable uio intr before callback unregister */ + /* disable uio intr before callback unregister */ + rte_intr_disable(intr_handle);