1. 19 7月, 2011 5 次提交
  2. 30 5月, 2011 1 次提交
  3. 07 5月, 2011 1 次提交
  4. 14 3月, 2011 2 次提交
  5. 13 3月, 2011 2 次提交
  6. 09 3月, 2011 2 次提交
  7. 01 2月, 2011 1 次提交
    • M
      vhost: rcu annotation fixup · 5e18247b
      Michael S. Tsirkin 提交于
      When built with rcu checks enabled, vhost triggers
      bogus warnings as vhost features are read without
      dev->mutex sometimes, and private pointer is read
      with our kind of rcu where work serves as a
      read side critical section.
      
      Fixing it properly is not trivial.
      Disable the warnings by stubbing out the checks for now.
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      5e18247b
  8. 10 1月, 2011 1 次提交
  9. 09 12月, 2010 5 次提交
  10. 29 11月, 2010 1 次提交
  11. 25 11月, 2010 1 次提交
  12. 04 11月, 2010 4 次提交
  13. 27 10月, 2010 1 次提交
  14. 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
  15. 12 10月, 2010 1 次提交
  16. 05 10月, 2010 1 次提交
    • J
      vhost: max s/g to match qemu · e0e9b406
      Jason Wang 提交于
      Qemu supports up to UIO_MAXIOV s/g so we have to match that because guest
      drivers may rely on this.
      
      Allocate indirect and log arrays dynamically to avoid using too much contigious
      memory and make the length of hdr array to match the header length since each
      iovec entry has a least one byte.
      
      Test with copying large files w/ and w/o migration in both linux and windows
      guests.
      Signed-off-by: NJason Wang <jasowang@redhat.com>
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      e0e9b406
  17. 22 9月, 2010 1 次提交
  18. 14 9月, 2010 1 次提交
    • M
      vhost-net: fix range checking in mrg bufs case · ee05d693
      Michael S. Tsirkin 提交于
      In mergeable buffer case, we use headcount, log_num
      and seg as indexes in same-size arrays, and
      we know that headcount <= seg and
      log_num equals either 0 or seg.
      
      Therefore, the right thing to do is range-check seg,
      not headcount as we do now: these will be different
      if guest chains s/g descriptors (this does not
      happen now, but we can not trust the guest).
      
      Long term, we should add BUG_ON checks to verify
      two other indexes are what we think they should be.
      Reported-by: NJason Wang <jasowang@redhat.com>
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      ee05d693
  19. 06 9月, 2010 2 次提交
    • M
      vhost: error handling fix · 615cc221
      Michael S. Tsirkin 提交于
      vhost should set worker to NULL on cgroups attach failure,
      so that we won't try to destroy the worker again on close.
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      615cc221
    • M
      vhost: fix attach to cgroups regression · 87d6a412
      Michael S. Tsirkin 提交于
      Since 2.6.36-rc1, non-root users of vhost-net fail to attach
      if they are in any cgroups.
      
      The reason is that when qemu uses vhost, vhost wants to attach
      its thread to all cgroups that qemu has.  But we got the API backwards,
      so a non-priveledged process (Qemu) tried to control
      the priveledged one (vhost), which fails.
      
      Fix this by switching to the new cgroup_attach_task_all,
      and running it from the vhost thread.
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      87d6a412
  20. 02 9月, 2010 1 次提交
  21. 22 8月, 2010 1 次提交
  22. 28 7月, 2010 3 次提交
    • D
      vhost-net: mergeable buffers support · 8dd014ad
      David Stevens 提交于
      This adds support for mergeable buffers in vhost-net: this is needed
      for older guests without indirect buffer support, as well
      as for zero copy with some devices.
      
      Includes changes by Michael S. Tsirkin to make the
      patch as low risk as possible (i.e., close to no changes
      when feature is disabled).
      Signed-off-by: NDavid Stevens <dlstevens@us.ibm.com>
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      8dd014ad
    • M
      vhost: apply cgroup to vhost workers · 9e3d1957
      Michael S. Tsirkin 提交于
      Apply the cgroup of the owner task to the created vhost worker.
      
      Based on patches from Sridhar Samudrala's and Tejun Heo.
      Later we'll need to also apply cpumask and probably priority
      of the owner process.
      
      Discussion on the best way to do this is still ongoing.
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      Cc: Tejun Heo <tj@kernel.org>
      Cc: Sridhar Samudrala <samudrala.sridhar@gmail.com>
      Cc: Li Zefan <lizf@cn.fujitsu.com>
      9e3d1957
    • T
      vhost: replace vhost_workqueue with per-vhost kthread · c23f3445
      Tejun Heo 提交于
      Replace vhost_workqueue with per-vhost kthread.  Other than callback
      argument change from struct work_struct * to struct vhost_work *,
      there's no visible change to vhost_poll_*() interface.
      
      This conversion is to make each vhost use a dedicated kthread so that
      resource control via cgroup can be applied.
      
      Partially based on Sridhar Samudrala's patch.
      
      * Updated to use sub structure vhost_work instead of directly using
        vhost_poll at Michael's suggestion.
      
      * Added flusher wake_up() optimization at Michael's suggestion.
      
      Changes by MST:
      * Converted atomics/barrier use to a spinlock.
      * Create thread on SET_OWNER
      * Fix flushing
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      Cc: Sridhar Samudrala <samudrala.sridhar@gmail.com>
      c23f3445
  23. 22 7月, 2010 1 次提交