| Message ID | 20210527104819.789840-1-jiri@resnulli.us (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f285f37cb1e6b29e7dc732c81510aa115463730f |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2] devlink: append split port number to the port name | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 1 maintainers not CCed: jiri@nvidia.com |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 1 this patch: 1 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 16 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 1 this patch: 1 |
| netdev/header_inline | success | Link |
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Thu, 27 May 2021 12:48:19 +0200 you wrote: > From: Jiri Pirko <jiri@nvidia.com> > > Instead of doing sprintf twice in case the port is split or not, append > the split port suffix in case the port is split. > > Signed-off-by: Jiri Pirko <jiri@nvidia.com> > > [...] Here is the summary with links: - [net-next,v2] devlink: append split port number to the port name https://git.kernel.org/netdev/net-next/c/f285f37cb1e6 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Thu, May 27, 2021 at 11:30:03PM CEST, patchwork-bot+netdevbpf@kernel.org wrote: >Hello: > >This patch was applied to netdev/net-next.git (refs/heads/master): > >On Thu, 27 May 2021 12:48:19 +0200 you wrote: >> From: Jiri Pirko <jiri@nvidia.com> >> >> Instead of doing sprintf twice in case the port is split or not, append >> the split port suffix in case the port is split. >> >> Signed-off-by: Jiri Pirko <jiri@nvidia.com> >> >> [...] > >Here is the summary with links: > - [net-next,v2] devlink: append split port number to the port name > https://git.kernel.org/netdev/net-next/c/f285f37cb1e6 > >You are awesome, thank you! 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?
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.
diff --git a/net/core/devlink.c b/net/core/devlink.c index 06b2b1941dce..8f9a5de44117 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -8632,12 +8632,10 @@ static int __devlink_port_phys_port_name_get(struct devlink_port *devlink_port, switch (attrs->flavour) { case DEVLINK_PORT_FLAVOUR_PHYSICAL: case DEVLINK_PORT_FLAVOUR_VIRTUAL: - if (!attrs->split) - n = snprintf(name, len, "p%u", attrs->phys.port_number); - else - n = snprintf(name, len, "p%us%u", - attrs->phys.port_number, - attrs->phys.split_subport_number); + n = snprintf(name, len, "p%u", attrs->phys.port_number); + if (n < len && attrs->split) + n += snprintf(name + n, len - n, "s%u", + attrs->phys.split_subport_number); break; case DEVLINK_PORT_FLAVOUR_CPU: case DEVLINK_PORT_FLAVOUR_DSA: