Updated Shyam's patch to address this and a sparse warning and a checkpatch warning On Sun, Jun 25, 2023 at 2:14 AM kernel test robot <lkp@xxxxxxxxx> wrote: > > tree: git://git.samba.org/sfrench/cifs-2.6.git for-next > head: d75e841ced93ce9cd86dc46b8a9453241dcbc61b > commit: 33bc5dec2b4fd8d00fed51183615d91badf607d6 [13/14] cifs: display the endpoint IP details in DebugData > config: hexagon-randconfig-r045-20230625 (https://download.01.org/0day-ci/archive/20230625/202306251539.R34e3RXd-lkp@xxxxxxxxx/config) > compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project.git 4a5ac14ee968ff0ad5d2cc1ffa0299048db4c88a) > reproduce: (https://download.01.org/0day-ci/archive/20230625/202306251539.R34e3RXd-lkp@xxxxxxxxx/reproduce) > > If you fix the issue in a separate patch/commit (i.e. not just a new version of > the same patch/commit), kindly add following tags > | Reported-by: kernel test robot <lkp@xxxxxxxxx> > | Closes: https://lore.kernel.org/oe-kbuild-all/202306251539.R34e3RXd-lkp@xxxxxxxxx/ > > All warnings (new ones prefixed by >>): > > In file included from fs/smb/client/cifs_debug.c:15: > In file included from include/uapi/linux/ethtool.h:19: > In file included from include/linux/if_ether.h:19: > In file included from include/linux/skbuff.h:17: > In file included from include/linux/bvec.h:10: > In file included from include/linux/highmem.h:12: > In file included from include/linux/hardirq.h:11: > In file included from ./arch/hexagon/include/generated/asm/hardirq.h:1: > In file included from include/asm-generic/hardirq.h:17: > In file included from include/linux/irq.h:20: > In file included from include/linux/io.h:13: > In file included from arch/hexagon/include/asm/io.h:334: > include/asm-generic/io.h:547:31: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] > 547 | val = __raw_readb(PCI_IOBASE + addr); > | ~~~~~~~~~~ ^ > include/asm-generic/io.h:560:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] > 560 | val = __le16_to_cpu((__le16 __force)__raw_readw(PCI_IOBASE + addr)); > | ~~~~~~~~~~ ^ > include/uapi/linux/byteorder/little_endian.h:37:51: note: expanded from macro '__le16_to_cpu' > 37 | #define __le16_to_cpu(x) ((__force __u16)(__le16)(x)) > | ^ > In file included from fs/smb/client/cifs_debug.c:15: > In file included from include/uapi/linux/ethtool.h:19: > In file included from include/linux/if_ether.h:19: > In file included from include/linux/skbuff.h:17: > In file included from include/linux/bvec.h:10: > In file included from include/linux/highmem.h:12: > In file included from include/linux/hardirq.h:11: > In file included from ./arch/hexagon/include/generated/asm/hardirq.h:1: > In file included from include/asm-generic/hardirq.h:17: > In file included from include/linux/irq.h:20: > In file included from include/linux/io.h:13: > In file included from arch/hexagon/include/asm/io.h:334: > include/asm-generic/io.h:573:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] > 573 | val = __le32_to_cpu((__le32 __force)__raw_readl(PCI_IOBASE + addr)); > | ~~~~~~~~~~ ^ > include/uapi/linux/byteorder/little_endian.h:35:51: note: expanded from macro '__le32_to_cpu' > 35 | #define __le32_to_cpu(x) ((__force __u32)(__le32)(x)) > | ^ > In file included from fs/smb/client/cifs_debug.c:15: > In file included from include/uapi/linux/ethtool.h:19: > In file included from include/linux/if_ether.h:19: > In file included from include/linux/skbuff.h:17: > In file included from include/linux/bvec.h:10: > In file included from include/linux/highmem.h:12: > In file included from include/linux/hardirq.h:11: > In file included from ./arch/hexagon/include/generated/asm/hardirq.h:1: > In file included from include/asm-generic/hardirq.h:17: > In file included from include/linux/irq.h:20: > In file included from include/linux/io.h:13: > In file included from arch/hexagon/include/asm/io.h:334: > include/asm-generic/io.h:584:33: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] > 584 | __raw_writeb(value, PCI_IOBASE + addr); > | ~~~~~~~~~~ ^ > include/asm-generic/io.h:594:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] > 594 | __raw_writew((u16 __force)cpu_to_le16(value), PCI_IOBASE + addr); > | ~~~~~~~~~~ ^ > include/asm-generic/io.h:604:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] > 604 | __raw_writel((u32 __force)cpu_to_le32(value), PCI_IOBASE + addr); > | ~~~~~~~~~~ ^ > >> fs/smb/client/cifs_debug.c:167:1: warning: label at end of compound statement is a C2x extension [-Wc2x-extensions] > 167 | } > | ^ > 7 warnings generated. > > > vim +167 fs/smb/client/cifs_debug.c > > 33bc5dec2b4fd8 fs/smb/client/cifs_debug.c Shyam Prasad N 2023-06-09 166 > 85150929a15b4e fs/cifs/cifs_debug.c Aurelien Aptel 2019-11-20 @167 } > 85150929a15b4e fs/cifs/cifs_debug.c Aurelien Aptel 2019-11-20 168 > > :::::: The code at line 167 was first introduced by commit > :::::: 85150929a15b4e0a225434d5970bba14ebdf31f1 cifs: dump channel info in DebugData > > :::::: TO: Aurelien Aptel <aaptel@xxxxxxxx> > :::::: CC: Steve French <stfrench@xxxxxxxxxxxxx> > > -- > 0-DAY CI Kernel Test Service > https://github.com/intel/lkp-tests/wiki -- Thanks, Steve
From 5e5f30455c24bb4b3dd5cca8c9ac20767e5a6f45 Mon Sep 17 00:00:00 2001 From: Shyam Prasad N <sprasad@xxxxxxxxxxxxx> Date: Fri, 9 Jun 2023 12:46:34 +0000 Subject: [PATCH 2/2] cifs: display the endpoint IP details in DebugData With multichannel, it is useful to know the src port details for each channel. This change will print the ip addr and port details for both the socket dest and src endpoints. Signed-off-by: Shyam Prasad N <sprasad@xxxxxxxxxxxxx> Reported-by: kernel test robot <lkp@xxxxxxxxx> Closes: https://lore.kernel.org/oe-kbuild-all/202306251539.R34e3RXd-lkp@xxxxxxxxx/ Signed-off-by: Steve French <stfrench@xxxxxxxxxxxxx> --- fs/smb/client/cifs_debug.c | 53 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/fs/smb/client/cifs_debug.c b/fs/smb/client/cifs_debug.c index b279f745466e..2c771c84b970 100644 --- a/fs/smb/client/cifs_debug.c +++ b/fs/smb/client/cifs_debug.c @@ -13,6 +13,7 @@ #include <linux/proc_fs.h> #include <linux/uaccess.h> #include <uapi/linux/ethtool.h> +#include <net/inet_sock.h> #include "cifspdu.h" #include "cifsglob.h" #include "cifsproto.h" @@ -147,6 +148,20 @@ cifs_dump_channel(struct seq_file *m, int i, struct cifs_chan *chan) in_flight(server), atomic_read(&server->in_send), atomic_read(&server->num_waiters)); + +#ifndef CONFIG_CIFS_SMB_DIRECT + if (server->ssocket) { + struct sockaddr src; + int addrlen; + + addrlen = kernel_getsockname(server->ssocket, &src); + if (addrlen != sizeof(struct sockaddr_in) && addrlen != sizeof(struct sockaddr_in6)) + return; + + seq_printf(m, "\n\t\tIP addr: dst: %pISpc, src: %pISpc", &server->dstaddr, &src); + } +#endif + } static inline const char *smb_speed_to_str(size_t bps) @@ -263,7 +278,7 @@ static int cifs_debug_files_proc_show(struct seq_file *m, void *v) 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 *server, *nserver; struct TCP_Server_Info *chan_server; struct cifs_ses *ses; struct cifs_tcon *tcon; @@ -318,7 +333,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) c = 0; spin_lock(&cifs_tcp_ses_lock); - list_for_each_entry(server, &cifs_tcp_ses_list, tcp_ses_list) { + list_for_each_entry_safe(server, nserver, &cifs_tcp_ses_list, tcp_ses_list) { /* channel info will be printed as a part of sessions below */ if (CIFS_SERVER_IS_CHAN(server)) continue; @@ -396,6 +411,29 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) atomic_read(&server->smbd_conn->mr_ready_count), atomic_read(&server->smbd_conn->mr_used_count)); skip_rdma: +#else + if (server->ssocket) { + struct sockaddr src; + int addrlen; + + /* kernel_getsockname can block. so drop the lock first */ + server->srv_count++; + spin_unlock(&cifs_tcp_ses_lock); + + addrlen = kernel_getsockname(server->ssocket, &src); + if ((addrlen != sizeof(struct sockaddr_in)) && + (addrlen != sizeof(struct sockaddr_in6))) { + spin_lock(&cifs_tcp_ses_lock); + goto skip_addr_details; + } + + seq_printf(m, "\nIP addr: dst: %pISpc, src: %pISpc", &server->dstaddr, &src); + + cifs_put_tcp_session(server, 0); + spin_lock(&cifs_tcp_ses_lock); + } + +skip_addr_details: #endif seq_printf(m, "\nNumber of credits: %d,%d,%d Dialect 0x%x", server->credits, @@ -493,7 +531,18 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) seq_printf(m, "\n\n\tExtra Channels: %zu ", ses->chan_count-1); for (j = 1; j < ses->chan_count; j++) { + /* + * kernel_getsockname can block inside + * cifs_dump_channel. so drop the lock first + */ + server->srv_count++; + spin_unlock(&cifs_tcp_ses_lock); + cifs_dump_channel(m, j, &ses->chans[j]); + + cifs_put_tcp_session(server, 0); + spin_lock(&cifs_tcp_ses_lock); + if (CIFS_CHAN_NEEDS_RECONNECT(ses, j)) seq_puts(m, "\tDISCONNECTED "); if (CIFS_CHAN_IN_RECONNECT(ses, j)) -- 2.34.1
