Hi Shyam, On Fri, Jun 4, 2021 at 1:12 PM Shyam Prasad <Shyam.Prasad@xxxxxxxxxxxxx> wrote: > You can find the updated patches in the linux-cifs mailing list about an hour ago. > Titled: Multichannel patches The link in the updated PR still points to the old buggy patch. > -----Original Message----- > From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> > Sent: Friday, June 4, 2021 4:39 PM > To: Shyam Prasad <Shyam.Prasad@xxxxxxxxxxxxx> > Cc: Steve French <sfrench@xxxxxxxxx>; linux-cifs@xxxxxxxxxxxxxxx; linux-next@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > Subject: Re: [EXTERNAL] [PATCH] cifs: Change cifs_ses.chans_need_reconnect and chan_index to "unsigned long" > > Hi Shyam, > > On Fri, Jun 4, 2021 at 12:41 PM Shyam Prasad <Shyam.Prasad@xxxxxxxxxxxxx> wrote: > > Thanks for the email. > > I've already submitted the fix for this. You should see this fixed tomorrow. > > Where can I find these submitted fixes? > > As per linux-next policy[1], commits in linux-next should be posted to the relevant mailing list first, which is linux-cifs, AFAIK. > > Thanks! > > [1] https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Flinux-next%2F20210430174733.5a31d0c6%40canb.auug.org.au%2F&data=04%7C01%7CShyam.Prasad%40microsoft.com%7C50e24fa9469045cee62208d9274937e2%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637584017711363338%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=WVfbz5WhzyupDUljqSmxlyCdSZtOPcdGxwYpoyqYXqA%3D&reserved=0 > > > -----Original Message----- > > From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> > > Sent: Friday, June 4, 2021 2:32 PM > > To: Steve French <sfrench@xxxxxxxxx>; Shyam Prasad > > <Shyam.Prasad@xxxxxxxxxxxxx> > > Cc: linux-cifs@xxxxxxxxxxxxxxx; linux-next@xxxxxxxxxxxxxxx; > > linux-kernel@xxxxxxxxxxxxxxx > > Subject: [EXTERNAL] [PATCH] cifs: Change cifs_ses.chans_need_reconnect and chan_index to "unsigned long" > > > > On 32-bit (e.g. m68k): > > > > fs/cifs/cifssmb.c: In function 'cifs_reconnect_tcon': > > ./include/linux/kern_levels.h:5:18: warning: format '%lx' expects argument of type 'long unsigned int', but argument 2 has type 'size_t' {aka 'unsigned int'} [-Wformat=] > > fs/cifs/cifssmb.c:201:42: note: format string is defined here > > 201 | cifs_dbg(FYI, "sess reconnect mask: 0x%lx, tcon reconnect: %d", > > | ~~^ > > | | > > | long unsigned int > > | %x > > > > fs/cifs/transport.c: In function 'cifs_pick_channel': > > fs/cifs/cifsglob.h:955:20: error: passing argument 2 of 'test_bit' from incompatible pointer type [-Werror=incompatible-pointer-types] > > 955 | test_bit((index), &(ses)->chans_need_reconnect) > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > | | > > | size_t * {aka unsigned int *} > > ./arch/m68k/include/asm/bitops.h:151:66: note: expected 'const volatile long unsigned int *' but argument is of type 'size_t *' {aka 'unsigned int *'} > > 151 | static inline int test_bit(int nr, const volatile unsigned long *vaddr) > > | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ > > > > fs/cifs/sess.c: In function 'cifs_chan_set_need_reconnect': > > fs/cifs/sess.c:98:22: error: passing argument 2 of 'bset_mem_set_bit' from incompatible pointer type [-Werror=incompatible-pointer-types] > > 98 | set_bit(chan_index, &ses->chans_need_reconnect); > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > > | | > > | size_t * {aka unsigned int *} > > ./arch/m68k/include/asm/bitops.h:41:69: note: expected 'volatile long unsigned int *' but argument is of type 'size_t *' {aka 'unsigned int *'} > > 41 | static inline void bset_mem_set_bit(int nr, volatile unsigned long *vaddr) > > | ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ > > fs/cifs/sess.c:98:22: error: passing argument 2 of 'bfset_mem_set_bit' from incompatible pointer type [-Werror=incompatible-pointer-types] > > 98 | set_bit(chan_index, &ses->chans_need_reconnect); > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > > | | > > | size_t * {aka unsigned int *} > > ./arch/m68k/include/asm/bitops.h:50:70: note: expected 'volatile long unsigned int *' but argument is of type 'size_t *' {aka 'unsigned int *'} > > 50 | static inline void bfset_mem_set_bit(int nr, volatile unsigned long *vaddr) > > | ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ > > > > [...] > > > > As bitops can only operate on long objects, and > > cifs_ses_get_chan_index() already returns "unsigned long", fix this by changing cifs_ses.chans_need_reconnect and chan_index from "size_t" to "unsigned long". > > > > Fixes: 374c6c7bba3cbaa1 ("cifs: changes to support multichannel during > > channel reconnect") > > Reported-by: noreply@xxxxxxxxxxxxxx > > Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> > > --- > > Can you please add Link: headers when committing patches? > > I could not find this patch in the lore archives of linux-cifs or linux-fsdevel, presumably it was posted elsewhere? > > Thanks! > > --- > > fs/cifs/cifsglob.h | 2 +- > > fs/cifs/sess.c | 6 +++--- > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index > > 8fea2ddd2bd7af26..a9c026af21e1e9d1 100644 > > --- a/fs/cifs/cifsglob.h > > +++ b/fs/cifs/cifsglob.h > > @@ -968,7 +968,7 @@ struct cifs_ses { > > * enable the sessions on top to continue to live till any > > * of the channels below are active. > > */ > > - size_t chans_need_reconnect; > > + unsigned long chans_need_reconnect; > > }; > > > > static inline bool > > diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index > > 1721a3b246942266..1a17ddd6abbe5778 100644 > > --- a/fs/cifs/sess.c > > +++ b/fs/cifs/sess.c > > @@ -94,7 +94,7 @@ void > > cifs_chan_set_need_reconnect(struct cifs_ses *ses, > > struct TCP_Server_Info *server) { > > - size_t chan_index = cifs_ses_get_chan_index(ses, server); > > + unsigned long chan_index = cifs_ses_get_chan_index(ses, > > + server); > > set_bit(chan_index, &ses->chans_need_reconnect); > > cifs_dbg(FYI, "Set reconnect bitmask for chan %lu; now 0x%lx\n", > > chan_index, ses->chans_need_reconnect); @@ -104,7 +104,7 @@ void cifs_chan_clear_need_reconnect(struct cifs_ses *ses, > > struct TCP_Server_Info *server) { > > - size_t chan_index = cifs_ses_get_chan_index(ses, server); > > + unsigned long chan_index = cifs_ses_get_chan_index(ses, > > + server); > > clear_bit(chan_index, &ses->chans_need_reconnect); > > cifs_dbg(FYI, "Cleared reconnect bitmask for chan %lu; now 0x%lx\n", > > chan_index, ses->chans_need_reconnect); @@ -114,7 +114,7 @@ bool cifs_chan_needs_reconnect(struct cifs_ses *ses, > > struct TCP_Server_Info *server) { > > - size_t chan_index = cifs_ses_get_chan_index(ses, server); > > + unsigned long chan_index = cifs_ses_get_chan_index(ses, > > + server); > > return CIFS_CHAN_NEEDS_RECONNECT(ses, chan_index); } Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
