| Message ID | 20240113165458.22935-1-stephen@networkplumber.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f22c49730c3691c25a1147081363eb35aa9d1048 |
| Delegated to: | David Ahern |
| Headers | show |
| Series | [iproute2] Revert "ss: prevent "Process" column from being printed unless requested" | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
Hello: This patch was applied to iproute2/iproute2.git (main) by Stephen Hemminger <stephen@networkplumber.org>: On Sat, 13 Jan 2024 08:54:10 -0800 you wrote: > This reverts commit 1607bf531fd2f984438d227ea97312df80e7cf56. > > This commit is being reverted because it breaks output of tcp info. > > Bug: https://bugzilla.kernel.org/show_bug.cgi?id=218372 > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> > > [...] Here is the summary with links: - [iproute2] Revert "ss: prevent "Process" column from being printed unless requested" https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=f22c49730c36 You are awesome, thank you!
Hi Stephen, On 13/01/2024 17:54, Stephen Hemminger wrote: > This reverts commit 1607bf531fd2f984438d227ea97312df80e7cf56. > > This commit is being reverted because it breaks output of tcp info. Thank you for having reverted this commit to solve the issue. It looks like it breaks more than just TCP info output, please see [1]. Because of the impact this issue seems to have, do you think it could be possible to have a v6.7.1 version including this revert patch or the fix from [1]? > The order of the columns enum is order sensistive. I think the modification Quentin did regarding the column order was correct when looking at: - what is being displayed: process info (PROC), then the rest (EXT) - the order in the "columns" array: "Process" (PROC), then "" (EXT) The issue seems to be due to the "current_field" pointer that is never switched to the last column, but get stuck to the one before. I tried to explain this in [1]. Please note that this fix makes sense if the order of the columns is "PROC", then "EXT" as suggested by Quentin. [1] https://lore.kernel.org/netdev/20240113-ss-fix-ext-col-disabled-v1-1-cf99a7381dec@kernel.org/ Cheers, Matt
On Mon, 15 Jan 2024 12:27:23 +0100 Matthieu Baerts <matttbe@kernel.org> wrote: > Hi Stephen, > > On 13/01/2024 17:54, Stephen Hemminger wrote: > > This reverts commit 1607bf531fd2f984438d227ea97312df80e7cf56. > > > > This commit is being reverted because it breaks output of tcp info. > > Thank you for having reverted this commit to solve the issue. > > It looks like it breaks more than just TCP info output, please see [1]. > Because of the impact this issue seems to have, do you think it could be > possible to have a v6.7.1 version including this revert patch or the fix > from [1]? Sorry, no this is not a big enough issue for a release.
On 15/01/2024 18:05, Stephen Hemminger wrote: > On Mon, 15 Jan 2024 12:27:23 +0100 > Matthieu Baerts <matttbe@kernel.org> wrote: > >> Hi Stephen, >> >> On 13/01/2024 17:54, Stephen Hemminger wrote: >>> This reverts commit 1607bf531fd2f984438d227ea97312df80e7cf56. >>> >>> This commit is being reverted because it breaks output of tcp info. >> >> Thank you for having reverted this commit to solve the issue. >> >> It looks like it breaks more than just TCP info output, please see [1]. >> Because of the impact this issue seems to have, do you think it could be >> possible to have a v6.7.1 version including this revert patch or the fix >> from [1]? > > > Sorry, no this is not a big enough issue for a release. OK, understood. That's quite a bit of work for us for the MPTCP kselftests to support this v6.7 version (25 places to patch, split in 10+ commits for the backports, etc.). We will then add a comment somewhere to say that this version of 'ss' has an issue and is incompatible with our selftests. Hopefully this version will not be used by the other CIs we don't control. Cheers, Matt
diff --git a/misc/ss.c b/misc/ss.c index 900fefa42015..c220a0758cb1 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -100,8 +100,8 @@ enum col_id { COL_SERV, COL_RADDR, COL_RSERV, - COL_PROC, COL_EXT, + COL_PROC, COL_MAX }; @@ -5819,9 +5819,6 @@ int main(int argc, char *argv[]) if (ssfilter_parse(¤t_filter.f, argc, argv, filter_fp)) usage(); - if (!show_processes) - columns[COL_PROC].disabled = 1; - if (!(current_filter.dbs & (current_filter.dbs - 1))) columns[COL_NETID].disabled = 1;
This reverts commit 1607bf531fd2f984438d227ea97312df80e7cf56. This commit is being reverted because it breaks output of tcp info. Bug: https://bugzilla.kernel.org/show_bug.cgi?id=218372 Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> --- misc/ss.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)