{"id":816258,"url":"http://patchwork.ozlabs.org/api/patches/816258/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170920141516.1402-3-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":"<20170920141516.1402-3-jiri@resnulli.us>","list_archive_url":null,"date":"2017-09-20T14:15:02","name":"[net-next,02/16] mlxsw: spectrum_switchdev: Add a ports bitmap to the mid db","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"98b4042bac859a79247a13dcf97cb955b64ddfcd","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/20170920141516.1402-3-jiri@resnulli.us/mbox/","series":[{"id":4129,"url":"http://patchwork.ozlabs.org/api/series/4129/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4129","date":"2017-09-20T14:15:00","name":"mlxsw: Multicast flood update","version":1,"mbox":"http://patchwork.ozlabs.org/series/4129/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816258/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816258/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=\"nBf7kz72\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xy1xp1YWlz9sNr\n\tfor ;\n\tThu, 21 Sep 2017 00:16:14 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751726AbdITOPZ (ORCPT );\n\tWed, 20 Sep 2017 10:15:25 -0400","from mail-wm0-f68.google.com ([74.125.82.68]:38290 \"EHLO\n\tmail-wm0-f68.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751612AbdITOPU (ORCPT\n\t); Wed, 20 Sep 2017 10:15:20 -0400","by mail-wm0-f68.google.com with SMTP id x17so2560219wmd.5\n\tfor ; Wed, 20 Sep 2017 07:15:19 -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\ts196sm1733263wmb.26.2017.09.20.07.15.18\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tWed, 20 Sep 2017 07:15:18 -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=5jvLoR9QvEQSLVK89fOgbpXVvgYiD1HtJtMc1U15GfA=;\n\tb=nBf7kz724MFqNPC1x2BnAmeuSguhaf7uBg4dTiitgmbrlNsEackFzGroezuETabsWk\n\tJ6FXoBuB48N8TLX4irhDwE4uIc8fpQa6p6QJdF/K+A7re/AmmfCt6hhs6JhZc0/7rt42\n\tbvk7bR/wsdCJWGzSQAFvGgUMLrgDWmoo3oH65rt4oIj6ZmEM062d3YkquT2jqTzzDwAl\n\t4U7nSqKN1Vt6Pxj5VfjOCUYZXLE9wKHReRoXjiVMaovx0F6qotFT7TbciImZcCfKly1c\n\tgYxiOq/RWKXLQ7qFuvdowPJJSHpYtv6uhZuAAXjrlKnP4b6ALv8TsxV9HO9qZg/J7f94\n\t0X2A==","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=5jvLoR9QvEQSLVK89fOgbpXVvgYiD1HtJtMc1U15GfA=;\n\tb=iFF5UYe84pEWuHL+Kbp178zsPd8bio5GjekF48ntF4HTft3FHCpN2c3PiOcwBxorF6\n\t9jMmhWKn4uRidtRBFonhfftMF+xNj/fsEmHSiHl6IDB2VvtqqFIZKUE6ABsI+19p4sNk\n\tDR2kN6sr/gcj8kT1w+KIfQIHireBKavJl+sgZmB7sIelgZziycuEZN5H56RbPMXbIaF2\n\tTh1sQ5mh/ciZgvj8EhGmQOKzaCJFUyOyzRFFt71iD1fE7JJSMg6fmA2s3BNZPmkGGt1w\n\tt/4SZmIU10z2UeUF4BSAkf3J6TWhO/oatMHMSih5nzphcffrIMVMHLj0GnTnAi4bsVLB\n\t2euA==","X-Gm-Message-State":"AHPjjUjfr78d4jA0NDdTyOk2tq/8D9GNCFR5CQwvYUf0BAPFsoelEJqE\n\tHVs1akOXMSGJcvwHFth1Ny7o9WOJ","X-Google-Smtp-Source":"AOwi7QBHgYqYs8B2ik78kgtDGOwjtJBvSy4qdV5rMx706OucbBnjcbCm06qnB1UJv66sTYBKcYU4Mg==","X-Received":"by 10.28.173.1 with SMTP id w1mr4096663wme.3.1505916918920;\n\tWed, 20 Sep 2017 07:15:18 -0700 (PDT)","From":"Jiri Pirko ","To":"netdev@vger.kernel.org","Cc":"davem@davemloft.net, nogahf@mellanox.com, idosch@mellanox.com,\n\tmlxsw@mellanox.com","Subject":"[patch net-next 02/16] mlxsw: spectrum_switchdev: Add a ports\n\tbitmap to the mid db","Date":"Wed, 20 Sep 2017 16:15:02 +0200","Message-Id":"<20170920141516.1402-3-jiri@resnulli.us>","X-Mailer":"git-send-email 2.9.5","In-Reply-To":"<20170920141516.1402-1-jiri@resnulli.us>","References":"<20170920141516.1402-1-jiri@resnulli.us>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Nogah Frankel \n\nAdd a bitmap of ports to the mid struct to hold the ports that are\nregistered to this mid.\n\nSigned-off-by: Nogah Frankel \nSigned-off-by: Jiri Pirko \n---\n drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 1 +\n .../net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 20 +++++++++++++++++---\n 2 files changed, 18 insertions(+), 3 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h\nindex 7180d8f..0424bee 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h\n@@ -95,6 +95,7 @@ struct mlxsw_sp_mid {\n \tu16 fid;\n \tu16 mid;\n \tunsigned int ref_count;\n+\tunsigned long *ports_in_mid; /* bits array */\n };\n \n enum mlxsw_sp_span_type {\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c\nindex 22f8d74..0fde16a 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c\n@@ -1239,6 +1239,7 @@ static struct mlxsw_sp_mid *__mlxsw_sp_mc_alloc(struct mlxsw_sp *mlxsw_sp,\n \t\t\t\t\t\tu16 fid)\n {\n \tstruct mlxsw_sp_mid *mid;\n+\tsize_t alloc_size;\n \tu16 mid_idx;\n \n \tmid_idx = find_first_zero_bit(mlxsw_sp->bridge->mids_bitmap,\n@@ -1250,6 +1251,14 @@ static struct mlxsw_sp_mid *__mlxsw_sp_mc_alloc(struct mlxsw_sp *mlxsw_sp,\n \tif (!mid)\n \t\treturn NULL;\n \n+\talloc_size = sizeof(unsigned long) *\n+\t\t BITS_TO_LONGS(mlxsw_core_max_ports(mlxsw_sp->core));\n+\tmid->ports_in_mid = kzalloc(alloc_size, GFP_KERNEL);\n+\tif (!mid->ports_in_mid) {\n+\t\tkfree(mid);\n+\t\treturn NULL;\n+\t}\n+\n \tset_bit(mid_idx, mlxsw_sp->bridge->mids_bitmap);\n \tether_addr_copy(mid->addr, addr);\n \tmid->fid = fid;\n@@ -1260,12 +1269,16 @@ static struct mlxsw_sp_mid *__mlxsw_sp_mc_alloc(struct mlxsw_sp *mlxsw_sp,\n \treturn mid;\n }\n \n-static int __mlxsw_sp_mc_dec_ref(struct mlxsw_sp *mlxsw_sp,\n+static int __mlxsw_sp_mc_dec_ref(struct mlxsw_sp_port *mlxsw_sp_port,\n \t\t\t\t struct mlxsw_sp_mid *mid)\n {\n+\tstruct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;\n+\n+\tclear_bit(mlxsw_sp_port->local_port, mid->ports_in_mid);\n \tif (--mid->ref_count == 0) {\n \t\tlist_del(&mid->list);\n \t\tclear_bit(mid->mid, mlxsw_sp->bridge->mids_bitmap);\n+\t\tkfree(mid->ports_in_mid);\n \t\tkfree(mid);\n \t\treturn 1;\n \t}\n@@ -1311,6 +1324,7 @@ static int mlxsw_sp_port_mdb_add(struct mlxsw_sp_port *mlxsw_sp_port,\n \t\t}\n \t}\n \tmid->ref_count++;\n+\tset_bit(mlxsw_sp_port->local_port, mid->ports_in_mid);\n \n \terr = mlxsw_sp_port_smid_set(mlxsw_sp_port, mid->mid, true,\n \t\t\t\t mid->ref_count == 1);\n@@ -1331,7 +1345,7 @@ static int mlxsw_sp_port_mdb_add(struct mlxsw_sp_port *mlxsw_sp_port,\n \treturn 0;\n \n err_out:\n-\t__mlxsw_sp_mc_dec_ref(mlxsw_sp, mid);\n+\t__mlxsw_sp_mc_dec_ref(mlxsw_sp_port, mid);\n \treturn err;\n }\n \n@@ -1437,7 +1451,7 @@ static int mlxsw_sp_port_mdb_del(struct mlxsw_sp_port *mlxsw_sp_port,\n \t\tnetdev_err(dev, \"Unable to remove port from SMID\\n\");\n \n \tmid_idx = mid->mid;\n-\tif (__mlxsw_sp_mc_dec_ref(mlxsw_sp, mid)) {\n+\tif (__mlxsw_sp_mc_dec_ref(mlxsw_sp_port, mid)) {\n \t\terr = mlxsw_sp_port_mdb_op(mlxsw_sp, mdb->addr, fid_index,\n \t\t\t\t\t mid_idx, false);\n \t\tif (err)\n","prefixes":["net-next","02/16"]}