1. 17 Apr, 2015 7 commits
  2. 16 Apr, 2015 20 commits
  3. 15 Apr, 2015 13 commits
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · 6b9107d6
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates 2015-04-14
      
      This series contains updates to i40e and i40evf.
      
      Mitch provides a fix for i40e, where VFs were gone and the associated
      VSI's had been removed and the rings were not stopped, which in some
      circumstances cased memory corruption or DMAR errors.  So stop all the
      rings associated with each VF before releasing its resources.  Also
      cleaned up a poorly indented piece of code.  Fixes VF link state, where
      VF devices were assuming link is up unless told otherwise, which means
      that VFs instantiated on a PF with no link, would report the wrong state.
      
      Anjali adds support to add Flow director Sideband rules for a VF from it's
      PF.  Fixes a recently discovered hardware issue, where after a VFLR
      hardware might be indicating to us a reset completion little too early, so
      wait another 10 msec for cache to be cleaned up.
      
      Jesse enables the user to dump the internal hardware state for better
      debugging by allowing a bash script to acquire information about the
      internal hardware state.  The data output to the kernel log is collected
      by the script and can then be sent to Intel.  Also fixed a possible
      failure path to allocate memory that was found by smatch.  Cleaned up
      unused local variables.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6b9107d6
    • Eric Dumazet's avatar
      bnx2x: Fix busy_poll vs netpoll · 074975d0
      Eric Dumazet authored
      Commit 9a2620c8 ("bnx2x: prevent WARN during driver unload")
      switched the napi/busy_lock locking mechanism from spin_lock() into
      spin_lock_bh(), breaking inter-operability with netconsole, as netpoll
      disables interrupts prior to calling our napi mechanism.
      
      This switches the driver into using atomic assignments instead of the
      spinlock mechanisms previously employed.
      
      Based on initial patch from Yuval Mintz & Ariel Elior
      
      I basically added softirq starvation avoidance, and mixture
      of atomic operations, plain writes and barriers.
      
      Note this slightly reduces the overhead for this driver when no
      busy_poll sockets are in use.
      
      Fixes: 9a2620c8 ("bnx2x: prevent WARN during driver unload")
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      074975d0
    • Thomas Gleixner's avatar
      net: hip04: Make tx coalesce timer actually work · 48b63776
      Thomas Gleixner authored
      The code sets the expiry value of the timer to a relative value and
      starts it with hrtimer_start_expires. That's fine, but that only works
      once. The timer is started in relative mode, so the expiry value gets
      overwritten with the absolut expiry time (now + expiry).
      
      So once the timer expired, a new call to hrtimer_start_expires results
      in an immidiately expired timer, because the expiry value is
      already in the past.
      
      Use the proper mechanisms to (re)start the timer in the intended way.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: dingtianhong <dingtianhong@huawei.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Zhangfei Gao <zhangfei.gao@linaro.org>
      Cc: Dan Carpenter <dan.carpenter@oracle.com>
      Cc: netdev@vger.kernel.org
      Acked-by: default avatarDing Tianhong <dingtianhong@huawei.com>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      48b63776
    • Linus Torvalds's avatar
      Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · c841e12a
      Linus Torvalds authored
      Pull kconfig updates from Michal Marek:
       "Here is the kconfig stuff for v4.1-rc1:
      
         - fixes for mergeconfig (used by make kvmconfig/tinyconfig)
      
         - header cleanup
      
         - make -s *config is silent now"
      
      * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kconfig: Do not print status messages in make -s mode
        kconfig: Simplify Makefile
        kbuild: add generic mergeconfig target, %.config
        merge_config.sh: rename MAKE to RUNMAKE
        merge_config.sh: improve indentation
        kbuild: mergeconfig: remove redundant $(objtree)
        kbuild: mergeconfig: move an error check to merge_config.sh
        kbuild: mergeconfig: fix "jobserver unavailable" warning
        kconfig: Remove unnecessary prototypes from headers
        kconfig: Remove dead code
        kconfig: Get rid of the P() macro in headers
        kconfig: fix a misspelling in scripts/kconfig/merge_config.sh
      c841e12a
    • Linus Torvalds's avatar
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · b422b758
      Linus Torvalds authored
      Pull kbuild updates from Michal Marek:
       "Here is the first round of kbuild changes for v4.1-rc1:
      
         - kallsyms fix for ARM and cleanup
      
         - make dep(end) removed (developers have no sense of nostalgia these
           days...)
      
         - include Makefiles by relative path
      
         - stop useless rebuilds of asm-offsets.h and bounds.h"
      
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        Kbuild: kallsyms: drop special handling of pre-3.0 GCC symbols
        Kbuild: kallsyms: ignore veneers emitted by the ARM linker
        kbuild: ia64: use $(src)/Makefile.gate rather than particular path
        kbuild: include $(src)/Makefile rather than $(obj)/Makefile
        kbuild: use relative path more to include Makefile
        kbuild: use relative path to include Makefile
        kbuild: do not add $(bounds-file) and $(offsets-file) to targets
        kbuild: remove warning about "make depend"
        kbuild: Don't reset timestamps in include/generated if not needed
      b422b758
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · d488d3a4
      Linus Torvalds authored
      Pull security subsystem updates from James Morris:
       "Highlights for this window:
      
         - improved AVC hashing for SELinux by John Brooks and Stephen Smalley
      
         - addition of an unconfined label to Smack
      
         - Smack documentation update
      
         - TPM driver updates"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (28 commits)
        lsm: copy comm before calling audit_log to avoid race in string printing
        tomoyo: Do not generate empty policy files
        tomoyo: Use if_changed when generating builtin-policy.h
        tomoyo: Use bin2c to generate builtin-policy.h
        selinux: increase avtab max buckets
        selinux: Use a better hash function for avtab
        selinux: convert avtab hash table to flex_array
        selinux: reconcile security_netlbl_secattr_to_sid() and mls_import_netlbl_cat()
        selinux: remove unnecessary pointer reassignment
        Smack: Updates for Smack documentation
        tpm/st33zp24/spi: Add missing device table for spi phy.
        tpm/st33zp24: Add proper wait for ordinal duration in case of irq mode
        smack: Fix gcc warning from unused smack_syslog_lock mutex in smackfs.c
        Smack: Allow an unconfined label in bringup mode
        Smack: getting the Smack security context of keys
        Smack: Assign smack_known_web as default smk_in label for kernel thread's socket
        tpm/tpm_infineon: Use struct dev_pm_ops for power management
        MAINTAINERS: Add Jason as designated reviewer for TPM
        tpm: Update KConfig text to include TPM2.0 FIFO chips
        tpm/st33zp24/dts/st33zp24-spi: Add dts documentation for st33zp24 spi phy
        ...
      d488d3a4
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · cb906953
      Linus Torvalds authored
      Pull crypto update from Herbert Xu:
       "Here is the crypto update for 4.1:
      
        New interfaces:
         - user-space interface for AEAD
         - user-space interface for RNG (i.e., pseudo RNG)
      
        New hashes:
         - ARMv8 SHA1/256
         - ARMv8 AES
         - ARMv8 GHASH
         - ARM assembler and NEON SHA256
         - MIPS OCTEON SHA1/256/512
         - MIPS img-hash SHA1/256 and MD5
         - Power 8 VMX AES/CBC/CTR/GHASH
         - PPC assembler AES, SHA1/256 and MD5
         - Broadcom IPROC RNG driver
      
        Cleanups/fixes:
         - prevent internal helper algos from being exposed to user-space
         - merge common code from assembly/C SHA implementations
         - misc fixes"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (169 commits)
        crypto: arm - workaround for building with old binutils
        crypto: arm/sha256 - avoid sha256 code on ARMv7-M
        crypto: x86/sha512_ssse3 - move SHA-384/512 SSSE3 implementation to base layer
        crypto: x86/sha256_ssse3 - move SHA-224/256 SSSE3 implementation to base layer
        crypto: x86/sha1_ssse3 - move SHA-1 SSSE3 implementation to base layer
        crypto: arm64/sha2-ce - move SHA-224/256 ARMv8 implementation to base layer
        crypto: arm64/sha1-ce - move SHA-1 ARMv8 implementation to base layer
        crypto: arm/sha2-ce - move SHA-224/256 ARMv8 implementation to base layer
        crypto: arm/sha256 - move SHA-224/256 ASM/NEON implementation to base layer
        crypto: arm/sha1-ce - move SHA-1 ARMv8 implementation to base layer
        crypto: arm/sha1_neon - move SHA-1 NEON implementation to base layer
        crypto: arm/sha1 - move SHA-1 ARM asm implementation to base layer
        crypto: sha512-generic - move to generic glue implementation
        crypto: sha256-generic - move to generic glue implementation
        crypto: sha1-generic - move to generic glue implementation
        crypto: sha512 - implement base layer for SHA-512
        crypto: sha256 - implement base layer for SHA-256
        crypto: sha1 - implement base layer for SHA-1
        crypto: api - remove instance when test failed
        crypto: api - Move alg ref count init to crypto_check_alg
        ...
      cb906953
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 6c373ca8
      Linus Torvalds authored
      Pull networking updates from David Miller:
      
       1) Add BQL support to via-rhine, from Tino Reichardt.
      
       2) Integrate SWITCHDEV layer support into the DSA layer, so DSA drivers
          can support hw switch offloading.  From Floria Fainelli.
      
       3) Allow 'ip address' commands to initiate multicast group join/leave,
          from Madhu Challa.
      
       4) Many ipv4 FIB lookup optimizations from Alexander Duyck.
      
       5) Support EBPF in cls_bpf classifier and act_bpf action, from Daniel
          Borkmann.
      
       6) Remove the ugly compat support in ARP for ugly layers like ax25,
          rose, etc.  And use this to clean up the neigh layer, then use it to
          implement MPLS support.  All from Eric Biederman.
      
       7) Support L3 forwarding offloading in switches, from Scott Feldman.
      
       8) Collapse the LOCAL and MAIN ipv4 FIB tables when possible, to speed
          up route lookups even further.  From Alexander Duyck.
      
       9) Many improvements and bug fixes to the rhashtable implementation,
          from Herbert Xu and Thomas Graf.  In particular, in the case where
          an rhashtable user bulk adds a large number of items into an empty
          table, we expand the table much more sanely.
      
      10) Don't make the tcp_metrics hash table per-namespace, from Eric
          Biederman.
      
      11) Extend EBPF to access SKB fields, from Alexei Starovoitov.
      
      12) Split out new connection request sockets so that they can be
          established in the main hash table.  Much less false sharing since
          hash lookups go direct to the request sockets instead of having to
          go first to the listener then to the request socks hashed
          underneath.  From Eric Dumazet.
      
      13) Add async I/O support for crytpo AF_ALG sockets, from Tadeusz Struk.
      
      14) Support stable privacy address generation for RFC7217 in IPV6.  From
          Hannes Frederic Sowa.
      
      15) Hash network namespace into IP frag IDs, also from Hannes Frederic
          Sowa.
      
      16) Convert PTP get/set methods to use 64-bit time, from Richard
          Cochran.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1816 commits)
        fm10k: Bump driver version to 0.15.2
        fm10k: corrected VF multicast update
        fm10k: mbx_update_max_size does not drop all oversized messages
        fm10k: reset head instead of calling update_max_size
        fm10k: renamed mbx_tx_dropped to mbx_tx_oversized
        fm10k: update xcast mode before synchronizing multicast addresses
        fm10k: start service timer on probe
        fm10k: fix function header comment
        fm10k: comment next_vf_mbx flow
        fm10k: don't handle mailbox events in iov_event path and always process mailbox
        fm10k: use separate workqueue for fm10k driver
        fm10k: Set PF queues to unlimited bandwidth during virtualization
        fm10k: expose tx_timeout_count as an ethtool stat
        fm10k: only increment tx_timeout_count in Tx hang path
        fm10k: remove extraneous "Reset interface" message
        fm10k: separate PF only stats so that VF does not display them
        fm10k: use hw->mac.max_queues for stats
        fm10k: only show actual queues, not the maximum in hardware
        fm10k: allow creation of VLAN on default vid
        fm10k: fix unused warnings
        ...
      6c373ca8
    • Catherine Sullivan's avatar
      i40e: Bump version to 1.3.2 · 2aea6dcb
      Catherine Sullivan authored
      Bump.
      
      Change-ID: Id14baae72332d0f1a9bc5d351ea1a85cb0295ec3
      Signed-off-by: default avatarCatherine Sullivan <catherine.sullivan@intel.com>
      Tested-by: default avatarJim Young <james.m.young@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      2aea6dcb
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · bb0fd7ab
      Linus Torvalds authored
      Pull ARM updates from Russell King:
       "Included in this update are both some long term fixes and some new
        features.
      
        Fixes:
      
         - An integer overflow in the calculation of ELF_ET_DYN_BASE.
      
         - Avoiding OOMs for high-order IOMMU allocations
      
         - SMP requires the data cache to be enabled for synchronisation
           primitives to work, so prevent the CPU_DCACHE_DISABLE option being
           visible on SMP builds.
      
         - A bug going back 10+ years in the noMMU ARM94* CPU support code,
           where it corrupts registers.  Found by folk getting Linux running
           on their cameras.
      
         - Versatile Express needs an errata workaround enabled for CPU
           hot-unplug to work.
      
        Features:
      
         - Clean up module linker by handling out of range relocations
           separately from relocation cases we don't handle.
      
         - Fix a long term bug in the pci_mmap_page_range() code, which we
           hope won't impact userspace (we hope there's no users of the
           existing broken interface.)
      
         - Don't map DMA coherent allocations when we don't have a MMU.
      
         - Drop experimental status for SMP_ON_UP.
      
         - Warn when DT doesn't specify ePAPR mandatory cache properties.
      
         - Add documentation concerning how we find the start of physical
           memory for AUTO_ZRELADDR kernels, detailing why we have chosen the
           mask and the implications of changing it.
      
         - Updates from Ard Biesheuvel to address some issues with large
           kernels (such as allyesconfig) failing to link.
      
         - Allow hibernation to work on modern (ARMv7) CPUs - this appears to
           have never worked in the past on these CPUs.
      
         - Enable IRQ_SHOW_LEVEL, which changes the /proc/interrupts output
           format (hopefully without userspace breaking...  let's hope that if
           it causes someone a problem, they tell us.)
      
         - Fix tegra-ahb DT offsets.
      
         - Rework ARM errata 643719 code (and ARMv7 flush_cache_louis()/
           flush_dcache_all()) code to be more efficient, and enable this
           errata workaround by default for ARMv7+SMP CPUs.  This complements
           the Versatile Express fix above.
      
         - Rework ARMv7 context code for errata 430973, so that only Cortex A8
           CPUs are impacted by the branch target buffer flush when this
           errata is enabled.  Also update the help text to indicate that all
           r1p* A8 CPUs are impacted.
      
         - Switch ARM to the generic show_mem() implementation, it conveys all
           the information which we were already reporting.
      
         - Prevent slow timer sources being used for udelay() - timers running
           at less than 1MHz are not useful for this, and can cause udelay()
           to return immediately, without any wait.  Using such a slow timer
           is silly.
      
         - VDSO support for 32-bit ARM, mainly for gettimeofday() using the
           ARM architected timer.
      
         - Perf support for Scorpion performance monitoring units"
      
      vdso semantic conflict fixed up as per linux-next.
      
      * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (52 commits)
        ARM: update errata 430973 documentation to cover Cortex A8 r1p*
        ARM: ensure delay timer has sufficient accuracy for delays
        ARM: switch to use the generic show_mem() implementation
        ARM: proc-v7: avoid errata 430973 workaround for non-Cortex A8 CPUs
        ARM: enable ARM errata 643719 workaround by default
        ARM: cache-v7: optimise test for Cortex A9 r0pX devices
        ARM: cache-v7: optimise branches in v7_flush_cache_louis
        ARM: cache-v7: consolidate initialisation of cache level index
        ARM: cache-v7: shift CLIDR to extract appropriate field before masking
        ARM: cache-v7: use movw/movt instructions
        ARM: allow 16-bit instructions in ALT_UP()
        ARM: proc-arm94*.S: fix setup function
        ARM: vexpress: fix CPU hotplug with CT9x4 tile.
        ARM: 8276/1: Make CPU_DCACHE_DISABLE depend on !SMP
        ARM: 8335/1: Documentation: DT bindings: Tegra AHB: document the legacy base address
        ARM: 8334/1: amba: tegra-ahb: detect and correct bogus base address
        ARM: 8333/1: amba: tegra-ahb: fix register offsets in the macros
        ARM: 8339/1: Enable CONFIG_GENERIC_IRQ_SHOW_LEVEL
        ARM: 8338/1: kexec: Relax SMP validation to improve DT compatibility
        ARM: 8337/1: mm: Do not invoke OOM for higher order IOMMU DMA allocations
        ...
      bb0fd7ab
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · bdfa54df
      Linus Torvalds authored
      Pull s390 updates from Martin Schwidefsky:
       "The major change in this merge is the removal of the support for
        31-bit kernels.  Naturally 31-bit user space will continue to work via
        the compat layer.
      
        And then some cleanup, some improvements and bug fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (23 commits)
        s390/smp: wait until secondaries are active & online
        s390/hibernate: fix save and restore of kernel text section
        s390/cacheinfo: add missing facility check
        s390/syscalls: simplify syscall_get_arch()
        s390/irq: enforce correct irqclass_sub_desc array size
        s390: remove "64" suffix from mem64.S and swsusp_asm64.S
        s390/ipl: cleanup macro usage
        s390/ipl: cleanup shutdown_action attributes
        s390/ipl: cleanup bin attr usage
        s390/uprobes: fix address space annotation
        s390: add missing arch_release_task_struct() declaration
        s390: make couple of functions and variables static
        s390/maccess: improve s390_kernel_write()
        s390/maccess: remove potentially broken probe_kernel_write()
        s390/watchdog: support for KVM hypervisors and delete pr_info messages
        s390/watchdog: enable KEEPALIVE for /dev/watchdog
        s390/dasd: remove setting of scheduler from driver
        s390/traps: panic() instead of die() on translation exception
        s390: remove test_facility(2) (== z/Architecture mode active) checks
        s390/cmpxchg: simplify cmpxchg_double
        ...
      bdfa54df
    • Greg Rose's avatar
      i40e: Use new 40G speeds · edf5cffd
      Greg Rose authored
      The kernel has added SPEED_40000 for ethtool.
      Go ahead and use the new #define.
      
      Change-ID: Ic7e16e5c9e91085afe539f11ee1b7668adc4d0ef
      Signed-off-by: default avatarGreg Rose <gregory.v.rose@intel.com>
      Tested-by: default avatarJim Young <james.m.young@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      edf5cffd
    • Jesse Brandeburg's avatar
      i40e: get rid of unused locals · 0f575bf3
      Jesse Brandeburg authored
      These changes just remove unused variables and any code that uses them
      as the results of storing into these variables doesn't have any
      side effects that I can see or provide any benefit.
      
      Change-ID: I8a5ec7132ff1443d23aae729cef94beaaaf19e3a
      Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
      Tested-by: default avatarJim Young <james.m.young@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      0f575bf3