Skip to content
  1. Jun 11, 2015
    • Weijie Yang's avatar
      zram: clear disk io accounting when reset zram device · d7ad41a1
      Weijie Yang authored
      
      
      Clear zram disk io accounting when resetting the zram device.  Otherwise
      the residual io accounting stat will affect the diskstat in the next
      zram active cycle.
      
      Signed-off-by: default avatarWeijie Yang <weijie.yang@samsung.com>
      Acked-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
      Acked-by: default avatarMinchan Kim <minchan@kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d7ad41a1
    • Vladimir Davydov's avatar
      memcg: do not call reclaim if !__GFP_WAIT · 7d638093
      Vladimir Davydov authored
      When trimming memcg consumption excess (see memory.high), we call
      try_to_free_mem_cgroup_pages without checking if we are allowed to sleep
      in the current context, which can result in a deadlock.  Fix this.
      
      Fixes: 241994ed
      
       ("mm: memcontrol: default hierarchy interface for memory")
      Signed-off-by: default avatarVladimir Davydov <vdavydov@parallels.com>
      Cc: Johannes Weiner <hannes@cmpxchg.org>
      Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      7d638093
    • Gu Zheng's avatar
      mm/memory_hotplug.c: set zone->wait_table to null after freeing it · 85bd8399
      Gu Zheng authored
      
      
      Izumi found the following oops when hot re-adding a node:
      
          BUG: unable to handle kernel paging request at ffffc90008963690
          IP: __wake_up_bit+0x20/0x70
          Oops: 0000 [#1] SMP
          CPU: 68 PID: 1237 Comm: rs:main Q:Reg Not tainted 4.1.0-rc5 #80
          Hardware name: FUJITSU PRIMEQUEST2800E/SB, BIOS PRIMEQUEST 2000 Series BIOS Version 1.87 04/28/2015
          task: ffff880838df8000 ti: ffff880017b94000 task.ti: ffff880017b94000
          RIP: 0010:[<ffffffff810dff80>]  [<ffffffff810dff80>] __wake_up_bit+0x20/0x70
          RSP: 0018:ffff880017b97be8  EFLAGS: 00010246
          RAX: ffffc90008963690 RBX: 00000000003c0000 RCX: 000000000000a4c9
          RDX: 0000000000000000 RSI: ffffea101bffd500 RDI: ffffc90008963648
          RBP: ffff880017b97c08 R08: 0000000002000020 R09: 0000000000000000
          R10: 0000000000000000 R11: 0000000000000000 R12: ffff8a0797c73800
          R13: ffffea101bffd500 R14: 0000000000000001 R15: 00000000003c0000
          FS:  00007fcc7ffff700(0000) GS:ffff880874800000(0000) knlGS:0000000000000000
          CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
          CR2: ffffc90008963690 CR3: 0000000836761000 CR4: 00000000001407e0
          Call Trace:
            unlock_page+0x6d/0x70
            generic_write_end+0x53/0xb0
            xfs_vm_write_end+0x29/0x80 [xfs]
            generic_perform_write+0x10a/0x1e0
            xfs_file_buffered_aio_write+0x14d/0x3e0 [xfs]
            xfs_file_write_iter+0x79/0x120 [xfs]
            __vfs_write+0xd4/0x110
            vfs_write+0xac/0x1c0
            SyS_write+0x58/0xd0
            system_call_fastpath+0x12/0x76
          Code: 5d c3 66 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 55 48 89 e5 48 83 ec 20 65 48 8b 04 25 28 00 00 00 48 89 45 f8 31 c0 48 8d 47 48 <48> 39 47 48 48 c7 45 e8 00 00 00 00 48 c7 45 f0 00 00 00 00 48
          RIP  [<ffffffff810dff80>] __wake_up_bit+0x20/0x70
           RSP <ffff880017b97be8>
          CR2: ffffc90008963690
      
      Reproduce method (re-add a node)::
        Hot-add nodeA --> remove nodeA --> hot-add nodeA (panic)
      
      This seems an use-after-free problem, and the root cause is
      zone->wait_table was not set to *NULL* after free it in
      try_offline_node.
      
      When hot re-add a node, we will reuse the pgdat of it, so does the zone
      struct, and when add pages to the target zone, it will init the zone
      first (including the wait_table) if the zone is not initialized.  The
      judgement of zone initialized is based on zone->wait_table:
      
      	static inline bool zone_is_initialized(struct zone *zone)
      	{
      		return !!zone->wait_table;
      	}
      
      so if we do not set the zone->wait_table to *NULL* after free it, the
      memory hotplug routine will skip the init of new zone when hot re-add
      the node, and the wait_table still points to the freed memory, then we
      will access the invalid address when trying to wake up the waiting
      people after the i/o operation with the page is done, such as mentioned
      above.
      
      Signed-off-by: default avatarGu Zheng <guz.fnst@cn.fujitsu.com>
      Reported-by: default avatarTaku Izumi <izumi.taku@jp.fujitsu.com>
      Reviewed by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
      Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Cc: Tang Chen <tangchen@cn.fujitsu.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      85bd8399
  2. Jun 09, 2015
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 5879ae5f
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Fix stack allocation in s390 BPF JIT, from Michael Holzheu.
      
       2) Disable LRO on openvswitch paths, from Jiri Benc.
      
       3) UDP early demux doesn't handle multicast group membership properly,
          fix from Shawn Bohrer.
      
       4) Fix TX queue hang due to incorrect handling of mixed sized fragments
          and linearlization in i40e driver, from Anjali Singhai Jain.
      
       5) Cannot use disable_irq() in timer handler of AMD xgbe driver, from
          Thomas Lendacky.
      
       6) b2net driver improperly assumes pci_alloc_consistent() gives zero'd
          out memory, use dma_zalloc_coherent().  From Sriharsha Basavapatna.
      
       7) Fix use-after-free in MPLS and ipv6, from Robert Shearman.
      
       8) Missing neif_napi_del() calls in cleanup paths of b44 driver, from
          Hauke Mehrtens.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        net: replace last open coded skb_orphan_frags with function call
        net: bcmgenet: power on MII block for all MII modes
        ipv6: Fix protocol resubmission
        ipv6: fix possible use after free of dev stats
        b44: call netif_napi_del()
        bridge: disable softirqs around br_fdb_update to avoid lockup
        Revert "bridge: use _bh spinlock variant for br_fdb_update to avoid lockup"
        mpls: fix possible use after free of device
        be2net: Replace dma/pci_alloc_coherent() calls with dma_zalloc_coherent()
        bridge: use _bh spinlock variant for br_fdb_update to avoid lockup
        amd-xgbe: Use disable_irq_nosync from within timer function
        rhashtable: add missing import <linux/export.h>
        i40e: Make sure to be in VEB mode if SRIOV is enabled at probe
        i40e: start up in VEPA mode by default
        i40e/i40evf: Fix mixed size frags and linearization
        ipv4/udp: Verify multicast group is ours in upd_v4_early_demux()
        openvswitch: disable LRO
        s390/bpf: fix bpf frame pointer setup
        s390/bpf: fix stack allocation
      5879ae5f
    • Linus Torvalds's avatar
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · 056537c6
      Linus Torvalds authored
      Pull last-minute virtio fix from Michael Tsirkin:
       "This fixes a minor issue affecting multiqueue virtio net when user
        keeps changing the number of active queues and CPUs are added and
        removed by hotplug"
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        virtio_pci: Clear stale cpumask when setting irq affinity
      056537c6
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 40b985fb
      Linus Torvalds authored
      Pull ARM SoC fixes from Kevin Hilman:
       "About 10 days worth of small bug fixes, and the (hopefully) final
        round fixes for from arm-soc land for the -rc cycle.  Nothing special
        to note, but here's a brief summary of fixes by SoC type:
      
         - OMAP:
              small set of misc DT fixes; boot fix for THUMB2 kernel
      
         - mediatek:
              PMIC fixes; DT fix for model name
      
         - exynos:
              wakeup interupt fixes for 3250
      
         - mvebu:
              revert mbus patch which broke DMA masters
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: dts: am335x-boneblack: disable RTC-only sleep to avoid hardware damage
        ARM: dts: AM35xx: fix system control module clocks
        arm64: dts: mt8173-evb: fix model name
        ARM: exynos: Fix wake-up interrupts for Exynos3250
        ARM: dts: Fix n900 dts file to work around 4.1 touchscreen regression on n900
        ARM: dts: Fix dm816x to use right compatible flag for MUSB
        ARM: OMAP3: Fix booting with thumb2 kernel
        Revert "bus: mvebu-mbus: make sure SDRAM CS for DMA don't overlap the MBus bridge window"
        bus: mvebu-mbus: do not set WIN_CTRL_SYNCBARRIER on non io-coherent platforms.
        ARM: mvebu: armada-xp-linksys-mamba: Disable internal RTC
        soc: mediatek: Add compile dependency to pmic-wrapper
        soc: mediatek: PMIC wrap: Fix register state machine handling
        soc: mediatek: PMIC wrap: Fix clock rate handling
      40b985fb
    • Willem de Bruijn's avatar
      net: replace last open coded skb_orphan_frags with function call · bbbf2df0
      Willem de Bruijn authored
      Commit 70008aa5
      
       ("skbuff: convert to skb_orphan_frags") replaced
      open coded tests of SKBTX_DEV_ZEROCOPY and skb_copy_ubufs with calls
      to helper function skb_orphan_frags. Apply that to the last remaining
      open coded site.
      
      Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
      Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bbbf2df0
    • Florian Fainelli's avatar
      net: bcmgenet: power on MII block for all MII modes · afe3f907
      Florian Fainelli authored
      The RGMII block is currently only powered on when using RGMII or
      RGMII_NO_ID, which is not correct when using the GENET interface in MII
      or Reverse MII modes. We always need to power on the RGMII interface for
      this block to properly work, regardless of the MII mode in which we
      operate.
      
      Fixes: aa09677c
      
       ("net: bcmgenet: add MDIO routines")
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      afe3f907
    • Josh Hunt's avatar
      ipv6: Fix protocol resubmission · 0243508e
      Josh Hunt authored
      
      
      UDP encapsulation is broken on IPv6. This is because the logic to resubmit
      the nexthdr is inverted, checking for a ret value > 0 instead of < 0. Also,
      the resubmit label is in the wrong position since we already get the
      nexthdr value when performing decapsulation. In addition the skb pull is no
      longer necessary either.
      
      This changes the return value check to look for < 0, using it for the
      nexthdr on the next iteration, and moves the resubmit label to the proper
      location.
      
      With these changes the v6 code now matches what we do in the v4 ip input
      code wrt resubmitting when decapsulating.
      
      Signed-off-by: default avatarJosh Hunt <johunt@akamai.com>
      Acked-by: default avatar"Tom Herbert" <tom@herbertland.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0243508e
    • Robert Shearman's avatar
      ipv6: fix possible use after free of dev stats · 27e41fcf
      Robert Shearman authored
      
      
      The memory pointed to by idev->stats.icmpv6msgdev,
      idev->stats.icmpv6dev and idev->stats.ipv6 can each be used in an RCU
      read context without taking a reference on idev. For example, through
      IP6_*_STATS_* calls in ip6_rcv. These memory blocks are freed without
      waiting for an RCU grace period to elapse. This could lead to the
      memory being written to after it has been freed.
      
      Fix this by using call_rcu to free the memory used for stats, as well
      as idev after an RCU grace period has elapsed.
      
      Signed-off-by: default avatarRobert Shearman <rshearma@brocade.com>
      Acked-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      27e41fcf
    • Kevin Hilman's avatar
      Merge tag 'omap-for-v4.1/fixes-rc6' of... · 0a68c6bc
      Kevin Hilman authored
      Merge tag 'omap-for-v4.1/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Merge omap fixes for v4.1, urgent fix to avoid potential hardware damage From Tony Lindgren:
      
      Omap fixes for the -rc cycle, including a fix for potential hardware
      breakage on BeagleBones:
      
      - BeagleBones don't support RTC-only mode, it can cause hardware
        damage if system-power-controller is specified without
        ti,pmic-shutdown-controller
      
      - Fix a recent regression to am3517 SoCs caused by the recent clock
        move that was not noticed until now despite automated boot
        testing
      
      - Fix a regression for n900 touchscreen triggered by recent
        recent input changes
      
      - Fix compatible property for dm816x USB to avoid errors with
        USB Ethernet
      
      - Fix oops for omap3 when built with CONFIG_THUMB2_KERNEL
      
      * tag 'omap-for-v4.1/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: dts: am335x-boneblack: disable RTC-only sleep to avoid hardware damage
        ARM: dts: AM35xx: fix system control module clocks
        ARM: dts: Fix n900 dts file to work around 4.1 touchscreen regression on n900
        ARM: dts: Fix dm816x to use right compatible flag for MUSB
        ARM: OMAP3: Fix booting with thumb2 kernel
      0a68c6bc
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/intel-iommu · 181e5059
      Linus Torvalds authored
      Pull Intel IOMMU fix from David Woodhouse:
       "This fixes an oops when attempting to enable 1:1 passthrough mode for
        devices on which VT-d translation was disabled anyway.
      
        It's actually a long-standing bug but recent changes (commit
        18436afd: "iommu/vt-d: Allow RMRR on graphics devices too") have
        made it much easier to trigger with 'iommu=pt intel_iommu=igfx_off' on
        the command line"
      
      * git://git.infradead.org/intel-iommu:
        iommu/vt-d: Fix passthrough mode with translation-disabled devices
      181e5059
  3. Jun 08, 2015
  4. Jun 07, 2015
    • Lendacky, Thomas's avatar
      amd-xgbe: Use disable_irq_nosync from within timer function · 078b29d7
      Lendacky, Thomas authored
      
      
      Since the Tx timer function runs in softirq context the driver needs
      to call disable_irq_nosync instead of a disable_irq.
      
      Reported-by: default avatarJosh Stone <jistone@redhat.com>
      Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      078b29d7
    • Hauke Mehrtens's avatar
      rhashtable: add missing import <linux/export.h> · 6d795413
      Hauke Mehrtens authored
      
      
      rhashtable uses EXPORT_SYMBOL_GPL() without importing linux/export.h
      directly it is only imported indirectly through some other includes.
      
      Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6d795413
    • Linus Torvalds's avatar
      Merge tag 'driver-core-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 37ef1647
      Linus Torvalds authored
      Pull driver core fixes from Greg KH:
       "Here are two fixes for the driver core that resolve some reported
        issues.
      
        One is a regression from 4.0, the other a fixes a reported oops that
        has been there since 3.19.
      
        Both have been in linux-next for a while with no problems"
      
      * tag 'driver-core-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        drivers/base: cacheinfo: handle absence of caches
        drivers: of/base: move of_init to driver_init
      37ef1647
    • Linus Torvalds's avatar
      Merge tag 'staging-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · eadc21f5
      Linus Torvalds authored
      Pull staging / IIO fixes from Greg KH:
       "Here are some IIO driver fixes to resolve reported issues, some ozwpan
        fixes for some reported CVE problems, and a rtl8712 driver fix for a
        reported regression.
      
        All have been in linux-next successfully"
      
      * tag 'staging-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        staging: rtl8712: fix stack dump
        ozwpan: unchecked signed subtraction leads to DoS
        ozwpan: divide-by-zero leading to panic
        ozwpan: Use unsigned ints to prevent heap overflow
        ozwpan: Use proper check to prevent heap overflow
        iio: adc: twl6030-gpadc: Fix modalias
        iio: adis16400: Fix burst transfer for adis16448
        iio: adis16400: Fix burst mode
        iio: adis16400: Compute the scan mask from channel indices
        iio: adis16400: Use != channel indices for the two voltage channels
        iio: adis16400: Report pressure channel scale
      eadc21f5
    • Linus Torvalds's avatar
      Merge tag 'tty-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · b334b773
      Linus Torvalds authored
      Pull tty/serial driver fixes from Greg KH:
       "Here are a few TTY and Serial driver fixes for reported regressions
        and crashes.
      
        All of these have been in linux-next with no reported problems"
      
      * tag 'tty-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        n_tty: Fix auditing support for cannonical mode
        serial: 8250_omap: provide complete custom startup & shutdown callbacks
        n_tty: Fix calculation of size in canon_copy_from_read_buf
        serial: imx: Fix DMA handling for IDLE condition aborts
        serial/amba-pl011: Unconditionally poll for FIFO space before each TX char
      b334b773
    • Linus Torvalds's avatar
      Merge tag 'usb-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · e900f2c0
      Linus Torvalds authored
      Pull USB and PHY driver fixes from Greg KH:
       "Here are some USB and PHY driver fixes that resolve some reported
        regressions.  Also in here are some new device ids.
      
        All of the details are in the shortlog and these patches have been in
        linux-next with no problems"
      
      * tag 'usb-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (22 commits)
        USB: cp210x: add ID for HubZ dual ZigBee and Z-Wave dongle
        usb: renesas_usbhs: Don't disable the pipe if Control write status stage
        usb: renesas_usbhs: Fix fifo unclear in usbhsf_prepare_pop
        usb: gadget: f_fs: fix check in read operation
        usb: musb: fix order of conditions for assigning end point operations
        usb: gadget: f_uac1: check return code from config_ep_by_speed
        usb: gadget: ffs: fix: Always call ffs_closed() in ffs_data_clear()
        usb: gadget: g_ffs: Fix counting of missing_functions
        usb: s3c2410_udc: correct reversed pullup logic
        usb: dwc3: gadget: Fix incorrect DEPCMD and DGCMD status macros
        usb: phy: tahvo: Pass the IRQF_ONESHOT flag
        usb: phy: ab8500-usb: Pass the IRQF_ONESHOT flag
        usb: renesas_usbhs: Revise the binding document about the dma-names
        usb: host: xhci: add mutex for non-thread-safe data
        usb: make module xhci_hcd removable
        USB: serial: ftdi_sio: Add support for a Motion Tracker Development Board
        usb: gadget: f_midi: fix segfault when reading empty id
        phy: phy-rcar-gen2: Fix USBHS_UGSTS_LOCK value
        phy: omap-usb2: invoke pm_runtime_disable on error path
        phy: fix Kconfig dependencies
        ...
      e900f2c0
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux · be19c4ab
      Linus Torvalds authored
      Pull devicetree fix from Grant Likely:
       "Stupid typo fix for v4.1.  One of the IS_ENABLED() macro calls forgot
        the CONFIG_ prefix.  Only affects a tiny number of platforms, but
        still..."
      
      * tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux:
        of/dynamic: Fix test for PPC_PSERIES
      be19c4ab
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 4b170692
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "i915 has a bunch of fixes, and Russell found a bug in sysfs writing
        handling that results in userspace getting stuck"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm: fix writing to /sys/class/drm/*/status
        drm/i915: Move WaBarrierPerformanceFixDisable:skl to skl code from chv code
        drm/i915: Include G4X/VLV/CHV in self refresh status
        drm/i915: Initialize HWS page address after GPU reset
        drm/i915: Don't skip request retirement if the active list is empty
        drm/i915/hsw: Fix workaround for server AUX channel clock divisor
      4b170692
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · f46c5818
      Linus Torvalds authored
      Pull input subsystem fixes from Dmitry Torokhov:
       "Just a couple touchpad drivers fixups"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: alps - do not reduce trackpoint speed by half
        Input: elantech - add new icbody type
        Input: elantech - fix detection of touchpads where the revision matches a known rate
      f46c5818
    • Linus Torvalds's avatar
      Merge branch 'stable/for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb · 77493bd9
      Linus Torvalds authored
      Pull swiotlb fix from Konrad Rzeszutek Wilk:
       "Tiny little fix which just converts an function to be static.  Really
        tiny"
      
      * 'stable/for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
        swiotlb: do not export map_single function
      77493bd9
    • Linus Torvalds's avatar
      Merge branch 'stable/for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft · 7dedcca0
      Linus Torvalds authored
      Pull iBFT fix from Konrad Rzeszutek Wilk:
       "One single fix from Chris to workaround UEFI platforms failing with
        iSCSI IBFT"
      
      * 'stable/for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft:
        iscsi_ibft: filter null v4-mapped v6 addresses
      7dedcca0
  5. Jun 06, 2015
    • Nicholas Mc Guire's avatar
      MIPS: KVM: Do not sign extend on unsigned MMIO load · ed9244e6
      Nicholas Mc Guire authored
      
      
      Fix possible unintended sign extension in unsigned MMIO loads by casting
      to uint16_t in the case of mmio_needed != 2.
      
      Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
      Reviewed-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Tested-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Gleb Natapov <gleb@kernel.org>
      Cc: Paolo Bonzini <pbonzini@redhat.com>
      Cc: kvm@vger.kernel.org
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/9985/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      ed9244e6
    • Markos Chandras's avatar
      MIPS: BPF: Fix stack pointer allocation · 8833bc30
      Markos Chandras authored
      
      
      Fix stack pointer offset which could potentially corrupt
      argument registers in the previous frame. The calculated offset
      reflects the size of all the registers we need to preserve so there
      is no need for this erroneous subtraction.
      
      [ralf@linux-mips.org: Fixed conflict due to only applying this fix part
      of the entire series as part of 4.1 fixes.]
      
      Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
      Cc: netdev@vger.kernel.org
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Alexei Starovoitov <ast@plumgrid.com>
      Cc: Daniel Borkmann <dborkman@redhat.com>
      Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
      Cc: linux-kernel@vger.kernel.org
      Cc: linux-mips@linux-mips.org
      Patchwork: http://patchwork.linux-mips.org/patch/10527/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      8833bc30
    • Huacai Chen's avatar
      MIPS: Loongson-3: Fix a cpu-hotplug issue in loongson3_ipi_interrupt() · e1fb96e0
      Huacai Chen authored
      
      
      setup_per_cpu_areas() only setup __per_cpu_offset[] for each possible
      cpu, but loongson_sysconf.nr_cpus can be greater than possible cpus
      (due to reserved_cpus_mask). So in loongson3_ipi_interrupt(), percpu
      access will touch the original varible in .data..percpu section which
      has been freed. Without this patch, cpu-hotplug will cause memery
      corruption.
      
      Signed-off-by: default avatarHuacai Chen <chenhc@lemote.com>
      Cc: John Crispin <john@phrozen.org>
      Cc: Steven J. Hill <Steven.Hill@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: Fuxin Zhang <zhangfx@lemote.com>
      Cc: Zhangjin Wu <wuzhangjin@gmail.com>
      Patchwork: http://patchwork.linux-mips.org/patch/10524/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      e1fb96e0
    • James Hogan's avatar
      MIPS: Fix enabling of DEBUG_STACKOVERFLOW · 5f35b9cd
      James Hogan authored
      Commit 334c86c4 ("MIPS: IRQ: Add stackoverflow detection") added
      kernel stack overflow detection, however it only enabled it conditional
      upon the preprocessor definition DEBUG_STACKOVERFLOW, which is never
      actually defined. The Kconfig option is called DEBUG_STACKOVERFLOW,
      which manifests to the preprocessor as CONFIG_DEBUG_STACKOVERFLOW, so
      switch it to using that definition instead.
      
      Fixes: 334c86c4
      
       ("MIPS: IRQ: Add stackoverflow detection")
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Cc: Adam Jiang <jiang.adam@gmail.com>
      Cc: linux-mips@linux-mips.org
      Cc: <stable@vger.kernel.org> # 2.6.37+
      Patchwork: http://patchwork.linux-mips.org/patch/10531/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      5f35b9cd
    • Joshua Kinard's avatar
      MIPS: c-r4k: Fix typo in probe_scache() · 755af33b
      Joshua Kinard authored
      
      
      Fixes a typo in arch/mips/mm/c-r4k.c's probe_scache().
      
      Signed-off-by: default avatarJoshua Kinard <kumba@gentoo.org>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      755af33b
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue · c6271b76
      David S. Miller authored
      
      
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates 2015-06-04
      
      This series contains updates to i40e and i40evf.
      
      Anjali provides three fixes, first to resolve a Tx queue hang if mixed
      size frags are passed to the driver while using TSO.  There was a corner
      case where we needed to linearize but we were not.  Next fixes a bug in
      the default configuration which prevented a software bridge loaded on the
      PF interface from working correctly because broadcast packets are
      incorrectly looped back.  Lastly fixes an NPAR bug when SRIOV is enabled,
      where we need to be in VEB mode, not VEPA mode at probe.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c6271b76
    • Chris Leech's avatar
      iscsi_ibft: filter null v4-mapped v6 addresses · e6050b61
      Chris Leech authored
      
      
      I've had reports of UEFI platforms failing iSCSI boot in various
      configurations, that ended up being caused by network initialization
      scripts getting tripped up by unexpected null addresses (0.0.0.0) being
      reported for gateways, dhcp servers, and dns servers.
      
      The tianocore EDK2 iSCSI driver generates an iBFT table that always uses
      IPv4-mapped IPv6 addresses for the NIC structure fields.  This results
      in values that are "not present or not specified" being reported as
      ::ffff:0.0.0.0 rather than all zeros as specified.
      
      The iscsi_ibft module filters unspecified fields from the iBFT from
      sysfs, preventing userspace from using invalid values and making it easy
      to check for the presence of a value.  This currently fails in regard to
      these mapped null addresses.
      
      In order to remain consistent with how the iBFT information is exposed,
      we should accommodate the behavior of the tianocore iSCSI driver as it's
      already in the wild in a large number of servers.
      
      Tested under qemu using an OVMF build of tianocore EDK2.
      
      Signed-off-by: default avatarChris Leech <cleech@redhat.com>
      Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
      Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      e6050b61