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 10D5041D4F for ; Thu, 23 Feb 2023 10:39:50 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0C09B43150; Thu, 23 Feb 2023 10:39:50 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id 488C5427E9 for ; Thu, 23 Feb 2023 10:39:48 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id j19-20020a05600c1c1300b003e9b564fae9so3649652wms.2 for ; Thu, 23 Feb 2023 01:39:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=bjUCpTbTRSVt1bTOna3K882jxlW/qrnnlRFUKPBnyM4=; b=VmCezL2O8R4yBscfNUPRG6VSWCf5F8OcLPspKVdkPZzKvQ/7FBGgt6J+Ku73xTSrWY e/XqytfxhF3s0BX9rUTZmgN8aL/LIYGCz66X/NepEhLj/ehUnAVDA+C433VgMtlHUIz7 BxwNEzjOh0wy++oSA1vZFfRU2A18sVSEQAxdwC1DwWNkcU/O9sMEs2RO9LG/t28tR2ga vOJ3+J9P5saelPSiO71CtVRvg/xIFITd8RGHfXMjmgd0MF/SuEM/aTxaFvkEVZ1D/UGk GXoj180qDTSXJnlLLSDF7OAXEaJ3NqSzW1TftwJHx+vDxLFynbdkLjpFIsv7lUgDwh6M RTSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=bjUCpTbTRSVt1bTOna3K882jxlW/qrnnlRFUKPBnyM4=; b=maGYVzYnrmLFf1DOcdzuNczqdMlGgjH0CaXisvP/mFhpM6IuAnSf43gXEzfQoPA3XX prKcyMhp0saF+hsn5h5WW26RU3cVtCy7IUzuq5q1d/1WtdlwI5B4Ybwwci/rGBzHuChi /u3gLOvzTvqHY//5xmLzHtA05l0DkuCEhuuMSBThVCNCTinzzj+WGR/g4hUBYtlZv0Dy LAgg6LscRACepnJ9LZqeyD8g+nzVnuLOvtj7vAodMoCLCdw3X5pYCiwFqrLHBOPdBCTF ONz6Mb8bWzHC2FgltaZ+uOLLuTMNd1Bb35BtkKB5zkV+aaHk1xjOIS0WcFBzZEu4My0y aDtQ== X-Gm-Message-State: AO0yUKVWvhMZZZ5BRjPNYV+RJR4GyjN29hID3Cfy/X6yVnRoBQrrpv3n tRl4/IumuAl7zbG7QSjbyX8= X-Google-Smtp-Source: AK7set/rgGl/tMqDgP498i84CVLoKDwegPPPVJhApRbtaTY/27/T7qDAhInyEryF1qGOXXFXnr3uzA== X-Received: by 2002:a05:600c:4b30:b0:3df:fbc7:5b10 with SMTP id i48-20020a05600c4b3000b003dffbc75b10mr2726582wmp.0.1677145187791; Thu, 23 Feb 2023 01:39:47 -0800 (PST) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id y24-20020a1c4b18000000b003e22508a343sm11132181wma.12.2023.02.23.01.39.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 01:39:47 -0800 (PST) From: luca.boccassi@gmail.com To: Ivan Malov Cc: Viacheslav Galaktionov , Andy Moreton , Andrew Rybchenko , dpdk stable Subject: patch 'net/sfc: enforce fate action in transfer flow rules' has been queued to stable release 20.11.8 Date: Thu, 23 Feb 2023 09:36:53 +0000 Message-Id: <20230223093715.3926893-49-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223093715.3926893-1-luca.boccassi@gmail.com> References: <20230223093715.3926893-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 20.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/25/23. 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/3098cd7566794ad7c3770231dd52be532ea032fc Thanks. Luca Boccassi --- >From 3098cd7566794ad7c3770231dd52be532ea032fc Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Tue, 14 Feb 2023 17:12:47 +0400 Subject: [PATCH] net/sfc: enforce fate action in transfer flow rules [ upstream commit 3b8e8f046b6754dfa7157675699ea0f5c65bba36 ] According to DPDK documentation, not specifying a fate action in a flow rule results in undefined behaviour. Define right behaviour in the driver. Fixes: 0839236d0391 ("net/sfc: support flow action drop in transfer rules") Signed-off-by: Ivan Malov Reviewed-by: Viacheslav Galaktionov Reviewed-by: Andy Moreton Acked-by: Andrew Rybchenko --- drivers/net/sfc/sfc_mae.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c index 02f189eca5..45431f9cd2 100644 --- a/drivers/net/sfc/sfc_mae.c +++ b/drivers/net/sfc/sfc_mae.c @@ -2136,6 +2136,21 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, if (rc != 0) goto fail_rule_parse_action; + /* + * A DPDK flow entry must specify a fate action, which the parser + * converts into a DELIVER action in a libefx action set. An + * attempt to replace the action in the action set should + * fail. If it succeeds then report an error, as the + * parsed flow entry did not contain a fate action. + */ + rc = efx_mae_action_set_populate_drop(spec); + if (rc == 0) { + rc = rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, NULL, + "no fate action found"); + goto fail_check_fate_action; + } + *action_setp = sfc_mae_action_set_attach(sa, spec); if (*action_setp != NULL) { efx_mae_action_set_spec_fini(sa->nic, spec); @@ -2149,6 +2164,7 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, return 0; fail_action_set_add: +fail_check_fate_action: fail_rule_parse_action: efx_mae_action_set_spec_fini(sa->nic, spec); -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 09:36:30.189456956 +0000 +++ 0049-net-sfc-enforce-fate-action-in-transfer-flow-rules.patch 2023-02-23 09:36:28.294171192 +0000 @@ -1 +1 @@ -From 3b8e8f046b6754dfa7157675699ea0f5c65bba36 Mon Sep 17 00:00:00 2001 +From 3098cd7566794ad7c3770231dd52be532ea032fc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3b8e8f046b6754dfa7157675699ea0f5c65bba36 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index c254562696..3daeed81b9 100644 +index 02f189eca5..45431f9cd2 100644 @@ -25,3 +26,3 @@ -@@ -3910,6 +3910,21 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, - SFC_ASSERT(B_FALSE); - } +@@ -2136,6 +2136,21 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, + if (rc != 0) + goto fail_rule_parse_action; @@ -36 +37 @@ -+ rc = efx_mae_action_set_populate_drop(ctx.spec); ++ rc = efx_mae_action_set_populate_drop(spec); @@ -44,4 +45,4 @@ - spec_mae->action_set = sfc_mae_action_set_attach(sa, &ctx); - if (spec_mae->action_set != NULL) { - sfc_mae_mac_addr_del(sa, ctx.src_mac); -@@ -3926,6 +3941,7 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, + *action_setp = sfc_mae_action_set_attach(sa, spec); + if (*action_setp != NULL) { + efx_mae_action_set_spec_fini(sa->nic, spec); +@@ -2149,6 +2164,7 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, @@ -52,3 +53,3 @@ - fail_workaround_tunnel_delivery: - fail_nb_count: - sfc_mae_encap_header_del(sa, ctx.encap_header); + fail_rule_parse_action: + efx_mae_action_set_spec_fini(sa->nic, spec); +