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 03EC6A034F for ; Tue, 1 Mar 2022 11:46:07 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F2A92407FF; Tue, 1 Mar 2022 11:46:06 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 71D02426E8 for ; Tue, 1 Mar 2022 11:46:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NjgymQQhTHMGOpUmpGX8Unl5mLPsgvgQgApmdIebMi0=; b=VunQbFbKU/QJ/j9r8sb15ZzlrNRdiupsYIK9l2R0kAhuYaIKUNeP1PpUt5fzOURsaxKEuA /aEIBpni3cAqH1Wqh56w5JumbBZYfg3L86fm2Xf/P5sdJkAMq6ZVscWPbLr1p8Bi6M8alg G1h2lG6LeUmlTxKr7yjzRL/cwWBuzXc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-220-lqV6bP2XO9KDyr3aC9XCZA-1; Tue, 01 Mar 2022 05:46:02 -0500 X-MC-Unique: lqV6bP2XO9KDyr3aC9XCZA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1ACAC814614; Tue, 1 Mar 2022 10:46:01 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 103A3721DF; Tue, 1 Mar 2022 10:45:59 +0000 (UTC) From: Kevin Traynor To: Nithin Dabilpuram Cc: Jerin Jacob , dpdk stable Subject: patch 'net/cnxk: register callback early to handle initial packets' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:46 +0000 Message-Id: <20220301104300.334382-90-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.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 03/06/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/667b3995446d943219c906bde6d13f10f2aeff5b Thanks. Kevin --- >From 667b3995446d943219c906bde6d13f10f2aeff5b Mon Sep 17 00:00:00 2001 From: Nithin Dabilpuram Date: Wed, 23 Feb 2022 01:05:04 +0530 Subject: [PATCH] net/cnxk: register callback early to handle initial packets [ upstream commit fb35a2c703ca5e05067a2f94965a06da8626875d ] Register callback early to handle initial error packets from inline device. Fixes: 69daa9e5022b ("net/cnxk: support inline security setup for cn10k") Signed-off-by: Nithin Dabilpuram Acked-by: Jerin Jacob --- drivers/net/cnxk/cn10k_ethdev.c | 6 ++++++ drivers/net/cnxk/cn10k_ethdev.h | 3 +++ drivers/net/cnxk/cn10k_ethdev_sec.c | 5 +---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/net/cnxk/cn10k_ethdev.c b/drivers/net/cnxk/cn10k_ethdev.c index 8378cbffc2..c36b858110 100644 --- a/drivers/net/cnxk/cn10k_ethdev.c +++ b/drivers/net/cnxk/cn10k_ethdev.c @@ -314,4 +314,10 @@ cn10k_nix_configure(struct rte_eth_dev *eth_dev) return rc; + if (dev->tx_offloads & RTE_ETH_TX_OFFLOAD_SECURITY || + dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SECURITY) { + /* Register callback to handle security error work */ + roc_nix_inl_cb_register(cn10k_eth_sec_sso_work_cb, NULL); + } + /* Update offload flags */ dev->rx_offload_flags = nix_rx_offload_flags(eth_dev); diff --git a/drivers/net/cnxk/cn10k_ethdev.h b/drivers/net/cnxk/cn10k_ethdev.h index 0982158c62..13403e14c4 100644 --- a/drivers/net/cnxk/cn10k_ethdev.h +++ b/drivers/net/cnxk/cn10k_ethdev.h @@ -83,4 +83,7 @@ void cn10k_eth_set_tx_function(struct rte_eth_dev *eth_dev); void cn10k_eth_sec_ops_override(void); +/* SSO Work callback */ +void cn10k_eth_sec_sso_work_cb(uint64_t *gw, void *args); + #define LMT_OFF(lmt_addr, lmt_num, offset) \ (void *)((uintptr_t)(lmt_addr) + \ diff --git a/drivers/net/cnxk/cn10k_ethdev_sec.c b/drivers/net/cnxk/cn10k_ethdev_sec.c index 235c16840e..a517421b12 100644 --- a/drivers/net/cnxk/cn10k_ethdev_sec.c +++ b/drivers/net/cnxk/cn10k_ethdev_sec.c @@ -139,5 +139,5 @@ static const struct rte_security_capability cn10k_eth_sec_capabilities[] = { }; -static void +void cn10k_eth_sec_sso_work_cb(uint64_t *gw, void *args) { @@ -250,7 +250,4 @@ cn10k_eth_sec_session_create(void *device, return -ENOTSUP; - if (rte_eal_process_type() == RTE_PROC_PRIMARY) - roc_nix_inl_cb_register(cn10k_eth_sec_sso_work_cb, NULL); - ipsec = &conf->ipsec; crypto = conf->crypto_xform; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:03.887217543 +0000 +++ 0090-net-cnxk-register-callback-early-to-handle-initial-p.patch 2022-03-01 10:41:01.459244130 +0000 @@ -1 +1 @@ -From fb35a2c703ca5e05067a2f94965a06da8626875d Mon Sep 17 00:00:00 2001 +From 667b3995446d943219c906bde6d13f10f2aeff5b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fb35a2c703ca5e05067a2f94965a06da8626875d ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 03ca1abe45..c6890f3699 100644 +index 8378cbffc2..c36b858110 100644 @@ -24 +25 @@ -@@ -295,4 +295,10 @@ cn10k_nix_configure(struct rte_eth_dev *eth_dev) +@@ -314,4 +314,10 @@ cn10k_nix_configure(struct rte_eth_dev *eth_dev) @@ -36 +37 @@ -index ec40e53152..fd7273078a 100644 +index 0982158c62..13403e14c4 100644 @@ -39 +40 @@ -@@ -82,4 +82,7 @@ void cn10k_eth_set_tx_function(struct rte_eth_dev *eth_dev); +@@ -83,4 +83,7 @@ void cn10k_eth_set_tx_function(struct rte_eth_dev *eth_dev); @@ -48 +49 @@ -index 6fbf444038..ac45056936 100644 +index 235c16840e..a517421b12 100644 @@ -58 +59 @@ -@@ -252,7 +252,4 @@ cn10k_eth_sec_session_create(void *device, +@@ -250,7 +250,4 @@ cn10k_eth_sec_session_create(void *device,