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 DA245A034F for ; Tue, 1 Mar 2022 11:46:05 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D5868426DC; Tue, 1 Mar 2022 11:46:05 +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 2B302426E1 for ; Tue, 1 Mar 2022 11:46:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131563; 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=uCs+lLCfwfDDUu0g4q3nKwZX+hoyAd40JjnIxACucdw=; b=RmD3ncqbMwn3kSBOe+mPaYloZkRmBG+bGZgLJqCgSraPL05MKB/0Z8uhg1Zx2Bu91+5iM7 p9lbCTZRfH9xMWn93FBSFSabxn8q4Cw/hpH0uGrqV0zz0wrF/GyAZOgGHqcXGFYkTkOOsy VJEqGB9iJv1/42gY9z9nHUoErlMCO/E= 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-124-3LicYQEmM-m8iEczpXAROg-1; Tue, 01 Mar 2022 05:46:00 -0500 X-MC-Unique: 3LicYQEmM-m8iEczpXAROg-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 9ED8751DF; Tue, 1 Mar 2022 10:45:59 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9AC63721DF; Tue, 1 Mar 2022 10:45:58 +0000 (UTC) From: Kevin Traynor To: Nithin Dabilpuram Cc: Jerin Jacob , dpdk stable Subject: patch 'net/cnxk: fix inline device RQ tag mask' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:45 +0000 Message-Id: <20220301104300.334382-89-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/12640e77b816edb6a2e74b9d672c3500d8c1a275 Thanks. Kevin --- >From 12640e77b816edb6a2e74b9d672c3500d8c1a275 Mon Sep 17 00:00:00 2001 From: Nithin Dabilpuram Date: Wed, 23 Feb 2022 01:05:03 +0530 Subject: [PATCH] net/cnxk: fix inline device RQ tag mask [ upstream commit 82529cff18df734262077661c6a91560b1fd8833 ] Fix inline device RQ tagmask to get packets with receive errors as type ETHDEV packets to callback handler so that packet buffers can get freed. Currently only IPsec denied packets get the right tag mask. Fixes: ee48f711f3b0 ("common/cnxk: support NIX inline inbound and outbound setup") Signed-off-by: Nithin Dabilpuram Acked-by: Jerin Jacob --- drivers/common/cnxk/roc_nix_inl.c | 2 +- drivers/net/cnxk/cnxk_ethdev.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/common/cnxk/roc_nix_inl.c b/drivers/common/cnxk/roc_nix_inl.c index e8981c4aa4..e71774cf4a 100644 --- a/drivers/common/cnxk/roc_nix_inl.c +++ b/drivers/common/cnxk/roc_nix_inl.c @@ -534,5 +534,5 @@ roc_nix_inl_dev_rq_get(struct roc_nix_rq *rq) inl_rq->flow_tag_width = 20; /* Special tag mask */ - inl_rq->tag_mask = 0xFFF00000; + inl_rq->tag_mask = rq->tag_mask; inl_rq->tt = SSO_TT_ORDERED; inl_rq->hwgrp = 0; diff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c index a90c2ae321..0c38f013c2 100644 --- a/drivers/net/cnxk/cnxk_ethdev.c +++ b/drivers/net/cnxk/cnxk_ethdev.c @@ -4,4 +4,6 @@ #include +#include + static inline uint64_t nix_get_rx_offload_capa(struct cnxk_eth_dev *dev) @@ -598,4 +600,11 @@ cnxk_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t qid, if (dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SECURITY) { + /* Pass a tagmask used to handle error packets in inline device. + * Ethdev rq's tag_mask field will be overwritten later + * when sso is setup. + */ + rq->tag_mask = + 0x0FF00000 | ((uint32_t)RTE_EVENT_TYPE_ETHDEV << 28); + /* Setup rq reference for inline dev if present */ rc = roc_nix_inl_dev_rq_get(rq); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:03.867351456 +0000 +++ 0089-net-cnxk-fix-inline-device-RQ-tag-mask.patch 2022-03-01 10:41:01.458244129 +0000 @@ -1 +1 @@ -From 82529cff18df734262077661c6a91560b1fd8833 Mon Sep 17 00:00:00 2001 +From 12640e77b816edb6a2e74b9d672c3500d8c1a275 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 82529cff18df734262077661c6a91560b1fd8833 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 003f972aeb..11a169137b 100644 +index e8981c4aa4..e71774cf4a 100644 @@ -25 +26 @@ -@@ -585,5 +585,5 @@ roc_nix_inl_dev_rq_get(struct roc_nix_rq *rq) +@@ -534,5 +534,5 @@ roc_nix_inl_dev_rq_get(struct roc_nix_rq *rq) @@ -33 +34 @@ -index 0558bc3eed..a2b2679398 100644 +index a90c2ae321..0c38f013c2 100644