{"id":815342,"url":"http://patchwork.ozlabs.org/api/patches/815342/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170919080020.5870-14-jiri@resnulli.us/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170919080020.5870-14-jiri@resnulli.us>","list_archive_url":null,"date":"2017-09-19T08:00:20","name":"[net-next,13/13] mlxsw: spectrum: Add multicast router traps and trap groups","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"9916da5c7eb8692b7e0156f23c18d18add0258c9","submitter":{"id":15321,"url":"http://patchwork.ozlabs.org/api/people/15321/?format=json","name":"Jiri Pirko","email":"jiri@resnulli.us"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170919080020.5870-14-jiri@resnulli.us/mbox/","series":[{"id":3798,"url":"http://patchwork.ozlabs.org/api/series/3798/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=3798","date":"2017-09-19T08:00:07","name":"mlxsw: Prepare for multicast router offload","version":1,"mbox":"http://patchwork.ozlabs.org/series/3798/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815342/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815342/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=resnulli-us.20150623.gappssmtp.com\n\theader.i=@resnulli-us.20150623.gappssmtp.com\n\theader.b=\"AAV+a4Vg\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xxFgM41Mjz9s7M\n\tfor ;\n\tTue, 19 Sep 2017 18:01:03 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751710AbdISIBC (ORCPT );\n\tTue, 19 Sep 2017 04:01:02 -0400","from mail-wr0-f195.google.com ([209.85.128.195]:36617 \"EHLO\n\tmail-wr0-f195.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751628AbdISIAf (ORCPT\n\t); Tue, 19 Sep 2017 04:00:35 -0400","by mail-wr0-f195.google.com with SMTP id g50so1706232wra.3\n\tfor ; Tue, 19 Sep 2017 01:00:34 -0700 (PDT)","from localhost (ip-89-177-125-82.net.upcbroadband.cz.\n\t[89.177.125.82]) by smtp.gmail.com with ESMTPSA id\n\t77sm1448140wmx.10.2017.09.19.01.00.33\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tTue, 19 Sep 2017 01:00:33 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=resnulli-us.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=YZqVSzAwXi76Waro4eCWWFPc2iJYNK+GC0bhSoUlCe8=;\n\tb=AAV+a4Vg1YbOFn8K5PXfjb+Ivn/WMH4WRZlCar0W/l27rFFpMTwtkmt5vxhGQ9Y7UP\n\t8GCHnTwmCGPHmEyKBwIKDD5p6L5rpe1rx5aeIzOjbWSklo60S+XYm3+eLlXRqYG63uaJ\n\tMeuodfb3vQbuyVi5/Hs3ffUlDWt8uGKfkaeNymH2RB5jLdU4H1ZKy9b/tByvhUBNbWJS\n\tuIjIs/5TntDDHH2ExbHQ4XNw2x/hfNmtdV1oML/6eHr99YtEfYAzFbgiGfg9PGst7zOA\n\tD3EplYUYQLHloEWWJYRRALcs+dl8su+G9LqCGZQ9mYlRQnGteWOISXVtpLZpmGWo75r+\n\tW7Qw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=YZqVSzAwXi76Waro4eCWWFPc2iJYNK+GC0bhSoUlCe8=;\n\tb=BvumgjJ6ChjMoQSPs/JSOoJ/R09InOxAA9/tTKdv6xbOrg3LC43r+EdL9a8ZgXPkQ4\n\t9tucKSdFNimyfbjBnPABl4a456Zo0hrLh9fHo58p/klC4oPgP4eYKfYgAKuQopWrvzeR\n\t1LqMaMHfXzraQJjpzEtKHk6GwI2KUDLvPGBydqGYM7rbV2CRrM+GhJ9W9PcDAApny6eO\n\taGtYzRRLVZlg7iTG5JUtwlylcjSUPjQI0xNu6PFpmpGpWNF1IXAQMCrdLAOMi5hXp+Os\n\ttlE9mU3t9Byyqs4dzdEPNdu34IRZByQERHDUNM/7DH7mbluhuIWXA1z1hBYjX4tA2FpC\n\tvD+w==","X-Gm-Message-State":"AHPjjUhAdMuGh/bkbTDN3hYzvI7lpPs48xHS3NvIO2aVCaLAjv+qaTo0\n\tBGJOB9kn/R3jK0g87T+cKI4iCzf/","X-Google-Smtp-Source":"AOwi7QBctg4gRv79ASaP7vQ1IBYhk7kbsxem4UDRDbIsNfKxo2+wPudXHLbgW8dTNQrzx+8GX/jpbw==","X-Received":"by 10.223.173.98 with SMTP id p89mr555239wrc.194.1505808033468; \n\tTue, 19 Sep 2017 01:00:33 -0700 (PDT)","From":"Jiri Pirko ","To":"netdev@vger.kernel.org","Cc":"davem@davemloft.net, yotamg@mellanox.com, idosch@mellanox.com,\n\tmlxsw@mellanox.com","Subject":"[patch net-next 13/13] mlxsw: spectrum: Add multicast router traps\n\tand trap groups","Date":"Tue, 19 Sep 2017 10:00:20 +0200","Message-Id":"<20170919080020.5870-14-jiri@resnulli.us>","X-Mailer":"git-send-email 2.9.5","In-Reply-To":"<20170919080020.5870-1-jiri@resnulli.us>","References":"<20170919080020.5870-1-jiri@resnulli.us>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Yotam Gigi \n\nAdd three new traps needed for multicast routing:\n - PIM: Trap for PIM protocol control packets.\n - RPF: Trap for packets that fail the RPF check on a specific hardware\n route entry.\n - MULTICAST: Generic trap for multicast. It is used for routes that trap\n the packets to the CPU.\n\nThe RPF and MULTICAST traps have rate limiters as these traps may have\nline-rate of packets trapped. The PIM trap has a rate limiter similarly to\nother L3 control protocols. The rate limiters are implemented by adding\nthree new trap groups for the newly introduced traps.\n\nSigned-off-by: Yotam Gigi \nReviewed-by: Ido Schimmel \nSigned-off-by: Jiri Pirko \n---\n drivers/net/ethernet/mellanox/mlxsw/reg.h | 3 +++\n drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 10 ++++++++++\n drivers/net/ethernet/mellanox/mlxsw/trap.h | 4 ++++\n 3 files changed, 17 insertions(+)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h\nindex c203e0d..17eba19 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h\n+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h\n@@ -3681,12 +3681,15 @@ enum mlxsw_reg_htgt_trap_group {\n \tMLXSW_REG_HTGT_TRAP_GROUP_SP_IGMP,\n \tMLXSW_REG_HTGT_TRAP_GROUP_SP_BGP,\n \tMLXSW_REG_HTGT_TRAP_GROUP_SP_OSPF,\n+\tMLXSW_REG_HTGT_TRAP_GROUP_SP_PIM,\n+\tMLXSW_REG_HTGT_TRAP_GROUP_SP_MULTICAST,\n \tMLXSW_REG_HTGT_TRAP_GROUP_SP_ARP,\n \tMLXSW_REG_HTGT_TRAP_GROUP_SP_HOST_MISS,\n \tMLXSW_REG_HTGT_TRAP_GROUP_SP_ROUTER_EXP,\n \tMLXSW_REG_HTGT_TRAP_GROUP_SP_REMOTE_ROUTE,\n \tMLXSW_REG_HTGT_TRAP_GROUP_SP_IP2ME,\n \tMLXSW_REG_HTGT_TRAP_GROUP_SP_DHCP,\n+\tMLXSW_REG_HTGT_TRAP_GROUP_SP_RPF,\n \tMLXSW_REG_HTGT_TRAP_GROUP_SP_EVENT,\n \tMLXSW_REG_HTGT_TRAP_GROUP_SP_IPV6_MLD,\n \tMLXSW_REG_HTGT_TRAP_GROUP_SP_IPV6_ND,\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c\nindex 6ba6ff2..e9b9443 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c\n@@ -3421,6 +3421,10 @@ static const struct mlxsw_listener mlxsw_sp_listener[] = {\n \t\t false, SP_IP2ME, DISCARD),\n \t/* ACL trap */\n \tMLXSW_SP_RXL_NO_MARK(ACL0, TRAP_TO_CPU, IP2ME, false),\n+\t/* Multicast Router Traps */\n+\tMLXSW_SP_RXL_MARK(IPV4_PIM, TRAP_TO_CPU, PIM, false),\n+\tMLXSW_SP_RXL_MARK(RPF, TRAP_TO_CPU, RPF, false),\n+\tMLXSW_SP_RXL_MARK(ACL1, TRAP_TO_CPU, MULTICAST, false),\n };\n \n static int mlxsw_sp_cpu_policers_set(struct mlxsw_core *mlxsw_core)\n@@ -3446,6 +3450,8 @@ static int mlxsw_sp_cpu_policers_set(struct mlxsw_core *mlxsw_core)\n \t\tcase MLXSW_REG_HTGT_TRAP_GROUP_SP_LACP:\n \t\tcase MLXSW_REG_HTGT_TRAP_GROUP_SP_LLDP:\n \t\tcase MLXSW_REG_HTGT_TRAP_GROUP_SP_OSPF:\n+\t\tcase MLXSW_REG_HTGT_TRAP_GROUP_SP_PIM:\n+\t\tcase MLXSW_REG_HTGT_TRAP_GROUP_SP_RPF:\n \t\t\trate = 128;\n \t\t\tburst_size = 7;\n \t\t\tbreak;\n@@ -3461,6 +3467,7 @@ static int mlxsw_sp_cpu_policers_set(struct mlxsw_core *mlxsw_core)\n \t\tcase MLXSW_REG_HTGT_TRAP_GROUP_SP_ROUTER_EXP:\n \t\tcase MLXSW_REG_HTGT_TRAP_GROUP_SP_REMOTE_ROUTE:\n \t\tcase MLXSW_REG_HTGT_TRAP_GROUP_SP_IPV6_ND:\n+\t\tcase MLXSW_REG_HTGT_TRAP_GROUP_SP_MULTICAST:\n \t\t\trate = 1024;\n \t\t\tburst_size = 7;\n \t\t\tbreak;\n@@ -3506,6 +3513,7 @@ static int mlxsw_sp_trap_groups_set(struct mlxsw_core *mlxsw_core)\n \t\tcase MLXSW_REG_HTGT_TRAP_GROUP_SP_LACP:\n \t\tcase MLXSW_REG_HTGT_TRAP_GROUP_SP_LLDP:\n \t\tcase MLXSW_REG_HTGT_TRAP_GROUP_SP_OSPF:\n+\t\tcase MLXSW_REG_HTGT_TRAP_GROUP_SP_PIM:\n \t\t\tpriority = 5;\n \t\t\ttc = 5;\n \t\t\tbreak;\n@@ -3522,12 +3530,14 @@ static int mlxsw_sp_trap_groups_set(struct mlxsw_core *mlxsw_core)\n \t\t\tbreak;\n \t\tcase MLXSW_REG_HTGT_TRAP_GROUP_SP_ARP:\n \t\tcase MLXSW_REG_HTGT_TRAP_GROUP_SP_IPV6_ND:\n+\t\tcase MLXSW_REG_HTGT_TRAP_GROUP_SP_RPF:\n \t\t\tpriority = 2;\n \t\t\ttc = 2;\n \t\t\tbreak;\n \t\tcase MLXSW_REG_HTGT_TRAP_GROUP_SP_HOST_MISS:\n \t\tcase MLXSW_REG_HTGT_TRAP_GROUP_SP_ROUTER_EXP:\n \t\tcase MLXSW_REG_HTGT_TRAP_GROUP_SP_REMOTE_ROUTE:\n+\t\tcase MLXSW_REG_HTGT_TRAP_GROUP_SP_MULTICAST:\n \t\t\tpriority = 1;\n \t\t\ttc = 1;\n \t\t\tbreak;\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/trap.h b/drivers/net/ethernet/mellanox/mlxsw/trap.h\nindex f396a1f..a981035 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/trap.h\n+++ b/drivers/net/ethernet/mellanox/mlxsw/trap.h\n@@ -62,6 +62,8 @@ enum {\n \tMLXSW_TRAP_ID_TTLERROR = 0x53,\n \tMLXSW_TRAP_ID_LBERROR = 0x54,\n \tMLXSW_TRAP_ID_IPV4_OSPF = 0x55,\n+\tMLXSW_TRAP_ID_IPV4_PIM = 0x58,\n+\tMLXSW_TRAP_ID_RPF = 0x5C,\n \tMLXSW_TRAP_ID_IP2ME = 0x5F,\n \tMLXSW_TRAP_ID_IPV6_UNSPECIFIED_ADDRESS = 0x60,\n \tMLXSW_TRAP_ID_IPV6_LINK_LOCAL_DEST = 0x61,\n@@ -89,6 +91,8 @@ enum {\n \tMLXSW_TRAP_ID_ROUTER_ALERT_IPV4 = 0xD6,\n \tMLXSW_TRAP_ID_ROUTER_ALERT_IPV6 = 0xD7,\n \tMLXSW_TRAP_ID_ACL0 = 0x1C0,\n+\t/* Multicast trap used for routes with trap action */\n+\tMLXSW_TRAP_ID_ACL1 = 0x1C1,\n \n \tMLXSW_TRAP_ID_MAX = 0x1FF\n };\n","prefixes":["net-next","13/13"]}