Skip to contentSkip to conversation

Revert "ss: prevent "Process" column from being printed unless requested"

PATCH Applied Stephen Hemminger 3 participants 5 messages Jan 13, 2024 – Jan 15, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "ss: prevent "Process" column from being printed unless requested"

This reverts commit 1607bf531fd2f984438d227ea97312df80e7cf56.

This commit is being reverted because it breaks output of tcp info.

---
 misc/ss.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
misc/ss.c +1 -4
index 900fefa42015..c220a0758cb1 100644
@@ -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(&current_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;
 
Signature · 1 line
2.43.0
#1 lore raw
This patch was applied to iproute2/iproute2.git (main) by Stephen Hemminger <[email protected]>:

Hello:

This patch was applied to iproute2/iproute2.git (main) by Stephen Hemminger <[email protected]>:

Quoted 8 lines · 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.

[...]

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!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
#2 lore raw
In reply to Stephen Hemminger

Hi Stephen,

Quoted 3 lines · Stephen Hemminger

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]?

Quoted 1 line

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/[email protected]/

Cheers,
Matt

Signature · 1 line
Sponsored by the NGI0 Core fund.
#3 lore raw
Quoted 5 lines · On Mon, 15 Jan 2024 12:27:23 +0100 Matthieu Baerts <[email protected]> wrote:

Hi Stephen,

Quoted 2 lines · Stephen Hemminger

This reverts commit 1607bf531fd2f984438d227ea97312df80e7cf56.

Quoted 8 lines
Quoted 1 line

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.

#4 lore raw
Quoted 12 lines · Stephen Hemminger
Quoted 9 lines · On Mon, 15 Jan 2024 12:27:23 +0100 Matthieu Baerts <[email protected]> wrote:

Hi Stephen,

Quoted 3 lines · Stephen Hemminger

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.

Quoted 7 lines
Quoted 4 lines

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

Signature · 1 line
Sponsored by the NGI0 Core fund.