[v2,5/5] CIFS: dump every session iface info

Message ID 20180614150452.22196-6-aaptel@suse.com
State New
Headers show
Series
  • [v2,1/5] CIFS: move default port definitions to cifsglob.h
Related show

Commit Message

Aurelien Aptel June 14, 2018, 3:04 p.m.
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
---
 fs/cifs/cifs_debug.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

Comments

Steve French June 14, 2018, 5:50 p.m. | #1
Seems useful - not sure if also would help to add patch later to dump
information via the debug ioctl.  No strong opinion on this

On Thu, Jun 14, 2018 at 10:04 AM, Aurelien Aptel <aaptel@suse.com> wrote:
> Signed-off-by: Aurelien Aptel <aaptel@suse.com>
> ---
>  fs/cifs/cifs_debug.c | 27 +++++++++++++++++++++++++++
>  1 file changed, 27 insertions(+)
>
> diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
> index 116146022aa1..e8db245194e7 100644
> --- a/fs/cifs/cifs_debug.c
> +++ b/fs/cifs/cifs_debug.c
> @@ -126,6 +126,25 @@ static void cifs_debug_tcon(struct seq_file *m, struct cifs_tcon *tcon)
>         seq_putc(m, '\n');
>  }
>
> +static void
> +cifs_dump_iface(struct seq_file *m, struct cifs_server_iface *iface)
> +{
> +       struct sockaddr_in *ipv4 = (struct sockaddr_in *)&iface->sockaddr;
> +       struct sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)&iface->sockaddr;
> +
> +       seq_printf(m, "\t\tSpeed: %zu bps\n", iface->speed);
> +       seq_puts(m, "\t\tCapabilities: ");
> +       if (iface->rdma_capable)
> +               seq_puts(m, "rdma ");
> +       if (iface->rss_capable)
> +               seq_puts(m, "rss ");
> +       seq_putc(m, '\n');
> +       if (iface->sockaddr.ss_family == AF_INET)
> +               seq_printf(m, "\t\tIPv4: %pI4\n", &ipv4->sin_addr);
> +       else if (iface->sockaddr.ss_family == AF_INET6)
> +               seq_printf(m, "\t\tIPv6: %pI6\n", &ipv6->sin6_addr);
> +}
> +
>  static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
>  {
>         struct list_head *tmp1, *tmp2, *tmp3;
> @@ -312,6 +331,14 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
>                                               mid_entry->mid);
>                         }
>                         spin_unlock(&GlobalMid_Lock);
> +
> +                       spin_lock(&ses->iface_lock);
> +                       seq_printf(m, "\n\tServer interfaces: %zu\n", ses->iface_count);
> +                       for (j = 0; j < ses->iface_count; j++) {
> +                               seq_printf(m, "\t%d)\n", j);
> +                               cifs_dump_iface(m, &ses->iface_list[j]);
> +                       }
> +                       spin_unlock(&ses->iface_lock);
>                 }
>         }
>         spin_unlock(&cifs_tcp_ses_lock);
> --
> 2.13.6
>

Patch

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index 116146022aa1..e8db245194e7 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -126,6 +126,25 @@  static void cifs_debug_tcon(struct seq_file *m, struct cifs_tcon *tcon)
 	seq_putc(m, '\n');
 }
 
+static void
+cifs_dump_iface(struct seq_file *m, struct cifs_server_iface *iface)
+{
+	struct sockaddr_in *ipv4 = (struct sockaddr_in *)&iface->sockaddr;
+	struct sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)&iface->sockaddr;
+
+	seq_printf(m, "\t\tSpeed: %zu bps\n", iface->speed);
+	seq_puts(m, "\t\tCapabilities: ");
+	if (iface->rdma_capable)
+		seq_puts(m, "rdma ");
+	if (iface->rss_capable)
+		seq_puts(m, "rss ");
+	seq_putc(m, '\n');
+	if (iface->sockaddr.ss_family == AF_INET)
+		seq_printf(m, "\t\tIPv4: %pI4\n", &ipv4->sin_addr);
+	else if (iface->sockaddr.ss_family == AF_INET6)
+		seq_printf(m, "\t\tIPv6: %pI6\n", &ipv6->sin6_addr);
+}
+
 static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
 {
 	struct list_head *tmp1, *tmp2, *tmp3;
@@ -312,6 +331,14 @@  static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
 					      mid_entry->mid);
 			}
 			spin_unlock(&GlobalMid_Lock);
+
+			spin_lock(&ses->iface_lock);
+			seq_printf(m, "\n\tServer interfaces: %zu\n", ses->iface_count);
+			for (j = 0; j < ses->iface_count; j++) {
+				seq_printf(m, "\t%d)\n", j);
+				cifs_dump_iface(m, &ses->iface_list[j]);
+			}
+			spin_unlock(&ses->iface_lock);
 		}
 	}
 	spin_unlock(&cifs_tcp_ses_lock);