From: Shyam Prasad N <sprasad@microsoft.com>

Date: Mon, 13 Mar 2023 11:09:12 +0000

Subject: [PATCH] cifs: dump pending mids for all channels in DebugData

References: bsc#1012628

Patch-mainline: 6.2.9

Git-commit: d12bc6d26f92c51b28e8f4a146ffcc630b688198

commit d12bc6d26f92c51b28e8f4a146ffcc630b688198 upstream.

Currently, we only dump the pending mid information only

on the primary channel in /proc/fs/cifs/DebugData.

If multichannel is active, we do not print the pending MID

list on secondary channels.

This change will dump the pending mids for all the channels

based on server->conn_id.

Signed-off-by: Shyam Prasad N <sprasad@microsoft.com>

Reviewed-by: Paulo Alcantara (SUSE) <pc@manguebit.com>

Cc: stable@vger.kernel.org

Signed-off-by: Steve French <stfrench@microsoft.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 fs/cifs/cifs_debug.c | 41 +++++++++++++++++++++++++++--------------

 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c

index d9876bd3..325b5bd4 100644

--- a/fs/cifs/cifs_debug.c

+++ b/fs/cifs/cifs_debug.c

@@ -215,6 +215,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)

 {

 	struct mid_q_entry *mid_entry;

 	struct TCP_Server_Info *server;

+	struct TCP_Server_Info *chan_server;

 	struct cifs_ses *ses;

 	struct cifs_tcon *tcon;

 	struct cifs_server_iface *iface;

@@ -471,23 +472,35 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)

 					seq_puts(m, "\t\t[CONNECTED]\n");

 			}

 			spin_unlock(&ses->iface_lock);

+

+			seq_puts(m, "\n\n\tMIDs: ");

+			spin_lock(&ses->chan_lock);

+			for (j = 0; j < ses->chan_count; j++) {

+				chan_server = ses->chans[j].server;

+				if (!chan_server)

+					continue;

+

+				if (list_empty(&chan_server->pending_mid_q))

+					continue;

+

+				seq_printf(m, "\n\tServer ConnectionId: 0x%llx",

+					   chan_server->conn_id);

+				spin_lock(&chan_server->mid_lock);

+				list_for_each_entry(mid_entry, &chan_server->pending_mid_q, qhead) {

+					seq_printf(m, "\n\t\tState: %d com: %d pid: %d cbdata: %p mid %llu",

+						   mid_entry->mid_state,

+						   le16_to_cpu(mid_entry->command),

+						   mid_entry->pid,

+						   mid_entry->callback_data,

+						   mid_entry->mid);

+				}

+				spin_unlock(&chan_server->mid_lock);

+			}

+			spin_unlock(&ses->chan_lock);

+			seq_puts(m, "\n--\n");

 		}

 		if (i == 0)

 			seq_printf(m, "\n\t\t[NONE]");

-

-		seq_puts(m, "\n\n\tMIDs: ");

-		spin_lock(&server->mid_lock);

-		list_for_each_entry(mid_entry, &server->pending_mid_q, qhead) {

-			seq_printf(m, "\n\tState: %d com: %d pid:"

-					" %d cbdata: %p mid %llu\n",

-					mid_entry->mid_state,

-					le16_to_cpu(mid_entry->command),

-					mid_entry->pid,

-					mid_entry->callback_data,

-					mid_entry->mid);

-		}

-		spin_unlock(&server->mid_lock);

-		seq_printf(m, "\n--\n");

 	}

 	if (c == 0)

 		seq_printf(m, "\n\t[NONE]");

-- 

2.35.3