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 E6B83455AD for ; Mon, 15 Jul 2024 17:31:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E1FDF40E2B; Mon, 15 Jul 2024 17:31:19 +0200 (CEST) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id 3CCFE40DFB for ; Mon, 15 Jul 2024 17:31:18 +0200 (CEST) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-42797289c8bso32835415e9.0 for ; Mon, 15 Jul 2024 08:31:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057478; x=1721662278; darn=dpdk.org; 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=NdvxmD8dn0YnyhuQc0bUSxpZUACTB4NgDBQvpVJDnmg=; b=YHaNSu9uIunihzHMltinGESNMA3cgDVJsPjGO0ztE5YB3N4ab9+FX1bwSXBxkUr9qh EQlRaUwlbMIvBA3NdEG01qGpNUga5RoCpVfXYQyQyL767dRXT8UbSvBH5B5RL7DbXmdH Nzry/mnnNEWxdj+IFcG0HqYTOZ+5hzYSH6JA/qKvRN7oWQGCMlVyXhigSMc4sBCGaKun ZKJdM9CrIJwGRaRqnfRvcFfdlujdLi9WIkWjOYK4M1MVcvgs2nZlHzd9HjcmYm0roCMF ebGrZBYJQd5GHnli+NFqsqb3aeWp3x9idIRGgCIrb1rKI+tvr/FzWp0qhEd6rqb6lrF/ vGGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057478; x=1721662278; 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=NdvxmD8dn0YnyhuQc0bUSxpZUACTB4NgDBQvpVJDnmg=; b=u+TsMjufikZiPIRzWt8Ngq/b0qo0uB4777x+ii4eSrKaK29ZDya1pF/I1uuqIt/AVQ D5E9n4uPRDpiK1FghNS8bO8QSsxFqY4aYNyDlpYeWwEqpT7mf93UoPl8DArMFUmwLzya Cy9jxqhuCsKu8sJB5tW4CloG6xE6kxRrf5t5/wU6vliW+p3HCObfjw+TAUL0rHFWdUNF E15KMW5i8adXvAjFfM4HpEmUma9gwJws7N096KnfP2u6FxlbiXhlXkYeayVdOPznKI+9 4Uy1Clop08PuMNxNCFrcG2n0u8Srl/wkXTzYrY+YNnJIBUmxdzSZZ+J0Ja1mXm5B9VVD YAfQ== X-Forwarded-Encrypted: i=1; AJvYcCWwGHCuF9OSDAYmj0YvLMGdP4fQlzHu6j0OjEbVcfv7rpUztDA6s8btvhpuDGNvRbR76Qbl0Uc9912h6VFdLRg= X-Gm-Message-State: AOJu0YyLUqw6fk5FFAsSVNidnECpua4O5s4BLbAl8rw7nmoPTTvjItRQ MYmIkpJXrjkIAiB6Cyiz8RCclXNY/0HmJrWiR1aVA1rPJ53eCHkO X-Google-Smtp-Source: AGHT+IF37935bMcvuR2Rvd1J4GfVjM3l3hYzYDFvfU2cCjcUZCM83aeD39EbyaO+uENhZZ5oygV3Mw== X-Received: by 2002:a05:600c:6a17:b0:425:5eec:d261 with SMTP id 5b1f17b1804b1-426708f1999mr129295205e9.34.1721057477833; Mon, 15 Jul 2024 08:31:17 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4279f2cc229sm126619625e9.38.2024.07.15.08.31.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:31:17 -0700 (PDT) From: luca.boccassi@gmail.com To: Peng Zhang Cc: Chaoyong He , Long Wu , dpdk stable Subject: patch 'net/nfp: disable ctrl VNIC queues on close' has been queued to stable release 22.11.6 Date: Mon, 15 Jul 2024 16:26:57 +0100 Message-Id: <20240715152704.2229503-79-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240715152704.2229503-1-luca.boccassi@gmail.com> References: <20240624235907.885628-81-luca.boccassi@gmail.com> <20240715152704.2229503-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 22.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/17/24. 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/59adabd7873c3c17ad879823612ff22b72a238ef Thanks. Luca Boccassi --- >From 59adabd7873c3c17ad879823612ff22b72a238ef Mon Sep 17 00:00:00 2001 From: Peng Zhang Date: Wed, 19 Jun 2024 17:58:09 +0800 Subject: [PATCH] net/nfp: disable ctrl VNIC queues on close [ upstream commit 23a04fe2b8b7775aaa694bb1253c9072b74210fc ] The logic forgot to disable the ctrl VNIC queues when representor port close, and this will cause DPDK application restart fail if not force reload the flower firmware. Fix this by adding the missing logic to disable the ctrl VNIC queues. Fixes: 945441ebdb9c ("net/nfp: add flower ctrl VNIC") Signed-off-by: Peng Zhang Reviewed-by: Chaoyong He Reviewed-by: Long Wu --- drivers/net/nfp/flower/nfp_flower.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index bc1df0d369..360345c50b 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -920,6 +920,8 @@ nfp_flower_cleanup_ctrl_vnic(struct nfp_net_hw *hw) pci_name = strchr(app_fw_flower->pf_hw->pf_dev->pci_dev->name, ':') + 1; + nfp_net_disable_queues(eth_dev); + snprintf(ctrl_txring_name, sizeof(ctrl_txring_name), "%s_cttx_ring", pci_name); for (i = 0; i < hw->max_tx_queues; i++) { txq = eth_dev->data->tx_queues[i]; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-15 16:19:38.527030002 +0100 +++ 0079-net-nfp-disable-ctrl-VNIC-queues-on-close.patch 2024-07-15 16:19:34.724209794 +0100 @@ -1 +1 @@ -From 23a04fe2b8b7775aaa694bb1253c9072b74210fc Mon Sep 17 00:00:00 2001 +From 59adabd7873c3c17ad879823612ff22b72a238ef Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 23a04fe2b8b7775aaa694bb1253c9072b74210fc ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 0edebd574a..5caaf9d745 100644 +index bc1df0d369..360345c50b 100644 @@ -27 +28 @@ -@@ -533,6 +533,8 @@ nfp_flower_cleanup_ctrl_vnic(struct nfp_app_fw_flower *app_fw_flower, +@@ -920,6 +920,8 @@ nfp_flower_cleanup_ctrl_vnic(struct nfp_net_hw *hw) @@ -29 +30 @@ - pci_name = strchr(hw_priv->pf_dev->pci_dev->name, ':') + 1; + pci_name = strchr(app_fw_flower->pf_hw->pf_dev->pci_dev->name, ':') + 1;