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 C570141D52 for ; Thu, 23 Feb 2023 16:09:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A94DE43225; Thu, 23 Feb 2023 16:09:54 +0100 (CET) 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 6DC034316C for ; Thu, 23 Feb 2023 16:09:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164992; 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=EZSwI7YuX5KTZ1C0zyys7OUhP4r92McKbsbDamEj7xo=; b=F+O6JBq5Q0lKXkS3xre8azvRcFYUcbZPNCLCQPeqTPoQWbej3QFzMFPmAbdi9eArpsBJ/a ThPlhp+RfHK5aF6mS3wmQRIVLx3QYY+UkDPkkPsWMrE5UjANAQmnpXhip0SAippXVOywFd k4qsN/n/W1IlBDABbm3nZKHM+Xb34PY= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-554-hmrExYUjPtayvfFiob9Ssw-1; Thu, 23 Feb 2023 10:09:11 -0500 X-MC-Unique: hmrExYUjPtayvfFiob9Ssw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 077F92805599; Thu, 23 Feb 2023 15:08:13 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 122702166B2B; Thu, 23 Feb 2023 15:08:11 +0000 (UTC) From: Kevin Traynor 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 21.11.4 Date: Thu, 23 Feb 2023 15:06:01 +0000 Message-Id: <20230223150631.723699-70-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.4 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/28/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/08f5c42a98dcaf2a73cfca4f2353f5d86c8fb050 Thanks. Kevin --- >From 08f5c42a98dcaf2a73cfca4f2353f5d86c8fb050 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 e8ef844427..ca08bd466a 100644 --- a/drivers/net/sfc/sfc_mae.c +++ b/drivers/net/sfc/sfc_mae.c @@ -4145,4 +4145,19 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, } + /* + * 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(ctx.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; + } + spec_mae->action_set = sfc_mae_action_set_attach(sa, &ctx); if (spec_mae->action_set != NULL) { @@ -4161,4 +4176,5 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, fail_action_set_add: +fail_check_fate_action: fail_workaround_jump_delivery: fail_nb_count: -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:25.496601152 +0000 +++ 0070-net-sfc-enforce-fate-action-in-transfer-flow-rules.patch 2023-02-23 14:46:23.832236182 +0000 @@ -1 +1 @@ -From 3b8e8f046b6754dfa7157675699ea0f5c65bba36 Mon Sep 17 00:00:00 2001 +From 08f5c42a98dcaf2a73cfca4f2353f5d86c8fb050 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 e8ef844427..ca08bd466a 100644 @@ -25 +26 @@ -@@ -3911,4 +3911,19 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, +@@ -4145,4 +4145,19 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, @@ -45 +46 @@ -@@ -3927,4 +3942,5 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, +@@ -4161,4 +4176,5 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, @@ -49 +50 @@ - fail_workaround_tunnel_delivery: + fail_workaround_jump_delivery: