1. 22 Aug, 2018 13 commits
  2. 21 Aug, 2018 4 commits
    • Linus Torvalds's avatar
      Merge tag 'please-pull-noboot' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 778a3395
      Linus Torvalds authored
      Pull ia64 NO_BOOTMEM conversion from Tony Luck:
       "Mike Rapoport kindly fixed up ia64 to work with NO_BOOTMEM"
      
      * tag 'please-pull-noboot' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        ia64: switch to NO_BOOTMEM
        ia64: use mem_data to detect nodes' minimal and maximal PFNs
        ia64: remove unused num_dma_physpages member from 'struct early_node_data'
        ia64: contig/paging_init: reduce code duplication
      778a3395
    • Linus Torvalds's avatar
      Merge tag 'linux-kselftest-4.19-rc1' of... · 6b2edf27
      Linus Torvalds authored
      Merge tag 'linux-kselftest-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull Kselftest update from Shuah Khan:
      
       - add cgroup core selftests
      
       - fix compile warnings in android ion test
      
       - fix to bugs in exclude and skip paths in vDSO test
      
       - remove obsolete config options
      
       - add missing .gitignore file
      
      * tag 'linux-kselftest-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        selftests/ftrace: Fix kprobe string testcase to not probe notrace function
        selftests: mount: remove no longer needed config option
        selftests: cgroup: add gitignore file
        Add cgroup core selftests
        selftests: vDSO - fix to return KSFT_SKIP when test couldn't be run
        selftests: vDSO - fix to exclude x86 test on non-x86 platforms
        selftests/android: initialize heap_type to avoid compiling warning
      6b2edf27
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 7140ad38
      Linus Torvalds authored
      Pull tracing updates from Steven Rostedt:
      
       - Restructure of lockdep and latency tracers
      
         This is the biggest change. Joel Fernandes restructured the hooks
         from irqs and preemption disabling and enabling. He got rid of a lot
         of the preprocessor #ifdef mess that they caused.
      
         He turned both lockdep and the latency tracers to use trace events
         inserted in the preempt/irqs disabling paths. But unfortunately,
         these started to cause issues in corner cases. Thus, parts of the
         code was reverted back to where lockdep and the latency tracers just
         get called directly (without using the trace events). But because the
         original change cleaned up the code very nicely we kept that, as well
         as the trace events for preempt and irqs disabling, but they are
         limited to not being called in NMIs.
      
       - Have trace events use SRCU for "rcu idle" calls. This was required
         for the preempt/irqs off trace events. But it also had to not allow
         them to be called in NMI context. Waiting till Paul makes an NMI safe
         SRCU API.
      
       - New notrace SRCU API to allow trace events to use SRCU.
      
       - Addition of mcount-nop option support
      
       - SPDX headers replacing GPL templates.
      
       - Various other fixes and clean ups.
      
       - Some fixes are marked for stable, but were not fully tested before
         the merge window opened.
      
      * tag 'trace-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (44 commits)
        tracing: Fix SPDX format headers to use C++ style comments
        tracing: Add SPDX License format tags to tracing files
        tracing: Add SPDX License format to bpf_trace.c
        blktrace: Add SPDX License format header
        s390/ftrace: Add -mfentry and -mnop-mcount support
        tracing: Add -mcount-nop option support
        tracing: Avoid calling cc-option -mrecord-mcount for every Makefile
        tracing: Handle CC_FLAGS_FTRACE more accurately
        Uprobe: Additional argument arch_uprobe to uprobe_write_opcode()
        Uprobes: Simplify uprobe_register() body
        tracepoints: Free early tracepoints after RCU is initialized
        uprobes: Use synchronize_rcu() not synchronize_sched()
        tracing: Fix synchronizing to event changes with tracepoint_synchronize_unregister()
        ftrace: Remove unused pointer ftrace_swapper_pid
        tracing: More reverting of "tracing: Centralize preemptirq tracepoints and unify their usage"
        tracing/irqsoff: Handle preempt_count for different configs
        tracing: Partial revert of "tracing: Centralize preemptirq tracepoints and unify their usage"
        tracing: irqsoff: Account for additional preempt_disable
        trace: Use rcu_dereference_raw for hooks from trace-event subsystem
        tracing/kprobes: Fix within_notrace_func() to check only notrace functions
        ...
      7140ad38
    • Linus Torvalds's avatar
      Merge tag 'ceph-for-4.19-rc1' of git://github.com/ceph/ceph-client · 0a78ac4b
      Linus Torvalds authored
      Pull ceph updates from Ilya Dryomov:
       "The main things are support for cephx v2 authentication protocol and
        basic support for rbd images within namespaces (myself).
      
        Also included are y2038 conversion patches from Arnd, a pile of
        miscellaneous fixes from Chengguang and Zheng's feature bit
        infrastructure for the filesystem"
      
      * tag 'ceph-for-4.19-rc1' of git://github.com/ceph/ceph-client: (40 commits)
        ceph: don't drop message if it contains more data than expected
        ceph: support cephfs' own feature bits
        crush: fix using plain integer as NULL warning
        libceph: remove unnecessary non NULL check for request_key
        ceph: refactor error handling code in ceph_reserve_caps()
        ceph: refactor ceph_unreserve_caps()
        ceph: change to void return type for __do_request()
        ceph: compare fsc->max_file_size and inode->i_size for max file size limit
        ceph: add additional size check in ceph_setattr()
        ceph: add additional offset check in ceph_write_iter()
        ceph: add additional range check in ceph_fallocate()
        ceph: add new field max_file_size in ceph_fs_client
        libceph: weaken sizeof check in ceph_x_verify_authorizer_reply()
        libceph: check authorizer reply/challenge length before reading
        libceph: implement CEPHX_V2 calculation mode
        libceph: add authorizer challenge
        libceph: factor out encrypt_authorizer()
        libceph: factor out __ceph_x_decrypt()
        libceph: factor out __prepare_write_connect()
        libceph: store ceph_auth_handshake pointer in ceph_connection
        ...
      0a78ac4b
  3. 20 Aug, 2018 18 commits
    • Linus Torvalds's avatar
      Merge tag 'rtc-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · bfebeb16
      Linus Torvalds authored
      Pull RTC updates from Alexandre Belloni:
       "It is now possible to add custom sysfs attributes while avoiding a
        possible race condition. Unused code has been removed resulting in a
        nice reduction of the code base. And more drivers have been switched
        to SPDX by their maintainers.
      
       Summary:
      
        Subsystem:
         - new helpers to add custom sysfs attributes
         - struct rtc_task removal along with rtc_irq_[un]register()
         - rtc_irq_set_state and rtc_irq_set_freq are not exported anymore
      
        Drivers:
         - armada38x: reset after rtc power loss
         - ds1307: now supports m41t11
         - isl1208: now supports isl1219 and tamper detection
         - pcf2127: internal SRAM support"
      
      * tag 'rtc-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (34 commits)
        rtc: ds1307: simplify hwmon config
        rtc: s5m: Add SPDX license identifier
        rtc: maxim: Add SPDX license identifiers
        rtc: isl1219: add device tree documentation
        rtc: isl1208: set ev-evienb bit from device tree
        rtc: isl1208: Add "evdet" interrupt source for isl1219
        rtc: isl1208: add support for isl1219 with tamper detection
        rtc: sysfs: facilitate attribute add to rtc device
        rtc: remove struct rtc_task
        char: rtc: remove task handling
        rtc: pcf85063: preserve control register value between stop and start
        rtc: sh: remove unused variable rtc_dev
        rtc: unexport rtc_irq_set_*
        rtc: simplify rtc_irq_set_state/rtc_irq_set_freq
        rtc: remove irq_task and irq_task_lock
        rtc: remove rtc_irq_register/rtc_irq_unregister
        rtc: sh: remove dead code
        rtc: sa1100: don't set PIE frequency
        rtc: ds1307: support m41t11 variant
        rtc: ds1307: fix data pointer to m41t0
        ...
      bfebeb16
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching · 3933ec73
      Linus Torvalds authored
      Pull livepatching updates from Jiri Kosina:
       "Code cleanups from Kamalesh Babulal"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
        livepatch: Validate module/old func name length
        livepatch: Remove reliable stacktrace check in klp_try_switch_task()
      3933ec73
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 7a324b3f
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
      
       - touch_max detection improvements and quirk handling fixes in wacom
         driver from Jason Gerecke and Ping Cheng
      
       - Palm rejection from Dmitry Torokhov and _dial support from Benjamin
         Tissoires for hid-multitouch driver
      
       - Low voltage support for i2c-hid driver from Stephen Boyd
      
       - Guitar-Hero support from Nicolas Adenis-Lamarre
      
       - other assorted small fixes and device ID additions
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (40 commits)
        HID: intel_ish-hid: tx_buf memory leak on probe/remove
        HID: intel-ish-hid: Prevent loading of driver on Mehlow
        HID: cougar: Add support for the Cougar 500k Gaming Keyboard
        HID: cougar: make compare_device_paths reusable
        HID: intel-ish-hid: remove redundant variable num_frags
        HID: multitouch: handle palm for touchscreens
        HID: multitouch: touchscreens also use confidence reports
        HID: multitouch: report MT_TOOL_PALM for non-confident touches
        HID: microsoft: support the Surface Dial
        HID: core: do not upper bound the collection stack
        HID: input: enable Totem on the Dell Canvas 27
        HID: multitouch: remove one copy of values
        HID: multitouch: ditch mt_report_id
        HID: multitouch: store a per application quirks value
        HID: multitouch: Store per collection multitouch data
        HID: multitouch: make sure the static list of class is not changed
        input: add MT_TOOL_DIAL
        HID: elan: Add support for touchpad on the Toshiba Click Mini L9W
        HID: elan: Add USB-id for HP x2 10-n000nd touchpad
        HID: elan: Add a flag for selecting if the touchpad has a LED
        ...
      7a324b3f
    • Linus Torvalds's avatar
      Merge tag 'backlight-next-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight · 61c4fc1e
      Linus Torvalds authored
      Pull backlight updates from Lee Jones:
       "Core Framework:
         - Remove unused/obsolete code/comments
      
        New Functionality:
         - Allow less granular brightness specification for high-res PWMs; pwm_bl
         - Align brightness {inc,dec}rements with that perceived by the human-eye; pwm_bl
      
        Fix-ups:
         - Prepare for the introduction of -Wimplicit-fall-through; adp8860_bl
      
        Bug Fixes:
         - Fix uninitialised variable; pwm_bl"
      
      * tag 'backlight-next-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
        backlight: pwm_bl: Fix uninitialized variable
        backlight: adp8860: Mark expected switch fall-through
        backlight: Remove obsolete comment for ->state
        dt-bindings: pwm-backlight: Move brightness-levels to optional
        backlight: pwm_bl: Compute brightness of LED linearly to human eye
        dt-bindings: pwm-backlight: Add a num-interpolation-steps property
        backlight: pwm_bl: Linear interpolation between brightness-levels
      61c4fc1e
    • Linus Torvalds's avatar
      Merge tag 'mfd-next-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · 532c2b92
      Linus Torvalds authored
      Pull MFD updates from Lee Jones:
       "New Drivers:
         - Add Cirrus Logic Madera Codec (CS47L35, CS47L85 and CS47L90/91) driver
         - Add ChromeOS EC CEC driver
         - Add ROHM BD71837 PMIC driver
      
        New Device Support:
         - Add support for Dialog Semi DA9063L PMIC variant to DA9063
         - Add support for Intel Ice Lake to Intel-PLSS-PCI
         - Add support for X-Powers AXP806 to AXP20x
      
        New Functionality:
         - Add support for USB Charging to the ChromeOS Embedded Controller
         - Add support for HDMI CEC to the ChromeOS Embedded Controller
         - Add support for HDMI CEC to Intel HDMI
         - Add support for accessory detection to Madera devices
         - Allow individual pins to be configured via DT' wlf,csnaddr-pd
         - Provide legacy platform specific EEPROM/Watchdog commands; rave-sp
      
        Fix-upsL
         - Trivial renaming/spelling fixes; cros_ec, da9063-*
         - Convert to Managed Resources (devm_*); da9063-*, ti_am335x_tscadc
         - Transition to helper macros/functions; da9063-*
         - Constify; kempld-core
         - Improve error path/messages; wm8994-core
         - Disable IRQs locally instead of relying on USB subsystem; dln2
         - Remove unused code; rave-sp
         - New exports; sec-core
      
        Bug Fixes:
         - Fix possible false I2C transaction error; arizona-core
         - Fix declared memory area size; hi655x-pmic
         - Fix checksum type; rave-sp
         - Fix incorrect default serial port configuration: rave-sp
         - Fix incorrect coherent DMA mask for sub-devices; sm501"
      
      * tag 'mfd-next-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (60 commits)
        mfd: madera: Add register definitions for accessory detect
        mfd: sm501: Set coherent_dma_mask when creating subdevices
        mfd: bd71837: Devicetree bindings for ROHM BD71837 PMIC
        mfd: bd71837: Core driver for ROHM BD71837 PMIC
        media: platform: cros-ec-cec: Fix dependency on MFD_CROS_EC
        mfd: sec-core: Export OF module alias table
        mfd: as3722: Disable auto-power-on when AC OK
        mfd: axp20x: Support AXP806 in I2C mode
        mfd: axp20x: Add self-working mode support for AXP806
        dt-bindings: mfd: axp20x: Add "self-working" mode for AXP806
        mfd: wm8994: Allow to configure CS/ADDR Pulldown from dts
        mfd: wm8994: Allow to configure Speaker Mode Pullup from dts
        mfd: rave-sp: Emulate CMD_GET_STATUS on device that don't support it
        mfd: rave-sp: Add legacy watchdog ping command translation
        mfd: rave-sp: Add legacy EEPROM access command translation
        mfd: rave-sp: Initialize flow control and parity of the port
        mfd: rave-sp: Fix incorrectly specified checksum type
        mfd: rave-sp: Remove unused defines
        mfd: hi655x: Fix regmap area declared size for hi655x
        mfd: ti_am335x_tscadc: Fix struct clk memory leak
        ...
      532c2b92
    • Linus Torvalds's avatar
      Merge tag 'edac_fixes_for_4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 8786583d
      Linus Torvalds authored
      Pull EDAC fix from Borislav Petkov:
       "An urgent fix for a NULL ptr deref on machines with LRDDR4 DIMMs, from
        Takashi Iwai"
      
      * tag 'edac_fixes_for_4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        EDAC: Add missing MEM_LRDDR4 entry in edac_mem_types[]
      8786583d
    • Joe Perches's avatar
      Raise the minimum required gcc version to 4.6 · cafa0010
      Joe Perches authored
      Various architectures fail to build properly with older versions of the
      gcc compiler.
      
      An example from Guenter Roeck in thread [1]:
      >
      >   In file included from ./include/linux/mm.h:17:0,
      >                    from ./include/linux/pid_namespace.h:7,
      >                    from ./include/linux/ptrace.h:10,
      >                    from arch/openrisc/kernel/asm-offsets.c:32:
      >   ./include/linux/mm_types.h:497:16: error: flexible array member in otherwise empty struct
      >
      > This is just an example with gcc 4.5.1 for or32. I have seen the problem
      > with gcc 4.4 (for unicore32) as well.
      
      So update the minimum required version of gcc to 4.6.
      
      [1] https://lore.kernel.org/lkml/20180814170904.GA12768@roeck-us.net/
      
      Miscellanea:
      
       - Update Documentation/process/changes.rst
      
       - Remove and consolidate version test blocks in compiler-gcc.h for
         versions lower than 4.6
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      Reviewed-by: default avatarKees Cook <keescook@chromium.org>
      Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      cafa0010
    • Tony Luck's avatar
      ia64: Fix kernel BUG at lib/ioremap.c:72! · cc26ebbe
      Tony Luck authored
      Commit 0bbf47ea ("ia64: use asm-generic/io.h") results in a BUG
      while booting ia64.  This is because asm-generic/io.h defines
      PCI_IOBASE, which results in the function acpi_pci_root_remap_iospace()
      doing a lot of unnecessary (and wrong) things.
      
      I'd suggested an #if !CONFIG_IA64 in the functon, but Arnd suggested
      keeping the fix inside the arch/ia64 tree.
      
      Fixes: 0bbf47ea ("ia64: use asm-generic/io.h")
      Suggested-by: default avatarArnd Bergman <arnd@arndb.de>
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      cc26ebbe
    • Jiri Kosina's avatar
      badf58a2
    • Jiri Kosina's avatar
      Merge branch 'for-4.19/wiimote' into for-linus · 1429b47b
      Jiri Kosina authored
      Guitar-Hero devices support for hid-wiimote
      1429b47b
    • Jiri Kosina's avatar
      Merge branch 'for-4.19/wacom' into for-linus · ffbeeaa4
      Jiri Kosina authored
      Wacom driver updates:
      
      - touch_max detection improvements
      - quirk handling cleanup
      - get rid of wacom custom usages
      ffbeeaa4
    • Jiri Kosina's avatar
      Merge branch 'for-4.19/upstream' into for-linus · a91ddf23
      Jiri Kosina authored
      Assorted small driver/core fixes.
      a91ddf23
    • Jiri Kosina's avatar
      Merge branch 'for-4.19/sony' into for-linus · 78a8ad79
      Jiri Kosina authored
      devm_* API conversion for hid-sony
      78a8ad79
    • Jiri Kosina's avatar
      Merge branch 'for-4.19/multitouch-multiaxis' into for-linus · 16501e84
      Jiri Kosina authored
      Multitouch updates:
      
      - Dial support
      - Palm rejection for touchscreens
      - a few small assorted fixes
      16501e84
    • Jiri Kosina's avatar
      Merge branch 'for-4.19/intel-ish' into for-linus · f5dd8071
      Jiri Kosina authored
      Device-specific fixes for hid-intel-ish
      f5dd8071
    • Jiri Kosina's avatar
      Merge branch 'for-4.19/i2c-hid' into for-linus · 4435b577
      Jiri Kosina authored
      Low voltage support for i2c-hid
      4435b577
    • Jiri Kosina's avatar
      Merge branch 'for-4.19/elan' into for-linus · 5a12d86c
      Jiri Kosina authored
      Resolution/pressure fixes and new device support for hid-elan
      5a12d86c
    • Jiri Kosina's avatar
      Merge branch 'for-4.19/cougar' into for-linus · 415d2b33
      Jiri Kosina authored
      New device support for hid-cougar
      415d2b33
  4. 19 Aug, 2018 5 commits
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 8fdd36d4
      Linus Torvalds authored
      Pull m68knommu updates from Greg Ungerer:
       "Only two changes.
      
        One cleans up warnings in the ColdFire DMA code, the other stubs out
        (with warnings) ColdFire clock api functions not normally used"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68knommu: Fix typos in Coldfire 5272 DMA debug code
        m68k: coldfire: Normalize clk API
      8fdd36d4
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 2ad0d526
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Fix races in IPVS, from Tan Hu.
      
       2) Missing unbind in matchall classifier, from Hangbin Liu.
      
       3) Missing act_ife action release, from Vlad Buslov.
      
       4) Cure lockdep splats in ila, from Cong Wang.
      
       5) veth queue leak on link delete, from Toshiaki Makita.
      
       6) Disable isdn's IIOCDBGVAR ioctl, it exposes kernel addresses. From
          Kees Cook.
      
       7) RCU usage fixup in XDP, from Tariq Toukan.
      
       8) Two TCP ULP fixes from Daniel Borkmann.
      
       9) r8169 needs REALTEK_PHY as a Kconfig dependency, from Heiner
          Kallweit.
      
      10) Always take tcf_lock with BH disabled, otherwise we can deadlock
          with rate estimator code paths. From Vlad Buslov.
      
      11) Don't use MSI-X on RTL8106e r8169 chips, they don't resume properly.
          From Jian-Hong Pan.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (41 commits)
        ip6_vti: fix creating fallback tunnel device for vti6
        ip_vti: fix a null pointer deferrence when create vti fallback tunnel
        r8169: don't use MSI-X on RTL8106e
        net: lan743x_ptp: convert to ktime_get_clocktai_ts64
        net: sched: always disable bh when taking tcf_lock
        ip6_vti: simplify stats handling in vti6_xmit
        bpf: fix redirect to map under tail calls
        r8169: add missing Kconfig dependency
        tools/bpf: fix bpf selftest test_cgroup_storage failure
        bpf, sockmap: fix sock_map_ctx_update_elem race with exist/noexist
        bpf, sockmap: fix map elem deletion race with smap_stop_sock
        bpf, sockmap: fix leakage of smap_psock_map_entry
        tcp, ulp: fix leftover icsk_ulp_ops preventing sock from reattach
        tcp, ulp: add alias for all ulp modules
        bpf: fix a rcu usage warning in bpf_prog_array_copy_core()
        samples/bpf: all XDP samples should unload xdp/bpf prog on SIGTERM
        net/xdp: Fix suspicious RCU usage warning
        net/mlx5e: Delete unneeded function argument
        Documentation: networking: ti-cpsw: correct cbs parameters for Eth1 100Mb
        isdn: Disable IIOCDBGVAR
        ...
      2ad0d526
    • Haishuang Yan's avatar
      ip6_vti: fix creating fallback tunnel device for vti6 · e2948e5a
      Haishuang Yan authored
      When set fb_tunnels_only_for_init_net to 1, don't create fallback tunnel
      device for vti6 when a new namespace is created.
      
      Tested:
      [root@builder2 ~]# modprobe ip6_tunnel
      [root@builder2 ~]# modprobe ip6_vti
      [root@builder2 ~]# echo 1 > /proc/sys/net/core/fb_tunnels_only_for_init_net
      [root@builder2 ~]# unshare -n
      [root@builder2 ~]# ip link
      1: lo: <LOOPBACK> mtu 65536 qdisc noop state DOWN mode DEFAULT group
      default qlen 1000
          link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
      Signed-off-by: default avatarHaishuang Yan <yanhaishuang@cmss.chinamobile.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e2948e5a
    • Haishuang Yan's avatar
      ip_vti: fix a null pointer deferrence when create vti fallback tunnel · cd1aa9c2
      Haishuang Yan authored
      After set fb_tunnels_only_for_init_net to 1, the itn->fb_tunnel_dev will
      be NULL and will cause following crash:
      
      [ 2742.849298] BUG: unable to handle kernel NULL pointer dereference at 0000000000000941
      [ 2742.851380] PGD 800000042c21a067 P4D 800000042c21a067 PUD 42aaed067 PMD 0
      [ 2742.852818] Oops: 0002 [#1] SMP PTI
      [ 2742.853570] CPU: 7 PID: 2484 Comm: unshare Kdump: loaded Not tainted 4.18.0-rc8+ #2
      [ 2742.855163] Hardware name: Fedora Project OpenStack Nova, BIOS seabios-1.7.5-11.el7 04/01/2014
      [ 2742.856970] RIP: 0010:vti_init_net+0x3a/0x50 [ip_vti]
      [ 2742.858034] Code: 90 83 c0 48 c7 c2 20 a1 83 c0 48 89 fb e8 6e 3b f6 ff 85 c0 75 22 8b 0d f4 19 00 00 48 8b 93 00 14 00 00 48 8b 14 ca 48 8b 12 <c6> 82 41 09 00 00 04 c6 82 38 09 00 00 45 5b c3 66 0f 1f 44 00 00
      [ 2742.861940] RSP: 0018:ffff9be28207fde0 EFLAGS: 00010246
      [ 2742.863044] RAX: 0000000000000000 RBX: ffff8a71ebed4980 RCX: 0000000000000013
      [ 2742.864540] RDX: 0000000000000000 RSI: 0000000000000013 RDI: ffff8a71ebed4980
      [ 2742.866020] RBP: ffff8a71ea717000 R08: ffffffffc083903c R09: ffff8a71ea717000
      [ 2742.867505] R10: 0000000000000000 R11: 0000000000000000 R12: ffff8a71ebed4980
      [ 2742.868987] R13: 0000000000000013 R14: ffff8a71ea5b49c0 R15: 0000000000000000
      [ 2742.870473] FS:  00007f02266c9740(0000) GS:ffff8a71ffdc0000(0000) knlGS:0000000000000000
      [ 2742.872143] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      [ 2742.873340] CR2: 0000000000000941 CR3: 000000042bc20006 CR4: 00000000001606e0
      [ 2742.874821] Call Trace:
      [ 2742.875358]  ops_init+0x38/0xf0
      [ 2742.876078]  setup_net+0xd9/0x1f0
      [ 2742.876789]  copy_net_ns+0xb7/0x130
      [ 2742.877538]  create_new_namespaces+0x11a/0x1d0
      [ 2742.878525]  unshare_nsproxy_namespaces+0x55/0xa0
      [ 2742.879526]  ksys_unshare+0x1a7/0x330
      [ 2742.880313]  __x64_sys_unshare+0xe/0x20
      [ 2742.881131]  do_syscall_64+0x5b/0x180
      [ 2742.881933]  entry_SYSCALL_64_after_hwframe+0x44/0xa9
      
      Reproduce:
      echo 1 > /proc/sys/net/core/fb_tunnels_only_for_init_net
      modprobe ip_vti
      unshare -n
      
      Fixes: 79134e6c ("net: do not create fallback tunnels for non-default namespaces")
      Cc: Eric Dumazet <edumazet@google.com>
      Signed-off-by: default avatarHaishuang Yan <yanhaishuang@cmss.chinamobile.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      cd1aa9c2
    • Jian-Hong Pan's avatar
      r8169: don't use MSI-X on RTL8106e · 7bb05b85
      Jian-Hong Pan authored
      Found the ethernet network on ASUS X441UAR doesn't come back on resume
      from suspend when using MSI-X.  The chip is RTL8106e - version 39.
      
      [   21.848357] libphy: r8169: probed
      [   21.848473] r8169 0000:02:00.0 eth0: RTL8106e, 0c:9d:92:32:67:b4, XID
      44900000, IRQ 127
      [   22.518860] r8169 0000:02:00.0 enp2s0: renamed from eth0
      [   29.458041] Generic PHY r8169-200:00: attached PHY driver [Generic
      PHY] (mii_bus:phy_addr=r8169-200:00, irq=IGNORE)
      [   63.227398] r8169 0000:02:00.0 enp2s0: Link is Up - 100Mbps/Full -
      flow control off
      [  124.514648] Generic PHY r8169-200:00: attached PHY driver [Generic
      PHY] (mii_bus:phy_addr=r8169-200:00, irq=IGNORE)
      
      Here is the ethernet controller in detail:
      
      02:00.0 Ethernet controller [0200]: Realtek Semiconductor Co., Ltd.
      RTL8101/2/6E PCI Express Fast/Gigabit Ethernet controller [10ec:8136]
      (rev 07)
      	Subsystem: ASUSTeK Computer Inc. RTL810xE PCI Express Fast
      Ethernet controller [1043:200f]
      	Flags: bus master, fast devsel, latency 0, IRQ 16
      	I/O ports at e000 [size=256]
      	Memory at ef100000 (64-bit, non-prefetchable) [size=4K]
      	Memory at e0000000 (64-bit, prefetchable) [size=16K]
      	Capabilities: <access denied>
      	Kernel driver in use: r8169
      	Kernel modules: r8169
      
      Falling back to MSI fixes the issue.
      
      Fixes: 6c6aa15f ("r8169: improve interrupt handling")
      Signed-off-by: default avatarJian-Hong Pan <jian-hong@endlessm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7bb05b85