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 97A52455AD for ; Mon, 15 Jul 2024 17:31:16 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9389340E25; Mon, 15 Jul 2024 17:31:16 +0200 (CEST) Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by mails.dpdk.org (Postfix) with ESMTP id A4AD140E24 for ; Mon, 15 Jul 2024 17:31:15 +0200 (CEST) Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2eec7e431d9so57225971fa.2 for ; Mon, 15 Jul 2024 08:31:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057475; x=1721662275; 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=sftuDP0g+Y/mOf5SGmtKHl0xhAZRJ/DkuvG+kUpySEk=; b=NxmGN8n9Sl+zu5m7phzWAhCcL1+MYnnU7s9lsAQuPxEnroQWVdlhnYbH0iKKvnwWoe RbQ5ldR3sm4LgvtvHTtKWhANs9yVeYSIdH2MkXFrPRgx2fa4NSp5t1P2VwxzGabecqI7 GcrSBXDrQarEdYYuHZzR9JaMtOjKyhwNvaGOxI+Nhuy1YOg72vgWNNlUOZhFPK4jsgsb YI8VHAZRJBkM4wwY/66F/k+dEpbMGFZz45eXq5YvkoMhUROUsovSLZyaVFF9qbChdSyD pahMRELkZ1sfKN0lD1xOwoXYFgmCwv7USKj0cuu8sIbR58Kqz2MGGzaPhUyX5cdL1ofa LsIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057475; x=1721662275; 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=sftuDP0g+Y/mOf5SGmtKHl0xhAZRJ/DkuvG+kUpySEk=; b=Ig8Lmx3OQn1mLfsmI1H2OFeQN3RgOg3TNgmBWHLuTI9xmQJP01ThQ+XI/5hqxHh13r rdmudJ2qR5uakb3SVsoKgivVg+NTZWvQ6w1r2eyUlbCTl5hglNIP0z9SnPauMNe3e3s2 hRs1I2p+FQEipTFU06lg50IzbzLmNdCVvoXDBqA/MJzOfHHBXYn4qPaAx3j9czfnOEpv ZuHPnf0ZkiA1WtVd5pdg26YFHEgePjP1gNLDJMhkfEKdr9QPopkMxJdliFnENMfTs1Iu wxqp2JW7uo7gcgbNb1lk+JkaMtqydO9AmzWoM42dycDRdNFo1CPQZizVpIuR9U85IKGn aKJg== X-Forwarded-Encrypted: i=1; AJvYcCVH14/IJnecu5u0uAuiH2wsMYV3vLnpPDI5DGMjLZ5A237M1uDLeMyF451p4zNJmjc2FnD4u2pBSpsacNK6EX0= X-Gm-Message-State: AOJu0YyAVtJmaCw5Y27gBkLqC3qD3bTv08d//QKf50Vf7dbdM8Zo0EqS sKor9DRshZ4LtA1U8oEYF0SAkr55Gd5Sx8DeukU+0IoS/tFLUNyb X-Google-Smtp-Source: AGHT+IHK3aNVPV9QWhXn6UVmMFimWLrB55wWZfxvjt7nsLKhEwQHeCp+k80aPBK8i7/ZA8XeA5TsOw== X-Received: by 2002:a2e:9ad5:0:b0:2ee:8555:4742 with SMTP id 38308e7fff4ca-2eef2d718e1mr1587291fa.27.1721057475062; Mon, 15 Jul 2024 08:31:15 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3680dafb9aasm6696233f8f.67.2024.07.15.08.31.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:31:14 -0700 (PDT) From: luca.boccassi@gmail.com To: Chaoyong He Cc: Long Wu , Peng Zhang , dpdk stable Subject: patch 'net/nfp: fix allocation of switch domain' has been queued to stable release 22.11.6 Date: Mon, 15 Jul 2024 16:26:55 +0100 Message-Id: <20240715152704.2229503-77-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/087d968fc074cdd4d1177518c6fcd512d6d63db7 Thanks. Luca Boccassi --- >From 087d968fc074cdd4d1177518c6fcd512d6d63db7 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Wed, 19 Jun 2024 17:51:33 +0800 Subject: [PATCH] net/nfp: fix allocation of switch domain [ upstream commit e393598fc2967284398fcdfee6c7a75d0ceb95db ] The check of 'RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID' cause the following call of 'rte_eth_switch_domain_alloc()' never trigger. Fix this by just remove the check logic. Fixes: e1124c4f8a45 ("net/nfp: add flower representor framework") Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower_representor.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index 090c828c18..b6e58d31ff 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -1047,10 +1047,9 @@ nfp_flower_repr_create(struct nfp_app_fw_flower *app_fw_flower) pci_dev = pf_dev->pci_dev; /* Allocate a switch domain for the flower app */ - if (app_fw_flower->switch_domain_id == RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID && - rte_eth_switch_domain_alloc(&app_fw_flower->switch_domain_id) != 0) { + ret = rte_eth_switch_domain_alloc(&app_fw_flower->switch_domain_id); + if (ret != 0) PMD_INIT_LOG(WARNING, "failed to allocate switch domain for device"); - } /* Now parse PCI device args passed for representor info */ if (pci_dev->device.devargs != NULL) { -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-15 16:19:38.441155274 +0100 +++ 0077-net-nfp-fix-allocation-of-switch-domain.patch 2024-07-15 16:19:34.720209709 +0100 @@ -1 +1 @@ -From e393598fc2967284398fcdfee6c7a75d0ceb95db Mon Sep 17 00:00:00 2001 +From 087d968fc074cdd4d1177518c6fcd512d6d63db7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e393598fc2967284398fcdfee6c7a75d0ceb95db ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 700957f945..e7550ce9ef 100644 +index 090c828c18..b6e58d31ff 100644 @@ -25 +26 @@ -@@ -907,10 +907,9 @@ nfp_flower_repr_create(struct nfp_app_fw_flower *app_fw_flower, +@@ -1047,10 +1047,9 @@ nfp_flower_repr_create(struct nfp_app_fw_flower *app_fw_flower)