Re: [PATCH net-next 5/5] ethtool: provide link mode names as a string set

Michal Kubecek
2019-12-09T20:45:51Z

On Mon, Dec 09, 2019 at 09:15:11PM +0100, Andrew Lunn wrote:
> On Mon, Dec 09, 2019 at 08:55:45PM +0100, Michal Kubecek wrote:
> > Unlike e.g. netdev features, the ethtool ioctl interface requires link mode
> > table to be in sync between kernel and userspace for userspace to be able
> > to display and set all link modes supported by kernel. The way arbitrary
> > length bitsets are implemented in netlink interface, this will be no longer
> > needed.
> >
> > To allow userspace to access all link modes running kernel supports, add
> > table of ethernet link mode names and make it available as a string set to
> > userspace GET_STRSET requests. Add build time check to make sure names
> > are defined for all modes declared in enum ethtool_link_mode_bit_indices.
>
> Hi Michal
>
> Having a build time check is a good idea. However, i don't see it in
> the code. Please could you point it out.

Thanks for noticing. The BUILD_BUG_ON() check got lost when I moved the
patch to an earlier place and changed the declaration to fixed size
array like other name tables have. But you are right, losing the check
would be too high price for the uniformity.

> > +#define __LINK_MODE_NAME(speed, type, duplex) \
> > + #speed "base" #type "/" #duplex
> > +#define __DEFINE_LINK_MODE_NAME(speed, type, duplex) \
> > + [ETHTOOL_LINK_MODE(speed, type, duplex)] = \
> > + __LINK_MODE_NAME(speed, type, duplex)
> > +#define __DEFINE_SPECIAL_MODE_NAME(_mode, _name) \
> > + [ETHTOOL_LINK_MODE_ ## _mode ## _BIT] = _name
> > +
> > +const char
> > +link_mode_names[__ETHTOOL_LINK_MODE_MASK_NBITS][ETH_GSTRING_LEN] = {
> > + __DEFINE_LINK_MODE_NAME(10, T, Half),
> > + __DEFINE_LINK_MODE_NAME(10, T, Full),
> > + __DEFINE_LINK_MODE_NAME(100, T, Half),
> > + __DEFINE_LINK_MODE_NAME(100, T, Full),
> > + __DEFINE_LINK_MODE_NAME(1000, T, Half),
> > + __DEFINE_LINK_MODE_NAME(1000, T, Full),
> > + __DEFINE_SPECIAL_MODE_NAME(Autoneg, "Autoneg"),
> > + __DEFINE_SPECIAL_MODE_NAME(TP, "TP"),
> > + __DEFINE_SPECIAL_MODE_NAME(AUI, "AUI"),
> > + __DEFINE_SPECIAL_MODE_NAME(MII, "MII"),
> > + __DEFINE_SPECIAL_MODE_NAME(FIBRE, "FIBRE"),
> > + __DEFINE_SPECIAL_MODE_NAME(BNC, "BNC"),
> > + __DEFINE_LINK_MODE_NAME(10000, T, Full),
> > + __DEFINE_SPECIAL_MODE_NAME(Pause, "Pause"),
> > + __DEFINE_SPECIAL_MODE_NAME(Asym_Pause, "Asym_Pause"),
> > + __DEFINE_LINK_MODE_NAME(2500, X, Full),
> > + __DEFINE_SPECIAL_MODE_NAME(Backplane, "Backplane"),
> > + __DEFINE_LINK_MODE_NAME(1000, KX, Full),
> > + __DEFINE_LINK_MODE_NAME(10000, KX4, Full),
> > + __DEFINE_LINK_MODE_NAME(10000, KR, Full),
> > + [ETHTOOL_LINK_MODE_10000baseR_FEC_BIT] = "10000baseR_FEC",
>
> Would
>
> __DEFINE_SPECIAL_MODE_NAME(10000baseR_FEC, 10000baseR_FEC),
>
> work here?

Right, it would (with double quotes for second argument). As I wrote the
macro for bits which don't represent actual link modes, it never occured
to me that it can be also used for this special case.

I'll wait until tomorrow to see if there are more comments and send v2.

Michal