Re: Interface naming on v5.14-rc1 regressed, possible unintended revert of b28d8f0c25a9?

On Tue, 2021-07-13 at 16:13 +0000, Parav Pandit wrote:

Hi Niklas,

quoted

From: Niklas Schnelle <schnelle@linux.ibm.com>
Sent: Tuesday, July 13, 2021 9:18 PM

Hi Parav, Hi Dave,

With v5.13 you added commit b28d8f0c25a9 ("devlink: Correct VIRTUAL port
to not have phys_port attributes") which changed the interface names of
VFs from e.g. ens2f0np0v0 to ens2f0v0. I did see that change for the v5.13-rc
cycle.

Now I just noticed that with v5.14-rc1 the old name is back. Looking at the
above commit and the code in v5.14-rc1 it looks to me like that commit was
partially reverted. In particular, the return of -EOPNOTSUPP from
__devlink_port_phys_port_name_get() in case of port flavour "virtual" is
gone while the part touching devlink_nl_port_attrs_put() seems to be there.

Now for some reason looking at git blame I still see the original commit
acf1ee44ca5da ("devlink: Introduce devlink port flavour
virtual") for the non removed lines. Could it be that somehow this got lost
while resolving a merge conflict?

Thanks for the bisecting and reporting.
I searched further.
I found that, it got introduced by below merge commit.
but I haven’t yet found the patch that removed the return of -EOPNOTSUPP.

commit 126285651b7f95282a0afe3a1b0221419b31d989
Merge: 9977d6f56bac 3822d0670c9d
Author: David S. Miller [off-list ref]
Date:   Mon Jun 7 13:01:52 2021 -0700

    Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net

    Bug fixes overlapping feature additions and refactoring, mostly.

    Signed-off-by: David S. Miller [off-list ref]

Just a FYI, I still see interface names with '..np0' suffix on v5.14-
rc2. Any progress on tracking down what happened? Also I think I
accidentially used the wrong mail address for the netdev list before,
sorry about that.