Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master

Apr 17, 2014

  1. Linus Torvalds

    Merge branch 'parisc-3.15' of git://git.kernel.org/pub/scm/linux/kern…

    …el/git/deller/parisc-linux
    
    Pull parisc updates from Helge Deller:
     "There are two major changes in this patchset:
    
      The major fix is that the epoll_pwait() syscall for 32bit userspace
      was not using the compat wrapper on a 64bit kernel.
    
      Secondly we changed the value of SHMLBA from 4MB to PAGE_SIZE to
      reflect that we can actually mmap to any multiple of PAGE_SIZE.  The
      only thing which needs care is that shared mmaps need to be mapped at
      the same offset inside the 4MB cache window"
    
    * 'parisc-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
      parisc: fix epoll_pwait syscall on compat kernel
      parisc: change value of SHMLBA from 0x00400000 to PAGE_SIZE
      parisc: Replace __get_cpu_var uses for address calculation
    authored April 17, 2014
  2. Linus Torvalds

    Merge branch 'ipmi' (emailed ipmi fixes)

    Merge ipmi fixes from Corey Minyard:
     "Things collected since last kernel release.
    
      Some of these are pretty important.  The first three are bug fixes.
      The next two are to hopefully make everyone happy about allowing
      ACPI to be on all the time and not have IPMI have an effect on the
      system when not in use.  The last is a little cleanup"
    
    * emailed patches from Corey Minyard <cminyard@mvista.com>:
      ipmi: boolify some things
      ipmi: Turn off all activity on an idle ipmi interface
      ipmi: Turn off default probing of interfaces
      ipmi: Reset the KCS timeout when starting error recovery
      ipmi: Fix a race restarting the timer
      Char: ipmi_bt_sm, fix infinite loop
    authored April 17, 2014
  3. ipmi: boolify some things

    Convert some ints to bools.
    
    Signed-off-by: Corey Minyard <cminyard@mvista.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    authored April 14, 2014 torvalds committed April 17, 2014
  4. ipmi: Turn off all activity on an idle ipmi interface

    The IPMI driver would wake up periodically looking for events and
    watchdog pretimeouts.  If there is nothing waiting for these events,
    it's really kind of pointless to be checking for them.  So modify the
    driver so the message handler can pass down if it needs the lower layer
    to be waiting for these.  Modify the system interface lower layer to
    turn off all timer and thread activity if the upper layer doesn't need
    anything and it is not currently handling messages.  And modify the
    message handler to not restart the timer if its timer is not needed.
    
    The timers and kthread will still be enabled if:
     - the SI interface is handling a message.
     - a user has enabled watching for events.
     - the IPMI watchdog timer is in use (since it uses pretimeouts).
     - the message handler is waiting on a remote response.
     - a user has registered to receive commands.
    
    This mostly affects interfaces without interrupts.  Interfaces with
    interrupts already don't use CPU in the system interface when the
    interface is idle.
    
    Signed-off-by: Corey Minyard <cminyard@mvista.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    authored April 14, 2014 torvalds committed April 17, 2014
  5. ipmi: Turn off default probing of interfaces

    The default probing can cause problems with some system, slow booting,
    extra CPU usages, etc.  Turn it off by default and give a config option
    to enable it.
    
    From: Matthew Garrett <matthew.garrett@nebula.com>
    Signed-off-by: Corey Minyard <cminyard@mvista.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    authored April 14, 2014 torvalds committed April 17, 2014
  6. ipmi: Reset the KCS timeout when starting error recovery

    The OBF timer in KCS was not reset in one situation when error recovery
    was started, resulting in an immediate timeout.
    
    Reported-by: Bodo Stroesser <bstroesser@ts.fujitsu.com>
    Signed-off-by: Corey Minyard <cminyard@mvista.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    authored April 14, 2014 torvalds committed April 17, 2014
  7. ipmi: Fix a race restarting the timer

    With recent changes it is possible for the timer handler to detect an
    idle interface and not start the timer, but the thread to start an
    operation at the same time.  The thread will not start the timer in that
    instance, resulting in the timer not running.
    
    Instead, move all timer operations under the lock and start the timer in
    the thread if it detect non-idle and the timer is not already running.
    Moving under locks allows the last timeout to be set in both the thread
    and the timer.  'Timer is not running' means that the timer is not
    pending and smi_timeout() is not running.  So we need a flag to detect
    this correctly.
    
    Also fix a few other timeout bugs: setting the last timeout when the
    interrupt has to be disabled and the timer started, and setting the last
    timeout in check_start_timer_thread possibly racing with the timer
    
    Signed-off-by: Corey Minyard <cminyard@mvista.com>
    Signed-off-by: Bodo Stroesser <bstroesser@ts.fujitsu.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    authored April 14, 2014 torvalds committed April 17, 2014
  8. Char: ipmi_bt_sm, fix infinite loop

    In read_all_bytes, we do
    
      unsigned char i;
      ...
      bt->read_data[0] = BMC2HOST;
      bt->read_count = bt->read_data[0];
      ...
      for (i = 1; i <= bt->read_count; i++)
        bt->read_data[i] = BMC2HOST;
    
    If bt->read_data[0] == bt->read_count == 255, we loop infinitely in the
    'for' loop.  Make 'i' an 'int' instead of 'char' to get rid of the
    overflow and finish the loop after 255 iterations every time.
    
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Reported-and-debugged-by: Rui Hui Dian <rhdian@novell.com>
    Cc: Tomas Cech <tcech@suse.cz>
    Cc: Corey Minyard <minyard@acm.org>
    Cc: <openipmi-developer@lists.sourceforge.net>
    Signed-off-by: Corey Minyard <cminyard@mvista.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    authored April 14, 2014 torvalds committed April 17, 2014
  9. Linus Torvalds

    Merge tag 'stable/for-linus-3.15-rc1-tag' of git://git.kernel.org/pub…

    …/scm/linux/kernel/git/xen/tip
    
    Pull Xen fixes from David Vrabel:
     "Xen regression and bug fixes for 3.15-rc1:
    
       - fix completely broken 32-bit PV guests caused by x86 refactoring
         32-bit thread_info.
       - only enable ticketlock slow path on Xen (not bare metal)
       - fix two bugs with PV guests not shutting down when requested
       - fix a minor memory leak in xen-pciback error path"
    
    * tag 'stable/for-linus-3.15-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
      xen/manage: Poweroff forcefully if user-space is not yet up.
      xen/xenbus: Avoid synchronous wait on XenBus stalling shutdown/restart.
      xen/spinlock: Don't enable them unconditionally.
      xen-pciback: silence an unwanted debug printk
      xen: fix memory leak in __xen_pcibk_add_pci_dev()
      x86/xen: Fix 32-bit PV guests's usage of kernel_stack
    authored April 17, 2014
  10. Linus Torvalds

    Merge tag '3.15-fixes' of git://neil.brown.name/md

    Pull md bugfix from Neil Brown:
     "One BUG fix for md for recent commit"
    
    * tag '3.15-fixes' of git://neil.brown.name/md:
      raid5: fix a race of stripe count check
    authored April 17, 2014
  11. Linus Torvalds

    Merge tag 'fbdev-reorder-3.15' of git://git.kernel.org/pub/scm/linux/…

    …kernel/git/tomba/linux
    
    Pull fbdev renaming patches from Tomi Valkeinen:
     "Reorder drivers/video/ directory so that all fbdev drivers are now
      located in drivers/video/fbdev/ and the fbdev framework core files are
      located in drivers/video/fbdev/core/
    
      The drivers/video/Kconfig is modified so that the DRM and the fbdev
      menu options are in separate submenus, instead of both being mixed in
      the same 'Graphics support' menu level"
    
    * tag 'fbdev-reorder-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
      video: Kconfig: move drm and fb into separate menus
      fbdev: move fbdev core files to separate directory
      video: move fbdev to drivers/video/fbdev
    authored April 17, 2014
  12. raid5: fix a race of stripe count check

    I hit another BUG_ON with e240c18. In __get_priority_stripe(),
    stripe count equals to 0 initially. Between atomic_inc and BUG_ON,
    get_active_stripe() finds the stripe. So the stripe count isn't 1 any more.
    
    V2: keeps the BUG_ON suggested by Neil.
    
    Signed-off-by: Shaohua Li <shli@fusionio.com>
    Signed-off-by: NeilBrown <neilb@suse.de>
    authored April 15, 2014 neilbrown committed April 17, 2014
  13. Tomi Valkeinen

    video: Kconfig: move drm and fb into separate menus

    At the moment the "Device Drivers / Graphics support" kernel config page
    looks rather messy, with DRM and fbdev driver selections on the same
    page, some on the top level Graphics support page, some under their
    respective subsystems.
    
    If I'm not mistaken, this is caused by the drivers depending on other
    things than DRM or FB, which causes Kconfig to arrange the options in
    not-so-neat manner.
    
    Both DRM and FB have a main menuconfig option for the whole DRM or FB
    subsystem. Optimally, this would be enough to arrange all DRM and FB
    options under the respective subsystem, but for whatever reason this
    doesn't work reliably.
    
    This patch adds an explicit submenu for DRM and FB, making it much
    clearer which options are related to FB, and which to DRM.
    
    Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
    Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Acked-by: Rob Clark <robdclark@gmail.com>
    Reviewed-by: Jingoo Han <jg1.han@samsung.com>
    Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    authored February 13, 2014
  14. Tomi Valkeinen

    fbdev: move fbdev core files to separate directory

    Instead of having fbdev framework core files at the root fbdev
    directory, mixed with random fbdev device drivers, move the fbdev core
    files to a separate core directory. This makes it much clearer which of
    the files are actually part of the fbdev framework, and which are part
    of device drivers.
    
    Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
    Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Acked-by: Rob Clark <robdclark@gmail.com>
    Acked-by: Jingoo Han <jg1.han@samsung.com>
    Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    authored February 13, 2014
  15. Tomi Valkeinen

    video: move fbdev to drivers/video/fbdev

    The drivers/video directory is a mess. It contains generic video related
    files, directories for backlight, console, linux logo, lots of fbdev
    device drivers, fbdev framework files.
    
    Make some order into the chaos by creating drivers/video/fbdev
    directory, and move all fbdev related files there.
    
    No functionality is changed, although I guess it is possible that some
    subtle Makefile build order related issue could be created by this
    patch.
    
    Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
    Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Acked-by: Rob Clark <robdclark@gmail.com>
    Acked-by: Jingoo Han <jg1.han@samsung.com>
    Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    authored February 13, 2014

