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 368D5A0555 for ; Thu, 9 Jun 2022 13:37:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2B84640220; Thu, 9 Jun 2022 13:37:26 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id DB22340220 for ; Thu, 9 Jun 2022 13:37:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=y8UBunNHwPxzzsTRhcs8puzVJ4WmogkULNV9y+Wvqt0=; b=DvW4pUYSgdTJ5cSn35rHwssgLf9lURtVWcgvwCe9OMOtJeALB3uvgSYxQOpz/YiyUm5bFp gj0+AOX/wJnAMA5wllHvIu9ERKrJbGBwFQbJKILQP1wvptMCBcBNqgGUxLU9EdrZREMiar PSDp/Lpi3yaNjYyHq22AUUOhV7rQwZY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-392-4vAiAVYMOGS9ZvsBts0mcw-1; Thu, 09 Jun 2022 07:37:20 -0400 X-MC-Unique: 4vAiAVYMOGS9ZvsBts0mcw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E9AEE800124; Thu, 9 Jun 2022 11:37:19 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 088DB1730C; Thu, 9 Jun 2022 11:37:18 +0000 (UTC) From: Kevin Traynor 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 21.11.2 Date: Thu, 9 Jun 2022 12:35:54 +0100 Message-Id: <20220609113701.386938-7-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 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 21.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/13/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/1fae8c76b75781382f55648ac7b156e7b35a6224 Thanks. Kevin --- >From 1fae8c76b75781382f55648ac7b156e7b35a6224 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 [ 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/mbuf/rte_mbuf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/mbuf/rte_mbuf.c b/lib/mbuf/rte_mbuf.c index 604d77bbda..dce900f28f 100644 --- a/lib/mbuf/rte_mbuf.c +++ b/lib/mbuf/rte_mbuf.c @@ -686,4 +686,7 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len) m->pkt_len, m->ol_flags, m->nb_segs, m->port); + if (m->ol_flags & (RTE_MBUF_F_RX_QINQ | RTE_MBUF_F_TX_QINQ)) + fprintf(f, ", vlan_tci_outer=%u", m->vlan_tci_outer); + if (m->ol_flags & (RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_TX_VLAN)) fprintf(f, ", vlan_tci=%u", m->vlan_tci); -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:29.952945865 +0100 +++ 0007-mbuf-dump-outer-VLAN.patch 2022-06-09 12:34:29.613980415 +0100 @@ -1 +1 @@ -From 4d75f3fcdedd86327c5d515e8fe5ece1ef16394d Mon Sep 17 00:00:00 2001 +From 1fae8c76b75781382f55648ac7b156e7b35a6224 Mon Sep 17 00:00:00 2001 @@ -9 +9 @@ -Enable printing of the outer VLAN if flags indicate it is present. +[ upstream commit 4d75f3fcdedd86327c5d515e8fe5ece1ef16394d ] @@ -11 +11 @@ -Cc: stable@dpdk.org +Enable printing of the outer VLAN if flags indicate it is present. @@ -21 +21 @@ -index 87592faccb..a2307cebe6 100644 +index 604d77bbda..dce900f28f 100644 @@ -24 +24 @@ -@@ -675,4 +675,7 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len) +@@ -686,4 +686,7 @@ rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len)