{"id":816260,"url":"http://patchwork.ozlabs.org/api/patches/816260/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170920141516.1402-4-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-4-jiri@resnulli.us>","list_archive_url":null,"date":"2017-09-20T14:15:03","name":"[net-next,03/16] mlxsw: spectrum_switchdev: Remove reference count from mid","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"440c69d33138dae133385fb616cd9a8f4685534e","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-4-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/816260/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816260/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=\"R8kV05aU\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xy1xy1BTwz9s82\n\tfor ;\n\tThu, 21 Sep 2017 00:16:22 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751711AbdITOPY (ORCPT );\n\tWed, 20 Sep 2017 10:15:24 -0400","from mail-wm0-f66.google.com ([74.125.82.66]:33574 \"EHLO\n\tmail-wm0-f66.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751678AbdITOPV (ORCPT\n\t); Wed, 20 Sep 2017 10:15:21 -0400","by mail-wm0-f66.google.com with SMTP id m127so2592491wmm.0\n\tfor ; Wed, 20 Sep 2017 07:15:20 -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\tt143sm1656678wmt.45.2017.09.20.07.15.19\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tWed, 20 Sep 2017 07:15:19 -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=vGulwZrv4l+owkENwO/gBvAL9FGuhL7S0tqEUaGZgck=;\n\tb=R8kV05aUbURO5oSWo7GgawMl1uwuROeikRhfS+wz45O3QZ/rHYKDNedkfDGFRSlKKr\n\tZSdZoK48banjVpeu/2UR+bgJLwsGj7eKWCyf5i7YwJMBYxQhHUkKjFYK+5y/9eWOZLy8\n\tRaoZrO5IMlYMukgqTOVTMyVB0sVCHzTgKEGwU067hB7mCsSMhuz7HmDgrU+kE0uIepBA\n\tNgytPFgr+yPOEB+WtEvhgtxG2xjB3gccavYn1q89zo/iygnVdmdF/dsOFdocgr1MpZAw\n\t2hrtDV4PAm9YEst03rsxX7e0KKvnlFCV4pXf/1OjXZO2FzStnAkdn1vhYyIzOhK4KnSo\n\tripw==","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=vGulwZrv4l+owkENwO/gBvAL9FGuhL7S0tqEUaGZgck=;\n\tb=Ci+MeKzRTU0fyhLaBsxKheg7vHhLCsGes2piY3yvSnDTC+cxbPmOvVNS3cYfXHh34z\n\tqzAxYYA7JJ/rJM30kdtLVGvp04b7co6+SJRIn7RUGYDVbHH2xq5HXaDVWAPhK+yoHu6f\n\tdBMTn7LiPUhuad80F0jIQye7E/0DPTbQMOxSIyCPMr1xCtMNG4K8InNzG9G01MLOzXM5\n\t4Qhi48+TzXE5jKLJPFepYli/p3C2ADSC/5lv3LVqyidxRxTtLtMdsH8SgkD3LtIX7bO7\n\tv1cgK85yVJNBf3qesR9TTkHlXf0W98/UfVa8Avs5PeNPpPz8WbZUe5FwuzP66PmNuRGM\n\tTCUA==","X-Gm-Message-State":"AHPjjUj5ViUyh4gUweW9yzx754dXgqTMo1UzMcJ7is3ng7TjTItis8JG\n\tDeE2DxezDPHjB8JIaGnnkW57oTJ+","X-Google-Smtp-Source":"AOwi7QB4R0YhUz3/wiqDLdyxrMOx24U1ZtaOS0YCMQ7CXe0RqOqmyjQ/itsYP6Ts23CBLR+PwOU2UA==","X-Received":"by 10.28.157.81 with SMTP id g78mr4101968wme.102.1505916920044; \n\tWed, 20 Sep 2017 07:15:20 -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 03/16] mlxsw: spectrum_switchdev: Remove reference\n\tcount from mid","Date":"Wed, 20 Sep 2017 16:15:03 +0200","Message-Id":"<20170920141516.1402-4-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\nSince there is a bitmap for the ports registered to each mid, there is no\nneed for a ref count, since it will always be the number of set bits in\nthis bitmap. Any check of the ref count was replaced with checking if the\nbitmap is empty.\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, 10 insertions(+), 11 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h\nindex 0424bee..6fd0afe 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h\n@@ -94,7 +94,6 @@ struct mlxsw_sp_mid {\n \tunsigned char addr[ETH_ALEN];\n \tu16 fid;\n \tu16 mid;\n-\tunsigned int ref_count;\n \tunsigned long *ports_in_mid; /* bits array */\n };\n \ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c\nindex 0fde16a..cb2275ed 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c\n@@ -1263,19 +1263,19 @@ static struct mlxsw_sp_mid *__mlxsw_sp_mc_alloc(struct mlxsw_sp *mlxsw_sp,\n \tether_addr_copy(mid->addr, addr);\n \tmid->fid = fid;\n \tmid->mid = mid_idx;\n-\tmid->ref_count = 0;\n \tlist_add_tail(&mid->list, &mlxsw_sp->bridge->mids_list);\n \n \treturn mid;\n }\n \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+static int mlxsw_sp_port_remove_from_mid(struct mlxsw_sp_port *mlxsw_sp_port,\n+\t\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+\tif (bitmap_empty(mid->ports_in_mid,\n+\t\t\t mlxsw_core_max_ports(mlxsw_sp->core))) {\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@@ -1296,6 +1296,7 @@ static int mlxsw_sp_port_mdb_add(struct mlxsw_sp_port *mlxsw_sp_port,\n \tstruct mlxsw_sp_bridge_device *bridge_device;\n \tstruct mlxsw_sp_bridge_port *bridge_port;\n \tstruct mlxsw_sp_mid *mid;\n+\tbool is_new_mid = false;\n \tu16 fid_index;\n \tint err = 0;\n \n@@ -1322,18 +1323,17 @@ static int mlxsw_sp_port_mdb_add(struct mlxsw_sp_port *mlxsw_sp_port,\n \t\t\tnetdev_err(dev, \"Unable to allocate MC group\\n\");\n \t\t\treturn -ENOMEM;\n \t\t}\n+\t\tis_new_mid = true;\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+\terr = mlxsw_sp_port_smid_set(mlxsw_sp_port, mid->mid, true, is_new_mid);\n \tif (err) {\n \t\tnetdev_err(dev, \"Unable to set SMID\\n\");\n \t\tgoto err_out;\n \t}\n \n-\tif (mid->ref_count == 1) {\n+\tif (is_new_mid) {\n \t\terr = mlxsw_sp_port_mdb_op(mlxsw_sp, mdb->addr, fid_index,\n \t\t\t\t\t mid->mid, true);\n \t\tif (err) {\n@@ -1345,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_port, mid);\n+\tmlxsw_sp_port_remove_from_mid(mlxsw_sp_port, mid);\n \treturn err;\n }\n \n@@ -1451,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_port, mid)) {\n+\tif (mlxsw_sp_port_remove_from_mid(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","03/16"]}