[GIT,PULL] smb3 client minor debugging fix

Pull-request

git://git.samba.org/sfrench/cifs-2.6.git tags/6.5-rc2-smb3-client-fixes

Message

Steve French July 22, 2023, 2:19 p.m. UTC

The following changes since commit fdf0eaf11452d72945af31804e2a1048ee1b574c:

  Linux 6.5-rc2 (2023-07-16 15:10:37 -0700)

are available in the Git repository at:

  git://git.samba.org/sfrench/cifs-2.6.git tags/6.5-rc2-smb3-client-fixes

for you to fetch changes up to ac0ce20fd8eaa9f5e193d138fbf1749c780928d0:

  cifs: update internal module version number for cifs.ko (2023-07-20
08:30:32 -0500)

----------------------------------------------------------------
add small debugging improvement
- it is helpful for network debugging of smb3 problems to be able to
use directory not just file (e.g. access to empty share)
----------------------------------------------------------------
Shyam Prasad N (1):
      cifs: allow dumping keys for directories too

Steve French (1):
      cifs: update internal module version number for cifs.ko

 fs/smb/client/cifsfs.h |  2 +-
 fs/smb/client/ioctl.c  | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)


--
Thanks,

Steve

Comments

Linus Torvalds July 22, 2023, 6:23 p.m. UTC | #1

On Sat, 22 Jul 2023 at 07:19, Steve French <[e-mail]> wrote:
>
> add small debugging improvement
> - it is helpful for network debugging of smb3 problems to be able to
> use directory not just file (e.g. access to empty share)
> ----------------------------------------------------------------
> Shyam Prasad N (1):
>       cifs: allow dumping keys for directories too
>
> Steve French (1):
>       cifs: update internal module version number for cifs.ko

Bah. I pulled, and then unpulled, because that module version number
change was obviously garbage.

That versioning has been problematic before too, and honestly seems to
be just completely broken and pointless random numbers that mostly -
but not always - are in sync.

This pull wasn't really a "fix" anyway, but then when I see nonsense
like that I just decide it's entirely bogus.

             Linus

Steve French July 22, 2023, 7:56 p.m. UTC | #2

On Sat, Jul 22, 2023 at 1:24 PM Linus Torvalds
<[e-mail]> wrote:
>
> On Sat, 22 Jul 2023 at 07:19, Steve French <[e-mail]> wrote:
> >
> > add small debugging improvement
> > - it is helpful for network debugging of smb3 problems to be able to
> > use directory not just file (e.g. access to empty share)
> > ----------------------------------------------------------------
> > Shyam Prasad N (1):
> >       cifs: allow dumping keys for directories too
> >
> > Steve French (1):
> >       cifs: update internal module version number for cifs.ko
>
> Bah. I pulled, and then unpulled, because that module version number
> change was obviously garbage.

I had missed a line in the version update.  Have now fixed that typo.
The module version number is used e.g. to tell when someone has
backported fixes for cifs.ko to an earlier kernel release (so e.g. we
can see from "modinfo cifs" or "cat /proc/fs/cifs/DebugData | grep
Version" whether they are running an updated version of cifs.ko or the
default version for that kernel).  I try to update the module version
at the end of the merge window but have sometimes delayed updating it
until after an important fix.

> This pull wasn't really a "fix" anyway, but then when I see nonsense
> like that I just decide it's entirely bogus.

For some context on the debug improvement:
- the keys change improves ability to read a network trace to debug
problems on encrypted connections which are very common (e.g. using
wireshark or tcpdump).  That works today with tools like "smbinfo keys
/mnt/file" but requires passing in a filename on the mount (see e.g.
https://wiki.samba.org/index.php/Wireshark_Decryption), but it often
makes more sense to just pass in the mount point path (ie a directory
not a filename).  And this fix was needed to debug some types of
problems (an obvious example is on an encrypted connection failing
operations on an empty share or with no files in the root of the
directory) - so you can simply pass in the "smbinfo keys <mntpoint>"
and get the information that wireshark needs.

I have updated to correct the version missing line at
git://git.samba.org/sfrench/cifs-2.6.git
tags/6.5-rc2-smb3-client-fixes-ver2

[e-mail] July 23, 2023, 6:44 p.m. UTC | #3

The pull request you sent on Sat, 22 Jul 2023 14:56:46 -0500:

> git://git.samba.org/sfrench/cifs-2.6.git tags/6.5-rc2-smb3-client-fixes-ver2

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/8266f53b39087c195f0d011dc5696cb2e6155242

Thank you!