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 1C3A2A034F for ; Wed, 10 Nov 2021 07:36:33 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1412D40142; Wed, 10 Nov 2021 07:36:33 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2065.outbound.protection.outlook.com [40.107.237.65]) by mails.dpdk.org (Postfix) with ESMTP id 1B68A40683 for ; Wed, 10 Nov 2021 07:36:32 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U/HcHaPiEtMxcEWPssnl7xFCxiFfQMv+8tPAwKDmW0TRL3N8jhpJwRY2rEXpjK5MscybDgN/wGos2fueDL0djggRUS7RlvYUb8nlwazc1RQia2IDKC+70FwcGtrulzM2o0k1uRlEpfPnZ5Pw8evK68q4TR+yYbJ0CJeZdLgO/dAygRyN1gyK9DUkE1PqGm5DjMkewgptPvkHwTOoVvTrn6uRdXeiImN4bVtVcFGPLRSxdedHKL5W/UBFfsiWQ6ZyzMkn2GH8rLfmQOILGXl7QS6WvTOpR3rxVjPIq9Aykx6cw6L64Z2EYR9M9j+CA9+u1kcm/+JMxmmJK32w9MoZIw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=rpYOfFHhQc+vFUHd+WBxqgEKCkAKlex4zHbzj4jdJFg=; b=H51nbiygWw8Fo9vn4Nc4r1/6VowYQOO1zAE0jixnC9sWIn6XRvpFTNeOlnr2636FTIuEWOCo5vbDAdGSFM0oV0IymVItNRf+5t0PUYkopa548w+lSXB3IAnU4Rjptr7jEsy4Y1PEHvUB5LIpGemtQcf5owZnJIuQ7T+UoMid6iUFDFn+kcopLtmfhSwvvxlJ8IQrr6J9XxBfkEMt8/T74by+cg10qmFzNcJcy64GPcr0WupGWVMAkjnud52FeRk+7Jn/QUH0ODT6WlB6KEKhm1s8lrj+zEqxRtDngIz6KTSc3C0fUo7uU85i93B1kJtqkomdOGiMgOHu2dkrq41R1A== 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=quarantine sp=quarantine 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=rpYOfFHhQc+vFUHd+WBxqgEKCkAKlex4zHbzj4jdJFg=; b=Jcym0qtJiAsnj8WlJnSU2CQ5bpR7lgz9rRsx0AOlt0kb7ZfJQ5PQF9w9sRrV6G/DsHNCzIUczJ9x3vjYTDpAE2uGlKVwSzv973bR1UfElgf+F5R+/Gd22Y6nUsIr8DzQnstl1MBd2uvkstaE8vzUR+Dv1pD0mIzF4T00rGWMWUHzfRbqt+S5wtjdrme5cGfR2o1XmH0Ro+I7LWlAltdJs8R0+65iok5yLOczhyV8CrDSlnCD5QwWydiIBmCVKx98vB5H6qJMDvRpMTYG4jnFNeVtM2D2yv+925jHX62Lk0QMLiHZXs4sySuzje5uY7l0fqLGUc3uMC5ti4CLg6WyIw== Received: from DM6PR13CA0050.namprd13.prod.outlook.com (2603:10b6:5:134::27) by DM6PR12MB4060.namprd12.prod.outlook.com (2603:10b6:5:216::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Wed, 10 Nov 2021 06:36:30 +0000 Received: from DM6NAM11FT003.eop-nam11.prod.protection.outlook.com (2603:10b6:5:134:cafe::4) by DM6PR13CA0050.outlook.office365.com (2603:10b6:5:134::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.7 via Frontend Transport; Wed, 10 Nov 2021 06:36:30 +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 DM6NAM11FT003.mail.protection.outlook.com (10.13.173.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 06:36:29 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:36:26 +0000 From: Xueming Li To: Ivan Malov CC: Luca Boccassi , Andrew Rybchenko , dpdk stable Date: Wed, 10 Nov 2021 14:28:41 +0800 Message-ID: <20211110063216.2744012-38-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e7c17dc9-a234-4ac9-4276-08d9a4146d9b X-MS-TrafficTypeDiagnostic: DM6PR12MB4060: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n5CE+/CNijxlGQxSBCf4hqEJmdwWoWdECoLNzwut60bU7joLtYJ/x5dPSh/89adPMIf3S21IOnf06rgN2Ar9z3uFbfYRv6oG7FbfmpX3/YPGEB3IYWjlmSdYwNYPQNuEbGloapFd8fISWKqjn2SyMlbpRWMKlzOwR1aDebmZN2BLdDZpqL7dJz2hRHKHQj0w0aOeO9esULLyHm5oiOulvHNKUc4bbFx6MHjrMlNh2QKZiarM7xwNjZ9YaO9Apmi1Fl1mFMh1YpNO/IjKZGF9748elmPrdnQOw9xvXArDtzXW/AhpHFh8m55qUup0pBxWr/R2yZHSDaBsHaBWprMswLD556sjgoDfZ2E7fLjLHT7acBaaOZAG4WdISYJLQ7CRBM7USw3+N2gSPfPRvCfpqR9LFUZ6M1+/tSZXX3Y4TtacMdrrVZvilV39OQcZOSDiJy68gzldcYXlpqyJMZ94YVtMdjc9XBydXc/8aJHN+HAijsAxmyn2atRkOZc0YVQb4Qz+UQ8q4woaTP5HcRhImCdkacdye1MSMU6jlAyCS+LZ118bK2oHNaj/I9GS4PJhrNK3gbLlONb7gHqoBPw0/hfbYfUzuGOgibnG99J04T+3gJ22D1MYNN6atXxfzsTp6EaXAoVAjhepHl4FUiFXK/WK5l0T3djutq2LMAwjMA2qvAOP845f46BOwIlG1r6mJy+vM1xUyXrHfw7Yrxd/A3fVyG6SFkZJf1QyuWFVp2b91MNri/T/Y0ESxm9EGBA9smtJhaxZo33V3krHb/iGbInzH69K0wEzdsw/QRGiWYS5db/AB3EUyJvuWrhCPsjD0ySe90BYHKO3sPu01+iGcQ== 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)(46966006)(36840700001)(16526019)(2616005)(86362001)(186003)(70586007)(70206006)(336012)(83380400001)(426003)(4001150100001)(966005)(36756003)(4326008)(1076003)(8936002)(2906002)(7636003)(6286002)(5660300002)(47076005)(54906003)(36906005)(26005)(6916009)(356005)(316002)(82310400003)(53546011)(55016002)(6666004)(36860700001)(8676002)(508600001)(7696005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:36:29.3589 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e7c17dc9-a234-4ac9-4276-08d9a4146d9b 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: DM6NAM11FT003.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4060 Subject: [dpdk-stable] patch 'net/sfc: set FDIR bit for flow mark in EF100 Rx' has been queued to stable release 20.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/12/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/ed49cafb257e1141fc6cf518e2ab5330bdd93fd8 Thanks. Xueming Li --- >From ed49cafb257e1141fc6cf518e2ab5330bdd93fd8 Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Mon, 30 Aug 2021 17:35:42 +0300 Subject: [PATCH] net/sfc: set FDIR bit for flow mark in EF100 Rx Cc: Xueming Li [ upstream commit 142dd26a2fbd909f8d10ca25b1e698cd41a2667f ] According to flow action MARK definition, PMDs must set both PKT_RX_FDIR and PKT_RX_FDIR_ID if the packet contains a mark. Fixes: 1aacc3d388d3 ("net/sfc: support user mark and flag Rx for EF100") Signed-off-by: Ivan Malov Reviewed-by: Andrew Rybchenko --- drivers/net/sfc/sfc_ef100_rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/sfc/sfc_ef100_rx.c b/drivers/net/sfc/sfc_ef100_rx.c index f5fa629f90..061077bcf4 100644 --- a/drivers/net/sfc/sfc_ef100_rx.c +++ b/drivers/net/sfc/sfc_ef100_rx.c @@ -413,7 +413,7 @@ sfc_ef100_rx_prefix_to_offloads(const struct sfc_ef100_rxq *rxq, 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; + ol_flags |= PKT_RX_FDIR | PKT_RX_FDIR_ID; m->hash.fdir.hi = user_mark; } } -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:03.767510974 +0800 +++ 0037-net-sfc-set-FDIR-bit-for-flow-mark-in-EF100-Rx.patch 2021-11-10 14:17:01.784080133 +0800 @@ -1 +1 @@ -From 142dd26a2fbd909f8d10ca25b1e698cd41a2667f Mon Sep 17 00:00:00 2001 +From ed49cafb257e1141fc6cf518e2ab5330bdd93fd8 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 142dd26a2fbd909f8d10ca25b1e698cd41a2667f ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index d4cb96881c..1bf04f565a 100644 +index f5fa629f90..061077bcf4 100644 @@ -22 +24 @@ -@@ -414,7 +414,7 @@ sfc_ef100_rx_prefix_to_offloads(const struct sfc_ef100_rxq *rxq, +@@ -413,7 +413,7 @@ sfc_ef100_rx_prefix_to_offloads(const struct sfc_ef100_rxq *rxq,