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 6F6A8A0543 for ; Tue, 21 Jun 2022 10:08:32 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 656614069C; Tue, 21 Jun 2022 10:08:32 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2054.outbound.protection.outlook.com [40.107.223.54]) by mails.dpdk.org (Postfix) with ESMTP id C6B754069C for ; Tue, 21 Jun 2022 10:08:30 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A/C2xo8H7KUKLsyy4o50mz+jgqhJ/pqtPdEixTF8iR4OYEf+OKaXcM/hvPDH8ebnDd83LL5D3qk8Wja9bQEOnOlUizJc0w2w1aschdWiwF3bVI4jUVQSO2t1uK27m2E/PCrc6DGQQkWgRqAZsnLNoqJOXqhj48QHzr4m1REKy/VBO0Qi0QseOVzekjcVBO7pcjyatFzQUKlQKoH4gvfV2f0rSlefp/fAID2C4HyF3IP6p6bOiulcB6t/2BSK76JqWaN/eieqmphfx8FwD4JCllIt9vsdsQIXwIkFqVygLkUlYuqdy8c8TzrZflmVJ+TJIByTgobkWZ3FyTv9jBpAEQ== 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=vl1zNXJ/aeI+DIltZlXkTAaj3lRqSAKex1Oz8BJWEqI=; b=WPWkAr+eAh8O56YED/4vvlh9lTbsQwbmt7VNe7IEAeGmCXvfC8KFBnTb9TBh3opzYz2kkOJgV4rz8l6aeoaevLNkHtew/nZmdZ9tgw2kZzUjcFQsrLgXjKoK2Tb3djeZLgzGYW+syKKx5OZb2mW7814wTMOMJdsVXn9UpGJUR3mzICmjanr9ptiOqCOIki0+ZS5eQ4I978DXrn2KoHuZ264YG6FaziO1RVEQwwnrAOLyvjqi/c14dAoLrxZGNoZXgY86YPlzrvZ3KhLfCpt2uUXo2KnTXGcQFf3Ny/97m1XAPRInsHuiwMkOezfxMyjdGtZTWjULuEMBOcW0WW7qqg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.236) smtp.rcpttodomain=6wind.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=vl1zNXJ/aeI+DIltZlXkTAaj3lRqSAKex1Oz8BJWEqI=; b=nwlwp7EcAxn+ATeWH1o0Ehqgqic5mrHWIrf2Z4AY2jUqDWIGEHfYBSGh9epkcCGY4UbsHqv1zro6WO8XV8bHlcChXPuTOIlYPn1BWp2jXq1x8+29lhbcJAyHXae8i29s+UPaTNuFJ9yVkHs1lz1MNnexcBE/Bf3aZ649lmG/nRCzm/doIvkaZJzE6GyfyqDl+WwkmI2kkiULkwdiJvRb1OkjHmsVQfCMOyAHef/9Wokx40srCKuT5OrlommLVk6sXkeN8YHR30BpNd6aDxFrpyYIymvnNRYIe5mxbG7fnCTAe45XV4nmvkNJLQu46UqKWRFRw9pO5Wf7Uy55L3guyw== Received: from BN6PR13CA0018.namprd13.prod.outlook.com (2603:10b6:404:10a::28) by BN7PR12MB2722.namprd12.prod.outlook.com (2603:10b6:408:2e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.13; Tue, 21 Jun 2022 08:08:29 +0000 Received: from BN8NAM11FT032.eop-nam11.prod.protection.outlook.com (2603:10b6:404:10a:cafe::93) by BN6PR13CA0018.outlook.office365.com (2603:10b6:404:10a::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15 via Frontend Transport; Tue, 21 Jun 2022 08:08:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.236) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.236 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.236; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.236) by BN8NAM11FT032.mail.protection.outlook.com (10.13.177.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:08:29 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL109.nvidia.com (10.27.9.19) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:08:28 +0000 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Tue, 21 Jun 2022 01:08:26 -0700 From: Xueming Li To: Ben Magistro CC: =?UTF-8?q?Morten=20Br=C3=B8rup?= , Olivier Matz , dpdk stable Subject: patch 'mbuf: dump outer VLAN' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:02:06 +0300 Message-ID: <20220621080301.2315720-61-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aac439f8-5818-4587-d927-08da535d39d2 X-MS-TrafficTypeDiagnostic: BN7PR12MB2722:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7YjlHI84o0k3RY0JQ5bJ3q5Qcd+xBjLu41VYwND3YKi9EcVPU+2P2+znHQFfrYm3ST2tikMWyVncGqCYBf/HDfvIb8clElDBwJrYKNZq79I50UIY8qiImQOfNtZ9wB872AMrEa03W/msJm0wVfEb7w35lXO1FgIlCYAfzF8lZYXOJrNjWKpbkx53i0IhdQoIgn5AOVJOzMmaDmUdP4cAHtyMMwBm7oxXqHxrf94yN8/6/cHhUMwNfR3Fu9CNxnyOj4j5eZMGrXFUPE7ybVAMFNdgEebIqVXTvqADErGs1RZ6QP9Q2UCMm/Iclgu2w6d9a1HoLu/qYi6BX+gd83ABJQbLSb/ekpnu83KNfi0q7meCtCvPwzyQNpszfEYt4BlV3s5fyOfopICAfxDiS7gw5SjFlgVhwsdHTPSHqbWUXJnjhOXnXkf2UyuXpFWxTdCY4dLaCNYYFmQjHn0ETZuQ+ACv6iG2HTOQ6YQM0AvoS4W3eoVX/3JAQ81Yb07oAo5Y95FLWP6jloVH2fPWDBfSgwL7zADRiYyHB3ay6YpnAMw/7d8EdwCHMnaboihfocR7i48F9seG94jRuwfag4PgsQqqCxt3zzwg9NCCGo9rJSteRweojEHYTO9nu59CE4r9tOLJz/mO3Glr8PecKa78rOU831cr4s+qSB9ddiOplvcC0y7n20Gd7EIbycXp0CD+eBHBLjmufVBZ77M0W0ZB4yDwoJH9jwyNKw5rejHSU+rkAasc3Ukar10FHWSk8TWfivI4xkN9zX3q1IrCYoNHNslU9SkrHVgUVOOswYjh3T5Ycn7mDUyUBsjcrKo88x5M1UgqQvRsJ2SCy71LtN4xNBadgZuKfbQEnm6Hg4RilkY= X-Forefront-Antispam-Report: CIP:12.22.5.236; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(346002)(376002)(136003)(396003)(39860400002)(40470700004)(36840700001)(46966006)(8936002)(70206006)(36860700001)(4326008)(8676002)(316002)(966005)(2906002)(478600001)(70586007)(36756003)(6916009)(82740400003)(40480700001)(5660300002)(82310400005)(55016003)(6286002)(356005)(26005)(6666004)(54906003)(40460700003)(86362001)(7696005)(1076003)(336012)(16526019)(81166007)(53546011)(426003)(186003)(2616005)(41300700001)(66574015)(47076005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:08:29.1811 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aac439f8-5818-4587-d927-08da535d39d2 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.236]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT032.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR12MB2722 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 20.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 06/23/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/de28f76399f2f683a8802305c2250cf862979f70 Thanks. Xueming Li --- >From de28f76399f2f683a8802305c2250cf862979f70 Mon Sep 17 00:00:00 2001 From: Ben Magistro Date: Mon, 4 Apr 2022 00:56:35 +0000 Subject: [PATCH] mbuf: dump outer VLAN MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 4d75f3fcdedd86327c5d515e8fe5ece1ef16394d ] Enable printing of the outer VLAN if flags indicate it is present. Signed-off-by: Ben Magistro Reviewed-by: Morten Brørup Acked-by: Olivier Matz --- lib/librte_mbuf/rte_mbuf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c index 5f77840557..6d3eb73ced 100644 --- a/lib/librte_mbuf/rte_mbuf.c +++ b/lib/librte_mbuf/rte_mbuf.c @@ -680,6 +680,9 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len) fprintf(f, " pkt_len=%u, ol_flags=%#"PRIx64", nb_segs=%u, port=%u", m->pkt_len, m->ol_flags, m->nb_segs, m->port); + if (m->ol_flags & (PKT_RX_QINQ | PKT_TX_QINQ)) + fprintf(f, ", vlan_tci_outer=%u", m->vlan_tci_outer); + if (m->ol_flags & (PKT_RX_VLAN | PKT_TX_VLAN)) fprintf(f, ", vlan_tci=%u", m->vlan_tci); -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:52.035162666 +0800 +++ 0060-mbuf-dump-outer-VLAN.patch 2022-06-21 15:37:49.081118072 +0800 @@ -1 +1 @@ -From 4d75f3fcdedd86327c5d515e8fe5ece1ef16394d Mon Sep 17 00:00:00 2001 +From de28f76399f2f683a8802305c2250cf862979f70 Mon Sep 17 00:00:00 2001 @@ -7,0 +8 @@ +Cc: Xueming Li @@ -9 +10 @@ -Enable printing of the outer VLAN if flags indicate it is present. +[ upstream commit 4d75f3fcdedd86327c5d515e8fe5ece1ef16394d ] @@ -11 +12 @@ -Cc: stable@dpdk.org +Enable printing of the outer VLAN if flags indicate it is present. @@ -17 +18 @@ - lib/mbuf/rte_mbuf.c | 3 +++ + lib/librte_mbuf/rte_mbuf.c | 3 +++ @@ -20,5 +21,5 @@ -diff --git a/lib/mbuf/rte_mbuf.c b/lib/mbuf/rte_mbuf.c -index 87592faccb..a2307cebe6 100644 ---- a/lib/mbuf/rte_mbuf.c -+++ b/lib/mbuf/rte_mbuf.c -@@ -674,6 +674,9 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len) +diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c +index 5f77840557..6d3eb73ced 100644 +--- a/lib/librte_mbuf/rte_mbuf.c ++++ b/lib/librte_mbuf/rte_mbuf.c +@@ -680,6 +680,9 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len) @@ -28 +29 @@ -+ if (m->ol_flags & (RTE_MBUF_F_RX_QINQ | RTE_MBUF_F_TX_QINQ)) ++ if (m->ol_flags & (PKT_RX_QINQ | PKT_TX_QINQ)) @@ -31 +32 @@ - if (m->ol_flags & (RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_TX_VLAN)) + if (m->ol_flags & (PKT_RX_VLAN | PKT_TX_VLAN))