From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 355D2C433EF for ; Thu, 17 Feb 2022 07:57:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236824AbiBQH5c (ORCPT ); Thu, 17 Feb 2022 02:57:32 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:41544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236804AbiBQH5B (ORCPT ); Thu, 17 Feb 2022 02:57:01 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2DA9DE94 for ; Wed, 16 Feb 2022 23:56:43 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C1EA961AA8 for ; Thu, 17 Feb 2022 07:56:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E4E62C36AE2; Thu, 17 Feb 2022 07:56:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645084602; bh=q+9l0IXHmkh58YrTte7TVGgHtGa8mRPNAfWsSTMvcW8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qF3AZYNnl2RKZ6z9JUvQy3e5IEnhDbqbZm2Ot5KWk8RW5A9fXOLHkxcB+b5Kklo4X Bo6KrUSFV3YM1+HzYUk1i3UpIM4XV/GOpc1dmZj0wo6NSqA+Y/vjkeqHpFMSyistnd kPJBeNJThbAUIAT8Bm1QDcWy46Dn+JFAMBKcl6fGEqt77VmunQM5+St7kZwS/YRYuG OmUCF39JufqNts8ShPTjiHaA5ePPzzWZjIbKDaaNn6D9rII57afwFGROXEYH5jp5PB CF52vzIluf9G/MOceshIxleo3xeWJ/MVRFLtDz003gwz0G/oWnQbvCPBdytBCZhdH9 FFeBNGP4pENSQ== From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Roi Dayan , Saeed Mahameed Subject: [net-next 15/15] net/mlx5e: TC, Allow sample action with CT Date: Wed, 16 Feb 2022 23:56:32 -0800 Message-Id: <20220217075632.831542-16-saeed@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220217075632.831542-1-saeed@kernel.org> References: <20220217075632.831542-1-saeed@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Roi Dayan Allow sample+CT actions but still block sample+CT NAT as it is not supported. Signed-off-by: Roi Dayan Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c | 6 ------ .../net/ethernet/mellanox/mlx5/core/en/tc/act/sample.c | 8 +++++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c index 1492d3e49c59..7368f95f2310 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c @@ -14,12 +14,6 @@ tc_act_can_offload_ct(struct mlx5e_tc_act_parse_state *parse_state, bool clear_action = act->ct.action & TCA_CT_ACT_CLEAR; struct netlink_ext_ack *extack = parse_state->extack; - if (flow_flag_test(parse_state->flow, SAMPLE)) { - NL_SET_ERR_MSG_MOD(extack, - "Sample action with connection tracking is not supported"); - return false; - } - if (parse_state->ct && !clear_action) { NL_SET_ERR_MSG_MOD(extack, "Multiple CT actions are not supported"); return false; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/sample.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/sample.c index f39538e3d027..2c0196431302 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/sample.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/sample.c @@ -13,10 +13,12 @@ tc_act_can_offload_sample(struct mlx5e_tc_act_parse_state *parse_state, struct mlx5_flow_attr *attr) { struct netlink_ext_ack *extack = parse_state->extack; + bool ct_nat; - if (flow_flag_test(parse_state->flow, CT)) { - NL_SET_ERR_MSG_MOD(extack, - "Sample action with connection tracking is not supported"); + ct_nat = attr->ct_attr.ct_action & TCA_CT_ACT_NAT; + + if (flow_flag_test(parse_state->flow, CT) && ct_nat) { + NL_SET_ERR_MSG_MOD(extack, "Sample action with CT NAT is not supported"); return false; } -- 2.34.1