netdev - Re: [patch net-next v2] devlink: append split port number to the port name

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20210730051834.53c83bac@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
Date:   Fri, 30 Jul 2021 05:18:34 -0700
From:   Jakub Kicinski <kuba@...nel.org>
To:     Jiri Pirko <jiri@...nulli.us>
Cc:     davem@...emloft.net, netdev@...r.kernel.org, mlxsw@...dia.com
Subject: Re: [patch net-next v2] devlink: append split port number to the
 port name

On Fri, 23 Jul 2021 11:33:36 +0200 Jiri Pirko wrote:
> Something wrong happened. The patch was applied but eventually, the
> removed lines are back:
> 
> acf1ee44ca5da (Parav Pandit    2020-03-03 08:12:42 -0600 9331)  case DEVLINK_PORT_FLAVOUR_VIRTUAL:
> f285f37cb1e6b (Jiri Pirko      2021-05-27 12:48:19 +0200 9332)          n = snprintf(name, len, "p%u", attrs->phys.port_number);
> f285f37cb1e6b (Jiri Pirko      2021-05-27 12:48:19 +0200 9333)          if (n < len && attrs->split)
> f285f37cb1e6b (Jiri Pirko      2021-05-27 12:48:19 +0200 9334)                  n += snprintf(name + n, len - n, "s%u",
> f285f37cb1e6b (Jiri Pirko      2021-05-27 12:48:19 +0200 9335)                                attrs->phys.split_subport_number);
> 08474c1a9df0c (Jiri Pirko      2018-05-18 09:29:02 +0200 9336)          if (!attrs->split)
> 378ef01b5f75e (Parav Pandit    2019-07-08 23:17:35 -0500 9337)                  n = snprintf(name, len, "p%u", attrs->phys.port_number);
> 08474c1a9df0c (Jiri Pirko      2018-05-18 09:29:02 +0200 9338)          else
> 378ef01b5f75e (Parav Pandit    2019-07-08 23:17:35 -0500 9339)                  n = snprintf(name, len, "p%us%u",
> 378ef01b5f75e (Parav Pandit    2019-07-08 23:17:35 -0500 9340)                               attrs->phys.port_number,
> 378ef01b5f75e (Parav Pandit    2019-07-08 23:17:35 -0500 9341)                               attrs->phys.split_subport_number);
> 126285651b7f9 (David S. Miller 2021-06-07 13:01:52 -0700 9342) 
> 08474c1a9df0c (Jiri Pirko      2018-05-18 09:29:02 +0200 9343)          break;
> 
> If I do "git reset --hard f285f37cb1e6b", everything is looking fine,
> in the current net-next, the removed lines are still present :O
> I see ghosts...
> 
> Could you check & fix?

Looks like it was fixed by commit 149ea30fdd5c ("devlink: Fix
phys_port_name of virtual port and merge error") in net. I'll 
merge net -> net-next soon, sorry for the breakage.