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 77EEEA0C45 for ; Tue, 30 Nov 2021 17:44:17 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6F73A4118F; Tue, 30 Nov 2021 17:44:17 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id D581141177 for ; Tue, 30 Nov 2021 17:44:15 +0100 (CET) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id AE9634000A for ; Tue, 30 Nov 2021 16:44:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290655; bh=x7qmRL39lngNI9KJVXH6cL61hlMVHA1JOcf88GFX+uc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bh6lYu3lVEJjUONYFpVO2coAH972c677IrNX8IV6m4uK4Q0kHKDzVXRKjqAmKPhdK F6UhTopxUPo2aF9SXFltUuHo+MPp+pKduohhj3qs1w0AljbXqQxzaWzpHdMZ7WM/Yd xRzZuzgY4y/0KSuk9lspfuEjoSy1yymKnhWq/+vHahXAcplwYWyeORKT+gVj0A/QCQ KkV7b75vgVyRVQme+4E5iIKOwVr8LPMLQKwUUxH+/iEu/eYrLg/jS9/KxSQouAwEqL CjGigHsSQsB0foXohhc5cbT1jWggH/UlqSOIMZvhy+LRlMFEA6f4YTvsZjWHkLHzPe jy08qk0HlOVwA== Received: by mail-ed1-f72.google.com with SMTP id q17-20020aa7da91000000b003e7c0641b9cso17479883eds.12 for ; Tue, 30 Nov 2021 08:44:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=x7qmRL39lngNI9KJVXH6cL61hlMVHA1JOcf88GFX+uc=; b=NhaHubMoA86QE/BLsDNkmewZ174Q7xijuFfaxmawmD7JZplfrjRABaycl02TnMl7sW gT0+x6/vFVu8v4n3/IsDasO0XfiXxBiFhsMpoQ8oY+MsMtfttbRWXCAqO0g+91IkwjLH 13LS4hL+Ok+gQMB/I4vh8rIKMOdTbpLW+lhLIFdpUMkmpAC8FL6HsaxKvzJLOl+qJg8S /V9V/FTvyQkWXp3EUwJPHNV7P61Jaspij5QMuhhyJ4IBU3MjFduuKlj+EzRFV9IJioYI 70LBNZJ5biAkdB2+iFePfxRO1F4L23OeF+UCypbadYSlZjH5+XkGJRA0+ceqho/Bbsrb UzqA== X-Gm-Message-State: AOAM532lblxhQ8Y3v+P6XmkwoPjfyMR7dp1sPxkKGFAJAI+dmXWAJoAB bPR2du0MMMeOTK/1aRK9PuhASvxqZfQwjFV8Z4CWQypSRmDoxkj6ViWLyqgZd2G0+hoEHfBvM6g ubmeyh9q6O0n4NIaBq/c9uBgB X-Received: by 2002:a17:907:7fa9:: with SMTP id qk41mr224709ejc.422.1638290655169; Tue, 30 Nov 2021 08:44:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJzELiwQkRtabuAs37/Sicfc2l9f01jpzC/0V4DQiEaIcbFnuMgUHy2EARj6xgJ4FMBYwOPjxg== X-Received: by 2002:a17:907:7fa9:: with SMTP id qk41mr224679ejc.422.1638290654981; Tue, 30 Nov 2021 08:44:14 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id d23sm3907796edq.51.2021.11.30.08.44.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:44:14 -0800 (PST) From: christian.ehrhardt@canonical.com To: Xiaoyu Min Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx4: fix empty Ethernet spec with VLAN' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:36:02 +0100 Message-Id: <20211130163605.2460997-158-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/e495c937fd06d03b27f31d218ab20d231866f73f Thanks. Christian Ehrhardt --- >From e495c937fd06d03b27f31d218ab20d231866f73f Mon Sep 17 00:00:00 2001 From: Xiaoyu Min Date: Mon, 22 Nov 2021 21:53:29 +0800 Subject: [PATCH] net/mlx4: fix empty Ethernet spec with VLAN [ upstream commit d564eea7ce7fe66f6b4210956b8907f663d30734 ] When the ETH spec is empty MLX4 PMD doesn't allow match other criteria, which means the flow should be promisc one. Currently, PMD validates this by setting flow->promisc bit when ETH spec is empty and checking whether there is other rte_flow_item followed when flow->promisc is on. However, commit [1] adds support to match traffic only on VLAN id, the above validation logic should be changed accordingly. This patch changes the above validate logic by skipping flow->promisc check if this item is VLAN. [1]: Fixes: c0d239263156 ("net/mlx4: support flow w/o ETH spec and with VLAN") Signed-off-by: Xiaoyu Min Acked-by: Matan Azrad --- drivers/net/mlx4/mlx4_flow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx4/mlx4_flow.c b/drivers/net/mlx4/mlx4_flow.c index b268c0fafa..927715ba0f 100644 --- a/drivers/net/mlx4/mlx4_flow.c +++ b/drivers/net/mlx4/mlx4_flow.c @@ -714,7 +714,8 @@ fill: flow->internal = 1; continue; } - if (flow->promisc || flow->allmulti) { + if ((item->type != RTE_FLOW_ITEM_TYPE_VLAN && flow->promisc) || + flow->allmulti) { msg = "mlx4 does not support additional matching" " criteria combined with indiscriminate" " matching on Ethernet headers"; -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:15.059035520 +0100 +++ 0158-net-mlx4-fix-empty-Ethernet-spec-with-VLAN.patch 2021-11-30 16:50:06.142876112 +0100 @@ -1 +1 @@ -From d564eea7ce7fe66f6b4210956b8907f663d30734 Mon Sep 17 00:00:00 2001 +From e495c937fd06d03b27f31d218ab20d231866f73f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d564eea7ce7fe66f6b4210956b8907f663d30734 ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index 2e1b6c87e9..9d7247cf81 100644 +index b268c0fafa..927715ba0f 100644 @@ -33 +34 @@ -@@ -713,7 +713,8 @@ fill: +@@ -714,7 +714,8 @@ fill: