1. 11 3月, 2011 2 次提交
    • D
      dlm: increase default hash table sizes · e3853a90
      David Teigland 提交于
      Make all three hash tables a consistent size of 1024
      rather than 1024, 512, 256.  All three tables, for
      resources, locks, and lock dir entries, will generally
      be filled to the same order of magnitude.
      Signed-off-by: NDavid Teigland <teigland@redhat.com>
      e3853a90
    • D
      dlm: record full callback state · 8304d6f2
      David Teigland 提交于
      Change how callbacks are recorded for locks.  Previously, information
      about multiple callbacks was combined into a couple of variables that
      indicated what the end result should be.  In some situations, we
      could not tell from this combined state what the exact sequence of
      callbacks were, and would end up either delivering the callbacks in
      the wrong order, or suppress redundant callbacks incorrectly.  This
      new approach records all the data for each callback, leaving no
      uncertainty about what needs to be delivered.
      Signed-off-by: NDavid Teigland <teigland@redhat.com>
      8304d6f2
  2. 12 2月, 2011 1 次提交
  3. 17 1月, 2011 1 次提交
    • N
      dlm: Make DLM depend on CONFIGFS_FS · 86c747d2
      Nicholas Bellinger 提交于
      This patch fixes the following kconfig error after changing
      CONFIGFS_FS -> select SYSFS:
      
      fs/sysfs/Kconfig:1:error: recursive dependency detected!
      fs/sysfs/Kconfig:1:	symbol SYSFS is selected by CONFIGFS_FS
      fs/configfs/Kconfig:1:	symbol CONFIGFS_FS is selected by DLM
      fs/dlm/Kconfig:1:	symbol DLM depends on SYSFS
      Signed-off-by: NNicholas A. Bellinger <nab@linux-iscsi.org>
      Cc: Joel Becker <jlbec@evilplan.org>
      Cc: Randy Dunlap <randy.dunlap@oracle.com>
      Cc: Stephen Rothwell <sfr@canb.auug.org.au>
      Cc: James Bottomley <James.Bottomley@suse.de>
      86c747d2
  4. 14 12月, 2010 1 次提交
  5. 13 11月, 2010 3 次提交
  6. 12 11月, 2010 1 次提交
    • D
      dlm: Handle application limited situations properly. · b36930dd
      David Miller 提交于
      In the normal regime where an application uses non-blocking I/O
      writes on a socket, they will handle -EAGAIN and use poll() to
      wait for send space.
      
      They don't actually sleep on the socket I/O write.
      
      But kernel level RPC layers that do socket I/O operations directly
      and key off of -EAGAIN on the write() to "try again later" don't
      use poll(), they instead have their own sleeping mechanism and
      rely upon ->sk_write_space() to trigger the wakeup.
      
      So they do effectively sleep on the write(), but this mechanism
      alone does not let the socket layers know what's going on.
      
      Therefore they must emulate what would have happened, otherwise
      TCP cannot possibly see that the connection is application window
      size limited.
      
      Handle this, therefore, like SUNRPC by setting SOCK_NOSPACE and
      bumping the ->sk_write_count as needed when we hit the send buffer
      limits.
      
      This should make TCP send buffer size auto-tuning and the
      ->sk_write_space() callback invocations actually happen.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      Signed-off-by: NDavid Teigland <teigland@redhat.com>
      b36930dd
  7. 15 10月, 2010 1 次提交
    • A
      llseek: automatically add .llseek fop · 6038f373
      Arnd Bergmann 提交于
      All file_operations should get a .llseek operation so we can make
      nonseekable_open the default for future file operations without a
      .llseek pointer.
      
      The three cases that we can automatically detect are no_llseek, seq_lseek
      and default_llseek. For cases where we can we can automatically prove that
      the file offset is always ignored, we use noop_llseek, which maintains
      the current behavior of not returning an error from a seek.
      
      New drivers should normally not use noop_llseek but instead use no_llseek
      and call nonseekable_open at open time.  Existing drivers can be converted
      to do the same when the maintainer knows for certain that no user code
      relies on calling seek on the device file.
      
      The generated code is often incorrectly indented and right now contains
      comments that clarify for each added line why a specific variant was
      chosen. In the version that gets submitted upstream, the comments will
      be gone and I will manually fix the indentation, because there does not
      seem to be a way to do that using coccinelle.
      
      Some amount of new code is currently sitting in linux-next that should get
      the same modifications, which I will do at the end of the merge window.
      
      Many thanks to Julia Lawall for helping me learn to write a semantic
      patch that does all this.
      
      ===== begin semantic patch =====
      // This adds an llseek= method to all file operations,
      // as a preparation for making no_llseek the default.
      //
      // The rules are
      // - use no_llseek explicitly if we do nonseekable_open
      // - use seq_lseek for sequential files
      // - use default_llseek if we know we access f_pos
      // - use noop_llseek if we know we don't access f_pos,
      //   but we still want to allow users to call lseek
      //
      @ open1 exists @
      identifier nested_open;
      @@
      nested_open(...)
      {
      <+...
      nonseekable_open(...)
      ...+>
      }
      
      @ open exists@
      identifier open_f;
      identifier i, f;
      identifier open1.nested_open;
      @@
      int open_f(struct inode *i, struct file *f)
      {
      <+...
      (
      nonseekable_open(...)
      |
      nested_open(...)
      )
      ...+>
      }
      
      @ read disable optional_qualifier exists @
      identifier read_f;
      identifier f, p, s, off;
      type ssize_t, size_t, loff_t;
      expression E;
      identifier func;
      @@
      ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
      {
      <+...
      (
         *off = E
      |
         *off += E
      |
         func(..., off, ...)
      |
         E = *off
      )
      ...+>
      }
      
      @ read_no_fpos disable optional_qualifier exists @
      identifier read_f;
      identifier f, p, s, off;
      type ssize_t, size_t, loff_t;
      @@
      ssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)
      {
      ... when != off
      }
      
      @ write @
      identifier write_f;
      identifier f, p, s, off;
      type ssize_t, size_t, loff_t;
      expression E;
      identifier func;
      @@
      ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
      {
      <+...
      (
        *off = E
      |
        *off += E
      |
        func(..., off, ...)
      |
        E = *off
      )
      ...+>
      }
      
      @ write_no_fpos @
      identifier write_f;
      identifier f, p, s, off;
      type ssize_t, size_t, loff_t;
      @@
      ssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)
      {
      ... when != off
      }
      
      @ fops0 @
      identifier fops;
      @@
      struct file_operations fops = {
       ...
      };
      
      @ has_llseek depends on fops0 @
      identifier fops0.fops;
      identifier llseek_f;
      @@
      struct file_operations fops = {
      ...
       .llseek = llseek_f,
      ...
      };
      
      @ has_read depends on fops0 @
      identifier fops0.fops;
      identifier read_f;
      @@
      struct file_operations fops = {
      ...
       .read = read_f,
      ...
      };
      
      @ has_write depends on fops0 @
      identifier fops0.fops;
      identifier write_f;
      @@
      struct file_operations fops = {
      ...
       .write = write_f,
      ...
      };
      
      @ has_open depends on fops0 @
      identifier fops0.fops;
      identifier open_f;
      @@
      struct file_operations fops = {
      ...
       .open = open_f,
      ...
      };
      
      // use no_llseek if we call nonseekable_open
      ////////////////////////////////////////////
      @ nonseekable1 depends on !has_llseek && has_open @
      identifier fops0.fops;
      identifier nso ~= "nonseekable_open";
      @@
      struct file_operations fops = {
      ...  .open = nso, ...
      +.llseek = no_llseek, /* nonseekable */
      };
      
      @ nonseekable2 depends on !has_llseek @
      identifier fops0.fops;
      identifier open.open_f;
      @@
      struct file_operations fops = {
      ...  .open = open_f, ...
      +.llseek = no_llseek, /* open uses nonseekable */
      };
      
      // use seq_lseek for sequential files
      /////////////////////////////////////
      @ seq depends on !has_llseek @
      identifier fops0.fops;
      identifier sr ~= "seq_read";
      @@
      struct file_operations fops = {
      ...  .read = sr, ...
      +.llseek = seq_lseek, /* we have seq_read */
      };
      
      // use default_llseek if there is a readdir
      ///////////////////////////////////////////
      @ fops1 depends on !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
      identifier fops0.fops;
      identifier readdir_e;
      @@
      // any other fop is used that changes pos
      struct file_operations fops = {
      ... .readdir = readdir_e, ...
      +.llseek = default_llseek, /* readdir is present */
      };
      
      // use default_llseek if at least one of read/write touches f_pos
      /////////////////////////////////////////////////////////////////
      @ fops2 depends on !fops1 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
      identifier fops0.fops;
      identifier read.read_f;
      @@
      // read fops use offset
      struct file_operations fops = {
      ... .read = read_f, ...
      +.llseek = default_llseek, /* read accesses f_pos */
      };
      
      @ fops3 depends on !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
      identifier fops0.fops;
      identifier write.write_f;
      @@
      // write fops use offset
      struct file_operations fops = {
      ... .write = write_f, ...
      +	.llseek = default_llseek, /* write accesses f_pos */
      };
      
      // Use noop_llseek if neither read nor write accesses f_pos
      ///////////////////////////////////////////////////////////
      
      @ fops4 depends on !fops1 && !fops2 && !fops3 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
      identifier fops0.fops;
      identifier read_no_fpos.read_f;
      identifier write_no_fpos.write_f;
      @@
      // write fops use offset
      struct file_operations fops = {
      ...
       .write = write_f,
       .read = read_f,
      ...
      +.llseek = noop_llseek, /* read and write both use no f_pos */
      };
      
      @ depends on has_write && !has_read && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
      identifier fops0.fops;
      identifier write_no_fpos.write_f;
      @@
      struct file_operations fops = {
      ... .write = write_f, ...
      +.llseek = noop_llseek, /* write uses no f_pos */
      };
      
      @ depends on has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
      identifier fops0.fops;
      identifier read_no_fpos.read_f;
      @@
      struct file_operations fops = {
      ... .read = read_f, ...
      +.llseek = noop_llseek, /* read uses no f_pos */
      };
      
      @ depends on !has_read && !has_write && !fops1 && !fops2 && !has_llseek && !nonseekable1 && !nonseekable2 && !seq @
      identifier fops0.fops;
      @@
      struct file_operations fops = {
      ...
      +.llseek = noop_llseek, /* no read or write fn */
      };
      ===== End semantic patch =====
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Cc: Julia Lawall <julia@diku.dk>
      Cc: Christoph Hellwig <hch@infradead.org>
      6038f373
  8. 03 9月, 2010 1 次提交
    • S
      dlm: Don't send callback to node making lock request when "try 1cb" fails · 314dd2a0
      Steven Whitehouse 提交于
      When converting a lock, an lkb is in the granted state and also being used
      to request a new state. In the case that the conversion was a "try 1cb"
      type which has failed, and if the new state was incompatible with the old
      state, a callback was being generated to the requesting node. This is
      incorrect as callbacks should only be sent to all the other nodes holding
      blocking locks. The requesting node should receive the normal (failed)
      response to its "try 1cb" conversion request only.
      
      This was discovered while debugging a performance problem on GFS2, however
      this fix also speeds up GFS as well. In the GFS2 case the performance gain
      is over 10x for cases of write activity to an inode whose glock is cached
      on another, idle (wrt that glock) node.
      
      (comment added, dct)
      Signed-off-by: NSteven Whitehouse <swhiteho@redhat.com>
      Tested-by: NAbhijith Das <adas@redhat.com>
      Signed-off-by: NDavid Teigland <teigland@redhat.com>
      314dd2a0
  9. 06 8月, 2010 2 次提交
  10. 01 5月, 2010 2 次提交
  11. 30 3月, 2010 1 次提交
    • T
      include cleanup: Update gfp.h and slab.h includes to prepare for breaking... · 5a0e3ad6
      Tejun Heo 提交于
      include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
      
      percpu.h is included by sched.h and module.h and thus ends up being
      included when building most .c files.  percpu.h includes slab.h which
      in turn includes gfp.h making everything defined by the two files
      universally available and complicating inclusion dependencies.
      
      percpu.h -> slab.h dependency is about to be removed.  Prepare for
      this change by updating users of gfp and slab facilities include those
      headers directly instead of assuming availability.  As this conversion
      needs to touch large number of source files, the following script is
      used as the basis of conversion.
      
        http://userweb.kernel.org/~tj/misc/slabh-sweep.py
      
      The script does the followings.
      
      * Scan files for gfp and slab usages and update includes such that
        only the necessary includes are there.  ie. if only gfp is used,
        gfp.h, if slab is used, slab.h.
      
      * When the script inserts a new include, it looks at the include
        blocks and try to put the new include such that its order conforms
        to its surrounding.  It's put in the include block which contains
        core kernel includes, in the same order that the rest are ordered -
        alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
        doesn't seem to be any matching order.
      
      * If the script can't find a place to put a new include (mostly
        because the file doesn't have fitting include block), it prints out
        an error message indicating which .h file needs to be added to the
        file.
      
      The conversion was done in the following steps.
      
      1. The initial automatic conversion of all .c files updated slightly
         over 4000 files, deleting around 700 includes and adding ~480 gfp.h
         and ~3000 slab.h inclusions.  The script emitted errors for ~400
         files.
      
      2. Each error was manually checked.  Some didn't need the inclusion,
         some needed manual addition while adding it to implementation .h or
         embedding .c file was more appropriate for others.  This step added
         inclusions to around 150 files.
      
      3. The script was run again and the output was compared to the edits
         from #2 to make sure no file was left behind.
      
      4. Several build tests were done and a couple of problems were fixed.
         e.g. lib/decompress_*.c used malloc/free() wrappers around slab
         APIs requiring slab.h to be added manually.
      
      5. The script was run on all .h files but without automatically
         editing them as sprinkling gfp.h and slab.h inclusions around .h
         files could easily lead to inclusion dependency hell.  Most gfp.h
         inclusion directives were ignored as stuff from gfp.h was usually
         wildly available and often used in preprocessor macros.  Each
         slab.h inclusion directive was examined and added manually as
         necessary.
      
      6. percpu.h was updated not to include slab.h.
      
      7. Build test were done on the following configurations and failures
         were fixed.  CONFIG_GCOV_KERNEL was turned off for all tests (as my
         distributed build env didn't work with gcov compiles) and a few
         more options had to be turned off depending on archs to make things
         build (like ipr on powerpc/64 which failed due to missing writeq).
      
         * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
         * powerpc and powerpc64 SMP allmodconfig
         * sparc and sparc64 SMP allmodconfig
         * ia64 SMP allmodconfig
         * s390 SMP allmodconfig
         * alpha SMP allmodconfig
         * um on x86_64 SMP allmodconfig
      
      8. percpu.h modifications were reverted so that it could be applied as
         a separate patch and serve as bisection point.
      
      Given the fact that I had only a couple of failures from tests on step
      6, I'm fairly confident about the coverage of this conversion patch.
      If there is a breakage, it's likely to be something in one of the arch
      headers which should be easily discoverable easily on most builds of
      the specific arch.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Guess-its-ok-by: NChristoph Lameter <cl@linux-foundation.org>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
      5a0e3ad6
  12. 08 3月, 2010 1 次提交
  13. 27 2月, 2010 3 次提交
    • D
      dlm: use bastmode in debugfs output · b6fa8796
      David Teigland 提交于
      The bast mode that appears in the debugfs output should be
      useful on both master and process nodes.  lkb_highbast is
      currently printed, and is only useful on the master node.
      lkb_bastmode is only useful on the process node.  This
      patch sets lkb_bastmode on the master node as well, and
      uses that value in the debugfs print.
      Signed-off-by: NDavid Teigland <teigland@redhat.com>
      b6fa8796
    • S
      dlm: Send lockspace name with uevents · b4a5d4bc
      Steven Whitehouse 提交于
      Although it is possible to get this information from the path,
      its much easier to provide the lockspace as a seperate env
      variable.
      Signed-off-by: NSteven Whitehouse <swhiteho@redhat.com>
      Signed-off-by: NDavid Teigland <teigland@redhat.com>
      b4a5d4bc
    • D
      dlm: send reply before bast · cf6620ac
      David Teigland 提交于
      When the lock master processes a successful operation (request,
      convert, cancel, or unlock), it will process the effects of the
      change before sending the reply for the operation.  The "effects"
      of the operation are:
      
      - blocking callbacks (basts) for any newly granted locks
      - waiting or converting locks that can now be granted
      
      The cast is queued on the local node when the reply from the lock
      master is received.  This means that a lock holder can receive a
      bast for a lock mode that is doesn't yet know has been granted.
      Signed-off-by: NDavid Teigland <teigland@redhat.com>
      cf6620ac
  14. 25 2月, 2010 1 次提交
    • D
      dlm: fix ordering of bast and cast · 7fe2b319
      David Teigland 提交于
      When both blocking and completion callbacks are queued for lock,
      the dlm would always deliver the completion callback (cast) first.
      In some cases the blocking callback (bast) is queued before the
      cast, though, and should be delivered first.  This patch keeps
      track of the order in which they were queued and delivers them
      in that order.
      
      This patch also keeps track of the granted mode in the last cast
      and eliminates the following bast if the bast mode is compatible
      with the preceding cast mode.  This happens when a remotely mastered
      lock is demoted, e.g. EX->NL, in which case the local node queues
      a cast immediately after sending the demote message.  In this way
      a cast can be queued for a mode, e.g. NL, that makes an in-transit
      bast extraneous.
      Signed-off-by: NDavid Teigland <teigland@redhat.com>
      7fe2b319
  15. 04 2月, 2010 1 次提交
  16. 04 12月, 2009 1 次提交
  17. 01 12月, 2009 1 次提交
    • D
      dlm: always use GFP_NOFS · 573c24c4
      David Teigland 提交于
      Replace all GFP_KERNEL and ls_allocation with GFP_NOFS.
      ls_allocation would be GFP_KERNEL for userland lockspaces
      and GFP_NOFS for file system lockspaces.
      
      It was discovered that any lockspaces on the system can
      affect all others by triggering memory reclaim in the
      file system which could in turn call back into the dlm
      to acquire locks, deadlocking dlm threads that were
      shared by all lockspaces, like dlm_recv.
      Signed-off-by: NDavid Teigland <teigland@redhat.com>
      573c24c4
  18. 01 10月, 2009 2 次提交
    • D
      dlm: fix socket fd translation · 6861f350
      David Teigland 提交于
      The code to set up sctp sockets was not using the sockfd_lookup()
      and sockfd_put() routines to translate an fd to a socket.  The
      direct fget and fput calls were resulting in error messages from
      alloc_fd().
      
      Also clean up two log messages and remove a third, related to
      setting up sctp associations.
      Signed-off-by: NDavid Teigland <teigland@redhat.com>
      6861f350
    • D
      dlm: fix lowcomms_connect_node for sctp · 04bedd79
      David Teigland 提交于
      The recently added dlm_lowcomms_connect_node() from
      391fbdc5 does not work
      when using SCTP instead of TCP.  The sctp connection code
      has nothing to do without data to send.  Check for no data
      in the sctp connection code and do nothing instead of
      triggering a BUG.  Also have connect_node() do nothing
      when the protocol is sctp.
      Signed-off-by: NDavid Teigland <teigland@redhat.com>
      04bedd79
  19. 23 9月, 2009 1 次提交
  20. 25 8月, 2009 2 次提交
  21. 19 8月, 2009 1 次提交
  22. 15 7月, 2009 1 次提交
  23. 13 7月, 2009 1 次提交
    • J
      genetlink: make netns aware · 134e6375
      Johannes Berg 提交于
      This makes generic netlink network namespace aware. No
      generic netlink families except for the controller family
      are made namespace aware, they need to be checked one by
      one and then set the family->netnsok member to true.
      
      A new function genlmsg_multicast_netns() is introduced to
      allow sending a multicast message in a given namespace,
      for example when it applies to an object that lives in
      that namespace, a new function genlmsg_multicast_allns()
      to send a message to all network namespaces (for objects
      that do not have an associated netns).
      
      The function genlmsg_multicast() is changed to multicast
      the message in just init_net, which is currently correct
      for all generic netlink families since they only work in
      init_net right now. Some will later want to work in all
      net namespaces because they do not care about the netns
      at all -- those will have to be converted to use one of
      the new functions genlmsg_multicast_allns() or
      genlmsg_multicast_netns() whenever they are made netns
      aware in some way.
      
      After this patch families can easily decide whether or
      not they should be available in all net namespaces. Many
      genl families us it for objects not related to networking
      and should therefore be available in all namespaces, but
      that will have to be done on a per family basis.
      
      Note that this doesn't touch on the checkpoint/restart
      problem where network namespaces could be used, genl
      families and multicast groups are numbered globally and
      I see no easy way of changing that, especially since it
      must be possible to multicast to all network namespaces
      for those families that do not care about netns.
      Signed-off-by: NJohannes Berg <johannes@sipsolutions.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      134e6375
  24. 19 6月, 2009 1 次提交
    • D
      dlm: fix plock use-after-free · c78a87d0
      David Teigland 提交于
      Fix a regression from the original addition of nfs lock support
      586759f0.  When a synchronous
      (non-nfs) plock completes, the waiting thread will wake up and
      free the op struct.  This races with the user thread in
      dev_write() which goes on to read the op's callback field to
      check if the lock is async and needs a callback.  This check
      can happen on the freed op.  The fix is to note the callback
      value before the op can be freed.
      Signed-off-by: NDavid Teigland <teigland@redhat.com>
      c78a87d0
  25. 18 6月, 2009 1 次提交
  26. 16 5月, 2009 1 次提交
    • D
      dlm: use more NOFS allocation · 748285cc
      David Teigland 提交于
      Change some GFP_KERNEL allocations to use either GFP_NOFS or
      ls_allocation (when available) which the fs sets to GFP_NOFS.
      The point is to prevent allocations from going back into the
      cluster fs in places where that might lead to deadlock.
      Signed-off-by: NDavid Teigland <teigland@redhat.com>
      748285cc
  27. 15 5月, 2009 1 次提交
  28. 07 5月, 2009 2 次提交
  29. 12 3月, 2009 2 次提交
    • D
      dlm: fix length calculation in compat code · 1fecb1c4
      David Teigland 提交于
      Using offsetof() to calculate name length does not work because
      it does not produce consistent results with with structure packing.
      This caused memcpy to corrupt memory by copying 4 extra bytes off
      the end of the buffer on 64 bit kernels with 32 bit userspace
      (the only case where this 32/64 compat code is used).
      
      The fix is to calculate name length directly from the start instead
      of trying to derive it later using count and offsetof.
      Signed-off-by: NDavid Teigland <teigland@redhat.com>
      1fecb1c4
    • D
      dlm: ignore cancel on granted lock · a536e381
      David Teigland 提交于
      Return immediately from dlm_unlock(CANCEL) if the lock is
      granted and not being converted; there's nothing to cancel.
      Signed-off-by: NDavid Teigland <teigland@redhat.com>
      a536e381