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 D60EEA04FD for ; Tue, 12 Jul 2022 21:23:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CEC854281C; Tue, 12 Jul 2022 21:23:58 +0200 (CEST) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mails.dpdk.org (Postfix) with ESMTP id B4AF94281C for ; Tue, 12 Jul 2022 21:23:56 +0200 (CEST) Received: by mail-wm1-f46.google.com with SMTP id n185so5287745wmn.4 for ; Tue, 12 Jul 2022 12:23:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o42B6Kbv9gfBDcw75lC0Oo3FxtEzhjI5+1Ho3gYw0Ac=; b=meseR+2faoPQKJ1H/Qvo7WdjFrMyHumwRGTZxhZxS3ZbmxP8A0wnyIhJQgOwbVK9L3 iPSLXzGVirb9iAcauK3mfZJD3MKEv6oVN6dLjWixnnX/s4sALWcN6DPTsAKJ9XZVAggS MTA093k9vBv1+gsXy9NHfz3djpgSYCBvszKoUGTSkKW5cijj2o3RmSvIeNCIbnWaP5dZ PC+6JVa4X+Pnpd2qVtdHpQr5M8xpA8/Fv5MlheYgLnNatIm2eEq4nCZnrRloMhuQOwfr zu+jCRBw/dWXfDlrVL/4IYUaIfa/el3qa9d0mPAwJdUi7PtOHcUyKjnjXSasEeXdwPaQ gL2w== 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=o42B6Kbv9gfBDcw75lC0Oo3FxtEzhjI5+1Ho3gYw0Ac=; b=64Oip1sPxzvzP9Sz68UMiCVK0aqmaPPP6oUe4HfnCauTNjJPj7UQChZ1gMEt+e5MC8 EhVApQnnxHYihRya9gBZd6XGuWwOQFw889dPEutw3ochU506cq5YU93iPRcPmm+26brJ 0sgu7x//bOE46Yrw2Mj05zGKIxdEoxwEjd2I46nqLxcF87jxqnE5y6yZGdc0rNGDx+uL mu33Lhb56NTfBmeVTH13fuGRUgelt49HbW60Gn8AcKqCJnoBrXk42N01O1nlpGOdeFaI bYpCpts/ZO+zJILIGSV8IuuYqHr9/0PQ9pfX6Qq3pRuUsp6cxOu4VpJmdNG2KbJ2hm0S 3OGg== X-Gm-Message-State: AJIora9+xWRasF/fuFJkVUnbNFg1+YKoMrFB+MYLc8XFJ//5z/Vr02WY CJTwHSzmlOjJxbN5SU/BrxwgZo9WPuE1zg== X-Google-Smtp-Source: AGRyM1tFhdYFsrEBTXfxxhTaocxiO7VHPUCKx+bdZlPMYB1eZm+KysMoI1WSmhKncynlhb0IgKCc2A== X-Received: by 2002:a05:600c:a03:b0:39e:4f0c:938c with SMTP id z3-20020a05600c0a0300b0039e4f0c938cmr5499257wmp.145.1657653836406; Tue, 12 Jul 2022 12:23:56 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id u3-20020a5d6da3000000b0021d66cf9547sm11469629wrs.0.2022.07.12.12.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 12:23:55 -0700 (PDT) From: luca.boccassi@gmail.com To: Wenxuan Wu Cc: Zhimin Huang , Qiming Yang , dpdk stable Subject: patch 'net/iavf: fix GTP-U extension flow' has been queued to stable release 21.11.2 Date: Tue, 12 Jul 2022 20:23:48 +0100 Message-Id: <20220712192349.4174428-5-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220712192349.4174428-1-luca.boccassi@gmail.com> References: <20220706203506.3422496-31-luca.boccassi@gmail.com> <20220712192349.4174428-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 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 07/14/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/9e7d93ae2f99123324b90aae18dd5eb152c3a9b8 Thanks. Luca Boccassi --- >From 9e7d93ae2f99123324b90aae18dd5eb152c3a9b8 Mon Sep 17 00:00:00 2001 From: Wenxuan Wu Date: Wed, 6 Jul 2022 10:56:26 +0800 Subject: [PATCH] net/iavf: fix GTP-U extension flow [ upstream commit 755fd7b22da9115fc6682c2cf9e9268bb26bfb38 ] Due to the change of struct rte_gtp_psc_generic_hdr, kernel driver can not handle gtp_psc properly, we introduce a new structure to fix this gap between kernel driver and struct rte_gtp_psc_generic_hdr. Fixes: d5eb3e600d9e ("net/iavf: support flow director basic rule") Signed-off-by: Wenxuan Wu Tested-by: Zhimin Huang Acked-by: Qiming Yang --- drivers/net/iavf/iavf_fdir.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/net/iavf/iavf_fdir.c b/drivers/net/iavf/iavf_fdir.c index b63aaca91d..6b847894d8 100644 --- a/drivers/net/iavf/iavf_fdir.c +++ b/drivers/net/iavf/iavf_fdir.c @@ -1185,8 +1185,22 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, GTPU_DWN, QFI); } - rte_memcpy(hdr->buffer, gtp_psc_spec, - sizeof(*gtp_psc_spec)); + /* + * New structure to fix gap between kernel driver and + * rte_gtp_psc_generic_hdr. + */ + struct iavf_gtp_psc_spec_hdr { + uint8_t len; + uint8_t qfi:6; + uint8_t type:4; + uint8_t next; + } psc; + psc.len = gtp_psc_spec->hdr.ext_hdr_len; + psc.qfi = gtp_psc_spec->hdr.qfi; + psc.type = gtp_psc_spec->hdr.type; + psc.next = 0; + rte_memcpy(hdr->buffer, &psc, + sizeof(struct iavf_gtp_psc_spec_hdr)); } hdrs->count = ++layer; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-12 20:22:33.883126609 +0100 +++ 0005-net-iavf-fix-GTP-U-extension-flow.patch 2022-07-12 20:22:33.713247244 +0100 @@ -1 +1 @@ -From 755fd7b22da9115fc6682c2cf9e9268bb26bfb38 Mon Sep 17 00:00:00 2001 +From 9e7d93ae2f99123324b90aae18dd5eb152c3a9b8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 755fd7b22da9115fc6682c2cf9e9268bb26bfb38 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index f236260502..4789d46ab2 100644 +index b63aaca91d..6b847894d8 100644 @@ -24 +25 @@ -@@ -1300,8 +1300,22 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad, +@@ -1185,8 +1185,22 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,