1. 09 1月, 2011 1 次提交
  2. 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
  3. 28 5月, 2010 1 次提交
    • J
      hwmon: (asus_atk0110) Don't load if ACPI resources aren't enforced · 70dd6bea
      Jean Delvare 提交于
      When the user passes the kernel parameter acpi_enforce_resources=lax,
      the ACPI resources are no longer protected, so a native driver can
      make use of them. In that case, we do not want the asus_atk0110 to be
      loaded. Unfortunately, this driver loads automatically due to its
      MODULE_DEVICE_TABLE, so the user ends up with two drivers loaded for
      the same device - this is bad.
      
      So I suggest that we prevent the asus_atk0110 driver from loading if
      acpi_enforce_resources=lax.
      Signed-off-by: NJean Delvare <khali@linux-fr.org>
      Acked-by: NLuca Tettamanti <kronos.it@gmail.com>
      Cc: Len Brown <lenb@kernel.org>
      70dd6bea
  4. 23 4月, 2010 1 次提交
    • J
      sysfs: use sysfs_attr_init in ASUS atk0110 driver · a30dcb4f
      Jiri Kosina 提交于
      Annotate dynamic sysfs attribute in atk_create_files(). This gets
      rid of the following lockdep warning:
      
       BUG: key ffff8800379ca670 not in .data!
       ------------[ cut here ]------------
       WARNING: at kernel/lockdep.c:2696 lockdep_init_map+0xd2/0x108()
       Hardware name: P5K PRO
       Modules linked in: asus_atk0110(+) pata_acpi firewire_ohci ata_generic
       dm_multipath firewire_core crc_itu_t pata_marvell floppy
       Pid: 599, comm: modprobe Not tainted 2.6.34-rc4 #27
       Call Trace:
        [<ffffffff8104cdb0>] warn_slowpath_common+0x7c/0x94
        [<ffffffff8104cddc>] warn_slowpath_null+0x14/0x16
        [<ffffffff81077c4d>] lockdep_init_map+0xd2/0x108
        [<ffffffff81165873>] sysfs_add_file_mode+0x66/0xa2
        [<ffffffff811658c0>] sysfs_add_file+0x11/0x13
        [<ffffffff8116594b>] sysfs_create_file+0x2a/0x2c
        [<ffffffff812c1f9c>] device_create_file+0x19/0x1b
        [<ffffffffa005b4fd>] atk_add+0x58b/0x72e [asus_atk0110]
        [<ffffffff812572a1>] acpi_device_probe+0x50/0x122
        [<ffffffff812c46af>] driver_probe_device+0xa2/0x127
        [<ffffffff812c4783>] __driver_attach+0x4f/0x6b
        [<ffffffff812c4734>] ? __driver_attach+0x0/0x6b
        [<ffffffff812c3c94>] bus_for_each_dev+0x59/0x8e
        [<ffffffff812c4519>] driver_attach+0x1e/0x20
        [<ffffffff812c4152>] bus_add_driver+0xb9/0x207
        [<ffffffff812c4a5f>] driver_register+0x9d/0x10e
        [<ffffffffa005f000>] ? atk0110_init+0x0/0x31 [asus_atk0110]
        [<ffffffff81257c7c>] acpi_bus_register_driver+0x43/0x45
        [<ffffffffa005f015>] atk0110_init+0x15/0x31 [asus_atk0110]
        [<ffffffffa005f000>] ? atk0110_init+0x0/0x31 [asus_atk0110]
        [<ffffffff81002069>] do_one_initcall+0x5e/0x15e
        [<ffffffff81085075>] sys_init_module+0xd8/0x239
        [<ffffffff81009cf2>] system_call_fastpath+0x16/0x1b
       ---[ end trace 4d0c84007055efb9 ]---
       BUG: key ffff8800379ca638 not in .data!
       BUG: key ffff8800379ca6a8 not in .data!
       BUG: key ffff8800379ca6e0 not in .data!
       BUG: key ffff880036f73670 not in .data!
       BUG: key ffff880036f73638 not in .data!
       BUG: key ffff880036f736a8 not in .data!
       BUG: key ffff880036f736e0 not in .data!
       BUG: key ffff880036f76c70 not in .data!
       BUG: key ffff880036f76c38 not in .data!
       BUG: key ffff880036f76ca8 not in .data!
       BUG: key ffff880036f76ce0 not in .data!
       BUG: key ffff8800368e7670 not in .data!
       BUG: key ffff8800368e7638 not in .data!
       BUG: key ffff8800368e76a8 not in .data!
       BUG: key ffff8800368e76e0 not in .data!
       BUG: key ffff880036ef7670 not in .data!
       BUG: key ffff880036ef7638 not in .data!
       BUG: key ffff880036ef76a8 not in .data!
       BUG: key ffff880036ef76e0 not in .data!
       BUG: key ffff8800373ccc70 not in .data!
       BUG: key ffff8800373ccc38 not in .data!
       BUG: key ffff8800373ccca8 not in .data!
       BUG: key ffff8800373ccce0 not in .data!
       BUG: key ffff880037a60870 not in .data!
       BUG: key ffff880037a60838 not in .data!
       BUG: key ffff880037a608a8 not in .data!
       BUG: key ffff880037a608e0 not in .data!
       BUG: key ffff880037355070 not in .data!
       BUG: key ffff880037355038 not in .data!
       BUG: key ffff8800373550a8 not in .data!
       BUG: key ffff8800373550e0 not in .data!
       BUG: key ffff8800378c2670 not in .data!
       BUG: key ffff8800378c2638 not in .data!
       BUG: key ffff8800378c26a8 not in .data!
       BUG: key ffff8800378c26e0 not in .data!
       BUG: key ffff880036ef7e70 not in .data!
       BUG: key ffff880036ef7e38 not in .data!
       BUG: key ffff880036ef7ea8 not in .data!
       BUG: key ffff880036ef7ee0 not in .data!
      
      Cc: Eric W. Biederman <ebiederm@xmission.com>
      Reported-by: NDhaval Giani <dhaval.giani@gmail.com>
      Signed-off-by: NJiri Kosina <jkosina@suse.cz>
      Tested-by: NDhaval Giani <dhaval.giani@gmail.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      
      a30dcb4f
  5. 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
  6. 25 1月, 2010 1 次提交
  7. 11 1月, 2010 2 次提交
  8. 10 10月, 2009 2 次提交
  9. 28 7月, 2009 1 次提交
  10. 09 5月, 2009 1 次提交
  11. 07 4月, 2009 1 次提交
    • L
      hwmon: Add Asus ATK0110 support · 2c03d07a
      Luca Tettamanti 提交于
      Asus boards have an ACPI interface for interacting with the hwmon (fan,
      temperatures, voltages) subsystem; this driver exposes the relevant
      information via the standard sysfs interface.
      
      There are two different ACPI interfaces:
      - an old one (based on RVLT/RFAN/RTMP)
      - a new one (GGRP/GITM)
      Both may be present but there a few cases (my board, sigh) where the
      new interface is just an empty stub; the driver defaults to the old one
      when both are present.
      The old interface has received a considerable testing, but I'm still
      awaiting confirmation from my tester that the new one is working as
      expected (hence the debug code is still enabled).
      
      Currently all the attributes are read-only, though a (partial) control
      should be possible with a bit more work.
      Signed-off-by: NLuca Tettamanti <kronos.it@gmail.com>
      Signed-off-by: NHans de Goede <hdegoede@redhat.com>
      Signed-off-by: NJean Delvare <khali@linux-fr.org>
      2c03d07a