From patchwork Wed Aug 23 08:08:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 804880 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="P+17w1Ir"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xcg6m4FYLz9sCZ for ; Wed, 23 Aug 2017 18:08:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753543AbdHWIIp (ORCPT ); Wed, 23 Aug 2017 04:08:45 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:35765 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753522AbdHWIIb (ORCPT ); Wed, 23 Aug 2017 04:08:31 -0400 Received: by mail-wr0-f194.google.com with SMTP id p8so602271wrf.2 for ; Wed, 23 Aug 2017 01:08:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OG7od1V5mgKDrluF2u1kyN3ZPn9mPGLLaVpWJRPkfho=; b=P+17w1IroeHKPAwf9K9FFDv7UF5qs2eg8qoqTdXbrSrHyhfe40LX/SjETJtOxSvKDc 9QiM+bLGqox5NHR/4mt98ozU2KMJ84roo5UbJkV4HlYjM6wTHRatNPN2tP88ciWhb5/F O3yiiV/x0eWvIWMU70KaVeWzYeWaYeZsyMXVib6DfMm2pa2eAxJwWobCfer2FMknHWHg H4+gJVym/0nBp+AnzNdr1RkwXH4vwHLh62gElxElsquNNOH/UWpZ8wJ2vaMhcrFOATuY 7JoYNNySvub3TH8whMc6ZZz/jWKpSWTSC2bv5wvMZsFxNGGNP9WLnXqy/YSQg4x7Z2XM uj2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OG7od1V5mgKDrluF2u1kyN3ZPn9mPGLLaVpWJRPkfho=; b=ATFQqZ6lpa1YlB/aKQhwcpiIdGVcfsLYZzEcsRs2FeiXzN3YAJr2WDIgmVAr0aXp3D QXUovm+06lbkUJZl+WsK1naOXz1ACikYMYfjzT3d82u2thbV/nvE8NC+IbABTtSXJAXS jqqe3nIdLprrDcqa+S0+fSbOsGsjiGXZbAhsolffxtkClxotRhePNr/SYYhjxFSebmHK CGgUd3SUbITk0qDdpg9T1iJoB14CcuT/kBtI7mfRklpBwkY2GwjGdIhx+JiZ6sQYsxWY dqXAhkXzrq4TLv2PGvqqvIh18RLpO2UqBnxAOgWOKRdpJfVdO26cvgZlFihxuD81N593 6Flw== X-Gm-Message-State: AHYfb5gBqeyWLvV7ybk4q5Yeus8mtSCxM72q6kzLRzGKabTXRBC+5oDB FoXU6KAIDcaI1oBJx1U= X-Received: by 10.223.154.166 with SMTP id a35mr982464wrc.226.1503475709481; Wed, 23 Aug 2017 01:08:29 -0700 (PDT) Received: from localhost (ip-89-177-135-35.net.upcbroadband.cz. [89.177.135.35]) by smtp.gmail.com with ESMTPSA id 6sm497327wrd.20.2017.08.23.01.08.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Aug 2017 01:08:28 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, idosch@mellanox.com, mlxsw@mellanox.com, jhs@mojatatu.com, xiyou.wangcong@gmail.com Subject: [patch net-next 5/5] mlxsw: spectrum_flower: Offload goto_chain termination action Date: Wed, 23 Aug 2017 10:08:22 +0200 Message-Id: <20170823080822.14898-5-jiri@resnulli.us> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170823080652.14847-1-jiri@resnulli.us> References: <20170823080652.14847-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko If action is gact goto_chain, offload it to HW by jumping to another ruleset. Signed-off-by: Jiri Pirko --- .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 23 ++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c index 34872aa..8aace9a 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c @@ -45,7 +45,7 @@ #include "core_acl_flex_keys.h" static int mlxsw_sp_flower_parse_actions(struct mlxsw_sp *mlxsw_sp, - struct net_device *dev, + struct net_device *dev, bool ingress, struct mlxsw_sp_acl_rule_info *rulei, struct tcf_exts *exts) { @@ -71,6 +71,20 @@ static int mlxsw_sp_flower_parse_actions(struct mlxsw_sp *mlxsw_sp, err = mlxsw_sp_acl_rulei_act_trap(rulei); if (err) return err; + } else if (is_tcf_gact_goto_chain(a)) { + u32 chain_index = tcf_gact_goto_chain_index(a); + struct mlxsw_sp_acl_ruleset *ruleset; + u16 group_id; + + ruleset = mlxsw_sp_acl_ruleset_lookup(mlxsw_sp, dev, + ingress, + chain_index, + MLXSW_SP_ACL_PROFILE_FLOWER); + if (IS_ERR(ruleset)) + return PTR_ERR(ruleset); + + group_id = mlxsw_sp_acl_ruleset_group_id(ruleset); + mlxsw_sp_acl_rulei_act_jump(rulei, group_id); } else if (is_tcf_mirred_egress_redirect(a)) { int ifindex = tcf_mirred_ifindex(a); struct net_device *out_dev; @@ -246,7 +260,7 @@ static int mlxsw_sp_flower_parse_ip(struct mlxsw_sp *mlxsw_sp, } static int mlxsw_sp_flower_parse(struct mlxsw_sp *mlxsw_sp, - struct net_device *dev, + struct net_device *dev, bool ingress, struct mlxsw_sp_acl_rule_info *rulei, struct tc_cls_flower_offload *f) { @@ -364,7 +378,8 @@ static int mlxsw_sp_flower_parse(struct mlxsw_sp *mlxsw_sp, if (err) return err; - return mlxsw_sp_flower_parse_actions(mlxsw_sp, dev, rulei, f->exts); + return mlxsw_sp_flower_parse_actions(mlxsw_sp, dev, ingress, + rulei, f->exts); } int mlxsw_sp_flower_replace(struct mlxsw_sp_port *mlxsw_sp_port, bool ingress, @@ -390,7 +405,7 @@ int mlxsw_sp_flower_replace(struct mlxsw_sp_port *mlxsw_sp_port, bool ingress, } rulei = mlxsw_sp_acl_rule_rulei(rule); - err = mlxsw_sp_flower_parse(mlxsw_sp, dev, rulei, f); + err = mlxsw_sp_flower_parse(mlxsw_sp, dev, ingress, rulei, f); if (err) goto err_flower_parse;