From: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
To: Andrew Lunn <andrew@lunn.ch>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel@savoirfairelinux.com,
"David S. Miller" <davem@davemloft.net>,
Florian Fainelli <f.fainelli@gmail.com>,
Guenter Roeck <linux@roeck-us.net>,
Neil Armstrong <narmstrong@baylibre.com>
Subject: Re: [PATCH net-next] net: dsa: mv88e6xxx: assert SMI lock
Date: Fri, 30 Oct 2015 16:50:49 -0400 [thread overview]
Message-ID: <20151030205048.GA6658@ketchup.mtl.sfl> (raw)
In-Reply-To: <20151030204110.GB10053@lunn.ch>
Hi Andrew,
On Oct. Friday 30 (44) 09:41 PM, Andrew Lunn wrote:
> On Fri, Oct 30, 2015 at 04:35:42PM -0400, Vivien Didelot wrote:
> > It's easy to forget to lock the smi_mutex before calling the low-level
> > _mv88e6xxx_reg_{read,write}, so add a assert_smi_lock function in them.
> >
> > Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
> > ---
> > drivers/net/dsa/mv88e6xxx.c | 31 ++++++++++++++++++-------------
> > 1 file changed, 18 insertions(+), 13 deletions(-)
> >
> > diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
> > index b1b14f5..70a0106 100644
> > --- a/drivers/net/dsa/mv88e6xxx.c
> > +++ b/drivers/net/dsa/mv88e6xxx.c
> > @@ -24,6 +24,16 @@
> > #include <net/switchdev.h>
> > #include "mv88e6xxx.h"
> >
> > +static inline void assert_smi_lock(struct dsa_switch *ds)
>
> No need for inline. Gcc will automatically inline it, if it thinks it
> is small enough.
OK, I will respin this without the inline keyword then.
>
> > +{
> > + struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
> > +
> > + if (unlikely(!mutex_is_locked(&ps->smi_mutex))) {
> > + dev_err(ds->master_dev, "SMI lock not held!\n");
> > + dump_stack();
> > + }
> > +}
> > +
>
> > -/* Must be called with SMI mutex held */
> > static int _mv88e6xxx_reg_read(struct dsa_switch *ds, int addr, int reg)
> > {
> > - struct mii_bus *bus = dsa_host_dev_to_mii_bus(ds->master_dev);
> > + struct mii_bus *bus;
> > int ret;
> >
> > + assert_smi_lock(ds);
> > +
> > + bus = dsa_host_dev_to_mii_bus(ds->master_dev);
>
> Is this change of when bus is assigned actually required?
No, but I found not necessary to issue this "mdio_bus" lookup if the
lock is not held (see net/dsa/dsa.c:555). Do you prefer not to do that?
Also are you OK with removing all the "Must be called with..." comments,
which I found not necessary too (some function have this comment, some
others don't).
Thanks,
-v
next prev parent reply other threads:[~2015-10-30 20:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-30 20:35 [PATCH net-next] net: dsa: mv88e6xxx: assert SMI lock Vivien Didelot
2015-10-30 20:41 ` Andrew Lunn
2015-10-30 20:50 ` Vivien Didelot [this message]
2015-10-30 21:01 ` Andrew Lunn
2015-10-30 21:11 ` Vivien Didelot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151030205048.GA6658@ketchup.mtl.sfl \
--to=vivien.didelot@savoirfairelinux.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=kernel@savoirfairelinux.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=narmstrong@baylibre.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).