1. 07 3月, 2015 3 次提交
    • L
      Merge tag 'pm+acpi-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 39ed853a
      Linus Torvalds 提交于
      Pull power management and ACPI fixes from Rafael Wysocki:
       "These are fixes for recent regressions (ACPI resources management,
        suspend-to-idle), stable-candidate fixes (ACPI backlight), fixes
        related to the wakeup IRQ management changes made in v3.18, other
        fixes (suspend-to-idle, cpufreq ppc driver) and a couple of cleanups
        (suspend-to-idle, generic power domains, ACPI backlight).
      
        Specifics:
      
         - Fix ACPI resources management problems introduced by the recent
           rework of the code in question (Jiang Liu) and a build issue
           introduced by those changes (Joachim Nilsson).
      
         - Fix a recent suspend-to-idle regression on systems where entering
           idle states causes local timers to stop, prevent suspend-to-idle
           from crashing in restricted configurations (no cpuidle driver,
           cpuidle disabled etc.) and clean up the idle loop somewhat while at
           it (Rafael J Wysocki).
      
         - Fix build problem in the cpufreq ppc driver (Geert Uytterhoeven).
      
         - Allow the ACPI backlight driver module to be loaded if ACPI is
           disabled which helps the i915 driver in those configurations
           (stable-candidate) and change the code to help debug unusual use
           cases (Chris Wilson).
      
         - Wakeup IRQ management changes in v3.18 caused some drivers on the
           at91 platform to trigger a warning from the IRQ core related to an
           unexpected combination of interrupt action handler flags.  However,
           on at91 a timer IRQ is shared with some other devices (including
           system wakeup ones) and that leads to the unusual combination of
           flags in question.
      
           To make it possible to avoid the warning introduce a new interrupt
           action handler flag (which can be used by drivers to indicate the
           special case to the core) and rework the problematic at91 drivers
           to use it and work as expected during system suspend/resume.  From
           Boris Brezillon, Rafael J Wysocki and Mark Rutland.
      
         - Clean up the generic power domains subsystem's debugfs interface
           (Kevin Hilman)"
      
      * tag 'pm+acpi-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        genirq / PM: describe IRQF_COND_SUSPEND
        tty: serial: atmel: rework interrupt and wakeup handling
        watchdog: at91sam9: request the irq with IRQF_NO_SUSPEND
        cpuidle / sleep: Use broadcast timer for states that stop local timer
        clk: at91: implement suspend/resume for the PMC irqchip
        rtc: at91rm9200: rework wakeup and interrupt handling
        rtc: at91sam9: rework wakeup and interrupt handling
        PM / wakeup: export pm_system_wakeup symbol
        genirq / PM: Add flag for shared NO_SUSPEND interrupt lines
        ACPI / video: Propagate the error code for acpi_video_register
        ACPI / video: Load the module even if ACPI is disabled
        PM / Domains: cleanup: rename gpd -> genpd in debugfs interface
        cpufreq: ppc: Add missing #include <asm/smp.h>
        x86/PCI/ACPI: Relax ACPI resource descriptor checks to work around BIOS bugs
        x86/PCI/ACPI: Ignore resources consumed by host bridge itself
        cpuidle: Clean up fallback handling in cpuidle_idle_call()
        cpuidle / sleep: Do sanity checks in cpuidle_enter_freeze() too
        idle / sleep: Avoid excessive disabling and enabling interrupts
        PCI: versatile: Update for list_for_each_entry() API change
        genirq / PM: better describe IRQF_NO_SUSPEND semantics
      39ed853a
    • L
      Merge tag 'locks-v4.0-3' of git://git.samba.org/jlayton/linux · 7c5bde7a
      Linus Torvalds 提交于
      Pull file locking fix from Jeff Layton:
       "Just a single patch to fix a memory leak that Daniel Wagner discovered
        while doing some testing with leases"
      
      * tag 'locks-v4.0-3' of git://git.samba.org/jlayton/linux:
        locks: fix fasync_struct memory leak in lease upgrade/downgrade handling
      7c5bde7a
    • L
      Merge tag 'nfs-for-4.0-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 1b1bd561
      Linus Torvalds 提交于
      Pull NFS client bugfixes from Trond Myklebust:
       "Highlights include:
      
         - Fix a regression in the NFSv4 open state recovery code
         - Fix a regression in the NFSv4 close code
         - Fix regressions and side-effects of the loop-back mounted NFS fixes
           in 3.18, that cause the NFS read() syscall to return EBUSY.
         - Fix regressions around the readdirplus code and how it interacts
           with the VFS lazy unmount changes that went into v3.18.
         - Fix issues with out-of-order RPC call replies replacing updated
           attributes with stale ones (particularly after a truncate()).
         - Fix an underflow checking issue with RPC/RDMA credits
         - Fix a number of issues with the NFSv4 delegation return/free code.
         - Fix issues around stale NFSv4.1 leases when doing a mount"
      
      * tag 'nfs-for-4.0-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (24 commits)
        NFSv4.1: Clear the old state by our client id before establishing a new lease
        NFSv4: Fix a race in NFSv4.1 server trunking discovery
        NFS: Don't write enable new pages while an invalidation is proceeding
        NFS: Fix a regression in the read() syscall
        NFSv4: Ensure we skip delegations that are already being returned
        NFSv4: Pin the superblock while we're returning the delegation
        NFSv4: Ensure we honour NFS_DELEGATION_RETURNING in nfs_inode_set_delegation()
        NFSv4: Ensure that we don't reap a delegation that is being returned
        NFS: Fix stateid used for NFS v4 closes
        NFSv4: Don't call put_rpccred() under the rcu_read_lock()
        NFS: Don't require a filehandle to refresh the inode in nfs_prime_dcache()
        NFSv3: Use the readdir fileid as the mounted-on-fileid
        NFS: Don't invalidate a submounted dentry in nfs_prime_dcache()
        NFSv4: Set a barrier in the update_changeattr() helper
        NFS: Fix nfs_post_op_update_inode() to set an attribute barrier
        NFS: Remove size hack in nfs_inode_attrs_need_update()
        NFSv4: Add attribute update barriers to delegreturn and pNFS layoutcommit
        NFS: Add attribute update barriers to NFS writebacks
        NFS: Set an attribute barrier on all updates
        NFS: Add attribute update barriers to nfs_setattr_update_inode()
        ...
      1b1bd561
  2. 06 3月, 2015 12 次提交
  3. 05 3月, 2015 12 次提交
  4. 04 3月, 2015 13 次提交
    • C
      ACPI / video: Propagate the error code for acpi_video_register · 28d63403
      Chris Wilson 提交于
      Report the actual error code from acpi_bus_register_driver(), it may
      help future debugging (typically ENODEV as previously reported, but the
      unusual cases are where it may help most).
      Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      Acked-by: NAaron Lu <aaron.lu@intel.com>
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      28d63403
    • C
      ACPI / video: Load the module even if ACPI is disabled · 6e17cb12
      Chris Wilson 提交于
      i915.ko depends upon the acpi/video.ko module and so refuses to load if
      ACPI is disabled at runtime if for example the BIOS is broken beyond
      repair. acpi/video provides an optional service for i915.ko and so we
      should just allow the modules to load, but do no nothing in order to let
      the machines boot correctly.
      Reported-by: NBill Augur <bill-auger@programmer.net>
      Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
      Cc: Jani Nikula <jani.nikula@intel.com>
      Cc: All applicable <stable@vger.kernel.org>
      Acked-by: NAaron Lu <aaron.lu@intel.com>
      [ rjw: Fixed up the new comment in acpi_video_init() ]
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      6e17cb12
    • K
      PM / Domains: cleanup: rename gpd -> genpd in debugfs interface · 66a5ca4b
      Kevin Hilman 提交于
      To keep consisitency with the rest of the file, use 'genpd' as the
      name of the 'struct generic_pm_domain' pointer instead of 'gpd'.
      
      This is just a rename, no functional changes.
      Signed-off-by: NKevin Hilman <khilman@linaro.org>
      Acked-by: NPavel Machek <pavel@ucw.cz>
      Reviewed-by: NUlf Hansson <ulf.hansson@linaro.org>
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      66a5ca4b
    • G
      cpufreq: ppc: Add missing #include <asm/smp.h> · 5877b4f4
      Geert Uytterhoeven 提交于
      If CONFIG_SMP=n, <linux/smp.h> does not include <asm/smp.h>, causing:
      
      drivers/cpufreq/ppc-corenet-cpufreq.c: In function 'corenet_cpufreq_cpu_init':
      drivers/cpufreq/ppc-corenet-cpufreq.c:173:3: error: implicit declaration of function 'get_hard_smp_processor_id' [-Werror=implicit-function-declaration]
      Signed-off-by: NGeert Uytterhoeven <geert+renesas@glider.be>
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      5877b4f4
    • J
      x86/PCI/ACPI: Relax ACPI resource descriptor checks to work around BIOS bugs · aa714d28
      Jiang Liu 提交于
      Some BIOSes report incorrect length for ACPI address space descriptors,
      so relax the checks to avoid regressions. This issue has appeared several
      times as:
       3162b6f0 ("PNPACPI: truncate _CRS windows with _LEN > _MAX - _MIN + 1")
       d558b483 ("x86/PCI: truncate _CRS windows with _LEN > _MAX - _MIN + 1")
       f238b414 ("PNPACPI: compute Address Space length rather than using _LEN")
       48728e07 ("x86/PCI: compute Address Space length rather than using _LEN")
      
      Please refer to https://bugzilla.kernel.org/show_bug.cgi?id=94221
      for more details and example malformed ACPI resource descriptors.
      
      Link: https://bugzilla.kernel.org/show_bug.cgi?id=94221
      Fixes: 593669c2 (x86/PCI/ACPI: Use common ACPI resource interfaces ...)
      Signed-off-by: NJiang Liu <jiang.liu@linux.intel.com>
      Tested-by: NDave Airlie <airlied@redhat.com>
      Tested-by: NPrakash Punnoor <prakash@punnoor.de>
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      aa714d28
    • J
      x86/PCI/ACPI: Ignore resources consumed by host bridge itself · 63f1789e
      Jiang Liu 提交于
      When parsing resources for PCI host bridge, we should ignore resources
      consumed by host bridge itself and only report window resources available
      to child PCI busses.
      
      Fixes: 593669c2 (x86/PCI/ACPI: Use common ACPI resource interfaces ...)
      Signed-off-by: NJiang Liu <jiang.liu@linux.intel.com>
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      63f1789e
    • T
      NFSv4.1: Clear the old state by our client id before establishing a new lease · e11259f9
      Trond Myklebust 提交于
      If the call to exchange-id returns with the EXCHGID4_FLAG_CONFIRMED_R flag
      set, then that means our lease was established by a previous mount instance.
      Ensure that we detect this situation, and that we clear the state held by
      that mount.
      Reported-by: NJorge Mora <Jorge.Mora@netapp.com>
      Signed-off-by: NTrond Myklebust <trond.myklebust@primarydata.com>
      e11259f9
    • N
      powerpc/iommu: Remove IOMMU device references via bus notifier · 4ad04e59
      Nishanth Aravamudan 提交于
      After d905c5df ("PPC: POWERNV: move iommu_add_device earlier"), the
      refcnt on the kobject backing the IOMMU group for a PCI device is
      elevated by each call to pci_dma_dev_setup_pSeriesLP() (via
      set_iommu_table_base_and_group). When we go to dlpar a multi-function
      PCI device out:
      
              iommu_reconfig_notifier ->
                      iommu_free_table ->
                              iommu_group_put
                              BUG_ON(tbl->it_group)
      
      We trip this BUG_ON, because there are still references on the table, so
      it is not freed. Fix this by moving the powernv bus notifier to common
      code and calling it for both powernv and pseries.
      
      Fixes: d905c5df ("PPC: POWERNV: move iommu_add_device earlier")
      Signed-off-by: NNishanth Aravamudan <nacc@linux.vnet.ibm.com>
      Tested-by: NNishanth Aravamudan <nacc@linux.vnet.ibm.com>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      4ad04e59
    • M
      powerpc/smp: Wait until secondaries are active & online · 875ebe94
      Michael Ellerman 提交于
      Anton has a busy ppc64le KVM box where guests sometimes hit the infamous
      "kernel BUG at kernel/smpboot.c:134!" issue during boot:
      
        BUG_ON(td->cpu != smp_processor_id());
      
      Basically a per CPU hotplug thread scheduled on the wrong CPU. The oops
      output confirms it:
      
        CPU: 0
        Comm: watchdog/130
      
      The problem is that we aren't ensuring the CPU active bit is set for the
      secondary before allowing the master to continue on. The master unparks
      the secondary CPU's kthreads and the scheduler looks for a CPU to run
      on. It calls select_task_rq() and realises the suggested CPU is not in
      the cpus_allowed mask. It then ends up in select_fallback_rq(), and
      since the active bit isnt't set we choose some other CPU to run on.
      
      This seems to have been introduced by 6acbfb96 "sched: Fix hotplug
      vs. set_cpus_allowed_ptr()", which changed from setting active before
      online to setting active after online. However that was in turn fixing a
      bug where other code assumed an active CPU was also online, so we can't
      just revert that fix.
      
      The simplest fix is just to spin waiting for both active & online to be
      set. We already have a barrier prior to set_cpu_online() (which also
      sets active), to ensure all other setup is completed before online &
      active are set.
      
      Fixes: 6acbfb96 ("sched: Fix hotplug vs. set_cpus_allowed_ptr()")
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      Signed-off-by: NAnton Blanchard <anton@samba.org>
      Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
      875ebe94
    • T
      NFSv4: Fix a race in NFSv4.1 server trunking discovery · 48d66b97
      Trond Myklebust 提交于
      We do not want to allow a race with another NFS mount to cause
      nfs41_walk_client_list() to establish a lease on our nfs_client before
      we're done checking for trunking.
      Signed-off-by: NTrond Myklebust <trond.myklebust@primarydata.com>
      48d66b97
    • L
      Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux · a6c5170d
      Linus Torvalds 提交于
      Pull nfsd fixes from Bruce Fields:
       "Three miscellaneous bugfixes, most importantly the clp->cl_revoked
        bug, which we've seen several reports of people hitting"
      
      * 'for-4.0' of git://linux-nfs.org/~bfields/linux:
        sunrpc: integer underflow in rsc_parse()
        nfsd: fix clp->cl_revoked list deletion causing softlock in nfsd
        svcrpc: fix memory leak in gssp_accept_sec_context_upcall
      a6c5170d
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 789d7f60
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) If an IPVS tunnel is created with a mixed-family destination
          address, it cannot be removed.  Fix from Alexey Andriyanov.
      
       2) Fix module refcount underflow in netfilter's nft_compat, from Pablo
          Neira Ayuso.
      
       3) Generic statistics infrastructure can reference variables sitting on
          a released function stack, therefore use dynamic allocation always.
          Fix from Ignacy Gawędzki.
      
       4) skb_copy_bits() return value test is inverted in ip_check_defrag().
      
       5) Fix network namespace exit in openvswitch, we have to release all of
          the per-net vports.  From Pravin B Shelar.
      
       6) Fix signedness bug in CAIF's cfpkt_iterate(), from Dan Carpenter.
      
       7) Fix rhashtable grow/shrink behavior, only expand during inserts and
          shrink during deletes.  From Daniel Borkmann.
      
       8) Netdevice names with semicolons should never be allowed, because
          they serve as a separator.  From Matthew Thode.
      
       9) Use {,__}set_current_state() where appropriate, from Fabian
          Frederick.
      
      10) Revert byte queue limits support in r8169 driver, it's causing
          regressions we can't figure out.
      
      11) tcp_should_expand_sndbuf() erroneously uses tp->packets_out to
          measure packets in flight, properly use tcp_packets_in_flight()
          instead.  From Neal Cardwell.
      
      12) Fix accidental removal of support for bluetooth in CSR based Intel
          wireless cards.  From Marcel Holtmann.
      
      13) We accidently added a behavioral change between native and compat
          tasks, wrt testing the MSG_CMSG_COMPAT bit.  Just ignore it if the
          user happened to set it in a native binary as that was always the
          behavior we had.  From Catalin Marinas.
      
      14) Check genlmsg_unicast() return valud in hwsim netlink tx frame
          handling, from Bob Copeland.
      
      15) Fix stale ->radar_required setting in mac80211 that can prevent
          starting new scans, from Eliad Peller.
      
      16) Fix memory leak in nl80211 monitor, from Johannes Berg.
      
      17) Fix race in TX index handling in xen-netback, from David Vrabel.
      
      18) Don't enable interrupts in amx-xgbe driver until all software et al.
          state is ready for the interrupt handler to run.  From Thomas
          Lendacky.
      
      19) Add missing netlink_ns_capable() checks to rtnl_newlink(), from Eric
          W Biederman.
      
      20) The amount of header space needed in macvtap was not calculated
          properly, fix it otherwise we splat past the beginning of the
          packet.  From Eric Dumazet.
      
      21) Fix bcmgenet TCP TX perf regression, from Jaedon Shin.
      
      22) Don't raw initialize or mod timers, use setup_timer() and
          mod_timer() instead.  From Vaishali Thakkar.
      
      23) Fix software maintained statistics in bcmgenet and systemport
          drivers, from Florian Fainelli.
      
      24) DMA descriptor updates in sh_eth need proper memory barriers, from
          Ben Hutchings.
      
      25) Don't do UDP Fragmentation Offload on RAW sockets, from Michal
          Kubecek.
      
      26) Openvswitch's non-masked set actions aren't constructed properly
          into netlink messages, fix from Joe Stringer.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (116 commits)
        openvswitch: Fix serialization of non-masked set actions.
        gianfar: Reduce logging noise seen due to phy polling if link is down
        ibmveth: Add function to enable live MAC address changes
        net: bridge: add compile-time assert for cb struct size
        udp: only allow UFO for packets from SOCK_DGRAM sockets
        sh_eth: Really fix padding of short frames on TX
        Revert "sh_eth: Enable Rx descriptor word 0 shift for r8a7790"
        sh_eth: Fix RX recovery on R-Car in case of RX ring underrun
        sh_eth: Ensure proper ordering of descriptor active bit write/read
        net/mlx4_en: Disbale GRO for incoming loopback/selftest packets
        net/mlx4_core: Fix wrong mask and error flow for the update-qp command
        net: systemport: fix software maintained statistics
        net: bcmgenet: fix software maintained statistics
        rxrpc: don't multiply with HZ twice
        rxrpc: terminate retrans loop when sending of skb fails
        net/hsr: Fix NULL pointer dereference and refcnt bugs when deleting a HSR interface.
        net: pasemi: Use setup_timer and mod_timer
        net: stmmac: Use setup_timer and mod_timer
        net: 8390: axnet_cs: Use setup_timer and mod_timer
        net: 8390: pcnet_cs: Use setup_timer and mod_timer
        ...
      789d7f60
    • J
      openvswitch: Fix serialization of non-masked set actions. · f4f8e738
      Joe Stringer 提交于
      Set actions consist of a regular OVS_KEY_ATTR_* attribute nested inside
      of a OVS_ACTION_ATTR_SET action attribute. When converting masked actions
      back to regular set actions, the inner attribute length was not changed,
      ie, double the length being serialized. This patch fixes the bug.
      
      Fixes: 83d2b9ba ("net: openvswitch: Support masked set actions.")
      Signed-off-by: NJoe Stringer <joestringer@nicira.com>
      Acked-by: NJarno Rajahalme <jrajahalme@nicira.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f4f8e738