From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93C08C43381 for ; Mon, 25 Mar 2019 17:06:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 57896208E4 for ; Mon, 25 Mar 2019 17:06:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eSaGjJAx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729829AbfCYRGU (ORCPT ); Mon, 25 Mar 2019 13:06:20 -0400 Received: from mail-yw1-f65.google.com ([209.85.161.65]:38389 "EHLO mail-yw1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725788AbfCYRGS (ORCPT ); Mon, 25 Mar 2019 13:06:18 -0400 Received: by mail-yw1-f65.google.com with SMTP id m207so7609404ywd.5 for ; Mon, 25 Mar 2019 10:06:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:openpgp:autocrypt:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=An5/sdVigHlTNDlY5rb7L8AA2591vVwtM7EjECAqMHY=; b=eSaGjJAxK9/+2z+XOfCjGtbbEw8bQqBIFfnYtvbz3hWeP4mXbneuxDLW8WMKzdU04T 6iRmlkX2QKtNHaUeqwwa2ZPKwVah/XSYHurXtmgCpf++VHodSPIuUmgDySruHCmpXUIz bjc2QA1UEuzFsaNhPKYisF58ngqL36vwk0rx+BBO5/8RShvFUXtS6W5/KYxFddgKLiED G/FhbGatTY5O9SNxTt3yIZmw3yBOp2CLwK4kQjPmLQWdXOOOrDJNtTFBWpxNU2FokOvh 7Ie5BRztVRyY3tyjdkhABu29yU5CzrTsnI91fqeOs9bZmCwhzhpsxBTt0XRDTr/u3BY9 Tajg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=An5/sdVigHlTNDlY5rb7L8AA2591vVwtM7EjECAqMHY=; b=biZA/JLhxBUNB7DXIWGe9g+N7SLCmX8jQnqZgKyC2VZnM2lXWc+t+x8T0hETh/s30G 58Vhm+v0lzv9OC9dFH7rvrfwq4v25xjBUsFeB3Y6XgFsFgamhoD5zhw/eCCNhFM5cNUW bKvYpJp9YPRDjsfSPCB9Kt5d4FxSo1mMHMIJzFICHj2DVood81w97W3aBwPlEu+63WPe vJlfYxjz8efLdcJvFGIa3oWi+R+FfNPrwAVEujzPoyE50WiOy74HqcAA1bqXagREWZEO tIYGkKiDKZ8L6sGC941uKkraMhiS23WLm+UWBVwKrJc21hRWMj8Sb2eef07lbdEqyslz RBvw== X-Gm-Message-State: APjAAAX2gWVgbvGhEijQw3A6JUd4McsOvP/z89QaMhp/UhOtexjCnYzT THGZtHqUCwj4tkRfucCMGHQ= X-Google-Smtp-Source: APXvYqwaBIWB2ismkCNR6a5ypfZhRmsV6+/ZLnXXmJVfA00NNQwFiH90IvIkOaBnecR6tbmzORtycw== X-Received: by 2002:a25:5445:: with SMTP id i66mr20616971ybb.419.1553533576963; Mon, 25 Mar 2019 10:06:16 -0700 (PDT) Received: from [10.67.48.231] ([192.19.223.250]) by smtp.googlemail.com with ESMTPSA id s186sm6372253yws.13.2019.03.25.10.06.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Mar 2019 10:06:16 -0700 (PDT) Subject: Re: [RFC PATCH net-next 03/13] net: dsa: Create a more convenient function for installing port VLANs To: Vladimir Oltean , davem@davemloft.net, netdev@vger.kernel.org Cc: andrew@lunn.ch, vivien.didelot@gmail.com, linus.walleij@linaro.org References: <20190324032346.32394-1-olteanv@gmail.com> <20190324032346.32394-4-olteanv@gmail.com> From: Florian Fainelli Openpgp: preference=signencrypt Autocrypt: addr=f.fainelli@gmail.com; prefer-encrypt=mutual; keydata= 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 M5kY0ACeNhCZJvZ5g4C2Lc9fcTHu8jxmEkI= Message-ID: <49500e18-f2d5-4c9f-2ce0-b6fa12cbc8d6@gmail.com> Date: Mon, 25 Mar 2019 10:06:08 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <20190324032346.32394-4-olteanv@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 3/23/19 8:23 PM, Vladimir Oltean wrote: > This refactors the two-phase transaction from dsa_slave_vlan_rx_add_vid > and also makes that code available for other functions from within DSA. > The newly exposed function either adds or deletes the specified VLAN > entry based on a boolean argument. > > Signed-off-by: Vladimir Oltean The name of the function does not make it particularly clear that passing false results in deleting the VLAN. Can you just wrap this under a different function name that is only doing the two-step adding of VLANs and keep using dsa_port_vlan_del() explicitly when you want to remove a VLAN? > --- > net/dsa/dsa_priv.h | 2 ++ > net/dsa/port.c | 24 ++++++++++++++++++++++++ > net/dsa/slave.c | 16 ++-------------- > 3 files changed, 28 insertions(+), 14 deletions(-) > > diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h > index 093b7d145eb1..8048ced3708f 100644 > --- a/net/dsa/dsa_priv.h > +++ b/net/dsa/dsa_priv.h > @@ -164,6 +164,8 @@ int dsa_port_pre_bridge_flags(const struct dsa_port *dp, unsigned long flags, > struct switchdev_trans *trans); > int dsa_port_bridge_flags(const struct dsa_port *dp, unsigned long flags, > struct switchdev_trans *trans); > +int dsa_port_trans_vlan_apply(struct dsa_port *dp, u16 vid, u16 flags, > + bool enabled); > int dsa_port_vlan_add(struct dsa_port *dp, > const struct switchdev_obj_port_vlan *vlan, > struct switchdev_trans *trans); > diff --git a/net/dsa/port.c b/net/dsa/port.c > index a86fe3be1261..9c7358f98004 100644 > --- a/net/dsa/port.c > +++ b/net/dsa/port.c > @@ -326,6 +326,30 @@ int dsa_port_vlan_del(struct dsa_port *dp, > return 0; > } > > +int dsa_port_trans_vlan_apply(struct dsa_port *dp, u16 vid, u16 flags, > + bool enabled) > +{ > + struct switchdev_obj_port_vlan vlan = { > + .obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN, > + .flags = flags, > + .vid_begin = vid, > + .vid_end = vid, > + }; > + struct switchdev_trans trans; > + int err; > + > + if (!enabled) > + return dsa_port_vlan_del(dp, &vlan); > + > + trans.ph_prepare = true; > + err = dsa_port_vlan_add(dp, &vlan, &trans); > + if (err == -EOPNOTSUPP) > + return 0; > + > + trans.ph_prepare = false; > + return dsa_port_vlan_add(dp, &vlan, &trans); > +} > + > static struct phy_device *dsa_port_get_phy_device(struct dsa_port *dp) > { > struct device_node *phy_dn; > diff --git a/net/dsa/slave.c b/net/dsa/slave.c > index 093eef6f2599..3191ef74f6a1 100644 > --- a/net/dsa/slave.c > +++ b/net/dsa/slave.c > @@ -987,13 +987,6 @@ static int dsa_slave_vlan_rx_add_vid(struct net_device *dev, __be16 proto, > u16 vid) > { > struct dsa_port *dp = dsa_slave_to_port(dev); > - struct switchdev_obj_port_vlan vlan = { > - .vid_begin = vid, > - .vid_end = vid, > - /* This API only allows programming tagged, non-PVID VIDs */ > - .flags = 0, > - }; > - struct switchdev_trans trans; > struct bridge_vlan_info info; > int ret; > > @@ -1010,13 +1003,8 @@ static int dsa_slave_vlan_rx_add_vid(struct net_device *dev, __be16 proto, > return -EBUSY; > } > > - trans.ph_prepare = true; > - ret = dsa_port_vlan_add(dp, &vlan, &trans); > - if (ret == -EOPNOTSUPP) > - return 0; > - > - trans.ph_prepare = false; > - return dsa_port_vlan_add(dp, &vlan, &trans); > + /* This API only allows programming tagged, non-PVID VIDs */ > + return dsa_port_trans_vlan_apply(dp, vid, 0, true); > } > > static int dsa_slave_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, > -- Florian