[GIT PULL] ksmbd server fixes

[GIT PULL] ksmbd server fixes

[Steve French]

Please pull the following changes since commit
457391b0380335d5e9a5babdec90ac53928b23b4:

  Linux 6.3 (2023-04-23 12:02:52 -0700)

are available in the Git repository at:

  git://git.samba.org/ksmbd.git tags/6.4-rc-ksmbd-server-fixes

for you to fetch changes up to 74d7970febf7e9005375aeda0df821d2edffc9f7:

  ksmbd: fix racy issue from using ->d_parent and ->d_name (2023-04-24
00:09:20 -0500)

----------------------------------------------------------------
- three SMB3.1.1 negotiate context fixes and cleanup
- new lock_rename_child VFS helper
- ksmbd fix to avoid unlink race and to use the new VFS helper to
avoid rename race
----------------------------------------------------------------
Al Viro (1):
      fs: introduce lock_rename_child() helper

David Disseldorp (3):
      ksmbd: set NegotiateContextCount once instead of every inc
      ksmbd: avoid duplicate negotiate ctx offset increments
      ksmbd: remove unused compression negotiate ctx packing

Namjae Jeon (2):
      ksmbd: remove internal.h include
      ksmbd: fix racy issue from using ->d_parent and ->d_name

Steve French (1):
      Merge tag 'pull-lock_rename_child' of
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs into
ksmbd-for-next

 fs/internal.h         |   2 -
 fs/ksmbd/smb2pdu.c    | 203 ++++++++++++--------------------------------------
 fs/ksmbd/vfs.c        | 437
++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------
 fs/ksmbd/vfs.h        |  19 ++---
 fs/ksmbd/vfs_cache.c  |   5 +-
 fs/namei.c            | 125 +++++++++++++++++++++++++------
 include/linux/namei.h |   9 +++
 7 files changed, 357 insertions(+), 443 deletions(-)

-- 
Thanks,

Steve

Re: [GIT PULL] ksmbd server fixes

[pr-tracker-bot]

The pull request you sent on Wed, 26 Apr 2023 21:11:44 -0500:

> git://git.samba.org/ksmbd.git tags/6.4-rc-ksmbd-server-fixes

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/1ae78a14516b9372e4c90a89ac21b259339a3a3a

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

Re: [GIT PULL] ksmbd server fixes

[Steve French]

[-- Attachment #1: Type: text/plain, Size: 2691 bytes --]

On Sun, May 21, 2023 at 2:21 PM Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> On Sun, May 21, 2023 at 12:03 PM Steve French <smfrench@gmail.com> wrote:
> >
> > I would be happy to do the move (to fs/smb) of the directories and
> > update the config soon (seems reasonably low risk) - let me know if you
> > want me to send it this week or wait till 6.5-rc
>
> So I think the "do it now or wait until the 6.5 merge window" is
> entirely up to you.
>
> We've often intentionally done big renames during the "quiet time"
> after the merge window is oven, just because doing them during the
> merge window can be somewhat painful with unnecessary conflicts.
>
> I would *not* want to do it during the last week of the release, just
> in case there are small details that need to be fixed up, but doing it
> now during the rc3/rc4 kind of timeframe is not only fairly quiet, but
> also gives us time to find any surprises.
>
> So in that sense, doing it now is likely one of the better times, and
> a pure rename should not be risky from a code standpoint.
>
> At the same time, doing it during the merge window isn't *wrong*
> either.  Despite the somewhat painful merge with folio changes, I
> don't think fs/cifs/ or fs/ksmbd/ normally have a lot of conflicts,
> and git does handle rename conflicts fairly well unless there's just
> lots of complexity.
>
> So it's really fine either way. The normal kind of "big changes"
> should obviously always be merge window things, but pure renames
> really are different and are often done outside of the merge window
> (the same way I intentionally did the MAINTAINERS re-ordering just
> *after* the merge window)
>
> But we don't do renames often enough to have any kind of strict rules
> about things like this.
>
> So I think "whenever is most convenient for you" is the thing to aim
> for here. This is *not* a "only during merge window" kind of thing.
>
>                  Linus

Here are two patches:
1)  Move CIFS/SMB3 related client and server files (cifs.ko and ksmbd.ko
and helper modules) to new fs/smb subdirectory (fs/smbfs was not used
to avoid confusion with the directory of the same name removed in 2.6.27
release and we also avoid using CONFIG_SMB_FS for the same reason)

   fs/cifs --> fs/smb/client
   fs/ksmbd --> fs/smb/server
   fs/smbfs_common --> fs/smb/common

