1. 27 Nov, 2017 1 commit
    • Linus Torvalds's avatar
      Rename superblock flags (MS_xyz -> SB_xyz) · 1751e8a6
      Linus Torvalds authored
      This is a pure automated search-and-replace of the internal kernel
      superblock flags.
      The s_flags are now called SB_*, with the names and the values for the
      moment mirroring the MS_* flags that they're equivalent to.
      Note how the MS_xyz flags are the ones passed to the mount system call,
      while the SB_xyz flags are what we then use in sb->s_flags.
      The script to do this was:
          # places to look in; re security/*: it generally should *not* be
          # touched (that stuff parses mount(2) arguments directly), but
          # there are two places where we really deal with superblock flags.
          FILES="drivers/mtd drivers/staging/lustre fs ipc mm \
                  include/linux/fs.h include/uapi/linux/bfs_fs.h \
                  security/apparmor/apparmorfs.c security/apparmor/include/lib.h"
          # the list of MS_... constants
                ACTIVE NOUSER"
          for i in $SYMS; do SED_PROG="$SED_PROG -e s/MS_$i/SB_$i/g"; done
          # we want files that contain at least one of MS_...,
          # with fs/namespace.c and fs/pnode.c excluded.
          L=$(for i in $SYMS; do git grep -w -l MS_$i $FILES; done| sort|uniq|grep -v '^fs/namespace.c'|grep -v '^fs/pnode.c')
          for f in $L; do sed -i $f $SED_PROG; done
      Requested-by: 's avatarAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: 's avatarLinus Torvalds <torvalds@linux-foundation.org>
  2. 21 Jul, 2017 1 commit
  3. 16 Jul, 2017 2 commits
    • Benjamin Coddington's avatar
      fs/locks: Remove fl_nspid and use fs-specific l_pid for remote locks · 9d5b86ac
      Benjamin Coddington authored
      Since commit c69899a1 "NFSv4: Update of VFS byte range lock must be
      atomic with the stateid update", NFSv4 has been inserting locks in rpciod
      worker context.  The result is that the file_lock's fl_nspid is the
      kworker's pid instead of the original userspace pid.
      The fl_nspid is only used to represent the namespaced virtual pid number
      when displaying locks or returning from F_GETLK.  There's no reason to set
      it for every inserted lock, since we can usually just look it up from
      fl_pid.  So, instead of looking up and holding struct pid for every lock,
      let's just look up the virtual pid number from fl_pid when it is needed.
      That means we can remove fl_nspid entirely.
      The translaton and presentation of fl_pid should handle the following four
      1 - F_GETLK on a remote file with a remote lock:
          In this case, the filesystem should determine the l_pid to return here.
          Filesystems should indicate that the fl_pid represents a non-local pid
          value that should not be translated by returning an fl_pid <= 0.
      2 - F_GETLK on a local file with a remote lock:
          This should be the l_pid of the lock manager process, and translated.
      3 - F_GETLK on a remote file with a local lock, and
      4 - F_GETLK on a local file with a local lock:
          These should be the translated l_pid of the local locking process.
      Fuse was already doing the correct thing by translating the pid into the
      caller's namespace.  With this change we must update fuse to translate
      to init's pid namespace, so that the locks API can then translate from
      init's pid namespace into the pid namespace of the caller.
      With this change, the locks API will expect that if a filesystem returns
      a remote pid as opposed to a local pid for F_GETLK, that remote pid will
      be <= 0.  This signifies that the pid is remote, and the locks API will
      forego translating that pid into the pid namespace of the local calling
      Finally, we convert remote filesystems to present remote pids using
      negative numbers. Have lustre, 9p, ceph, cifs, and dlm negate the remote
      pid returned for F_GETLK lock requests.
      Since local pids will never be larger than PID_MAX_LIMIT (which is
      currently defined as <= 4 million), but pid_t is an unsigned int, we
      should have plenty of room to represent remote pids with negative
      numbers if we assume that remote pid numbers are similarly limited.
      If this is not the case, then we run the risk of having a remote pid
      returned for which there is also a corresponding local pid.  This is a
      problem we have now, but this patch should reduce the chances of that
      occurring, while also returning those remote pid numbers, for whatever
      that may be worth.
      Signed-off-by: 's avatarBenjamin Coddington <bcodding@redhat.com>
      Signed-off-by: 's avatarJeff Layton <jlayton@redhat.com>
    • Benjamin Coddington's avatar
      fs/locks: Use allocation rather than the stack in fcntl_getlk() · 52306e88
      Benjamin Coddington authored
      Struct file_lock is fairly large, so let's save some space on the stack by
      using an allocation for struct file_lock in fcntl_getlk(), just as we do
      for fcntl_setlk().
      Signed-off-by: 's avatarBenjamin Coddington <bcodding@redhat.com>
      Signed-off-by: 's avatarJeff Layton <jlayton@redhat.com>
  4. 27 May, 2017 2 commits
  5. 21 Apr, 2017 1 commit
  6. 24 Dec, 2016 1 commit
  7. 18 Oct, 2016 1 commit
  8. 28 Sep, 2016 1 commit
  9. 22 Sep, 2016 3 commits
    • Peter Zijlstra's avatar
      fs/locks: Use percpu_down_read_preempt_disable() · 87709e28
      Peter Zijlstra authored
      Avoid spurious preemption.
      Signed-off-by: 's avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Cc: Al Viro <viro@ZenIV.linux.org.uk>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Oleg Nesterov <oleg@redhat.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: dave@stgolabs.net
      Cc: der.herr@hofr.at
      Cc: paulmck@linux.vnet.ibm.com
      Cc: riel@redhat.com
      Cc: tj@kernel.org
      Cc: linux-kernel@vger.kernel.org
      Signed-off-by: 's avatarIngo Molnar <mingo@kernel.org>
    • Peter Zijlstra's avatar
      fs/locks: Replace lg_local with a per-cpu spinlock · 7c3f654d
      Peter Zijlstra authored
      As Oleg suggested, replace file_lock_list with a structure containing
      the hlist head and a spinlock.
      This completely removes the lglock from fs/locks.
      Suggested-by: 's avatarOleg Nesterov <oleg@redhat.com>
      Signed-off-by: 's avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Cc: Al Viro <viro@ZenIV.linux.org.uk>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: dave@stgolabs.net
      Cc: der.herr@hofr.at
      Cc: paulmck@linux.vnet.ibm.com
      Cc: riel@redhat.com
      Cc: tj@kernel.org
      Cc: linux-kernel@vger.kernel.org
      Signed-off-by: 's avatarIngo Molnar <mingo@kernel.org>
    • Peter Zijlstra's avatar
      fs/locks: Replace lg_global with a percpu-rwsem · aba37660
      Peter Zijlstra authored
      Replace the global part of the lglock with a percpu-rwsem.
      Since fcl_lock is a spinlock and itself nests under i_lock, which too
      is a spinlock we cannot acquire sleeping locks at
      We can however wrap all fcl_lock acquisitions with percpu_down_read
      such that all invocations of locks_{insert,remove}_global_locks() have
      that read lock held.
      This allows us to replace the lg_global part of the lglock with the
      write side of the rwsem.
      In the absense of writers, percpu_{down,up}_read() are free of atomic
      instructions. This further avoids the very long preempt-disable
      regions caused by lglock on larger machines.
      Signed-off-by: 's avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Cc: Al Viro <viro@ZenIV.linux.org.uk>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Oleg Nesterov <oleg@redhat.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: dave@stgolabs.net
      Cc: der.herr@hofr.at
      Cc: paulmck@linux.vnet.ibm.com
      Cc: riel@redhat.com
      Cc: tj@kernel.org
      Cc: linux-kernel@vger.kernel.org
      Signed-off-by: 's avatarIngo Molnar <mingo@kernel.org>
  10. 16 Sep, 2016 2 commits
    • Miklos Szeredi's avatar
      vfs: do get_write_access() on upper layer of overlayfs · 4d0c5ba2
      Miklos Szeredi authored
      The problem with writecount is: we want consistent handling of it for
      underlying filesystems as well as overlayfs.  Making sure i_writecount is
      correct on all layers is difficult.  Instead this patch makes sure that
      when write access is acquired, it's always done on the underlying writable
      layer (called the upper layer).  We must also make sure to look at the
      writecount on this layer when checking for conflicting leases.
      Open for write already updates the upper layer's writecount.  Leaving only
      For truncate copy up must happen before get_write_access() so that the
      writecount is updated on the upper layer.  Problem with this is if
      something fails after that, then copy-up was done needlessly.  E.g. if
      break_lease() was interrupted.  Probably not a big deal in practice.
      Another interesting case is if there's a denywrite on a lower file that is
      then opened for write or truncated.  With this patch these will succeed,
      which is somewhat counterintuitive.  But I think it's still acceptable,
      considering that the copy-up does actually create a different file, so the
      old, denywrite mapping won't be touched.
      On non-overlayfs d_real() is an identity function and d_real_inode() is
      equivalent to d_inode() so this patch doesn't change behavior in that case.
      Signed-off-by: 's avatarMiklos Szeredi <mszeredi@redhat.com>
      Acked-by: 's avatarJeff Layton <jlayton@poochiereds.net>
      Cc: "J. Bruce Fields" <bfields@fieldses.org>
    • Miklos Szeredi's avatar
      locks: fix file locking on overlayfs · c568d683
      Miklos Szeredi authored
      This patch allows flock, posix locks, ofd locks and leases to work
      correctly on overlayfs.
      Instead of using the underlying inode for storing lock context use the
      overlay inode.  This allows locks to be persistent across copy-up.
      This is done by introducing locks_inode() helper and using it instead of
      file_inode() to get the inode in locking code.  For non-overlayfs the two
      are equivalent, except for an extra pointer dereference in locks_inode().
      Since lock operations are in "struct file_operations" we must also make
      sure not to call underlying filesystem's lock operations.  Introcude a
      super block flag MS_NOREMOTELOCK to this effect.
      Signed-off-by: 's avatarMiklos Szeredi <mszeredi@redhat.com>
      Acked-by: 's avatarJeff Layton <jlayton@poochiereds.net>
      Cc: "J. Bruce Fields" <bfields@fieldses.org>
  11. 18 Aug, 2016 1 commit
  12. 01 Jul, 2016 1 commit
    • Miklos Szeredi's avatar
      locks: use file_inode() · 6343a212
      Miklos Szeredi authored
      (Another one for the f_path debacle.)
      ltp fcntl33 testcase caused an Oops in selinux_file_send_sigiotask.
      The reason is that generic_add_lease() used filp->f_path.dentry->inode
      while all the others use file_inode().  This makes a difference for files
      opened on overlayfs since the former will point to the overlay inode the
      latter to the underlying inode.
      So generic_add_lease() added the lease to the overlay inode and
      generic_delete_lease() removed it from the underlying inode.  When the file
      was released the lease remained on the overlay inode's lock list, resulting
      in use after free.
      Reported-by: 's avatarEryu Guan <eguan@redhat.com>
      Fixes: 4bacc9c9 ("overlayfs: Make f_path always point to the overlay and f_inode to the underlay")
      Cc: <stable@vger.kernel.org>
      Signed-off-by: 's avatarMiklos Szeredi <mszeredi@redhat.com>
      Reviewed-by: 's avatarJeff Layton <jlayton@redhat.com>
      Signed-off-by: 's avatarJ. Bruce Fields <bfields@redhat.com>
  13. 22 Jan, 2016 1 commit
    • Al Viro's avatar
      wrappers for ->i_mutex access · 5955102c
      Al Viro authored
      parallel to mutex_{lock,unlock,trylock,is_locked,lock_nested},
      inode_foo(inode) being mutex_foo(&inode->i_mutex).
      Please, use those for access to ->i_mutex; over the coming cycle
      ->i_mutex will become rwsem, with ->lookup() done with it held
      only shared.
      Signed-off-by: 's avatarAl Viro <viro@zeniv.linux.org.uk>
  14. 08 Jan, 2016 6 commits
  15. 18 Dec, 2015 1 commit
    • Paul Gortmaker's avatar
      fs: make locks.c explicitly non-modular · 91899226
      Paul Gortmaker authored
      The Kconfig currently controlling compilation of this code is:
      config FILE_LOCKING
           bool "Enable POSIX file locking API" if EXPERT
      ...meaning that it currently is not being built as a module by anyone.
      Lets remove the couple traces of modularity so that when reading the
      driver there is no doubt it is builtin-only.
      Since module_init translates to device_initcall in the non-modular
      case, the init ordering gets bumped to one level earlier when we
      use the more appropriate fs_initcall here.  However we've made similar
      changes before without any fallout and none is expected here either.
      Cc: Jeff Layton <jlayton@poochiereds.net>
      Acked-by: 's avatarJeff Layton <jlayton@poochiereds.net>
      Cc: "J. Bruce Fields" <bfields@fieldses.org>
      Cc: Alexander Viro <viro@zeniv.linux.org.uk>
      Cc: linux-fsdevel@vger.kernel.org
      Signed-off-by: 's avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: 's avatarJeff Layton <jeff.layton@primarydata.com>
  16. 08 Dec, 2015 1 commit
  17. 18 Nov, 2015 1 commit
  18. 16 Nov, 2015 1 commit
    • Jeff Layton's avatar
      locks: Allow disabling mandatory locking at compile time · 9e8925b6
      Jeff Layton authored
      Mandatory locking appears to be almost unused and buggy and there
      appears no real interest in doing anything with it.  Since effectively
      no one uses the code and since the code is buggy let's allow it to be
      disabled at compile time.  I would just suggest removing the code but
      undoubtedly that will break some piece of userspace code somewhere.
      For the distributions that don't care about this piece of code
      this gives a nice starting point to make mandatory locking go away.
      Cc: Benjamin Coddington <bcodding@redhat.com>
      Cc: Dmitry Vyukov <dvyukov@google.com>
      Cc: Jeff Layton <jeff.layton@primarydata.com>
      Cc: J. Bruce Fields <bfields@fieldses.org>
      Signed-off-by: 's avatar"Eric W. Biederman" <ebiederm@xmission.com>
      Signed-off-by: 's avatarJeff Layton <jeff.layton@primarydata.com>
  19. 22 Oct, 2015 3 commits
  20. 15 Oct, 2015 1 commit
  21. 21 Sep, 2015 1 commit
    • Dmitry Vyukov's avatar
      fs: fix data races on inode->i_flctx · 128a3785
      Dmitry Vyukov authored
      locks_get_lock_context() uses cmpxchg() to install i_flctx.
      cmpxchg() is a release operation which is correct. But it uses
      a plain load to load i_flctx. This is incorrect. Subsequent loads
      from i_flctx can hoist above the load of i_flctx pointer itself
      and observe uninitialized garbage there. This in turn can lead
      to corruption of ctx->flc_lock and other members.
      Documentation/memory-barriers.txt explicitly requires to use
      a barrier in such context:
      "A load-load control dependency requires a full read memory barrier".
      Use smp_load_acquire() in locks_get_lock_context() and in bunch
      of other functions that can proceed concurrently with
      The data race was found with KernelThreadSanitizer (KTSAN).
      Signed-off-by: 's avatarDmitry Vyukov <dvyukov@google.com>
      Signed-off-by: 's avatarJeff Layton <jeff.layton@primarydata.com>
  22. 31 Aug, 2015 1 commit
  23. 13 Jul, 2015 3 commits
  24. 17 Apr, 2015 1 commit
    • Andrey Vagin's avatar
      proc: show locks in /proc/pid/fdinfo/X · 6c8c9031
      Andrey Vagin authored
      Let's show locks which are associated with a file descriptor in
      its fdinfo file.
      Currently we don't have a reliable way to determine who holds a lock.  We
      can find some information in /proc/locks, but PID which is reported there
      can be wrong.  For example, a process takes a lock, then forks a child and
      dies.  In this case /proc/locks contains the parent pid, which can be
      reused by another process.
      $ cat /proc/locks
      6: FLOCK  ADVISORY  WRITE 324 00:13:13431 0 EOF
      $ ps -C rpcbind
        PID TTY          TIME CMD
        332 ?        00:00:00 rpcbind
      $ cat /proc/332/fdinfo/4
      pos:	0
      flags:	0100000
      mnt_id:	22
      lock:	1: FLOCK  ADVISORY  WRITE 324 00:13:13431 0 EOF
      $ ls -l /proc/332/fd/4
      lr-x------ 1 root root 64 Mar  5 14:43 /proc/332/fd/4 -> /run/rpcbind.lock
      $ ls -l /proc/324/fd/
      total 0
      lrwx------ 1 root root 64 Feb 27 14:50 0 -> /dev/pts/0
      lrwx------ 1 root root 64 Feb 27 14:50 1 -> /dev/pts/0
      lrwx------ 1 root root 64 Feb 27 14:49 2 -> /dev/pts/0
      You can see that the process with the 324 pid doesn't hold the lock.
      This information is required for proper dumping and restoring file
      Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
      Cc: Jonathan Corbet <corbet@lwn.net>
      Cc: Alexander Viro <viro@zeniv.linux.org.uk>
      Acked-by: 's avatarJeff Layton <jlayton@poochiereds.net>
      Acked-by: 's avatar"J. Bruce Fields" <bfields@fieldses.org>
      Acked-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
      Cc: Pavel Emelyanov <xemul@parallels.com>
      Cc: Joe Perches <joe@perches.com>
      Signed-off-by: 's avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: 's avatarLinus Torvalds <torvalds@linux-foundation.org>
  25. 03 Apr, 2015 2 commits
    • Jeff Layton's avatar
      locks: use cmpxchg to assign i_flctx pointer · 0429c2b5
      Jeff Layton authored
      During the v3.20/v4.0 cycle, I had originally had the code manage the
      inode->i_flctx pointer using a compare-and-swap operation instead of the
      Sasha Levin though hit a problem while testing with trinity that made me
      believe that that wasn't safe. At the time, changing the code to protect
      the i_flctx pointer seemed to fix the issue, but I now think that was
      just coincidence.
      The issue was likely the same race that Kirill Shutemov hit while
      testing the pre-rc1 v4.0 kernel and that Linus spotted. Due to the way
      that the spinlock was dropped in the middle of flock_lock_file, you
      could end up with multiple flock locks for the same struct file on the
      Reinstate the use of a CAS operation to assign this pointer since it's
      likely to be more efficient and gets the i_lock completely out of the
      file locking business.
      Signed-off-by: 's avatarJeff Layton <jeff.layton@primarydata.com>
    • Jeff Layton's avatar
      locks: get rid of WE_CAN_BREAK_LSLK_NOW dead code · 3648888e
      Jeff Layton authored
      As Bruce points out, there's no compelling reason to change /proc/locks
      output at this point. If we did want to do this, then we'd almost
      certainly want to introduce a new file to display this info (maybe via
      Let's remove the dead WE_CAN_BREAK_LSLK_NOW ifdef here and just plan to
      stay with the legacy format.
      Reported-by: 's avatarJ. Bruce Fields <bfields@redhat.com>
      Signed-off-by: 's avatarJeff Layton <jeff.layton@primarydata.com>