Apr 16, 2014

  1. Linus Torvalds

    Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tip/tip
    
    Pull x86 fixes from Ingo Molnar:
     "Various fixes:
    
       - reboot regression fix
       - build message spam fix
       - GPU quirk fix
       - 'make kvmconfig' fix
    
      plus the wire-up of the renameat2() system call on i386"
    
    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      x86: Remove the PCI reboot method from the default chain
      x86/build: Supress "Nothing to be done for ..." messages
      x86/gpu: Fix sign extension issue in Intel graphics stolen memory quirks
      x86/platform: Fix "make O=dir kvmconfig"
      i386: Wire up the renameat2() syscall
    authored April 16, 2014
  2. Linus Torvalds

    Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/…

    …linux/kernel/git/tip/tip
    
    Pull perf fixes from Ingo Molnar:
     "Tooling fixes, plus a simple hardware-enablement patch for the Intel
      RAPL PMU (energy use measurement) on Haswell CPUs, which I hope is
      still fine at this stage"
    
    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      perf tools: Instead of redirecting flex output, use -o
      perf tools: Fix double free in perf test 21 (code-reading.c)
      perf stat: Initialize statistics correctly
      perf bench: Set more defaults in the 'numa' suite
      perf bench: Fix segfault at the end of an 'all' execution
      perf bench: Update manpage to mention numa and futex
      perf probe: Use dwarf_getcfi_elf() instead of dwarf_getcfi()
      perf probe: Fix to handle errors in line_range searching
      perf probe: Fix --line option behavior
      perf tools: Pick up libdw without explicit LIBDW_DIR
      MAINTAINERS: Change e-mail to kernel.org one
      perf callchains: Disable unwind libraries when libelf isn't found
      tools lib traceevent: Do not call warning() directly
      tools lib traceevent: Print event name when show warning if possible
      perf top: Fix documentation of invalid -s option
      perf/x86: Enable DRAM RAPL support on Intel Haswell
    authored April 16, 2014
  3. Linus Torvalds

    Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tip/tip
    
    Pull irq fix from Ingo Molnar:
     "ARM VIC (Vectored Irq Controller) irqchip driver fix"
    
    * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      irqchip: vic: Properly chain the cascaded IRQs
    authored April 16, 2014
  4. Linus Torvalds

    Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/…

    …linux/kernel/git/tip/tip
    
    Pull locking fixes from Ingo Molnar:
     "liblockdep fixes and mutex debugging fixes"
    
    * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      locking/mutex: Fix debug_mutexes
      tools/liblockdep: Add proper versioning to the shared obj
      tools/liblockdep: Ignore asmlinkage and visible
    authored April 16, 2014
  5. Linus Torvalds

    Merge tag 'fbdev-fixes-3.15' of git://git.kernel.org/pub/scm/linux/ke…

    …rnel/git/tomba/linux
    
    Pull fbdev fixes from Tomi Valkeinen:
     - fix build errors for bf54x-lq043fb and imxfb
     - fbcon fix for da8xx-fb
     - omapdss fixes for hdmi audio, irq handling and fclk calculation
    
    * tag 'fbdev-fixes-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
      video: bf54x-lq043fb: fix build error
      OMAPDSS: Change struct reg_field to dispc_reg_field
      OMAPDSS: Take pixelclock unit change into account in hdmi_compute_acr()
      OMAPDSS: fix shared irq handlers
      video: imxfb: Select LCD_CLASS_DEVICE unconditionally
      OMAPDSS: fix rounding when calculating fclk rate
      video: da8xx-fb: Fix casting of info->pseudo_palette
    authored April 16, 2014
  6. Linus Torvalds

    Merge tag 'pinctrl-v3.15-2' of git://git.kernel.org/pub/scm/linux/ker…

    …nel/git/linusw/linux-pinctrl
    
    Pull pincontrol fixes from Linus Walleij:
     "A first set of pin control fixes for the v3.15 series:
    
       - Fix a couple of barnsjukdomar on the Rockchip driver.
    
       - Remove an idiotic debug print I happened to leave behind in the
         Nomadik driver.
    
       - Fixup the Qualcomm MSM interrupt handling code for the TLMM v2.
    
       - Three patches renaming the Broadcom Capri driver to BCM28155.  This
         has been falling between the chairs for some time due to some
         cross-tree synchronization misunderstandings, now I'm fed up with
         this and just rename it in this -rc1 phase"
    
    * tag 'pinctrl-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
      pinctrl: fix typo in bindings documentation
      Update bcm_defconfig with new pinctrl CONFIG
      pinctrl: Rename Broadcom Capri pinctrl driver
      pinctrl: msm: Correct interrupt code for TLMM v2
      pinctrl: nomadik: delete stray debug print
      pinctrl: rockchip: handle first half of rk3188-bank0 correctly
      pinctrl: rockchip: add return value to rockchip_set_mux
      pinctrl: rockchip: fix offset of mux registers for rk3188
    authored April 16, 2014
  7. Linus Torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/s390/linux
    
    Pull s390 patches from Martin Schwidefsky:
     "An update to the oops output with additional information about the
      crash.  The renameat2 system call is enabled.  Two patches in regard
      to the PTR_ERR_OR_ZERO cleanup.  And a bunch of bug fixes"
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
      s390/sclp_cmd: replace PTR_RET with PTR_ERR_OR_ZERO
      s390/sclp: replace PTR_RET with PTR_ERR_OR_ZERO
      s390/sclp_vt220: Fix kernel panic due to early terminal input
      s390/compat: fix typo
      s390/uaccess: fix possible register corruption in strnlen_user_srst()
      s390: add 31 bit warning message
      s390: wire up sys_renameat2
      s390: show_registers() should not map user space addresses to kernel symbols
      s390/mm: print control registers and page table walk on crash
      s390/smp: fix smp_stop_cpu() for !CONFIG_SMP
      s390: fix control register update
    authored April 16, 2014
  8. Linus Torvalds

    Merge tag 'please-pull-ia64-erratum' of git://git.kernel.org/pub/scm/…

    …linux/kernel/git/aegl/linux
    
    Pull itanium erratum fix from Tony Luck:
     "Small workaround for a rare, but annoying, erratum #237"
    
    * tag 'please-pull-ia64-erratum' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
      [IA64] Change default PSR.ac from '1' to '0' (Fix erratum #237)
    authored April 16, 2014
  9. [IA64] Change default PSR.ac from '1' to '0' (Fix erratum #237)

    April 2014 Itanium processor specification update:
    
    http://www.intel.com/content/www/us/en/processors/itanium/itanium-specification-update.html
    
    describes this erratum:
    
    =========================================================================
    237. Under a complex set of conditions, store to load forwarding for a
    sub 8-byte load may complete incorrectly
    
    Problem: A load instruction may complete incorrectly when a code sequence
    using 4-byte or smaller load and store operations to the same address
    is executed in combination with specific timing of all the following
    concurrent conditions: store to load forwarding, alignment checking
    enabled, a mis-predicted branch, and complex cache utilization activity.
    
    Implication: The affected sub 8-byte instruction may complete
    incorrectly resulting in unpredictable system behavior. There is an
    extremely low probability of exposure due to the significant number of
    complex microarchitectural concurrent conditions required to encounter
    the erratum.
    
    Workaround: Set PSR.ac = 0 to completely avoid the erratum. Disabling
    Hyper-Threading will significantly reduce exposure to the conditions
    that contribute to encountering the erratum.
    
    Status: See the Summary Table of Changes for the affected steppings.
    =========================================================================
    
    [Table of changes essentially lists all models from McKinley to Tukwila]
    
    The PSR.ac bit controls whether the processor will always generate
    an unaligned reference trap (0x5a00) for a misaligned data access
    (when PSR.ac=1) or if it will let the access succeed when running
    on a cpu that implements logic to handle some unaligned accesses.
    
    Way back in 2008 in commit b704882
      [IA64] Rationalize kernel mode alignment checking
    we made the decision to always enable strict checking. We were
    already doing so in trap/interrupt context because the common
    preamble code set this bit - but the rest of supervisor code
    (and by inheritance user code) ran with PSR.ac=0.
    
    We now reverse that decision and set PSR.ac=0 everywhere in the
    kernel (also inherited by user processes). This will avoid the
    erratum using the method described in the Itanium specification
    update.  Net effect for users is that the processor will handle
    unaligned access when it can (typically with a tiny performance
    bubble in the pipeline ... but much less invasive than taking a
    trap and having the OS perform the access).
    
    Signed-off-by: Tony Luck <tony.luck@intel.com>
    authored March 28, 2014
  10. x86: Remove the PCI reboot method from the default chain

    Steve reported a reboot hang and bisected it back to this commit:
    
      a4f1987 x86, reboot: Add EFI and CF9 reboot methods into the default list
    
    He heroically tested all reboot methods and found the following:
    
      reboot=t       # triple fault                  ok
      reboot=k       # keyboard ctrl                 FAIL
      reboot=b       # BIOS                          ok
      reboot=a       # ACPI                          FAIL
      reboot=e       # EFI                           FAIL   [system has no EFI]
      reboot=p       # PCI 0xcf9                     FAIL
    
    And I think it's pretty obvious that we should only try PCI 0xcf9 as a
    last resort - if at all.
    
    The other observation is that (on this box) we should never try
    the PCI reboot method, but close with either the 'triple fault'
    or the 'BIOS' (terminal!) reboot methods.
    
    Thirdly, CF9_COND is a total misnomer - it should be something like
    CF9_SAFE or CF9_CAREFUL, and 'CF9' should be 'CF9_FORCE' ...
    
    So this patch fixes the worst problems:
    
     - it orders the actual reboot logic to follow the reboot ordering
       pattern - it was in a pretty random order before for no good
       reason.
    
     - it fixes the CF9 misnomers and uses BOOT_CF9_FORCE and
       BOOT_CF9_SAFE flags to make the code more obvious.
    
     - it tries the BIOS reboot method before the PCI reboot method.
       (Since 'BIOS' is a terminal reboot method resulting in a hang
        if it does not work, this is essentially equivalent to removing
        the PCI reboot method from the default reboot chain.)
    
     - just for the miraculous possibility of terminal (resulting
       in hang) reboot methods of triple fault or BIOS returning
       without having done their job, there's an ordering between
       them as well.
    
    Reported-and-bisected-and-tested-by: Steven Rostedt <rostedt@goodmis.org>
    Cc: Li Aubrey <aubrey.li@linux.intel.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Matthew Garrett <mjg59@srcf.ucam.org>
    Link: http://lkml.kernel.org/r/20140404064120.GB11877@gmail.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    authored April 04, 2014
  11. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

    Pull networking fixes from David Miller:
    
     1) Fix BPF filter validation of netlink attribute accesses, from
        Mathias Kruase.
    
     2) Netfilter conntrack generation seqcount not initialized properly,
        from Andrey Vagin.
    
     3) Fix comparison mask computation on big-endian in nft_cmp_fast(),
        from Patrick McHardy.
    
     4) Properly limit MTU over ipv6, from Eric Dumazet.
    
     5) Fix seccomp system call argument population on 32-bit, from Daniel
        Borkmann.
    
     6) skb_network_protocol() should not use hard-coded ETH_HLEN, instead
        skb->mac_len needs to be used.  From Vlad Yasevich.
    
     7) We have several cases of using socket based communications to
        implement a tunnel.  For example, some tunnels are encapsulations
        over UDP so we use an internal kernel UDP socket to do the
        transmits.
    
        These tunnels should behave just like other software devices and
        pass the packets on down to the next layer.
    
        Most importantly we want the top-level socket (eg TCP) that created
        the traffic to be charged for the SKB memory.
    
        However, once you get into the IP output path, we have code that
        assumed that whatever was attached to skb->sk is an IP socket.
    
        To keep the top-level socket being charged for the SKB memory,
        whilst satisfying the needs of the IP output path, we now pass in an
        explicit 'sk' argument.
    
        From Eric Dumazet.
    
     8) ping_init_sock() leaks group info, from Xiaoming Wang.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (33 commits)
      cxgb4: use the correct max size for firmware flash
      qlcnic: Fix MSI-X initialization code
      ip6_gre: don't allow to remove the fb_tunnel_dev
      ipv4: add a sock pointer to dst->output() path.
      ipv4: add a sock pointer to ip_queue_xmit()
      driver/net: cosa driver uses udelay incorrectly
      at86rf230: fix __at86rf230_read_subreg function
      at86rf230: remove check if AVDD settled
      net: cadence: Add architecture dependencies
      net: Start with correct mac_len in skb_network_protocol
      Revert "net: sctp: Fix a_rwnd/rwnd management to reflect real state of the receiver's buffer"
      cxgb4: Save the correct mac addr for hw-loopback connections in the L2T
      net: filter: seccomp: fix wrong decoding of BPF_S_ANC_SECCOMP_LD_W
      seccomp: fix populating a0-a5 syscall args in 32-bit x86 BPF
      qlcnic: Do not disable SR-IOV when VFs are assigned to VMs
      qlcnic: Fix QLogic application/driver interface for virtual NIC configuration
      qlcnic: Fix PVID configuration on eSwitch port.
      qlcnic: Fix max ring count calculation
      qlcnic: Fix to send INIT_NIC_FUNC as first mailbox.
      qlcnic: Fix panic due to uninitialzed delayed_work struct in use.
      ...
    authored April 15, 2014

