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 01D83A0C47 for ; Tue, 10 Aug 2021 17:43:14 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E957A4014F; Tue, 10 Aug 2021 17:43:13 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id 63CE04114F for ; Tue, 10 Aug 2021 17:43:12 +0200 (CEST) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (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-canonical-1.canonical.com (Postfix) with ESMTPS id 4C7523F338 for ; Tue, 10 Aug 2021 15:43:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610192; bh=Qm/Cwt/8JfgzDkFqe75cVj5PeR5eNu2cwwglQS2uAiw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sCK2aafILVpYCuQV7jmJvaWLfNBHODncZAa0/GOi3arHwZiEDyCukKNJByJ5UHuEi 1NvEoKB3DOLSdA5vnPw92TYdL91xwT6Zv0V9xsr3USlhPUGIhLWKC/TTnEPMyVUi7W yGZtoZi9sMFxHk2Gw7V96FChTW3MsPpw0qjJ+JIuxtSeFb6V8JcC1IgtcutCh4Q1CW JPtfXAGskk0B8duS96bTmFy8YHrJdlJfSLJ8WvKeTNzCTYF/VUu2R55XqAHh1xJEba 66KFQTRCYRV+cxVLXo0744bscpueIosC9hBJ1LOirDuokWBLDnyGT4Ng90C5efOh2J qG8FMcCzXsD6A== Received: by mail-ed1-f69.google.com with SMTP id y22-20020a0564023596b02903bd9452ad5cso10909849edc.20 for ; Tue, 10 Aug 2021 08:43:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Qm/Cwt/8JfgzDkFqe75cVj5PeR5eNu2cwwglQS2uAiw=; b=E9OxlynbOsYgf7LLPp/5OlTHf5Z8NIMlMQmqgE0Y+dgSkDlG0CRFLolfZdl8G8Ogrg eOEnEyAFPIWuG0+3NtkaPr5r/Vt2JR+TYRuYHJf9qaf8gJEAuZtl0Wr8TeoTlOS8dr+A aOEqu0oN3rAjIflX7ji5RWWvrtMex9S2czTOoX5qR4AiP3vWOE7VAHJhvDP4A77cVhy4 vCuCsETrd0iUczmTuIF/2VAAwL2CUdYruweHv/KZy/RrSIigRkGe6lB/uAjnwgqBThPQ JakY0O5lr0MYC44BmZ5+2CxNDCULxSSWm6hl7UaHZZazrQOLzyTbpGBw1cPkCiGQhKor MCVQ== X-Gm-Message-State: AOAM533b3sZD0OOFuDeFkZbdMV3boyXa7BprOn0noWCq6iuvxjkjFnEn 0bHm5dZfxz+57IOIAbDcs0Fd6TNUQZQwbzg9oERBJmi2WIUbAK0y9w4ebv6/aajKhK5Ry4DFa7u bEYEPvnBbBndTMDo9RNuw4byd X-Received: by 2002:aa7:df03:: with SMTP id c3mr5614659edy.348.1628610191835; Tue, 10 Aug 2021 08:43:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxqEm1pZeaMDKLLAcCYW/m1KfPQlAxEegpsMMMh9CNY9h4xrE59RulPcf2DKEe+2QaxJMhDYw== X-Received: by 2002:aa7:df03:: with SMTP id c3mr5614629edy.348.1628610191597; Tue, 10 Aug 2021 08:43:11 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id lk14sm7034740ejb.9.2021.08.10.08.43.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:43:11 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Xiaoyu Min Cc: Matan Azrad , dpdk stable Date: Tue, 10 Aug 2021 17:39:33 +0200 Message-Id: <20210810154022.749358-53-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix match MPLS over GRE with key' has been queued to stable release 19.11.10 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/21. 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/c685b39b909cc09459301dad68040233fcda1fe7 Thanks. Christian Ehrhardt --- >From c685b39b909cc09459301dad68040233fcda1fe7 Mon Sep 17 00:00:00 2001 From: Xiaoyu Min Date: Thu, 1 Jul 2021 13:54:56 +0800 Subject: [PATCH] net/mlx5: fix match MPLS over GRE with key [ upstream commit 4b1cb50a86b73dceade317be4541f2c176c7ca5b ] Currently PMD needs previous layer information in order to set corresponding match field for MPLSoGRE or MPLSoUDP. GRE_KEY item is missing as supported previous layer when translate item MPLS, which causes flow[1] cannot match MPLS over GRE traffic. According to RFC4023, MPLS over GRE tunnel with optional key field needs to be supported too. By adding missing GRE_KEY as supported previous layer fix problem. [1]: flow create 0 ingress pattern eth / ipv6 / gre k_bit is 1 / gre_key / mpls label is 966138 / end actions queue index 1 / mark id 0xa / end Fixes: a7a0365565a4 ("net/mlx5: match GRE key and present bits") Signed-off-by: Xiaoyu Min Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 42ae1bbe2c..5f0d720d69 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -6221,6 +6221,8 @@ flow_dv_translate_item_mpls(void *matcher, void *key, MLX5_UDP_PORT_MPLS); break; case MLX5_FLOW_LAYER_GRE: + /* Fall-through. */ + case MLX5_FLOW_LAYER_GRE_KEY: MLX5_SET(fte_match_set_misc, misc_m, gre_protocol, 0xffff); MLX5_SET(fte_match_set_misc, misc_v, gre_protocol, RTE_ETHER_TYPE_MPLS); -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:15.066446077 +0200 +++ 0053-net-mlx5-fix-match-MPLS-over-GRE-with-key.patch 2021-08-10 15:11:13.038638243 +0200 @@ -1 +1 @@ -From 4b1cb50a86b73dceade317be4541f2c176c7ca5b Mon Sep 17 00:00:00 2001 +From c685b39b909cc09459301dad68040233fcda1fe7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4b1cb50a86b73dceade317be4541f2c176c7ca5b ] + @@ -22 +23,0 @@ -Cc: stable@dpdk.org @@ -31 +32 @@ -index 4758b9f2cb..0209a3e8e6 100644 +index 42ae1bbe2c..5f0d720d69 100644 @@ -34 +35 @@ -@@ -9064,6 +9064,8 @@ flow_dv_translate_item_mpls(void *matcher, void *key, +@@ -6221,6 +6221,8 @@ flow_dv_translate_item_mpls(void *matcher, void *key,