2) With the fs/cifs directory moved to fs/smb/client, correct mentions
of this in Documentation and comments.

Follow on patch can change Documentation/filesystems/cifs -->
Documentation/filesystems/smb (since it contains both server
and client documentation)


--
Thanks,

Steve

[-- Attachment #2: 0001-smb-move-client-and-server-files-to-common-directory.patch --]
[-- Type: application/x-patch, Size: 43387 bytes --]

[-- Attachment #3: 0002-cifs-correct-references-in-Documentation-to-old-fs-c.patch --]
[-- Type: application/x-patch, Size: 5631 bytes --]

Re: [GIT PULL] ksmbd server fixes

[ronnie sahlberg]

Sounds like a good plan.

On Mon, 22 May 2023 at 14:39, Steve French via samba-technical
<samba-technical@lists.samba.org> wrote:
>
> On Sun, May 21, 2023 at 2:21 PM Linus Torvalds
> <torvalds@linux-foundation.org> wrote:
> >
> > On Sun, May 21, 2023 at 12:03 PM Steve French <smfrench@gmail.com> wrote:
> > >
> > > I would be happy to do the move (to fs/smb) of the directories and
> > > update the config soon (seems reasonably low risk) - let me know if you
> > > want me to send it this week or wait till 6.5-rc
> >
> > So I think the "do it now or wait until the 6.5 merge window" is
> > entirely up to you.
> >
> > We've often intentionally done big renames during the "quiet time"
> > after the merge window is oven, just because doing them during the
> > merge window can be somewhat painful with unnecessary conflicts.
> >
> > I would *not* want to do it during the last week of the release, just
> > in case there are small details that need to be fixed up, but doing it
> > now during the rc3/rc4 kind of timeframe is not only fairly quiet, but
> > also gives us time to find any surprises.
> >
> > So in that sense, doing it now is likely one of the better times, and
> > a pure rename should not be risky from a code standpoint.
> >
> > At the same time, doing it during the merge window isn't *wrong*
> > either.  Despite the somewhat painful merge with folio changes, I
> > don't think fs/cifs/ or fs/ksmbd/ normally have a lot of conflicts,
> > and git does handle rename conflicts fairly well unless there's just
> > lots of complexity.
> >
> > So it's really fine either way. The normal kind of "big changes"
> > should obviously always be merge window things, but pure renames
> > really are different and are often done outside of the merge window
> > (the same way I intentionally did the MAINTAINERS re-ordering just
> > *after* the merge window)
> >
> > But we don't do renames often enough to have any kind of strict rules
> > about things like this.
> >
> > So I think "whenever is most convenient for you" is the thing to aim
> > for here. This is *not* a "only during merge window" kind of thing.
> >
> >                  Linus
>
> Here are two patches:
> 1)  Move CIFS/SMB3 related client and server files (cifs.ko and ksmbd.ko
> and helper modules) to new fs/smb subdirectory (fs/smbfs was not used
> to avoid confusion with the directory of the same name removed in 2.6.27
> release and we also avoid using CONFIG_SMB_FS for the same reason)
>
>    fs/cifs --> fs/smb/client
>    fs/ksmbd --> fs/smb/server
>    fs/smbfs_common --> fs/smb/common
>
> 2) With the fs/cifs directory moved to fs/smb/client, correct mentions
> of this in Documentation and comments.
>
> Follow on patch can change Documentation/filesystems/cifs -->
> Documentation/filesystems/smb (since it contains both server
> and client documentation)
>
>
> --
> Thanks,
>
> Steve