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 5F40643B7D for ; Tue, 5 Mar 2024 10:58:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 57A7442E46; Tue, 5 Mar 2024 10:58:20 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2080.outbound.protection.outlook.com [40.107.237.80]) by mails.dpdk.org (Postfix) with ESMTP id 61D734026B for ; Tue, 5 Mar 2024 10:58:18 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IgfLyBcAz23Y7x9ARSJxb53kFlMik6Dcurazp5CtpHBtf3bXTkVkjRdrtAgWq04IJSFLl+NFmEKYwXh9b94KvRJZ2f8SBv+IGskm4UdbMRB2pxcPl/kZ3scTVNFuRviWbeIYlF1mtx4OvXDf/3M8iX46F3sN0Z7fjX3Xt70cTarz00/uiU3BEcGGlK7IUkQlpoavlLpdDKnU87414szofDmbah0gOwdPrL+uEbq3nMDnsxWRprdHnIP7VOKhl4Gk+oihiPrlKInTGZYBEZIHpki51yKJPSPKl9mwbetPwWPe/Kl2Q2jyZKHQ8T+aYqn5NK5xRVTf7rNxAeP5FyK4Hw== 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=7ifdvyhOsOGyVxfEpVZKQ1kLJZy8X9Wt/kPDnXKqQmA=; b=lvm5aDj6lMzRxBN/6GuJr+ZJ7al6j+h8rIBlZ9fcV8+KRl+l1k9jG6TMCami2i2ajw75IKkwanHkikspXrflLl0gQegZbYu4YJQrlVYb7qWtnFLYY/8GMu13seLSOH+i1tBf9DxpqMOCImCKNK4IIAnxN7HlxcAkWpL4eKpQecxoUcKcf5lQ+Cx21tE1fluF0yFWnWlHc0Nul4AGp6n+7EFxdZEQX2IwBW1PwJwD9XLvvn2G4Cg7BadxKbCuZ4IsqZ+EzjrAlyk96r4IXYBdit+R5VdioFBAyh0LJxyFzrR5Pz0FHEczQHLLWhahq/El+/YicT3RtPXlZzyvXodrIw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=microsoft.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 (0) 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=7ifdvyhOsOGyVxfEpVZKQ1kLJZy8X9Wt/kPDnXKqQmA=; b=C8edKvkApudQDR6A8+Q0PKXKBVn6zoNv6XMRDpdL3EbifX0Y1bITY+V0qhKSh/FG0PYj7n8U0J6JyF9k34ZSUxD/C9fVyjYRjhhP+GbN/hr29wiG1wMTy92FOCSlyN2e3yt68adE1STSyZCiGu1N9pHhGLrFBH2Q3k/etSkCvOPa0oAf1JMs7Z6VG1NdzNGqsxOb9EGc3u60pQ+XUqP1MkQ8st+Z7EJYXKvB7KQ3vsIW+vPW+s3+ZcGuoIwHLjLPRqAaozpgm7xjFwWsO7zjjDDSPWU/I1nvBtCGNjfaUVI7KH3D+Icm6+lOvsgIdjfQY+k0hT+b5//oQsgbkl3qLw== Received: from SJ0PR13CA0137.namprd13.prod.outlook.com (2603:10b6:a03:2c6::22) by BY5PR12MB4193.namprd12.prod.outlook.com (2603:10b6:a03:20c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.24; Tue, 5 Mar 2024 09:58:10 +0000 Received: from SJ5PEPF000001D6.namprd05.prod.outlook.com (2603:10b6:a03:2c6:cafe::67) by SJ0PR13CA0137.outlook.office365.com (2603:10b6:a03:2c6::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.23 via Frontend Transport; Tue, 5 Mar 2024 09:58:10 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SJ5PEPF000001D6.mail.protection.outlook.com (10.167.242.58) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:58:10 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 5 Mar 2024 01:58:00 -0800 Received: from nvidia.com (10.126.231.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.1258.12; Tue, 5 Mar 2024 01:57:59 -0800 From: Xueming Li To: Alan Elder CC: Ferruh Yigit , dpdk stable Subject: patch 'net: add macros for VLAN metadata parsing' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:47:32 +0800 Message-ID: <20240305094757.439387-112-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.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-TrafficTypeDiagnostic: SJ5PEPF000001D6:EE_|BY5PR12MB4193:EE_ X-MS-Office365-Filtering-Correlation-Id: cd39cc24-a0a1-4e68-6022-08dc3cfac401 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2xr9QTPvDjCWDMwx7q2q1xldzfwpnfNIa3NysxuX3TxKLSjVA8H3s9z8D3A6RR5szAqG+uv3YnFja8ZT1y7AwwcbO0ssDBHz/11r9JogGqMKskauUd6n/Zu1ITjSmKjUxghXhTBMYNYoHVVD5a8CFVXS4bJ7L/Dxw6GPB0KDwXHF7GoWNiDa4IMHI69fFXgBSJp9BX7pwVuAyBN7gS3y8XGF60YY1NsYpvJhi9ykIo79Fjjj3fHOsDDgRRgueGabIbPrbj1K4AyqMtsEaUiIrfY8WCQ80urUGYNclY0WHn6r77+/EGsHBk7w7YYPWNBZKZjbPbhF+Xt+/fwnJwpGqzXyyX05YRyCWavXsCXmjuj1ZtptP56oX9T8hyqFTEghG3wRgNbfHpQaDociiTnEZLgzjyGyQ9rL/xHgpIgacBBK7GGtyyMak2zslk9EFRQMZGQ5nFuCcdKyOoii+PwAoX95dceTr+tX9rDvgB0di4HP1ta+Sv3diBhyMRgkQPd2k61Y564ilav7YqSTspAYuxTHJlEYUL3sfKLsvu8yC8IiJ82VwuwwN9ksoaLcN+Cvthrk0m7sHqjceUmrloQZMIa/NU/tnlzhp19GOnrXNYqs6CQClMzlheHoO7bh/bviIfgww3SUak+aa87y0JHA2LSO++YWKa9JmMekBhFu20RSsh5g+A9znZs1hwf5O7j4TWLQdXVT7sB3/xbxTKm1KP8duJG3n6nLeus7pJyuy9iFp63dbg2Eo2Dt/L3WAL36 X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(36860700004)(376005)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:58:10.7370 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cd39cc24-a0a1-4e68-6022-08dc3cfac401 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001D6.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4193 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 23.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/31/24. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=de2d362411cbc91c28216db27330f5d6f6bb7635 Thanks. Xueming Li --- >From de2d362411cbc91c28216db27330f5d6f6bb7635 Mon Sep 17 00:00:00 2001 From: Alan Elder Date: Mon, 19 Feb 2024 09:31:25 +0000 Subject: [PATCH] net: add macros for VLAN metadata parsing Cc: Xueming Li [ upstream commit b74087f15e16c42fe4ff9c4d603cc7a51a1aa1dc ] Add common macros for extracting parts of VLAN tag. Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device") Signed-off-by: Alan Elder Reviewed-by: Ferruh Yigit --- .mailmap | 1 + lib/net/rte_ether.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/.mailmap b/.mailmap index 55901a26c0..9541b3b02e 100644 --- a/.mailmap +++ b/.mailmap @@ -34,6 +34,7 @@ Alain Leon Alan Brady Alan Carew Alan Dewar +Alan Elder Alan Liu Alan Winkowski Alejandro Lucero diff --git a/lib/net/rte_ether.h b/lib/net/rte_ether.h index ce073ea818..75285bdd12 100644 --- a/lib/net/rte_ether.h +++ b/lib/net/rte_ether.h @@ -46,6 +46,20 @@ extern "C" { #define RTE_ETHER_MIN_MTU 68 /**< Minimum MTU for IPv4 packets, see RFC 791. */ +/* VLAN header fields */ +#define RTE_VLAN_DEI_SHIFT 12 +#define RTE_VLAN_PRI_SHIFT 13 +#define RTE_VLAN_PRI_MASK 0xe000 /* Priority Code Point */ +#define RTE_VLAN_DEI_MASK 0x1000 /* Drop Eligible Indicator */ +#define RTE_VLAN_ID_MASK 0x0fff /* VLAN Identifier */ + +#define RTE_VLAN_TCI_ID(vlan_tci) ((vlan_tci) & RTE_VLAN_ID_MASK) +#define RTE_VLAN_TCI_PRI(vlan_tci) (((vlan_tci) & RTE_VLAN_PRI_MASK) >> RTE_VLAN_PRI_SHIFT) +#define RTE_VLAN_TCI_DEI(vlan_tci) (((vlan_tci) & RTE_VLAN_DEI_MASK) >> RTE_VLAN_DEI_SHIFT) +#define RTE_VLAN_TCI_MAKE(id, pri, dei) ((id) | \ + ((pri) << RTE_VLAN_PRI_SHIFT) | \ + ((dei) << RTE_VLAN_DEI_SHIFT)) + /** * Ethernet address: * A universally administered address is uniquely assigned to a device by its -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:34.305307010 +0800 +++ 0111-net-add-macros-for-VLAN-metadata-parsing.patch 2024-03-05 17:39:30.903566497 +0800 @@ -1 +1 @@ -From b74087f15e16c42fe4ff9c4d603cc7a51a1aa1dc Mon Sep 17 00:00:00 2001 +From de2d362411cbc91c28216db27330f5d6f6bb7635 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b74087f15e16c42fe4ff9c4d603cc7a51a1aa1dc ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index b2d0fc0729..12d2875641 100644 +index 55901a26c0..9541b3b02e 100644