Apr 15, 2014

  1. cxgb4: use the correct max size for firmware flash

    The wrong max fw size was being used and causing false
    "too big" errors running ethtool -f.
    
    Signed-off-by: Steve Wise <swise@opengridcomputing.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    authored April 15, 2014 davem330 committed April 15, 2014
  2. qlcnic: Fix MSI-X initialization code

    Function qlcnic_setup_tss_rss_intr() might enter endless
    loop in case pci_enable_msix() contiguously returns a
    positive number of MSI-Xs that could have been allocated.
    Besides, the function contains 'err = -EIO;' assignment
    that never could be reached. This update fixes the
    aforementioned issues.
    
    Cc: Shahed Shaikh <shahed.shaikh@qlogic.com>
    Cc: Dept-HSGLinuxNICDev@qlogic.com
    Cc: netdev@vger.kernel.org
    Cc: linux-pci@vger.kernel.org
    
    Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
    Acked-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    authored April 15, 2014 davem330 committed April 15, 2014
  3. ip6_gre: don't allow to remove the fb_tunnel_dev

    It's possible to remove the FB tunnel with the command 'ip link del ip6gre0' but
    this is unsafe, the module always supposes that this device exists. For example,
    ip6gre_tunnel_lookup() may use it unconditionally.
    
    Let's add a rtnl handler for dellink, which will never remove the FB tunnel (we
    let ip6gre_destroy_tunnels() do the job).
    
    Introduced by commit c12b395 ("gre: Support GRE over IPv6").
    
    CC: Dmitry Kozlov <xeb@mail.ru>
    Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    authored April 14, 2014 davem330 committed April 15, 2014
  4. ipv4: add a sock pointer to dst->output() path.

    In the dst->output() path for ipv4, the code assumes the skb it has to
    transmit is attached to an inet socket, specifically via
    ip_mc_output() : The sk_mc_loop() test triggers a WARN_ON() when the
    provider of the packet is an AF_PACKET socket.
    
    The dst->output() method gets an additional 'struct sock *sk'
    parameter. This needs a cascade of changes so that this parameter can
    be propagated from vxlan to final consumer.
    
    Fixes: 8f646c9 ("vxlan: keep original skb ownership")
    Reported-by: lucien xin <lucien.xin@gmail.com>
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    authored April 15, 2014 davem330 committed April 15, 2014
  5. Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/lin…

    …ux/kernel/git/jolsa/perf into perf/urgent
    
    Pull perf/urgent fixes from Jiri Olsa:
    
      * Instead of redirecting flex output, use -o (Cody P Schafer)
    
      * Fix double free in perf test 21 (Adrian Hunter)
    
    Signed-off-by: Jiri Olsa <jolsa@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    authored April 15, 2014
  6. ipv4: add a sock pointer to ip_queue_xmit()

    ip_queue_xmit() assumes the skb it has to transmit is attached to an
    inet socket. Commit 31c70d5 ("l2tp: keep original skb ownership")
    changed l2tp to not change skb ownership and thus broke this assumption.
    
    One fix is to add a new 'struct sock *sk' parameter to ip_queue_xmit(),
    so that we do not assume skb->sk points to the socket used by l2tp
    tunnel.
    
    Fixes: 31c70d5 ("l2tp: keep original skb ownership")
    Reported-by: Zhan Jianyu <nasa4836@gmail.com>
    Tested-by: Zhan Jianyu <nasa4836@gmail.com>
    Signed-off-by: Eric Dumazet <edumazet@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    authored April 15, 2014 davem330 committed April 15, 2014
  7. xen/manage: Poweroff forcefully if user-space is not yet up.

    The user can launch the guest in this sequence:
    
    xl create -p /vm.cfg	[launch, but pause it]
    xl shutdown latest	[sets control/shutdown=poweroff]
    xl unpause latest
    xl console latest	[and see that the guest has completely
    ignored the shutdown request]
    
    In reality the guest hasn't ignored it. It registers a watch
    and gets a notification that there is value. It then calls
    the shutdown_handler which ends up calling orderly_shutdown.
    
    Unfortunately that is so early in the bootup that there
    are no user-space. Which means that the orderly_shutdown fails.
    But since the force flag was set to false it continues on without
    reporting.
    
    What we really want to is to use the force when we are in the
    SYSTEM_BOOTING state and not use the 'force' when SYSTEM_RUNNING.
    
    However, if we are in the running state - and the shutdown command
    has been given before the user-space has been setup, there is nothing
    we can do. Worst yet, we stop ignoring the 'xl shutdown' requests!
    
    As such, the other part of this patch is to only stop ignoring
    the 'xl shutdown' when we are truly in the power off sequence.
    
    That means the user can do multiple 'xl shutdown' and we will try
    to act on them instead of ignoring them.
    
    Fixes-Bug: http://bugs.xenproject.org/xen/bug/6
    Reported-by:  Alex Bligh <alex@alex.org.uk>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Signed-off-by: David Vrabel <david.vrabel@citrix.com>
    authored April 04, 2014 dvrabel committed April 15, 2014
  8. xen/xenbus: Avoid synchronous wait on XenBus stalling shutdown/restart.

    The 'read_reply' works with 'process_msg' to read of a reply in XenBus.
    'process_msg' is running from within the 'xenbus' thread. Whenever
    a message shows up in XenBus it is put on a xs_state.reply_list list
    and 'read_reply' picks it up.
    
    The problem is if the backend domain or the xenstored process is killed.
    In which case 'xenbus' is still awaiting - and 'read_reply' if called -
    stuck forever waiting for the reply_list to have some contents.
    
    This is normally not a problem - as the backend domain can come back
    or the xenstored process can be restarted. However if the domain
    is in process of being powered off/restarted/halted - there is no
    point of waiting on it coming back - as we are effectively being
    terminated and should not impede the progress.
    
    This patch solves this problem by checking whether the guest is the
    right domain. If it is an initial domain and hurtling towards death -
    there is no point of continuing the wait. All other type of guests
    continue with their behavior (as Xenstore is expected to still be
    running in another domain).
    
    Fixes-Bug: http://bugs.xenproject.org/xen/bug/8
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
    Reviewed-by: David Vrabel <david.vrabel@citrix.com>
    Signed-off-by: David Vrabel <david.vrabel@citrix.com>
    authored April 04, 2014 dvrabel committed April 15, 2014
  9. xen/spinlock: Don't enable them unconditionally.

    The git commit a945928
    ('xen: Do not enable spinlocks before jump_label_init() has executed')
    was added to deal with the jump machinery. Earlier the code
    that turned on the jump label was only called by Xen specific
    functions. But now that it had been moved to the initcall machinery
    it gets called on Xen, KVM, and baremetal - ouch!. And the detection
    machinery to only call it on Xen wasn't remembered in the heat
    of merge window excitement.
    
    This means that the slowpath is enabled on baremetal while it should
    not be.
    
    Reported-by: Waiman Long <waiman.long@hp.com>
    Acked-by: Steven Rostedt <rostedt@goodmis.org>
    CC: stable@vger.kernel.org
    CC: Boris Ostrovsky <boris.ostrovsky@oracle.com>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Signed-off-by: David Vrabel <david.vrabel@citrix.com>
    authored April 04, 2014 dvrabel committed April 15, 2014
Something went wrong with that request. Please try again.