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 129C543C60 for ; Thu, 7 Mar 2024 02:37:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0855742F0E; Thu, 7 Mar 2024 02:37:00 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id 89B3342EE3 for ; Thu, 7 Mar 2024 02:36:57 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-412e96284b9so3269485e9.3 for ; Wed, 06 Mar 2024 17:36:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775417; x=1710380217; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6qO8A7/dHQDnT+TgjGEoq7coJi9xXOC1XXGaTdbeLpw=; b=DLnU5k0Yu7hvbI7G93MYL2hm3Cibc+GHh6XDyOvC3/OYY3Ky3qT7OcSVPvG0N79uRo 6F8bxuaj3uuHISffkoDtOF34jSfva3R6ZHGWf1as7LhIFQG44gwgmyxhHE4ZU1jq/tGA ad5EiN/QRiRWKiANME1HIFTk5yPDOZndZ09HrwLePNIClcMiaeyBSiXkqjfiVDfc4AJU 7EcYYX2fYjBqen0QOa3FemIKqwfCNhlYSj6bX3P0nJACUxoO2XN++N0KYfZaD+Vcqt6x i+8G3beOsIDgdrxaPeH9QTcmJrK0DzRmNH1tRnRhvBV1RIZbkX2DPDjgtn6B3rpppkmS RORQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775417; x=1710380217; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6qO8A7/dHQDnT+TgjGEoq7coJi9xXOC1XXGaTdbeLpw=; b=BJAlVfUaasskPPPHlfpct3IvUGb/a8TkmnCKEzh3EXFyb4mKxV3xLNp3pMnQdm+i34 7EZCUAxe3XeANM73YCCsMif6e5d3DjDBWvD7htwj1D1nQLQD1wlDEgqJ16TJza2NO15q 3ml4ebptzkPld/kKRbeMHdalC34a99Hm/vGfHiV4yLZwq7Y27NyNpMGfarR2UhGdGFmz Z9g/f+XKWY8SOefiboe98vLVo0C1aXMApTKcuJ/LuOp/TTE1GDl6WPOIQWwWZxLYCG5l kfo7sCb4Hguw18F3RDgOhPa223NqMig9Ue486VXesDzDkOZeGwZcN5nfRPhbkSB2tmCm 2NFA== X-Forwarded-Encrypted: i=1; AJvYcCVftvk8YmemPhb+FJnFuea5pCVlZ83e4hwC9SGi1I4oZaOinfpSrMOTWKo8N4B0JcUkjVvtIQLdAEXulenH5ac= X-Gm-Message-State: AOJu0YzWq9kOvUZazm8HdWZzSB79T8VC66O7pKUc+szubbY3oMd89E7p WqA5e646rgFvcGorBumXj2B6keJnRn0o1RgX8A0H93YnUfzgVXKJcu5sFiHfoH4= X-Google-Smtp-Source: AGHT+IEaF7geo9m0EIywH+zSkpVVRKo59d6L0tyxEMFxio3DJ5io2LG6EcKJObv6dUqotgz1YfL8pQ== X-Received: by 2002:a05:600c:1d17:b0:412:e993:d5da with SMTP id l23-20020a05600c1d1700b00412e993d5damr5455425wms.32.1709775417171; Wed, 06 Mar 2024 17:36:57 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id ay11-20020a05600c1e0b00b00412b431eb0csm886920wmb.14.2024.03.06.17.36.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:36:56 -0800 (PST) From: luca.boccassi@gmail.com To: Alan Elder Cc: Ferruh Yigit , dpdk stable Subject: patch 'net: add macros for VLAN metadata parsing' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:31:40 +0000 Message-Id: <20240307013159.1735343-83-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.5 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/09/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://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/6ccc09636724c4aede51a9d7a115f33335c93149 Thanks. Luca Boccassi --- >From 6ccc09636724c4aede51a9d7a115f33335c93149 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 [ 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 e4c3ff0024..061ca09b98 100644 --- a/.mailmap +++ b/.mailmap @@ -31,6 +31,7 @@ Akshay Dorwat Alain Leon 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 bf8a55ba06..020d9b46ba 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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:41.797580532 +0000 +++ 0083-net-add-macros-for-VLAN-metadata-parsing.patch 2024-03-07 01:05:34.950943242 +0000 @@ -1 +1 @@ -From b74087f15e16c42fe4ff9c4d603cc7a51a1aa1dc Mon Sep 17 00:00:00 2001 +From 6ccc09636724c4aede51a9d7a115f33335c93149 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b74087f15e16c42fe4ff9c4d603cc7a51a1aa1dc ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index b2d0fc0729..12d2875641 100644 +index e4c3ff0024..061ca09b98 100644 @@ -22,2 +23,2 @@ -@@ -34,6 +34,7 @@ Alain Leon - Alan Brady +@@ -31,6 +31,7 @@ Akshay Dorwat + Alain Leon @@ -31 +32 @@ -index ce073ea818..75285bdd12 100644 +index bf8a55ba06..020d9b46ba 100644