1. 22 Feb, 2017 13 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 3051bf36
      Linus Torvalds authored
      Pull networking updates from David Miller:
       "Highlights:
      
         1) Support TX_RING in AF_PACKET TPACKET_V3 mode, from Sowmini
            Varadhan.
      
         2) Simplify classifier state on sk_buff in order to shrink it a bit.
            From Willem de Bruijn.
      
         3) Introduce SIPHASH and it's usage for secure sequence numbers and
            syncookies. From Jason A. Donenfeld.
      
         4) Reduce CPU usage for ICMP replies we are going to limit or
            suppress, from Jesper Dangaard Brouer.
      
         5) Introduce Shared Memory Communications socket layer, from Ursula
            Braun.
      
         6) Add RACK loss detection and allow it to actually trigger fast
            recovery instead of just assisting after other algorithms have
            triggered it. From Yuchung Cheng.
      
         7) Add xmit_more and BQL support to mvneta driver, from Simon Guinot.
      
         8) skb_cow_data avoidance in esp4 and esp6, from Steffen Klassert.
      
         9) Export MPLS packet stats via netlink, from Robert Shearman.
      
        10) Significantly improve inet port bind conflict handling, especially
            when an application is restarted and changes it's setting of
            reuseport. From Josef Bacik.
      
        11) Implement TX batching in vhost_net, from Jason Wang.
      
        12) Extend the dummy device so that VF (virtual function) features,
            such as configuration, can be more easily tested. From Phil
            Sutter.
      
        13) Avoid two atomic ops per page on x86 in bnx2x driver, from Eric
            Dumazet.
      
        14) Add new bpf MAP, implementing a longest prefix match trie. From
            Daniel Mack.
      
        15) Packet sample offloading support in mlxsw driver, from Yotam Gigi.
      
        16) Add new aquantia driver, from David VomLehn.
      
        17) Add bpf tracepoints, from Daniel Borkmann.
      
        18) Add support for port mirroring to b53 and bcm_sf2 drivers, from
            Florian Fainelli.
      
        19) Remove custom busy polling in many drivers, it is done in the core
            networking since 4.5 times. From Eric Dumazet.
      
        20) Support XDP adjust_head in virtio_net, from John Fastabend.
      
        21) Fix several major holes in neighbour entry confirmation, from
            Julian Anastasov.
      
        22) Add XDP support to bnxt_en driver, from Michael Chan.
      
        23) VXLAN offloads for enic driver, from Govindarajulu Varadarajan.
      
        24) Add IPVTAP driver (IP-VLAN based tap driver) from Sainath Grandhi.
      
        25) Support GRO in IPSEC protocols, from Steffen Klassert"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1764 commits)
        Revert "ath10k: Search SMBIOS for OEM board file extension"
        net: socket: fix recvmmsg not returning error from sock_error
        bnxt_en: use eth_hw_addr_random()
        bpf: fix unlocking of jited image when module ronx not set
        arch: add ARCH_HAS_SET_MEMORY config
        net: napi_watchdog() can use napi_schedule_irqoff()
        tcp: Revert "tcp: tcp_probe: use spin_lock_bh()"
        net/hsr: use eth_hw_addr_random()
        net: mvpp2: enable building on 64-bit platforms
        net: mvpp2: switch to build_skb() in the RX path
        net: mvpp2: simplify MVPP2_PRS_RI_* definitions
        net: mvpp2: fix indentation of MVPP2_EXT_GLOBAL_CTRL_DEFAULT
        net: mvpp2: remove unused register definitions
        net: mvpp2: simplify mvpp2_bm_bufs_add()
        net: mvpp2: drop useless fields in mvpp2_bm_pool and related code
        net: mvpp2: remove unused 'tx_skb' field of 'struct mvpp2_tx_queue'
        net: mvpp2: release reference to txq_cpu[] entry after unmapping
        net: mvpp2: handle too large value in mvpp2_rx_time_coal_set()
        net: mvpp2: handle too large value handling in mvpp2_rx_pkts_coal_set()
        net: mvpp2: remove useless arguments in mvpp2_rx_{pkts, time}_coal_set
        ...
      3051bf36
    • Linus Torvalds's avatar
      Merge tag 'gcc-plugins-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 1e74a2eb
      Linus Torvalds authored
      Pull gcc-plugins updates from Kees Cook:
       "This includes infrastructure updates and the structleak plugin, which
        performs forced initialization of certain structures to avoid possible
        information exposures to userspace.
      
        Summary:
      
         - infrastructure updates (gcc-common.h)
      
         - introduce structleak plugin for forced initialization of some
           structures"
      
      * tag 'gcc-plugins-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        gcc-plugins: Add structleak for more stack initialization
        gcc-plugins: consolidate on PASS_INFO macro
        gcc-plugins: add PASS_INFO and build_const_char_string()
      1e74a2eb
    • Kees Cook's avatar
    • Kees Cook's avatar
    • Linus Torvalds's avatar
      Merge tag 'rodata-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 7bb03382
      Linus Torvalds authored
      Pull rodata updates from Kees Cook:
       "This renames the (now inaccurate) DEBUG_RODATA and related
        SET_MODULE_RONX configs to the more sensible STRICT_KERNEL_RWX and
        STRICT_MODULE_RWX"
      
      * tag 'rodata-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        arch: Rename CONFIG_DEBUG_RODATA and CONFIG_DEBUG_MODULE_RONX
        arch: Move CONFIG_DEBUG_RODATA and CONFIG_SET_MODULE_RONX to be common
      7bb03382
    • Linus Torvalds's avatar
      Merge tag 'usercopy-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 4a0853bf
      Linus Torvalds authored
      Pull usercopy test updates from Kees Cook:
       "This improves the usercopy tests:
      
         - check zeroing on failed copy_from_user()/get_user() (caught bug on
           ARM)
      
         - adjust tests for SMAP/PAN (can't zero userspace memory on failure)"
      
      * tag 'usercopy-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        usercopy: Add tests for all get_user() sizes
        usercopy: Adjust tests to deal with SMAP/PAN
        usercopy: add testcases to check zeroing on failure
      4a0853bf
    • Linus Torvalds's avatar
      Merge tag 'pstore-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 6d1dd93e
      Linus Torvalds authored
      Pull pstore updates from Kees Cook:
       "Minor changes to pstore tree:
      
         - update MAINTAINERS with current git repo, add more files.
      
         - move prz allocation checks into the walker
      
         - initialize flags correctly (by accident spinlock was technically
           ok)"
      
      * tag 'pstore-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        MAINTAINERS: Adjust pstore git repo URI, add files
        pstore: Check for prz allocation in walker
        pstore: Correctly initialize spinlock and flags
      6d1dd93e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 81bbef23
      Linus Torvalds authored
      Pull HID fix from Jiri Kosina:
       "Regression fix for HID_RMI-driven synaptics touchpads in
        !CONFIG_HID_RMI cases"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: rmi: fallback to generic/multitouch if hid-rmi is not built
      81bbef23
    • Linus Torvalds's avatar
      Merge branch 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 79f4d1d5
      Linus Torvalds authored
      Pull libata updates from Tejun Heo:
      
       - Bartlomiej added pata_falcon
      
       - Christoph is trying to remove use of static 4k buf.  It's still WIP
      
       - config cleanup around HAS_DMA
      
       - other fixes and driver-specific changes
      
      * 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (29 commits)
        ata: pata_of_platform: using of_property_read_u32() helper
        pata_atiixp: Don't use unconnected secondary port on SB600/SB700
        libata-sff: Don't scan disabled ports when checking for legacy mode.
        pata_octeon_cf: remove unused local variables from octeon_cf_set_piomode()
        ahci: qoriq: added ls2088a platforms support
        ahci: qoriq: report error when ecc register address is missing in dts
        ahci: qoriq: added a condition to enable dma coherence
        Revert "libata: switch to dynamic allocation instead of ata_scsi_rbuf"
        ahci: imx: fix building without hwmon or thermal
        ata: add Atari Falcon PATA controller driver
        ata: pass queued command to ->sff_data_xfer method
        ata: allow subsystem to be used on m68k arch
        libata: switch to dynamic allocation instead of ata_scsi_rbuf
        libata: don't call ata_scsi_rbuf_fill for command without a response buffer
        libata: call ->scsi_done from ata_scsi_simulate
        libata: remove the done callback from ata_scsi_args
        libata: move struct ata_scsi_args to libata-scsi.c
        libata: avoid global response buffer in atapi_qc_complete
        libata-eh: Use switch() instead of sparse array for protocol strings
        ata: sata_mv: Convert to devm_ioremap_resource()
        ...
      79f4d1d5
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-4.11-rc1' of git://git.infradead.org/users/vkoul/slave-dma · 97a229f9
      Linus Torvalds authored
      Pull dmaengine updates from Vinod Koul:
       "This time we fairly boring and bit small update.
      
         - Support for Intel iDMA 32-bit hardware
         - deprecate broken support for channel switching in async_tx
         - bunch of updates on stm32-dma
         - Cyclic support for zx dma and making in generic zx dma driver
         - Small updates to bunch of other drivers"
      
      * tag 'dmaengine-4.11-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (29 commits)
        async_tx: deprecate broken support for channel switching
        dmaengine: rcar-dmac: Widen DMA mask to 40 bits
        dmaengine: sun6i: allow build on ARM64 platforms (sun50i)
        dmaengine: Provide a wrapper for memcpy operations
        dmaengine: zx: fix build warning
        dmaengine: dw: we do support Merrifield SoC in PCI mode
        dmaengine: dw: add support of iDMA 32-bit hardware
        dmaengine: dw: introduce register mappings for iDMA 32-bit
        dmaengine: dw: introduce block2bytes() and bytes2block()
        dmaengine: dw: extract dwc_chan_pause() for future use
        dmaengine: dw: replace convert_burst() with one liner
        dmaengine: dw: register IRQ and DMA pool with instance ID
        dmaengine: dw: Fix data corruption in large device to memory transfers
        dmaengine: ste_dma40: indicate granularity on channels
        dmaengine: ste_dma40: indicate directions on channels
        dmaengine: stm32-dma: Add error messages if xlate fails
        dmaengine: dw: pci: remove LPE Audio DMA ID
        dmaengine: stm32-dma: Add max_burst support
        dmaengine: stm32-dma: Add synchronization support
        dmaengine: stm32-dma: Fix residue computation issue in cyclic mode
        ...
      97a229f9
    • Linus Torvalds's avatar
      Merge tag 'media/v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · ff58d005
      Linus Torvalds authored
      Pull media updates from Mauro Carvalho Chehab:
      
       - new drivers:
             - i.MX6 Video Data Order Adapter's (VDOA)
             - Toshiba et8ek8 5MP sensor
             - STM DELTA multi-format video decoder V4L2 driver
             - SPI connected IR LED
             - Mediatek IR remote receiver
             - ZyDAS ZD1301 DVB USB interface driver
      
       - new RC keymaps
      
       - some very old LIRC drivers got removed from staging
      
       - RC core gained support encoding IR scan codes
      
       - DVB si2168 gained support for DVBv5 statistics
      
       - lirc_sir driver ported to rc-core and promoted from staging
      
       - other bug fixes, board additions and driver improvements
      
      * tag 'media/v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (230 commits)
        [media] mtk-vcodec: fix build warnings without DEBUG
        [media] zd1301: fix building interface driver without demodulator
        [media] usbtv: add sharpness control
        [media] cxusb: Use a dma capable buffer also for reading
        [media] ttpci: address stringop overflow warning
        [media] dvb-usb-v2: avoid use-after-free
        [media] add Hama Hybrid DVB-T Stick support
        [media] et8ek8: Fix compiler / Coccinelle warnings
        [media] media: fix semicolon.cocci warnings
        [media] media: exynos4-is: add flags to dummy Exynos IS i2c adapter
        [media] v4l: of: check for unique lanes in data-lanes and clock-lanes
        [media] coda/imx-vdoa: constify structs
        [media] st-delta: debug: trace stream/frame information & summary
        [media] st-delta: add mjpeg support
        [media] st-delta: EOS (End Of Stream) support
        [media] st-delta: rpmsg ipc support
        [media] st-delta: add memory allocator helper functions
        [media] st-delta: STiH4xx multi-format video decoder v4l2 driver
        [media] MAINTAINERS: add st-delta driver
        [media] ARM: multi_v7_defconfig: enable STMicroelectronics DELTA Support
        ...
      ff58d005
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 5ab35662
      Linus Torvalds authored
      Pull pin control updates from Linus Walleij:
       "Pin control bulk changes for the v4.11 kernel cycle.
      
        Core changes:
      
         - Switch the generic pin config argument from 16 to 24 bits, only use
           8 bits for the configuration type. We might need to encode more
           information about a certain setting than we need to encode
           different generic settings.
      
         - Add a cross-talk API to the pin control GPIO back-end, utilizing
           pinctrl_gpio_set_config() from GPIO drivers that want to set up a
           certain pin configuration in the back-end.
      
           This also includes the .set_config() refactoring of the GPIO chips,
           so that they pass a generic configuration for things like
           debouncing and single ended (typically open drain). This change has
           also been merged in an immutable branch to the GPIO tree.
      
         - Take hogs with a delayed work, so that we finalize probing a pin
           controller before trying to get any hogs.
      
         - For pin controllers putting all group and function definitions into
           the device tree, we now have generic code to deal with this and it
           is used in two drivers so far.
      
         - Simplifications of the pin request conflict check.
      
         - Make dt_free_map() optional.
      
        Updates to drivers:
      
         - pinctrl-single now use the generic helpers to generate dynamic
           group and function tables from the device tree.
      
         - Texas Instruments IOdelay configuration driver add-on to
           pinctrl-single.
      
         - i.MX: use radix trees to store groups and functions, use the new
           generic group and function helpers to manage them.
      
         - Intel: add support for hardware debouncing and 1K pull-down. New
           subdriver for the Gemini Lake SoC.
      
         - Renesas SH-PFC: drive strength and bias support, CAN bus muxing,
           MSIOF, SDHI, HSCIF for r8a7796. Gyro-ADC supporton r8a7791.
      
         - Aspeed: use syscon cross-dependencies to set up related bits in the
           LPC host controller and display controller.
      
         - Aspeed: finalize G4 and G5 support. Fix mux configuration on GPIOs.
           Add banks Y, Z, AA, AB and AC.
      
         - AMD: support additional GPIO.
      
         - STM32: set this controller to strict muxing mode. STM32H743 MCU
           support.
      
         - Allwinner sunxi: deep simplifications on how to support subvariants
           of SoCs without adding to much SoC-specific data for each
           subvariant, especially for sun5i variants. New driver for V3s SoCs.
           New driver for the H5 SoC. Support A31/A31s variants with the new
           variant framework.
      
         - Mvebu: simplifications to use a MMIO and regmap abstraction. New
           subdrivers for the 98DX3236, 98DX5241 SoCs.
      
         - Samsung Exynos: delete Exynos4415 support. Add crosstalk to the SoC
           driver to access regmaps. Add infrastructure for pin-bank retention
           control. Clean out the pin retention control from
           arch/arm/mach-exynos and arch/arm/mach-s5p and put it properly in
           the Samsung pin control driver(s).
      
         - Meson: add HDMI HPD/DDC pins. Add pwm_ao_b pin.
      
         - Qualcomm: use raw spinlock variants: this makes the qualcomm driver
           realtime-safe"
      
      * tag 'pinctrl-v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (111 commits)
        pinctrl: samsung: Fix return value check in samsung_pinctrl_get_soc_data()
        pinctrl: intel: unlock on error in intel_config_set_pull()
        pinctrl: berlin: make bool drivers explicitly non-modular
        pinctrl: spear: make bool drivers explicitly non-modular
        pinctrl: mvebu: make bool drivers explicitly non-modular
        pinctrl: sunxi: make sun5i explicitly non-modular
        pinctrl: sunxi: Remove stray printk call in sun5i driver's probe function
        pinctrl: samsung: mark PM functions as __maybe_unused
        pinctrl: sunxi: Remove redundant A31s pinctrl driver
        pinctrl: sunxi: Support A31/A31s with pinctrl variants
        pinctrl: Amend bindings for STM32 pinctrl
        pinctrl: Add STM32 pinctrl driver DT bindings
        pinctrl: stm32: Add STM32H743 MCU support
        include: dt-bindings: Add STM32H7 pinctrl DT defines
        gpio: aspeed: Remove dependence on GPIOF_* macros
        pinctrl: stm32: fix bad location of gpiochip_lock_as_irq
        drivers: pinctrl: add driver for Allwinner H5 SoC
        pinctrl: intel: Add Intel Gemini Lake pin controller support
        pinctrl: intel: Add support for 1k additional pull-down
        pinctrl: intel: Add support for hardware debouncer
        ...
      5ab35662
    • Jiri Kosina's avatar
      HID: rmi: fallback to generic/multitouch if hid-rmi is not built · 2fa299a9
      Jiri Kosina authored
      Commit 279967a6 ("HID: rmi: Handle all Synaptics touchpads using hid-rmi")
      unconditionally switches over handling of all Synaptics touchpads to hid-rmi
      (to make use of extended features of the HW); in case CONFIG_HID_RMI is
      disabled though this renders the touchpad unusable, as the
      
      	HID_DEVICE(HID_BUS_ANY, HID_GROUP_RMI, HID_ANY_ID, HID_ANY_ID)
      
      match doesn't exist and generic/multitouch doesn't bind to it either (due
      to hid group mismatch).
      
      Fix this by switching over to hid-rmi only if it has been actually built.
      
      Fixes: 279967a6 ("HID: rmi: Handle all Synaptics touchpads using hid-rmi")
      Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Acked-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
      Tested-by: default avatarAndrew Duggan <aduggan@synaptics.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      2fa299a9
  2. 21 Feb, 2017 27 commits
    • Linus Torvalds's avatar
      Merge tag 'extable-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux · 6d1c42d9
      Linus Torvalds authored
      Pull exception table module split from Paul Gortmaker:
       "Final extable.h related changes.
      
        This completes the separation of exception table content from the
        module.h header file. This is achieved with the final commit that
        removes the one line back compatible change that sourced extable.h
        into the module.h file.
      
        The commits are unchanged since January, with the exception of a
        couple Acks that came in for the last two commits a bit later. The
        changes have been in linux-next for quite some time[1] and have got
        widespread arch coverage via toolchains I have and also from
        additional ones the kbuild bot has.
      
        Maintaners of the various arch were Cc'd during the postings to
        lkml[2] and informed that the intention was to take the remaining arch
        specific changes and lump them together with the final two non-arch
        specific changes and submit for this merge window.
      
        The ia64 diffstat stands out and probably warrants a mention. In an
        earlier review, Al Viro made a valid comment that the original header
        separation of content left something to be desired, and that it get
        fixed as a part of this change, hence the larger diffstat"
      
      * tag 'extable-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (21 commits)
        module.h: remove extable.h include now users have migrated
        core: migrate exception table users off module.h and onto extable.h
        cris: migrate exception table users off module.h and onto extable.h
        hexagon: migrate exception table users off module.h and onto extable.h
        microblaze: migrate exception table users off module.h and onto extable.h
        unicore32: migrate exception table users off module.h and onto extable.h
        score: migrate exception table users off module.h and onto extable.h
        metag: migrate exception table users off module.h and onto extable.h
        arc: migrate exception table users off module.h and onto extable.h
        nios2: migrate exception table users off module.h and onto extable.h
        sparc: migrate exception table users onto extable.h
        openrisc: migrate exception table users off module.h and onto extable.h
        frv: migrate exception table users off module.h and onto extable.h
        sh: migrate exception table users off module.h and onto extable.h
        xtensa: migrate exception table users off module.h and onto extable.h
        mn10300: migrate exception table users off module.h and onto extable.h
        alpha: migrate exception table users off module.h and onto extable.h
        arm: migrate exception table users off module.h and onto extable.h
        m32r: migrate exception table users off module.h and onto extable.h
        ia64: ensure exception table search users include extable.h
        ...
      6d1c42d9
    • Linus Torvalds's avatar
      Merge tag 'mips_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips · 0f002fdd
      Linus Torvalds authored
      Pull MIPS updates from James Hogan:
       "Here's the main MIPS pull request for 4.11.
      
        It contains a few new features such as IRQ stacks, cacheinfo support,
        and KASLR for Octeon CPUs, and a variety of smaller improvements and
        fixes including devicetree additions, kexec cleanups, microMIPS stack
        unwinding fixes, and a bunch of build fixes to clean up continuous
        integration builds.
      
        Its all been in linux-next for at least a couple of days, most of it
        far longer.
      
        Miscellaneous:
         - Add IRQ stacks
         - Add cacheinfo support
         - Add "uzImage.bin" zboot target
         - Unify performance counter definitions
         - Export various (mainly assembly) symbols alongside their
           definitions
         - Audit and remove unnecessary uses of module.h
      
        kexec & kdump:
         - Lots of improvements and fixes
         - Add correct copy_regs implementations
         - Add debug logging of new kernel information
      
        Security:
         - Use Makefile.postlink to insert relocations into vmlinux
         - Provide plat_post_relocation hook (used for Octeon KASLR)
         - Add support for tuning mmap randomisation
         - Relocate DTB
      
        microMIPS:
         - A load of unwind fixes
         - Add some missing .insn to fix link errors
      
        MIPSr6:
         - Fix MULTU/MADDU/MSUBU sign extension in r2 emulation
         - Remove r2_emul_return and use ERETNC unconditionally on MIPSr6
         - Allow pre-r6 emulation on SMP MIPSr6 kernels
      
        Cache management:
         - Treat physically indexed dcache as non-aliasing
         - Add return errors to protected cache ops for KVM
         - CM3: Ensure L1 & L2 cache ECC checking matches
         - CM3: Indicate inclusive caches
         - I6400: Treat dcache as physically indexed
      
        Memory management:
         - Ensure bootmem doesn't corrupt reserved memory
         - Export some TLB exception generation functions for KVM
      
        OF:
         - NULL check initial_boot_params before use in of_scan_flat_dt()
         - Fix unaligned access in of_alias_scan()
      
        SMP:
         - CPS: Don't BUG if a CPU fails to start
      
        Other fixes:
         - Fix longstanding 64-bit IP checksum carry bug
         - Fix KERN_CONT fallout in cpu-bugs64.c and sync-r4k.c
         - Update defconfigs for NF_CT_PROTO_DCCP, DPLITE,
           CPU_FREQ_STAT,SCSI_DH changes
         - Disable certain builtin compiler options, stack-check (whole
           kernel), asynchronous-unwind-tables (VDSO).
         - A bunch of build fixes from kernelci.org testing
         - Various other minor cleanups & corrections
      
        BMIPS:
         - Migrate interrupts during bmips_cpu_disable
         - BCM47xx: Add Luxul devices
         - BCM47xx: Fix Asus WL-500W button inversion
         - BCM7xxx: Add SPI device nodes
      
        Generic (multiplatform):
         - Add kexec DTB passing
         - Fix big endian
         - Add cpp_its_S in ksym_dep_filter to silence build warning
      
        IP22:
         - Reformat inline assembler code to modern standards
         - Fix binutils 2.25 build error
      
        IP27:
         - Fix duplicate CAC_BASE definition build error
         - Disable qlge driver to workaround broken compiler
      
        Lantiq:
         - Refresh defconfig and activate more drivers
         - Lock DMA register access
         - Fix cascading IRQ setup
         - Fix build of VPE loader
         - xway: Fix ethernet packet header corruption over reboot
      
        Loongson1
         - Add watchdog support
         - 1B: Reduce DEFAULT_MEMSIZE to 64MB
         - 1B: Change OSC clock name to match rest of kernel
         - 1C: Remove ARCH_WANT_OPTIONAL_GPIOLIB
      
        Octeon:
         - Add KASLR support
         - Support Octeon III USB controller
         - Fix large copy_from_user corner case
         - Enable devtmpfs in defconfig
      
        Netlogic:
         - Fix non-default XLR build error due to netlogic,xlp-pic code
         - Fix assembler warning from smpboot.S
      
        pic32mzda:
         - Fix linker error when early printk is disabled
      
        Pistachio:
         - Add base device tree
         - Add Ci40 "Marduk" device tree
      
        Ralink:
         - Support raw appended DTB
         - Add missing I2C & I2S clocks
         - Add missing pinmux and fix pinmux function name typo
         - Add missing clk_round_rate()
         - Clean up prom_init()
         - MT7621: Set SoC type
         - MT7621: Support highmem
      
        TXx9:
         - Modernize printing of kernel messages and resolve KERN_CONT fallout
         - 7segled: use permission-specific DEVICE_ATTR variants
      
        XilFPGA:
         - Add IRQ controller and UART IRQ
         - Add AXI I2C and emaclite to DT & defconfig"
      
      * tag 'mips_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips: (148 commits)
        MIPS: VDSO: Explicitly use -fno-asynchronous-unwind-tables
        MIPS: BCM47XX: Fix button inversion for Asus WL-500W
        MIPS: DTS: Add img directory to Makefile
        MIPS: ip27: Disable qlge driver in defconfig
        MIPS: pic32mzda: Fix linker error for pic32_get_pbclk()
        MIPS: Lantiq: Keep ethernet enabled during boot
        MIPS: OCTEON: Fix copy_from_user fault handling for large buffers
        MIPS: Fix special case in 64 bit IP checksumming.
        MIPS: OCTEON: Enable DEVTMPFS
        MIPS: lantiq: Set physical_memsize
        MIPS: sysmips: Remove duplicated include from syscall.c
        Kbuild: Add cpp_its_S in ksym_dep_filter
        MIPS: Audit and remove any unnecessary uses of module.h
        MIPS: Unify perf counter register definitions
        MIPS: Disable stack checks on MIPS kernels
        MIPS: OCTEON: Platform support for OCTEON III USB controller
        MIPS: Lantiq: Fix cascaded IRQ setup
        MIPS: sync-r4k: Fix KERN_CONT fallout
        MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch
        MIPS: Fix distclean with Makefile.postlink
        ...
      0f002fdd
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.11-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 252b95c0
      Linus Torvalds authored
      Pull xen updates from Juergen Gross:
       "Xen features and fixes:
      
         - a series from Boris Ostrovsky adding support for booting Linux as
           Xen PVH guest
      
         - a series from Juergen Gross streamlining the xenbus driver
      
         - a series from Paul Durrant adding support for the new device model
           hypercall
      
         - several small corrections"
      
      * tag 'for-linus-4.11-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen/privcmd: add IOCTL_PRIVCMD_RESTRICT
        xen/privcmd: Add IOCTL_PRIVCMD_DM_OP
        xen/privcmd: return -ENOTTY for unimplemented IOCTLs
        xen: optimize xenbus driver for multiple concurrent xenstore accesses
        xen: modify xenstore watch event interface
        xen: clean up xenbus internal headers
        xenbus: Neaten xenbus_va_dev_error
        xen/pvh: Use Xen's emergency_restart op for PVH guests
        xen/pvh: Enable CPU hotplug
        xen/pvh: PVH guests always have PV devices
        xen/pvh: Initialize grant table for PVH guests
        xen/pvh: Make sure we don't use ACPI_IRQ_MODEL_PIC for SCI
        xen/pvh: Bootstrap PVH guest
        xen/pvh: Import PVH-related Xen public interfaces
        xen/x86: Remove PVH support
        x86/boot/32: Convert the 32-bit pgtable setup code from assembly to C
        xen/manage: correct return value check on xenbus_scanf()
        x86/xen: Fix APIC id mismatch warning on Intel
        xen/netback: set default upper limit of tx/rx queues to 8
        xen/netfront: set default upper limit of tx/rx queues to 8
      252b95c0
    • Linus Torvalds's avatar
      Merge branch 'stable-4.11' of git://git.infradead.org/users/pcmoore/audit · b8989bcc
      Linus Torvalds authored
      Pull audit updates from Paul Moore:
       "The audit changes for v4.11 are relatively small compared to what we
        did for v4.10, both in terms of size and impact.
      
         - two patches from Steve tweak the formatting for some of the audit
           records to make them more consistent with other audit records.
      
         - three patches from Richard record the name of a module on module
           load, fix the logging of sockaddr information when using
           socketcall() on 32-bit systems, and add the ability to reset
           audit's lost record counter.
      
         - my lone patch just fixes an annoying style nit that I was reminded
           about by one of Richard's patches.
      
        All these patches pass our test suite"
      
      * 'stable-4.11' of git://git.infradead.org/users/pcmoore/audit:
        audit: remove unnecessary curly braces from switch/case statements
        audit: log module name on init_module
        audit: log 32-bit socketcalls
        audit: add feature audit_lost reset
        audit: Make AUDIT_ANOM_ABEND event normalized
        audit: Make AUDIT_KERNEL event conform to the specification
      b8989bcc
    • Kalle Valo's avatar
      Revert "ath10k: Search SMBIOS for OEM board file extension" · 005c3490
      Kalle Valo authored
      This reverts commit f2593cb1.
      
      Paul reported that this patch with older board-2.bin ath10k initialisation
      fails on Dell XPS 13:
      
      ath10k_pci 0000:3a:00.0: failed to fetch board data for bus=pci,vendor=168c,
      device=003e,subsystem-vendor=1a56,subsystem-device=1535,variant=RV_0520 from
      ath10k/QCA6174/hw3.0/board-2.bin
      
      The reason is that the older board-2.bin does not have the variant version of
      the image name and ath10k does not fallback to the older naming scheme.
      Reported-by: default avatarPaul Menzel <pmenzel@molgen.mpg.de>
      Link: https://bugzilla.kernel.org/show_bug.cgi?id=185621#c9
      Fixes: f2593cb1 ("ath10k: Search SMBIOS for OEM board file extension")
      Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      005c3490
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · c9341ee0
      Linus Torvalds authored
      Pull security layer updates from James Morris:
       "Highlights:
      
         - major AppArmor update: policy namespaces & lots of fixes
      
         - add /sys/kernel/security/lsm node for easy detection of loaded LSMs
      
         - SELinux cgroupfs labeling support
      
         - SELinux context mounts on tmpfs, ramfs, devpts within user
           namespaces
      
         - improved TPM 2.0 support"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (117 commits)
        tpm: declare tpm2_get_pcr_allocation() as static
        tpm: Fix expected number of response bytes of TPM1.2 PCR Extend
        tpm xen: drop unneeded chip variable
        tpm: fix misspelled "facilitate" in module parameter description
        tpm_tis: fix the error handling of init_tis()
        KEYS: Use memzero_explicit() for secret data
        KEYS: Fix an error code in request_master_key()
        sign-file: fix build error in sign-file.c with libressl
        selinux: allow changing labels for cgroupfs
        selinux: fix off-by-one in setprocattr
        tpm: silence an array overflow warning
        tpm: fix the type of owned field in cap_t
        tpm: add securityfs support for TPM 2.0 firmware event log
        tpm: enhance read_log_of() to support Physical TPM event log
        tpm: enhance TPM 2.0 PCR extend to support multiple banks
        tpm: implement TPM 2.0 capability to get active PCR banks
        tpm: fix RC value check in tpm2_seal_trusted
        tpm_tis: fix iTPM probe via probe_itpm() function
        tpm: Begin the process to deprecate user_read_timer
        tpm: remove tpm_read_index and tpm_write_index from tpm.h
        ...
      c9341ee0
    • Linus Torvalds's avatar
      Merge tag 'dm-4.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 7a771cea
      Linus Torvalds authored
      Pull device mapper updates from Mike Snitzer:
      
       - Fix dm-raid transient device failure processing and other smaller
         tweaks.
      
       - Add journal support to the DM raid target to close the 'write hole'
         on raid 4/5/6.
      
       - Fix dm-cache corruption, due to rounding bug, when cache exceeds 2TB.
      
       - Add 'metadata2' feature to dm-cache to separate the dirty bitset out
         from other cache metadata. This improves speed of shutting down a
         large cache device (which implies writing out dirty bits).
      
       - Fix a memory leak during dm-stats data structure destruction.
      
       - Fix a DM multipath round-robin path selector performance regression
         that was caused by less precise balancing across all paths.
      
       - Lastly, introduce a DM core fix for a long-standing DM snapshot
         deadlock that is rooted in the complexity of the device stack used in
         conjunction with block core maintaining bios on current->bio_list to
         manage recursion in generic_make_request(). A more comprehensive fix
         to block core (and its hook in the cpu scheduler) would be wonderful
         but this DM-specific fix is pragmatic considering how difficult it
         has been to make progress on a generic fix.
      
      * tag 'dm-4.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: (22 commits)
        dm: flush queued bios when process blocks to avoid deadlock
        dm round robin: revert "use percpu 'repeat_count' and 'current_path'"
        dm stats: fix a leaked s->histogram_boundaries array
        dm space map metadata: constify dm_space_map structures
        dm cache metadata: use cursor api in blocks_are_clean_separate_dirty()
        dm persistent data: add cursor skip functions to the cursor APIs
        dm cache metadata: use dm_bitset_new() to create the dirty bitset in format 2
        dm bitset: add dm_bitset_new()
        dm cache metadata: name the cache block that couldn't be loaded
        dm cache metadata: add "metadata2" feature
        dm cache metadata: use bitset cursor api to load discard bitset
        dm bitset: introduce cursor api
        dm btree: use GFP_NOFS in dm_btree_del()
        dm space map common: memcpy the disk root to ensure it's arch aligned
        dm block manager: add unlikely() annotations on dm_bufio error paths
        dm cache: fix corruption seen when using cache > 2TB
        dm raid: cleanup awkward branching in raid_message() option processing
        dm raid: use mddev rather than rdev->mddev
        dm raid: use read_disk_sb() throughout
        dm raid: add raid4/5/6 journaling support
        ...
      7a771cea
    • Linus Torvalds's avatar
      Merge tag 'mmc-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc · e67bd12d
      Linus Torvalds authored
      Pull MMC updates from Ulf Hansson:
       "MMC core:
         - Add support for Marvell SD8787 Wifi/BT chip
         - Improve UHS support for SDIO
         - Invent MMC_CAP_3_3V_DDR and a DT binding for eMMC DDR 3.3V mode
         - Detect Auto BKOPS enable bit
         - Export eMMC device lifetime information through sysfs
         - First take to slim down the public mmc headers to avoid abuse
         - Re-factoring of the mmc block device driver to prepare for blkmq
         - Cleanup code for the mmc block device driver
         - Clarify and cleanup code dealing with data requests
         - Cleanup some code by converting to ida_simple_ functions
         - Cleanup code dealing with card quirks
         - Cleanup private and public mmc header files
      
        MMC host:
         - Don't rely on public mmc headers to include non-mmc related headers
         - meson: Add support for eMMC HS400 mode
         - meson: Various cleanups and improvements
         - omap_hsmmc: Use the proper provided busy timeout from the core
         - sunxi: Enable new timings for the A64 MMC controllers
         - sunxi: Improvements for clock management
         - tmio: Improvements for SDIO interrupts
         - mxs-mmc: Add CMD23 support
         - sdhci-msm: Enable HS400 enhanced strobe mode support
         - sdhci-msm: Correct HS400 tuning sequence
         - sdhci-acpi: Support deferred probe
         - sdhci-pci: Add support for eMMC HS200 tuning mode on AMD
         - mediatek: Correct the implementation of card busy detection
         - dw_mmc: Initial support for ZX mmc controller
         - sh_mobile_sdhi: Enable support for eMMC HS200 mode
         - sh_mmcif: Various cleanups and improvements"
      
      * tag 'mmc-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (145 commits)
        mmc: core: add mmc prefix for blk_fixups
        mmc: core: move all quirks together into quirks.h
        mmc: core: improve the quirks for sdio devices
        mmc: core: move some sdio IDs out of quirks file
        mmc: core: change quirks.c to be a header file
        mmc: sdhci-cadence: fix bit shift of read data from PHY port
        mmc: Adding AUTO_BKOPS_EN bit set for Auto BKOPS support
        mmc: MAN_BKOPS_EN inverse debug message logic
        mmc: meson-gx: add support for HS400 mode
        mmc: meson-gx: remove unneeded checks in remove
        mmc: meson-gx: reduce bounce buffer size
        mmc: meson-gx: set max block count and request size
        mmc: meson-gx: improve interrupt handling
        mmc: meson-gx: improve meson_mmc_irq_thread
        mmc: meson-gx: improve meson_mmc_clk_set
        mmc: meson-gx: minor improvements in meson_mmc_set_ios
        mmc: meson: Assign the minimum clk rate as close to 400KHz as possible
        mmc: core: start to break apart mmc_start_areq()
        mmc: block: respect bool returned from blk_end_request()
        mmc: block: return errorcode from mmc_sd_num_wr_blocks()
        ...
      e67bd12d
    • Kees Cook's avatar
      usercopy: Add tests for all get_user() sizes · 4c5d7bc6
      Kees Cook authored
      The existing test was only exercising native unsigned long size
      get_user(). For completeness, we should check all sizes. But we
      must skip some 32-bit architectures that don't implement a 64-bit
      get_user().
      
      These new tests actually uncovered a bug in ARM's 64-bit get_user()
      zeroing.
      Signed-off-by: default avatarKees Cook <keescook@chromium.org>
      4c5d7bc6
    • Linus Torvalds's avatar
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · cdc19470
      Linus Torvalds authored
      Pull SCSI updates from James Bottomley:
       "This update includes the usual round of major driver updates (ncr5380,
        ufs, lpfc, be2iscsi, hisi_sas, storvsc, cxlflash, aacraid,
        megaraid_sas, ...).
      
        There's also an assortment of minor fixes and the major update of
        switching a bunch of drivers to pci_alloc_irq_vectors from Christoph"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (188 commits)
        scsi: megaraid_sas: handle dma_addr_t right on 32-bit
        scsi: megaraid_sas: array overflow in megasas_dump_frame()
        scsi: snic: switch to pci_irq_alloc_vectors
        scsi: megaraid_sas: driver version upgrade
        scsi: megaraid_sas: Change RAID_1_10_RMW_CMDS to RAID_1_PEER_CMDS and set value to 2
        scsi: megaraid_sas: Indentation and smatch warning fixes
        scsi: megaraid_sas: Cleanup VD_EXT_DEBUG and SPAN_DEBUG related debug prints
        scsi: megaraid_sas: Increase internal command pool
        scsi: megaraid_sas: Use synchronize_irq to wait for IRQs to complete
        scsi: megaraid_sas: Bail out the driver load if ld_list_query fails
        scsi: megaraid_sas: Change build_mpt_mfi_pass_thru to return void
        scsi: megaraid_sas: During OCR, if get_ctrl_info fails do not continue with OCR
        scsi: megaraid_sas: Do not set fp_possible if TM capable for non-RW syspdIO, change fp_possible to bool
        scsi: megaraid_sas: Remove unused pd_index from megasas_build_ld_nonrw_fusion
        scsi: megaraid_sas: megasas_return_cmd does not memset IO frame to zero
        scsi: megaraid_sas: max_fw_cmds are decremented twice, remove duplicate
        scsi: megaraid_sas: update can_queue only if the new value is less
        scsi: megaraid_sas: Change max_cmd from u32 to u16 in all functions
        scsi: megaraid_sas: set pd_after_lb from MR_BuildRaidContext and initialize pDevHandle to MR_DEVHANDLE_INVALID
        scsi: megaraid_sas: latest controller OCR capability from FW before sending shutdown DCMD
        ...
      cdc19470
    • Linus Torvalds's avatar
      Merge tag 'for-4.11/linus-merge-signed' of git://git.kernel.dk/linux-block · 772c8f6f
      Linus Torvalds authored
      Pull block layer updates from Jens Axboe:
      
       - blk-mq scheduling framework from me and Omar, with a port of the
         deadline scheduler for this framework. A port of BFQ from Paolo is in
         the works, and should be ready for 4.12.
      
       - Various fixups and improvements to the above scheduling framework
         from Omar, Paolo, Bart, me, others.
      
       - Cleanup of the exported sysfs blk-mq data into debugfs, from Omar.
         This allows us to export more information that helps debug hangs or
         performance issues, without cluttering or abusing the sysfs API.
      
       - Fixes for the sbitmap code, the scalable bitmap code that was
         migrated from blk-mq, from Omar.
      
       - Removal of the BLOCK_PC support in struct request, and refactoring of
         carrying SCSI payloads in the block layer. This cleans up the code
         nicely, and enables us to kill the SCSI specific parts of struct
         request, shrinking it down nicely. From Christoph mainly, with help
         from Hannes.
      
       - Support for ranged discard requests and discard merging, also from
         Christoph.
      
       - Support for OPAL in the block layer, and for NVMe as well. Mainly
         from Scott Bauer, with fixes/updates from various others folks.
      
       - Error code fixup for gdrom from Christophe.
      
       - cciss pci irq allocation cleanup from Christoph.
      
       - Making the cdrom device operations read only, from Kees Cook.
      
       - Fixes for duplicate bdi registrations and bdi/queue life time
         problems from Jan and Dan.
      
       - Set of fixes and updates for lightnvm, from Matias and Javier.
      
       - A few fixes for nbd from Josef, using idr to name devices and a
         workqueue deadlock fix on receive. Also marks Josef as the current
         maintainer of nbd.
      
       - Fix from Josef, overwriting queue settings when the number of
         hardware queues is updated for a blk-mq device.
      
       - NVMe fix from Keith, ensuring that we don't repeatedly mark and IO
         aborted, if we didn't end up aborting it.
      
       - SG gap merging fix from Ming Lei for block.
      
       - Loop fix also from Ming, fixing a race and crash between setting loop
         status and IO.
      
       - Two block race fixes from Tahsin, fixing request list iteration and
         fixing a race between device registration and udev device add
         notifiations.
      
       - Double free fix from cgroup writeback, from Tejun.
      
       - Another double free fix in blkcg, from Hou Tao.
      
       - Partition overflow fix for EFI from Alden Tondettar.
      
      * tag 'for-4.11/linus-merge-signed' of git://git.kernel.dk/linux-block: (156 commits)
        nvme: Check for Security send/recv support before issuing commands.
        block/sed-opal: allocate struct opal_dev dynamically
        block/sed-opal: tone down not supported warnings
        block: don't defer flushes on blk-mq + scheduling
        blk-mq-sched: ask scheduler for work, if we failed dispatching leftovers
        blk-mq: don't special case flush inserts for blk-mq-sched
        blk-mq-sched: don't add flushes to the head of requeue queue
        blk-mq: have blk_mq_dispatch_rq_list() return if we queued IO or not
        block: do not allow updates through sysfs until registration completes
        lightnvm: set default lun range when no luns are specified
        lightnvm: fix off-by-one error on target initialization
        Maintainers: Modify SED list from nvme to block
        Move stack parameters for sed_ioctl to prevent oversized stack with CONFIG_KASAN
        uapi: sed-opal fix IOW for activate lsp to use correct struct
        cdrom: Make device operations read-only
        elevator: fix loading wrong elevator type for blk-mq devices
        cciss: switch to pci_irq_alloc_vectors
        block/loop: fix race between I/O and set_status
        blk-mq-sched: don't hold queue_lock when calling exit_icq
        block: set make_request_fn manually in blk_mq_update_nr_hw_queues
        ...
      772c8f6f
    • Mark Brown's avatar
      sched/core: Fix build paravirt build on arm and arm64 · fd4a61e0
      Mark Brown authored
      Commit 004172bd ("sched/core: Remove unnecessary #include headers")
      removed the inclusion of asm/paravirt.h which is used to get
      declarations of paravirt_steal_rq_enabled and paravirt_steal_clock.
      
      It is implicitly included on x86 but not on arm and arm64 breaking the
      build if paravirtualization is used.  Since things from that header are
      used directly fix the build by putting the direct inclusion back.
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      fd4a61e0
    • Maxime Jayat's avatar
      net: socket: fix recvmmsg not returning error from sock_error · e623a9e9
      Maxime Jayat authored
      Commit 34b88a68 ("net: Fix use after free in the recvmmsg exit path"),
      changed the exit path of recvmmsg to always return the datagrams
      variable and modified the error paths to set the variable to the error
      code returned by recvmsg if necessary.
      
      However in the case sock_error returned an error, the error code was
      then ignored, and recvmmsg returned 0.
      
      Change the error path of recvmmsg to correctly return the error code
      of sock_error.
      
      The bug was triggered by using recvmmsg on a CAN interface which was
      not up. Linux 4.6 and later return 0 in this case while earlier
      releases returned -ENETDOWN.
      
      Fixes: 34b88a68 ("net: Fix use after free in the recvmmsg exit path")
      Signed-off-by: default avatarMaxime Jayat <maxime.jayat@mobile-devices.fr>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e623a9e9
    • Tobias Klauser's avatar
      bnxt_en: use eth_hw_addr_random() · 1faaa78f
      Tobias Klauser authored
      Use eth_hw_addr_random() to set a random MAC address in order to make
      sure bp->dev->addr_assign_type will be properly set to NET_ADDR_RANDOM.
      Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1faaa78f
    • David S. Miller's avatar
      Merge branch 'bpf-unlocking-fix' · d54fef31
      David S. Miller authored
      Daniel Borkmann says:
      
      ====================
      BPF fix with regards to unlocking
      
      This set fixes the issue Eric was reporting recently [1].
      First patch is a prerequisite discussed with Laura that is
      needed for the later fix in the second one. I've tested this
      extensively and it does not reproduce anymore on my side
      after the fix. Thanks & sorry about that!
      
        [1] https://www.spinics.net/lists/netdev/msg421877.html
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d54fef31
    • Daniel Borkmann's avatar
      bpf: fix unlocking of jited image when module ronx not set · 9d876e79
      Daniel Borkmann authored
      Eric and Willem reported that they recently saw random crashes when
      JIT was in use and bisected this to 74451e66 ("bpf: make jited
      programs visible in traces"). Issue was that the consolidation part
      added bpf_jit_binary_unlock_ro() that would unlock previously made
      read-only memory back to read-write. However, DEBUG_SET_MODULE_RONX
      cannot be used for this to test for presence of set_memory_*()
      functions. We need to use ARCH_HAS_SET_MEMORY instead to fix this;
      also add the corresponding bpf_jit_binary_lock_ro() to filter.h.
      
      Fixes: 74451e66 ("bpf: make jited programs visible in traces")
      Reported-by: default avatarEric Dumazet <edumazet@google.com>
      Reported-by: default avatarWillem de Bruijn <willemb@google.com>
      Bisected-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
      Tested-by: default avatarWillem de Bruijn <willemb@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9d876e79
    • Daniel Borkmann's avatar
      arch: add ARCH_HAS_SET_MEMORY config · d2852a22
      Daniel Borkmann authored
      Currently, there's no good way to test for the presence of
      set_memory_ro/rw/x/nx() helpers implemented by archs such as
      x86, arm, arm64 and s390.
      
      There's DEBUG_SET_MODULE_RONX and DEBUG_RODATA, however both
      don't really reflect that: set_memory_*() are also available
      even when DEBUG_SET_MODULE_RONX is turned off, and DEBUG_RODATA
      is set by parisc, but doesn't implement above functions. Thus,
      add ARCH_HAS_SET_MEMORY that is selected by mentioned archs,
      where generic code can test against this.
      
      This also allows later on to move DEBUG_SET_MODULE_RONX out of
      the arch specific Kconfig to define it only once depending on
      ARCH_HAS_SET_MEMORY.
      Suggested-by: default avatarLaura Abbott <labbott@redhat.com>
      Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d2852a22
    • Eric Dumazet's avatar
      net: napi_watchdog() can use napi_schedule_irqoff() · 559c59b2
      Eric Dumazet authored
      hrtimer handlers run with masked hard IRQ, we can therefore
      use napi_schedule_irqoff()
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      559c59b2
    • Eric Dumazet's avatar
      tcp: Revert "tcp: tcp_probe: use spin_lock_bh()" · 29869d66
      Eric Dumazet authored
      This reverts commit e70ac171.
      
      jtcp_rcv_established() is in fact called with hard irq being disabled.
      
      Initial bug report from Ricardo Nabinger Sanchez [1] still needs
      to be investigated, but does not look like a TCP bug.
      
      [1] https://www.spinics.net/lists/netdev/msg420960.htmlSigned-off-by: default avatarEric Dumazet <edumazet@google.com>
      Reported-by: default avatarkernel test robot <xiaolong.ye@intel.com>
      Cc: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      29869d66
    • Tobias Klauser's avatar
      net/hsr: use eth_hw_addr_random() · d4af4c0a
      Tobias Klauser authored
      Use eth_hw_addr_random() to set a random MAC address in order to make sure
      dev->addr_assign_type will be properly set to NET_ADDR_RANDOM.
      Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d4af4c0a
    • David S. Miller's avatar
      Merge branch 'mvpp2-next' · 32cc1bb3
      David S. Miller authored
      Thomas Petazzoni says:
      
      ====================
      net: mvpp2: misc improvements and preparation patches
      
      This series contains a number of fixes, misc improvements and
      preparation patches for an upcoming series that adds support for the
      new PPv2.2 network controller to the mvpp2 driver.
      
      The most significant improvements are:
      
       - Switching to using build_skb(), which is necessary for the upcoming
         PPv2.2 support, but anyway a good improvement to the current mvpp2
         driver (supporting PPv2.1).
      
       - Making the driver build on 64-bit platforms.
      
      Changes since v3:
      
       - Addition of a patch "net: mvpp2: fix DMA address calculation in
         mvpp2_txq_inc_put()", which fixes a bug in the driver in the
         calculation of DMA addresses. This bug was found using
         DMA_API_DEBUG.
      
       - Modify the "net: mvpp2: switch to build_skb() in the RX path" patch
         to recalculate the fragment size when the MTU is changed in
         mvpp2_bm_update_mtu().
      
       - Added Acked-by from Russell King on all patches, except:
      
          * "net: mvpp2: fix DMA address calculation in
            mvpp2_txq_inc_put()", because it's a new patch
      
          * "net: mvpp2: switch to build_skb() in the RX path" because I
            modified it since the v3.
      
       - Rebased on top of 4.10.
      
      Changes since v2:
      
       - Fix remaining 64-bit build warning, reported by David Miller.
      
       - Adjust how bit mask related definitions are done in "net: mvpp2:
         simplify MVPP2_PRS_RI_* definitions" according to Russell King
         suggestions.
      
       - Add a patch "net: mvpp2: remove useless arguments in
         mvpp2_rx_{pkts,time}_coal_set", suggested by Russell King.
      
       - Rework mvpp2_rx_time_coal_set() implementation to avoid overflows
         and rounding errors. I've used the implementation suggested by
         Russell King.
      
      Changes since v1:
      
       - This series is split as a separate series from the larger patch set
         adding support for PPv2.2 in the mvpp2 driver, as requested by
         David Miller.
      
       - Rebased on top of v4.10-rc1.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      32cc1bb3
    • Thomas Petazzoni's avatar
      net: mvpp2: enable building on 64-bit platforms · d3158807
      Thomas Petazzoni authored
      The mvpp2 is going to be extended to support the Marvell Armada 7K/8K
      platform, which is ARM64. As a preparation to this work, this commit
      enables building the mvpp2 driver on ARM64, by:
      
       - Adjusting the Kconfig dependency
      
       - Fixing the types used in the driver so that they are 32/64-bits
         compliant. We use dma_addr_t for DMA addresses, and unsigned long
         for virtual addresses.
      
      It is worth mentioning that after this commit, the driver is for now
      still only used on 32-bits platforms, and will only work on 32-bits
      platforms.
      Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d3158807
    • Thomas Petazzoni's avatar
      net: mvpp2: switch to build_skb() in the RX path · 0e037281
      Thomas Petazzoni authored
      This commit adapts the mvpp2 RX path to use the build_skb() method. Not
      only build_skb() is now the recommended mechanism, but it also
      simplifies the addition of support for the PPv2.2 variant.
      
      Indeed, without build_skb(), we have to keep track for each RX
      descriptor of the physical address of the packet buffer, and the virtual
      address of the SKB. However, in PPv2.2 running on 64 bits platform,
      there is not enough space in the descriptor to store the virtual address
      of the SKB. So having to take care only of the address of the packet
      buffer, and building the SKB upon reception helps in supporting PPv2.2.
      
      The implementation is fairly straightforward:
      
       - mvpp2_skb_alloc() is renamed to mvpp2_buf_alloc() and no longer
         allocates a SKB. Instead, it allocates a buffer using the new
         mvpp2_frag_alloc() function, with enough space for the data and SKB.
      
       - The initialization of the RX buffers in mvpp2_bm_bufs_add() as well
         as the refill of the RX buffers in mvpp2_rx_refill() is adjusted
         accordingly.
      
       - Finally, the mvpp2_rx() is modified to use build_skb().
      Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0e037281
    • Thomas Petazzoni's avatar
      net: mvpp2: simplify MVPP2_PRS_RI_* definitions · 8138affc
      Thomas Petazzoni authored
      Some of the MVPP2_PRS_RI_* definitions use the ~(value) syntax, which
      doesn't compile nicely on 64-bit. Moreover, those definitions are in
      fact unneeded, since they are always used in combination with a bit
      mask that ensures only the appropriate bits are modified.
      
      Therefore, such definitions should just be set to 0x0. In addition, as
      suggested by Russell King, we change the _MASK definitions to also use
      the BIT() macro so that it is clear they are related to the values
      defined afterwards.
      
      For example:
      
       #define MVPP2_PRS_RI_L2_CAST_MASK              0x600
       #define MVPP2_PRS_RI_L2_UCAST                  ~(BIT(9) | BIT(10))
       #define MVPP2_PRS_RI_L2_MCAST                  BIT(9)
       #define MVPP2_PRS_RI_L2_BCAST                  BIT(10)
      
      becomes
      
       #define MVPP2_PRS_RI_L2_CAST_MASK              (BIT(9) | BIT(10))
       #define MVPP2_PRS_RI_L2_UCAST                  0x0
       #define MVPP2_PRS_RI_L2_MCAST                  BIT(9)
       #define MVPP2_PRS_RI_L2_BCAST                  BIT(10)
      
      Because the values (MVPP2_PRS_RI_L2_UCAST, MVPP2_PRS_RI_L2_MCAST and
      MVPP2_PRS_RI_L2_BCAST) are always applied with
      MVPP2_PRS_RI_L2_CAST_MASK, and therefore there is no need for
      MVPP2_PRS_RI_L2_UCAST to be defined as ~(BIT(9) | BIT(10)).
      
      It fixes the following warnings when building the driver on a 64-bit
      platform (which is not possible as of this commit, but will be enabled
      in a follow-up commit):
      
      drivers/net/ethernet/marvell/mvpp2.c: In function ‘mvpp2_prs_mac_promisc_set’:
      drivers/net/ethernet/marvell/mvpp2.c:524:33: warning: large integer implicitly truncated to unsigned type [-Woverflow]
       #define MVPP2_PRS_RI_L2_UCAST   ~(BIT(9) | BIT(10))
                                       ^
      drivers/net/ethernet/marvell/mvpp2.c:1459:33: note: in expansion of macro ‘MVPP2_PRS_RI_L2_UCAST’
         mvpp2_prs_sram_ri_update(&pe, MVPP2_PRS_RI_L2_UCAST,
      Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8138affc
    • Thomas Petazzoni's avatar
    • Thomas Petazzoni's avatar
    • Thomas Petazzoni's avatar
      net: mvpp2: simplify mvpp2_bm_bufs_add() · 3eb2d998
      Thomas Petazzoni authored
      The mvpp2_bm_bufs_add() currently creates a fake cookie by calling
      mvpp2_bm_cookie_pool_set(), just to be able to call
      mvpp2_pool_refill(). But all what mvpp2_pool_refill() does is extract
      the pool ID from the cookie, and call mvpp2_bm_pool_put() with this ID.
      
      Instead of doing this convoluted thing, just call mvpp2_bm_pool_put()
      directly, since we have the BM pool ID.
      Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3eb2d998