From patchwork Thu Oct 13 06:06:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shmulik Ladkani X-Patchwork-Id: 681623 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3svgJp0GT2z9sD6 for ; Thu, 13 Oct 2016 17:08:26 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=IDfm59ri; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934371AbcJMGIA (ORCPT ); Thu, 13 Oct 2016 02:08:00 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:35088 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934270AbcJMGHv (ORCPT ); Thu, 13 Oct 2016 02:07:51 -0400 Received: by mail-pf0-f194.google.com with SMTP id s8so4313828pfj.2 for ; Wed, 12 Oct 2016 23:07:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QZqVPRKzJaPw4G0ddbAxN1WNIxg5zrULGNhM2kRvd40=; b=IDfm59riwYiEsHhNwRhz2DxCm20XMXpNYdgp2YLBCkt+3yP549hXKddUcxa+XSLsqY 7L1D5Gdp3OoJSAUa5Mh5GqRiYci50O0bb10GAOz/Kv0JZ0UxCUn1ilSRk16KAjo7XbBR LHxNb6giX72suP40vaiaN4tqtXX90SGPnR1otQSzR+dss/kxOmdmIvw9N7Jaf2jTIEIh OaqSdqSPI7pLRzJzUv1+srRI9C2KrLWITCeW36z22P/XJ3iSL8R2VsZuH97FnFGBeWG3 NLdoYp3GDs5KVmNu7HTVz5xatea1DjKsB4hH59OnJLkOE0uADUuZxP9YrM1ZOABy8HoE E/oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QZqVPRKzJaPw4G0ddbAxN1WNIxg5zrULGNhM2kRvd40=; b=X0/UmvlyXQJf0fMkuZ7HjZxRh0n+CTv9NEzb+vc1g6vYWX3zZZpLX4wwgSnIloqV+3 SUD7BBP0PYsmAfIv4dKtewIgVw59Cz3oi8FAIs2N6rO3YEtsXwRqE6IVLUdljZB69VC9 qewgA/p/RJIjv7Xyy0BVxl1tcNaIII7MKqq4AvrdjnvEHYOwDSnY79pZ9ZybqBSEMIfP i+kzDiDiXfqmy4d58PuDq06FhkAQarpY/MF5EdbOFKqEUrtRR/VykG9pVeDKnKP9j8g9 eBurXiHzSzTWiU8NTSbO0nfkJ9A/ZKvpUYZ8GeLR1cmxArVROhRw1Qxb+xh6EkU9RsZ4 8wig== X-Gm-Message-State: AA6/9Rk0BcWEpkKfKxg62U37vIuxsEXnGoAfYPrGMHUmKsa2Gv6aDNF7suOhUFPGl17hag== X-Received: by 10.99.117.91 with SMTP id f27mr6149369pgn.75.1476338828887; Wed, 12 Oct 2016 23:07:08 -0700 (PDT) Received: from pixies.home ([47.153.177.125]) by smtp.gmail.com with ESMTPSA id s25sm16109148pfj.93.2016.10.12.23.07.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Oct 2016 23:07:08 -0700 (PDT) From: Shmulik Ladkani To: David Miller Cc: Jamal Hadi Salim , Eric Dumazet , WANG Cong , Daniel Borkmann , netdev@vger.kernel.org, Shmulik Ladkani , Hariprasad S , Jeff Kirsher , Saeed Mahameed , Jiri Pirko , Ido Schimmel , Jakub Kicinski Subject: [PATCH v4 net-next 3/4] net/sched: tc_mirred: Rename public predicates 'is_tcf_mirred_redirect' and 'is_tcf_mirred_mirror' Date: Thu, 13 Oct 2016 09:06:43 +0300 Message-Id: <1476338804-25440-4-git-send-email-shmulik.ladkani@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1476338804-25440-1-git-send-email-shmulik.ladkani@gmail.com> References: <1476338804-25440-1-git-send-email-shmulik.ladkani@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org These accessors are used in various drivers that support tc offloading, to detect properties of a given 'tc_action'. 'is_tcf_mirred_redirect' tests that the action is TCA_EGRESS_REDIR. 'is_tcf_mirred_mirror' tests that the action is TCA_EGRESS_MIRROR. As a prep towards supporting INGRESS redir/mirror, rename these predicates to reflect their true meaning: s/is_tcf_mirred_redirect/is_tcf_mirred_egress_redirect/ s/is_tcf_mirred_mirror/is_tcf_mirred_egress_mirror/ Signed-off-by: Shmulik Ladkani Cc: Hariprasad S Cc: Jeff Kirsher Cc: Saeed Mahameed Cc: Jiri Pirko Cc: Ido Schimmel Cc: Jakub Kicinski Acked-by: Jamal Hadi Salim --- drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 +- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 +++- drivers/net/ethernet/netronome/nfp/nfp_net_offload.c | 2 +- include/net/tc_act/tc_mirred.h | 4 ++-- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c index 49d2deb..52af62e 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c @@ -113,7 +113,7 @@ static int fill_action_fields(struct adapter *adap, } /* Re-direct to specified port in hardware. */ - if (is_tcf_mirred_redirect(a)) { + if (is_tcf_mirred_egress_redirect(a)) { struct net_device *n_dev; unsigned int i, index; bool found = false; diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index a244d9a..784b0b9 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -8410,7 +8410,7 @@ static int parse_tc_actions(struct ixgbe_adapter *adapter, } /* Redirect to a VF or a offloaded macvlan */ - if (is_tcf_mirred_redirect(a)) { + if (is_tcf_mirred_egress_redirect(a)) { int ifindex = tcf_mirred_ifindex(a); err = handle_redirect_action(adapter, ifindex, queue, diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index ce8c54d..135a95b 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -404,7 +404,7 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, struct tcf_exts *exts, continue; } - if (is_tcf_mirred_redirect(a)) { + if (is_tcf_mirred_egress_redirect(a)) { int ifindex = tcf_mirred_ifindex(a); struct net_device *out_dev; struct mlx5e_priv *out_priv; diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c index 1ec0a4c..43a5edd 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -1237,8 +1237,10 @@ static int mlxsw_sp_port_add_cls_matchall(struct mlxsw_sp_port *mlxsw_sp_port, tcf_exts_to_list(cls->exts, &actions); list_for_each_entry(a, &actions, list) { - if (!is_tcf_mirred_mirror(a) || protocol != htons(ETH_P_ALL)) + if (!is_tcf_mirred_egress_mirror(a) || + protocol != htons(ETH_P_ALL)) { return -ENOTSUPP; + } err = mlxsw_sp_port_add_cls_matchall_mirror(mlxsw_sp_port, cls, a, ingress); diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_offload.c b/drivers/net/ethernet/netronome/nfp/nfp_net_offload.c index 8acfb63..cfed40c 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_offload.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_offload.c @@ -128,7 +128,7 @@ static void nfp_net_bpf_stats_reset(struct nfp_net *nn) if (is_tcf_gact_shot(a)) return NN_ACT_TC_DROP; - if (is_tcf_mirred_redirect(a) && + if (is_tcf_mirred_egress_redirect(a) && tcf_mirred_ifindex(a) == nn->netdev->ifindex) return NN_ACT_TC_REDIR; } diff --git a/include/net/tc_act/tc_mirred.h b/include/net/tc_act/tc_mirred.h index 9543109..604bc31 100644 --- a/include/net/tc_act/tc_mirred.h +++ b/include/net/tc_act/tc_mirred.h @@ -14,7 +14,7 @@ struct tcf_mirred { }; #define to_mirred(a) ((struct tcf_mirred *)a) -static inline bool is_tcf_mirred_redirect(const struct tc_action *a) +static inline bool is_tcf_mirred_egress_redirect(const struct tc_action *a) { #ifdef CONFIG_NET_CLS_ACT if (a->ops && a->ops->type == TCA_ACT_MIRRED) @@ -23,7 +23,7 @@ static inline bool is_tcf_mirred_redirect(const struct tc_action *a) return false; } -static inline bool is_tcf_mirred_mirror(const struct tc_action *a) +static inline bool is_tcf_mirred_egress_mirror(const struct tc_action *a) { #ifdef CONFIG_NET_CLS_ACT if (a->ops && a->ops->type == TCA_ACT_MIRRED)