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 90721A0C3F for ; Sat, 12 Jun 2021 01:10:47 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8B38C4014F; Sat, 12 Jun 2021 01:10:47 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2051.outbound.protection.outlook.com [40.107.220.51]) by mails.dpdk.org (Postfix) with ESMTP id 0E7B74014F for ; Sat, 12 Jun 2021 01:10:46 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J7J+c129uy69MfLwx+2S3DXpbOVq44qCPDgCyh1mylRh64sVd0NSOiSc+U5ZDhDk7dVIpEEok8S1wDmEh40VJMtn7YypCXMM7Kcz3ODXkT6Vp0sMzj/DsX+ve6S1mPZgUkhmoChoWpbNHD39+K03H07p2G4l1rLUFignrm8ROazs24y0cCS0B+4AoP/iD0mJawemo0a1bp74xqpRpJg0CY2O5mhUrUviTzl9UffY28K39izS8gU0mFwpampgVYF7dK/TFFyhQZUPLZ2Rpx4MJyZoCUHiRp9PyTImroA6Zf/8KA7wL5kSBWX5JckP1bJzigccD7VggrqyACtgjmVymQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ETXksEUYHjer/kIBOML+MydY7cR3vkcNbPLbHENjNf0=; b=JqvcRw19+JUAmR98fPJvpHFxbYvEtnfktrESK5zEmaolEe1800OnVf89x8wcm58sicWR7rTQN7BiAUtvrUOFUPMcUmqhaHiLK+vzPqnx+/pV9sRw43FwrCYLulzk5Xid8jjcHFJxjaoJ1zKEyRohcZdCWENbGr4xyrsNP78nr1FqhH7+yaOlRFQEy2ffuGm2J9MxWYO31gM3VMj+3WnCibFYhob6/FtNzZ3AOjK2OuXLbDYBMrvnYkiWwOqkHG6Cr7rRoE3F3WyK0Xffd+kasRT+E30ZZkvxfc4gZB/q/40kvte+TMlb0XIwzirMM/IwA3DkgAdLkzyw1S90LpTC6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=oktetlabs.ru smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ETXksEUYHjer/kIBOML+MydY7cR3vkcNbPLbHENjNf0=; b=Sendy5STR/vrSSeD//IOgNbB5CSDXhhPBaNgvJOdYYq9blXYycZx7KgACn1qXJyIxen1XTrH9Wmpblu/MI0EvkT4OdzFZ05ZQmHowPs56YN6PxqrqgSnyORcIz6xfENdEy/kNXk46bexqTUKMTEa0lyevJy7zGWkIsb6/7Vbqlr32IiKj0fNXSvRPB3GFiCQKF3pPuPvVl3AmcQFRpBW3bfMOv1ud2JSsY3TzHVb4K44nn/SdLWSlow6LfPFiIOyRuSgh1vbSkicA5A9RUoSigrgd3uoA8dDPHzBQmTdwv3Mn8z8EDuRBHWcr95bs0LfC19xXbWvVPvl+GY3jVMDYg== Received: from MWHPR12CA0062.namprd12.prod.outlook.com (2603:10b6:300:103::24) by BY5PR12MB4998.namprd12.prod.outlook.com (2603:10b6:a03:1d4::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.22; Fri, 11 Jun 2021 23:10:44 +0000 Received: from CO1NAM11FT013.eop-nam11.prod.protection.outlook.com (2603:10b6:300:103:cafe::95) by MWHPR12CA0062.outlook.office365.com (2603:10b6:300:103::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:10:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; oktetlabs.ru; dkim=none (message not signed) header.d=none;oktetlabs.ru; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT013.mail.protection.outlook.com (10.13.174.227) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:10:43 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:10:41 +0000 From: Xueming Li To: Andrew Rybchenko CC: Luca Boccassi , Andy Moreton , Ivan Malov , dpdk stable Date: Sat, 12 Jun 2021 07:02:35 +0800 Message-ID: <20210611230433.8208-61-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 10d6633c-028d-4c6e-cc1f-08d92d2e2368 X-MS-TrafficTypeDiagnostic: BY5PR12MB4998: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GccckBUnG9MYoyqeLP6xHWCl1g75VF6X0vx3U1qm2nmU4T68qhVnNURCK1F9tD5Dq6NKMxUS8P4Nbo4cQHgOtKaSiy0zKEHa3LbabgoACMkO9qzOF+b1na8t5uqTkheSqt9ZO2Ls5S7jT0DurWWgSJ9K13/f+5KWxqEVItQTadLzCMo94n01OuPmXWnrMbh6B9HZ0LOYbwGy7Z48ryHO9T8VCFonwjENvNhN9xZP4BWBBS8wJoFrsKiOqyDAzPC/3zilJeeEfYFNPvS8K+3D3AL6MFbMh8WJG8HW4vZC2bNIz6sSlG/179SePZnH2AzLw1fA+JpxnZR5EdqTpfjndOVclbSahbo0w0vLRsAKBZmw2nmsbe3VM/upKzhAHrynyQK6Xtniyd+CRpNc2P/0jvLqbQKq1AZer+9gfiKpgga5z3t55hPUCBwp37jf+FGFmM+nrJmvXO6ojuNWsynBjJz3ihpAE1phC+xe2m8eH/eslude+Kkk9rj+Sr+pX+IYA0uNsBZCLZmVUzRL6nbF8yGAwJFppTy6uijzYvwO2rXJizy9Qh/rfJ63tj6ZnFMGuOkWQnCRC4la+NjAXn4bXK9r3ViOM8X8PBI3rUPs5u2FmBAxNlzXrCb75f6pW6tuGCfvJ1/DKNI27nWC7fRJxil1HZQfooaboweqx0DH+gX0P3BrcbpMJKOfgkQ0iJ8E8iQOefRxJFO+DD2b2aIkuTX91xsggkzTjyAGFzASdWcQXPVZ2jsgSNEMgCtqwWaNM0TzKsoPqd8U9xadQc//iYSBoCQvlOF5+ryxRdCjNa2fMxPlivFnq3eq19vWMJ5E X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(346002)(136003)(39860400002)(376002)(396003)(46966006)(36840700001)(55016002)(6666004)(2616005)(4326008)(6916009)(70206006)(70586007)(316002)(426003)(36906005)(82310400003)(47076005)(336012)(54906003)(7696005)(16526019)(7636003)(356005)(36860700001)(1076003)(26005)(82740400003)(966005)(8936002)(186003)(5660300002)(2906002)(83380400001)(6286002)(86362001)(36756003)(478600001)(8676002)(53546011); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:10:43.4292 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 10d6633c-028d-4c6e-cc1f-08d92d2e2368 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT013.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4998 Subject: [dpdk-stable] patch 'net/sfc: fix mark support in EF100 native Rx datapath' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 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/14/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/15cf480f1a93b1e24d5d20db142472ba2fa03ff2 Thanks. Xueming Li --- >From 15cf480f1a93b1e24d5d20db142472ba2fa03ff2 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Wed, 28 Apr 2021 17:17:02 +0300 Subject: [PATCH] net/sfc: fix mark support in EF100 native Rx datapath Cc: Luca Boccassi [ upstream commit ad82838e3c7c11bd940bf4b5384377fa83c6a2ba ] Decouple user mark from user flag. Usage of mark does not require to use flag as well. Flag is not actually supported yet. Fixes: 1aacc3d388d3 ("net/sfc: support user mark and flag Rx for EF100") Signed-off-by: Andrew Rybchenko Reviewed-by: Andy Moreton Reviewed-by: Ivan Malov --- drivers/net/sfc/sfc_ef100_rx.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/net/sfc/sfc_ef100_rx.c b/drivers/net/sfc/sfc_ef100_rx.c index c1c56d0e75..6ec0451057 100644 --- a/drivers/net/sfc/sfc_ef100_rx.c +++ b/drivers/net/sfc/sfc_ef100_rx.c @@ -46,6 +46,9 @@ ((_ndesc) - 1 /* head must not step on tail */ - \ 1 /* Rx error */ - 1 /* flush */) +/** Invalid user mark value when the mark should be treated as unset */ +#define SFC_EF100_USER_MARK_INVALID 0 + struct sfc_ef100_rx_sw_desc { struct rte_mbuf *mbuf; }; @@ -365,7 +368,6 @@ static const efx_rx_prefix_layout_t sfc_ef100_rx_prefix_layout = { SFC_EF100_RX_PREFIX_FIELD(LENGTH, B_FALSE), SFC_EF100_RX_PREFIX_FIELD(RSS_HASH_VALID, B_FALSE), - SFC_EF100_RX_PREFIX_FIELD(USER_FLAG, B_FALSE), SFC_EF100_RX_PREFIX_FIELD(CLASS, B_FALSE), SFC_EF100_RX_PREFIX_FIELD(RSS_HASH, B_FALSE), SFC_EF100_RX_PREFIX_FIELD(USER_MARK, B_FALSE), @@ -404,12 +406,16 @@ sfc_ef100_rx_prefix_to_offloads(const struct sfc_ef100_rxq *rxq, ESF_GZ_RX_PREFIX_RSS_HASH); } - if ((rxq->flags & SFC_EF100_RXQ_USER_MARK) && - EFX_TEST_OWORD_BIT(rx_prefix[0], ESF_GZ_RX_PREFIX_USER_FLAG_LBN)) { - ol_flags |= PKT_RX_FDIR_ID; + if (rxq->flags & SFC_EF100_RXQ_USER_MARK) { + uint32_t user_mark; + /* EFX_OWORD_FIELD converts little-endian to CPU */ - m->hash.fdir.hi = EFX_OWORD_FIELD(rx_prefix[0], - ESF_GZ_RX_PREFIX_USER_MARK); + user_mark = EFX_OWORD_FIELD(rx_prefix[0], + ESF_GZ_RX_PREFIX_USER_MARK); + if (user_mark != SFC_EF100_USER_MARK_INVALID) { + ol_flags |= PKT_RX_FDIR_ID; + m->hash.fdir.hi = user_mark; + } } m->ol_flags = ol_flags; @@ -794,8 +800,7 @@ sfc_ef100_rx_qstart(struct sfc_dp_rxq *dp_rxq, unsigned int evq_read_ptr, rxq->flags &= ~SFC_EF100_RXQ_RSS_HASH; if ((unsup_rx_prefix_fields & - ((1U << EFX_RX_PREFIX_FIELD_USER_FLAG) | - (1U << EFX_RX_PREFIX_FIELD_USER_MARK))) == 0) + (1U << EFX_RX_PREFIX_FIELD_USER_MARK)) == 0) rxq->flags |= SFC_EF100_RXQ_USER_MARK; else rxq->flags &= ~SFC_EF100_RXQ_USER_MARK; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:58.217857400 +0800 +++ 0061-net-sfc-fix-mark-support-in-EF100-native-Rx-datapath.patch 2021-06-12 06:53:56.300000000 +0800 @@ -1 +1 @@ -From ad82838e3c7c11bd940bf4b5384377fa83c6a2ba Mon Sep 17 00:00:00 2001 +From 15cf480f1a93b1e24d5d20db142472ba2fa03ff2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit ad82838e3c7c11bd940bf4b5384377fa83c6a2ba ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 07b37ff47f..8cde24c585 100644 +index c1c56d0e75..6ec0451057 100644