1. 07 Feb, 2020 5 commits
    • Jakub Sitnicki's avatar
      selftests/bpf: Test freeing sockmap/sockhash with a socket in it · 5d3919a9
      Jakub Sitnicki authored
      Commit 7e81a353 ("bpf: Sockmap, ensure sock lock held during tear
      down") introduced sleeping issues inside RCU critical sections and while
      holding a spinlock on sockmap/sockhash tear-down. There has to be at least
      one socket in the map for the problem to surface.
      This adds a test that triggers the warnings for broken locking rules. Not a
      fix per se, but rather tooling to verify the accompanying fixes. Run on a
      VM with 1 vCPU to reproduce the warnings.
      Fixes: 7e81a353
       ("bpf: Sockmap, ensure sock lock held during tear down")
      Signed-off-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
      Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
      Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
      Link: https://lore.kernel.org/bpf/20200206111652.694507-4-jakub@cloudflare.com
    • Jakub Sitnicki's avatar
      bpf, sockhash: Synchronize_rcu before free'ing map · 0b2dc839
      Jakub Sitnicki authored
      We need to have a synchronize_rcu before free'ing the sockhash because any
      outstanding psock references will have a pointer to the map and when they
      use it, this could trigger a use after free.
      This is a sister fix for sockhash, following commit 2bb90e5c ("bpf:
      sockmap, synchronize_rcu before free'ing map") which addressed sockmap,
      which comes from a manual audit.
      Fixes: 604326b4
       ("bpf, sockmap: convert to generic sk_msg interface")
      Signed-off-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
      Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
      Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
      Link: https://lore.kernel.org/bpf/20200206111652.694507-3-jakub@cloudflare.com
    • Jakub Sitnicki's avatar
      bpf, sockmap: Don't sleep while holding RCU lock on tear-down · db6a5018
      Jakub Sitnicki authored
      rcu_read_lock is needed to protect access to psock inside sock_map_unref
      when tearing down the map. However, we can't afford to sleep in lock_sock
      while in RCU read-side critical section. Grab the RCU lock only after we
      have locked the socket.
      This fixes RCU warnings triggerable on a VM with 1 vCPU when free'ing a
      sockmap/sockhash that contains at least one socket:
      | =============================
      | WARNING: suspicious RCU usage
      | 5.5.0-04005-g8fc91b97 #450 Not tainted
      | -----------------------------
      | include/linux/rcupdate.h:272 Illegal context switch in RCU read-side critical section!
      | other info that might help us debug this:
      | rcu_scheduler_active = 2, debug_locks = 1
      | 4 locks held by kworker/0:1/62:
      |  #0: ffff88813b019748 ((wq_completion)events){+.+.}, at: process_one_work+0x1d7/0x5e0
      |  #1: ffffc900000abe50 ((work_completion)(&map->work)){+.+.}, at: process_one_work+0x1d7/0x5e0
      |  #2: ffffffff82065d20 (rcu_read_lock){....}, at: sock_map_free+0x5/0x170
      |  #3: ffff8881368c5df8 (&stab->lock){+...}, at: sock_map_free+0x64/0x170
      | stack backtrace:
      | CPU: 0 PID: 62 Comm: kworker/0:1 Not tainted 5.5.0-04005-g8fc91b97 #450
      | Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20190727_073836-buildvm-ppc64le-16.ppc.fedoraproject.org-3.fc31 04/01/2014
      | Workqueue: events bpf_map_free_deferred
      | Call Trace:
      |  dump_stack+0x71/0xa0
      |  ___might_sleep+0x105/0x190
      |  lock_sock_nested+0x28/0x90
      |  sock_map_free+0x95/0x170
      |  bpf_map_free_deferred+0x58/0x80
      |  process_one_work+0x260/0x5e0
      |  worker_thread+0x4d/0x3e0
      |  kthread+0x108/0x140
      |  ? process_one_work+0x5e0/0x5e0
      |  ? kthread_park+0x90/0x90
      |  ret_from_fork+0x3a/0x50
      | =============================
      | WARNING: suspicious RCU usage
      | 5.5.0-04005-g8fc91b97-dirty #452 Not tainted
      | -----------------------------
      | include/linux/rcupdate.h:272 Illegal context switch in RCU read-side critical section!
      | other info that might help us debug this:
      | rcu_scheduler_active = 2, debug_locks = 1
      | 4 locks held by kworker/0:1/62:
      |  #0: ffff88813b019748 ((wq_completion)events){+.+.}, at: process_one_work+0x1d7/0x5e0
      |  #1: ffffc900000abe50 ((work_completion)(&map->work)){+.+.}, at: process_one_work+0x1d7/0x5e0
      |  #2: ffffffff82065d20 (rcu_read_lock){....}, at: sock_hash_free+0x5/0x1d0
      |  #3: ffff888139966e00 (&htab->buckets[i].lock){+...}, at: sock_hash_free+0x92/0x1d0
      | stack backtrace:
      | CPU: 0 PID: 62 Comm: kworker/0:1 Not tainted 5.5.0-04005-g8fc91b97-dirty #452
      | Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20190727_073836-buildvm-ppc64le-16.ppc.fedoraproject.org-3.fc31 04/01/2014
      | Workqueue: events bpf_map_free_deferred
      | Call Trace:
      |  dump_stack+0x71/0xa0
      |  ___might_sleep+0x105/0x190
      |  lock_sock_nested+0x28/0x90
      |  sock_hash_free+0xec/0x1d0
      |  bpf_map_free_deferred+0x58/0x80
      |  process_one_work+0x260/0x5e0
      |  worker_thread+0x4d/0x3e0
      |  kthread+0x108/0x140
      |  ? process_one_work+0x5e0/0x5e0
      |  ? kthread_park+0x90/0x90
      |  ret_from_fork+0x3a/0x50
      Fixes: 7e81a353
       ("bpf: Sockmap, ensure sock lock held during tear down")
      Signed-off-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
      Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
      Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
      Link: https://lore.kernel.org/bpf/20200206111652.694507-2-jakub@cloudflare.com
    • Toke Høiland-Jørgensen's avatar
      bpftool: Don't crash on missing xlated program instructions · d95f1e8b
      Toke Høiland-Jørgensen authored
      Turns out the xlated program instructions can also be missing if
      kptr_restrict sysctl is set. This means that the previous fix to check the
      jited_prog_insns pointer was insufficient; add another check of the
      xlated_prog_insns pointer as well.
      Fixes: 5b79bcdf ("bpftool: Don't crash on missing jited insns or ksyms")
      Fixes: cae73f23
       ("bpftool: use bpf_program__get_prog_info_linear() in prog.c:do_dump()")
      Signed-off-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
      Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
      Reviewed-by: default avatarQuentin Monnet <quentin@isovalent.com>
      Link: https://lore.kernel.org/bpf/20200206102906.112551-1-toke@redhat.com
    • Lorenz Bauer's avatar
      bpf, sockmap: Check update requirements after locking · 85b8ac01
      Lorenz Bauer authored
      It's currently possible to insert sockets in unexpected states into
      a sockmap, due to a TOCTTOU when updating the map from a syscall.
      sock_map_update_elem checks that sk->sk_state == TCP_ESTABLISHED,
      locks the socket and then calls sock_map_update_common. At this
      point, the socket may have transitioned into another state, and
      the earlier assumptions don't hold anymore. Crucially, it's
      conceivable (though very unlikely) that a socket has become unhashed.
      This breaks the sockmap's assumption that it will get a callback
      via sk->sk_prot->unhash.
      Fix this by checking the (fixed) sk_type and sk_protocol without the
      lock, followed by a locked check of sk_state.
      Unfortunately it's not possible to push the check down into
      sock_(map|hash)_update_common, since BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB
      run before the socket has transitioned from TCP_SYN_RECV into
      Fixes: 604326b4
       ("bpf, sockmap: convert to generic sk_msg interface")
      Signed-off-by: default avatarLorenz Bauer <lmb@cloudflare.com>
      Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
      Reviewed-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
      Link: https://lore.kernel.org/bpf/20200207103713.28175-1-lmb@cloudflare.com
  2. 05 Feb, 2020 5 commits
  3. 03 Feb, 2020 3 commits
  4. 31 Jan, 2020 1 commit
  5. 29 Jan, 2020 14 commits
    • Martin KaFai Lau's avatar
      bpf: Reuse log from btf_prase_vmlinux() in btf_struct_ops_init() · d3e42bb0
      Martin KaFai Lau authored
      Instead of using a locally defined "struct bpf_verifier_log log = {}",
      btf_struct_ops_init() should reuse the "log" from its calling
      function "btf_parse_vmlinux()".  It should also resolve the
      frame-size too large compiler warning in some ARCH.
      Fixes: 27ae7997
       ("bpf: Introduce BPF_PROG_TYPE_STRUCT_OPS")
      Signed-off-by: default avatarMartin KaFai Lau <kafai@fb.com>
      Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
      Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
      Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
      Link: https://lore.kernel.org/bpf/20200127175145.1154438-1-kafai@fb.com
    • Lorenzo Bianconi's avatar
      net: mvneta: fix XDP support if sw bm is used as fallback · 44efc78d
      Lorenzo Bianconi authored
      In order to fix XDP support if sw buffer management is used as fallback
      for hw bm devices, define MVNETA_SKB_HEADROOM as maximum between
      XDP_PACKET_HEADROOM and NET_SKB_PAD and let the hw aligns the IP header
      to 4-byte boundary.
      Fix rx_offset_correction initialization if mvneta_bm_port_init fails in
      mvneta_resume routine
      Fixes: 0db51da7
       ("net: mvneta: add basic XDP support")
      Tested-by: default avatarSven Auhagen <sven.auhagen@voleatech.de>
      Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Joe Perches's avatar
      sch_choke: Use kvcalloc · 793da4bf
      Joe Perches authored
      Convert the use of kvmalloc_array with __GFP_ZERO to
      the equivalent kvcalloc.
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • David S. Miller's avatar
      mptcp: Fix build with PROC_FS disabled. · f6f7d8cf
      David S. Miller authored
      net/mptcp/subflow.c: In function ‘mptcp_subflow_create_socket’:
      net/mptcp/subflow.c:624:25: error: ‘struct netns_core’ has no member named ‘sock_inuse’
      Reported-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Randy Dunlap's avatar
      MAINTAINERS: mptcp@ mailing list is moderated · 74759e16
      Randy Dunlap authored
      Note that mptcp@lists.01.org is moderated, like we note for
      other mailing lists.
      Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Cc: Mat Martineau <mathew.j.martineau@linux.intel.com>
      Cc: Matthieu Baerts <matthieu.baerts@tessares.net>
      Cc: netdev@vger.kernel.org
      Cc: mptcp@lists.01.org
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    • Linus Torvalds's avatar
      Merge branch 'for-v5.6' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris/linux-security · b3a60822
      Linus Torvalds authored
      Pull security subsystem update from James Morris:
       "Just one minor fix this time"
      * 'for-v5.6' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris/linux-security:
        security: remove EARLY_LSM_COUNT which never used
    • Linus Torvalds's avatar
      Merge branch 'next-integrity' of... · 73a0bff2
      Linus Torvalds authored
      Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity
      Pull IMA updates from Mimi Zohar:
       "Two new features - measuring certificates and querying IMA for a file
        hash - and three bug fixes:
         - Measuring certificates is like the rest of IMA, based on policy,
           but requires loading a custom policy. Certificates loaded onto a
           keyring, for example during early boot, before a custom policy has
           been loaded, are queued and only processed after loading the custom
         - IMA calculates and caches files hashes. Other kernel subsystems,
           and possibly kernel modules, are interested in accessing these
           cached file hashes.
        The bug fixes prevent classifying a file short read (e.g. shutdown) as
        an invalid file signature, add a missing blank when displaying the
        securityfs policy rules containing LSM labels, and, lastly, fix the
        handling of the IMA policy information for unknown LSM labels"
      * 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
        IMA: Defined delayed workqueue to free the queued keys
        IMA: Call workqueue functions to measure queued keys
        IMA: Define workqueue for early boot key measurements
        IMA: pre-allocate buffer to hold keyrings string
        ima: ima/lsm policy rule loading logic bug fixes
        ima: add the ability to query the cached hash of a given file
        ima: Add a space after printing LSM rules for readability
        IMA: fix measuring asymmetric keys Kconfig
        IMA: Read keyrings= option from the IMA policy
        IMA: Add support to limit measuring keys
        KEYS: Call the IMA hook to measure keys
        IMA: Define an IMA hook to measure keys
        IMA: Add KEY_CHECK func to measure keys
        IMA: Check IMA policy flag
        ima: avoid appraise error for hash calc interrupt
    • Linus Torvalds's avatar
      Merge tag 'tomoyo-pr-20200128' of git://git.osdn.net/gitroot/tomoyo/tomoyo-test1 · 2cf64d7c
      Linus Torvalds authored
      Pull tomoyo update from Tetsuo Handa:
       "One 'int' -> 'atomic_t' conversion patch to suppress KCSAN's warning"
      * tag 'tomoyo-pr-20200128' of git://git.osdn.net/gitroot/tomoyo/tomoyo-test1:
        tomoyo: Use atomic_t for statistics counter
    • Linus Torvalds's avatar
      Merge tag 's390-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 740eaf7d
      Linus Torvalds authored
      Pull s390 updates from Vasily Gorbik:
       - Add clang 10 build support.
       - Fix BUG() implementation to contain precise bug address, which is
         relevant for kprobes.
       - Make ftraced function appear in a stacktrace.
       - Minor perf improvements and refactoring.
       - Possible deadlock and recovery fixes in pci code.
      * tag 's390-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390: fix __EMIT_BUG() macro
        s390/ftrace: generate traced function stack frame
        s390: adjust -mpacked-stack support check for clang 10
        s390/jump_label: use "i" constraint for clang
        s390/cpum_sf: Use DIV_ROUND_UP
        s390/cpum_sf: Use kzalloc and minor changes
        s390/cpum_sf: Convert debug trace to common layout
        s390/pci: Fix possible deadlock in recover_store()
        s390/pci: Recover handle in clp_set_pci_fn()
    • Linus Torvalds's avatar
      Merge tag 'for-linus-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · fad7bdc9
      Linus Torvalds authored
      Pull UML updates from Anton Ivanov:
       "I am sending this on behalf of Richard who is traveling.
        This contains the following changes for UML:
         - Fix for time travel mode
         - Disable CONFIG_CONSTRUCTORS again
         - A new command line option to have an non-raw serial line
         - Preparations to remove obsolete UML network drivers"
      * tag 'for-linus-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
        um: Fix time-travel=inf-cpu with xor/raid6
        Revert "um: Enable CONFIG_CONSTRUCTORS"
        um: Mark non-vector net transports as obsolete
        um: Add an option to make serial driver non-raw
    • Linus Torvalds's avatar
      Merge tag 'trace-v5.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · a78416d9
      Linus Torvalds authored
      Pull tracing fix from Steven Rostedt:
       "Kprobe events added 'ustring' to distinguish reading strings from
        kernel space or user space.
        But the creating of the event format file only checks for 'string' to
        display string formats. 'ustring' must also be handled"
      * tag 'trace-v5.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing/kprobes: Have uname use __get_str() in print_fmt
    • Linus Torvalds's avatar
      Merge tag 'thermal-v5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux · abb22e44
      Linus Torvalds authored
      Pull thermal updates from Daniel Lezcano:
       - Depromote debug print on the db8500 platform (Linus Walleij)
       - Fix compilation warning when compiling with make W=1 (Amit Kucheria)
       - Code cleanup and refactoring, regmap conversion and add hwmon support
         on Qoriq (Andrey Smirnov)
       - Add an idle injection cpu cooling device and its documentation,
         rename the cpu_cooling device to cpufreq_cooling device (Daniel
       - Convert unexported functions to static, add the __init annotation in
         the thermal-of code and remove the pointless wrapper functions
         (Daniel Lezcano)
       - Fix register offset for Armada XP and register reset bit
         initialization (Zak Hays)
       - Enable hwmon on the rockchip (Stefan Schaeckeler)
       - Add the thermal sensor for the H6/H5/H3/A64/A83T/R40 sun8i platform
         and their device tree bindings, followed by a fix for the ths number
         and the sparse warnings (Yangtao Li)
       - Code cleansup for the sun8i and hwmon support (Yangtao Li)
       - Silent some messages which are misleading given the changes made in
         the previous version on generic-adc (Martin Blumenstingl)
       - Rename exynos to Exynos (Krzysztof Kozlowski)
       - Add the bcm2711 thermal driver with the device tree bindings (Stefan
       - Use usleep_range() instead of udelay() as the call is always done in
         a sleep-able context (Geert Uytterhoeven)
       - Do code cleanup and re-organization to set the scene for a new
         process for the brcmstb (Florian Fainelli)
       - Fix bindings check issues on brcm (Stefan Wahren)
       - Add Jasper Lake support on int340x (Nivedita Swaminathan)
       - Add Comet Lake support on intel pch (Gayatri Kammela)
       - Fix unmatched pci_release_region() on x86 (Chuhong Yuan)
       - Remove temperature boundaries for rcar and rcar3 (Niklas Söderlund)
       - Fix return value to -ENODEV when thermal_zone_of_sensor_register() is
         called with the of-node is missing (Peter Mamonov)
       - Code cleanup, interrupt bouncing, and better support on stm32 (Pascal
      * tag 'thermal-v5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux: (66 commits)
        thermal: stm32: Fix low threshold interrupt flood
        thermal: stm32: Improve temperature computing
        thermal: stm32: Handle multiple trip points
        thermal: stm32: Disable interrupts at probe
        thermal: stm32: Rework sensor mode management
        thermal: stm32: Fix icifr register name
        thermal: of: Make thermal_zone_of_sensor_register return -ENODEV if a sensor OF node is missing
        thermal: rcar_gen3_thermal: Remove temperature bound
        thermal: rcar_thermal: Remove temperature bound
        thermal: intel: intel_pch_thermal: Add Comet Lake (CML) platform support
        thermal: intel: Fix unmatched pci_release_region
        thermal: int340x: processor_thermal: Add Jasper Lake support
        dt-bindings: brcm,avs-ro-thermal: Fix binding check issues
        thermal: brcmstb_thermal: Register different ops per process
        thermal: brcmstb_thermal: Restructure interrupt registration
        thermal: brcmstb_thermal: Add 16nm process thermal parameters
        dt-bindings: thermal: Define BCM7216 thermal sensor compatible
        thermal: brcmstb_thermal: Prepare to support a different process
        thermal: brcmstb_thermal: Do not use DT coefficients
        thermal: rcar_thermal: Use usleep_range() instead of udelay()
    • Linus Torvalds's avatar
      Merge tag 'sound-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · fb95aae6
      Linus Torvalds authored
      Pull sound updates from Takashi Iwai:
       "As the diffstat shows we've had again a lot of works done for this
        cycle: the majority of changes are the continued componentization and
        code refactoring in ASoC, the tree-wide PCM API updates and cleanups
        and SOF updates while a few ASoC driver updates are seen, too.
        Here we go, some highlights:
         - Finally y2038 support landed to ALSA ABI; some ioctls have been
           extended and lots of tricks were applied
         - Applying the new managed PCM buffer API to all drivers; the API
           itself was already merged in 5.5
         - The already deprecated dimension support in ALSA control API is
           dropped completely now
         - Verification of ALSA control elements to catch API misuses
         - Further code refactorings and moving things to the component level
         - Lots of updates and improvements on SOF / Intel drivers; now
           including common HDMI driver and SoundWire support
         - New driver support for Ingenic JZ4770, Mediatek MT6660, Qualcomm
           WCD934x and WSA881x, and Realtek RT700, RT711, RT715, RT1011,
           RT1015 and RT1308
         - Improved ring-buffer communications using waitqueue
         - Drop the superfluous buffer preallocation on x86
         - Many code cleanups, mostly constifications over the whole tree
         - USB-audio: quirks for MOTU, Corsair Virtuoso, Line6 Helix
         - FireWire: code refactoring for oxfw and dice drivers"
      * tag 'sound-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (638 commits)
        ALSA: usb-audio: add quirks for Line6 Helix devices fw>=2.82
        ALSA: hda: Add Clevo W65_67SB the power_save blacklist
        ASoC: soc-core: remove null_snd_soc_ops
        ASoC: soc-pcm: add soc_rtd_trigger()
        ASoC: soc-pcm: add soc_rtd_hw_free()
        ASoC: soc-pcm: add soc_rtd_hw_params()
        ASoC: soc-pcm: add soc_rtd_prepare()
        ASoC: soc-pcm: add soc_rtd_shutdown()
        ASoC: soc-pcm: add soc_rtd_startup()
        ASoC: rt1015: add rt1015 amplifier driver
        ASoC: madera: Correct some kernel doc
        ASoC: topology: fix soc_tplg_fe_link_create() - link->dobj initialization order
        ASoC: Intel: skl_hda_dsp_common: Fix global-out-of-bounds bug
        ASoC: madera: Correct DMIC only input hook ups
        ALSA: cs46xx: fix spelling mistake "to" -> "too"
        ALSA: hda - Add docking station support for Lenovo Thinkpad T420s
        ASoC: Add MediaTek MT6660 Speaker Amp Driver
        ASoC: dt-bindings: rt5645: add suppliers
        ASoC: max98090: fix deadlock in max98090_dapm_put_enum_double()
        ASoC: dapm: add snd_soc_dapm_put_enum_double_locked
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next · bd2463ac
      Linus Torvalds authored
      Pull networking updates from David Miller:
       1) Add WireGuard
       2) Add HE and TWT support to ath11k driver, from John Crispin.
       3) Add ESP in TCP encapsulation support, from Sabrina Dubroca.
       4) Add variable window congestion control to TIPC, from Jon Maloy.
       5) Add BCM84881 PHY driver, from Russell King.
       6) Start adding netlink support for ethtool operations, from Michal
       7) Add XDP drop and TX action support to ena driver, from Sameeh
       8) Add new ipv4 route notifications so that mlxsw driver does not have
          to handle identical routes itself. From Ido Schimmel.
       9) Add BPF dynamic program extensions, from Alexei Starovoitov.
      10) Support RX and TX timestamping in igc, from Vinicius Costa Gomes.
      11) Add support for macsec HW offloading, from Antoine Tenart.
      12) Add initial support for MPTCP protocol, from Christoph Paasch,
          Matthieu Baerts, Florian Westphal, Peter Krystad, and many others.
      13) Add Octeontx2 PF support, from Sunil Goutham, Geetha sowjanya, Linu
          Cherian, and others.
      * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (1469 commits)
        net: phy: add default ARCH_BCM_IPROC for MDIO_BCM_IPROC
        udp: segment looped gso packets correctly
        netem: change mailing list
        qed: FW debug features
        qed: rt init valid initialization changed
        qed: Debug feature: ilt and mdump
        qed: FW Add fw overlay feature
        qed: FW HSI changes
        qed: FW iscsi/fcoe changes
        qed: Add abstraction for different hsi values per chip
        qed: FW Additional ll2 type
        qed: Use dmae to write to widebus registers in fw_funcs
        qed: FW Parser offsets modified
        qed: FW Queue Manager changes
        qed: FW Expose new registers and change windows
        qed: FW Internal ram offsets modifications
        MAINTAINERS: Add entry for Marvell OcteonTX2 Physical Function driver
        Documentation: net: octeontx2: Add RVU HW and drivers overview
        octeontx2-pf: ethtool RSS config support
        octeontx2-pf: Add basic ethtool support
  6. 28 Jan, 2020 12 commits
    • Linus Torvalds's avatar
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · a78208e2
      Linus Torvalds authored
      Pull crypto updates from Herbert Xu:
         - Removed CRYPTO_TFM_RES flags
         - Extended spawn grabbing to all algorithm types
         - Moved hash descsize verification into API code
         - Fixed recursive pcrypt dead-lock
         - Added new 32 and 64-bit generic versions of poly1305
         - Added cryptogams implementation of x86/poly1305
         - Added support for i.MX8M Mini in caam
         - Added support for i.MX8M Nano in caam
         - Added support for i.MX8M Plus in caam
         - Added support for A33 variant of SS in sun4i-ss
         - Added TEE support for Raven Ridge in ccp
         - Added in-kernel API to submit TEE commands in ccp
         - Added AMD-TEE driver
         - Added support for BCM2711 in iproc-rng200
         - Added support for AES256-GCM based ciphers for chtls
         - Added aead support on SEC2 in hisilicon"
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (244 commits)
        crypto: arm/chacha - fix build failured when kernel mode NEON is disabled
        crypto: caam - add support for i.MX8M Plus
        crypto: x86/poly1305 - emit does base conversion itself
        crypto: hisilicon - fix spelling mistake "disgest" -> "digest"
        crypto: chacha20poly1305 - add back missing test vectors and test chunking
        crypto: x86/poly1305 - fix .gitignore typo
        tee: fix memory allocation failure checks on drv_data and amdtee
        crypto: ccree - erase unneeded inline funcs
        crypto: ccree - make cc_pm_put_suspend() void
        crypto: ccree - split overloaded usage of irq field
        crypto: ccree - fix PM race condition
        crypto: ccree - fix FDE descriptor sequence
        crypto: ccree - cc_do_send_request() is void func
        crypto: ccree - fix pm wrongful error reporting
        crypto: ccree - turn errors to debug msgs
        crypto: ccree - fix AEAD decrypt auth fail
        crypto: ccree - fix typo in comment
        crypto: ccree - fix typos in error msgs
        crypto: atmel-{aes,sha,tdes} - Retire crypto_platform_data
        crypto: x86/sha - Eliminate casts on asm implementations
    • Linus Torvalds's avatar
      Merge tag '5.6-smb3-fixes-and-dfs-and-readdir-improvements' of git://git.samba.org/sfrench/cifs-2.6 · 68353984
      Linus Torvalds authored
      Pull cifs updates from Steve French:
       "Various SMB3/CIFS fixes including four for stable.
         - Improvement to fallocate (enables 3 additional xfstests)
         - Fix for file creation when mounting with modefromsid
         - Add ability to backup/restore dos attributes and creation time
         - DFS failover and reconnect fixes
         - performance optimization for readir
        Note that due to the upcoming SMB3 Test Event (at SNIA SDC next week)
        there will likely be more changesets near the end of the merge window
        (since we will be testing heavily next week, I held off on some
        patches and I expect some additional multichannel patches as well as
        patches to enable some additional xfstests)"
      * tag '5.6-smb3-fixes-and-dfs-and-readdir-improvements' of git://git.samba.org/sfrench/cifs-2.6: (24 commits)
        CIFS: Fix task struct use-after-free on reconnect
        cifs: use PTR_ERR_OR_ZERO() to simplify code
        cifs: add support for fallocate mode 0 for non-sparse files
        cifs: fix NULL dereference in match_prepath
        smb3: fix default permissions on new files when mounting with modefromsid
        CIFS: Add support for setting owner info, dos attributes, and create time
        cifs: remove set but not used variable 'server'
        cifs: Fix memory allocation in __smb2_handle_cancelled_cmd()
        cifs: Fix mount options set in automount
        cifs: fix unitialized variable poential problem with network I/O cache lock patch
        cifs: Fix return value in __update_cache_entry
        cifs: Avoid doing network I/O while holding cache lock
        cifs: Fix potential deadlock when updating vol in cifs_reconnect()
        cifs: Merge is_path_valid() into get_normalized_path()
        cifs: Introduce helpers for finding TCP connection
        cifs: Get rid of kstrdup_const()'d paths
        cifs: Clean up DFS referral cache
        cifs: Don't use iov_iter::type directly
        cifs: set correct max-buffer-size for smb2_ioctl_init()
        cifs: use compounding for open and first query-dir for readdir()
    • Linus Torvalds's avatar
      Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt · c8994374
      Linus Torvalds authored
      Pull fsverity updates from Eric Biggers:
       - Optimize fs-verity sequential read performance by implementing
         readahead of Merkle tree pages. This allows the Merkle tree to be
         read in larger chunks.
       - Optimize FS_IOC_ENABLE_VERITY performance in the uncached case by
         implementing readahead of data pages.
       - Allocate the hash requests from a mempool in order to eliminate the
         possibility of allocation failures during I/O.
      * tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
        fs-verity: use u64_to_user_ptr()
        fs-verity: use mempool for hash requests
        fs-verity: implement readahead of Merkle tree pages
        fs-verity: implement readahead for FS_IOC_ENABLE_VERITY
    • Linus Torvalds's avatar
      Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt · f0d87441
      Linus Torvalds authored
      Pull fscrypt updates from Eric Biggers:
       - Extend the FS_IOC_ADD_ENCRYPTION_KEY ioctl to allow the raw key to be
         provided via a keyring key.
       - Prepare for the new dirhash method (SipHash of plaintext name) that
         will be used by directories that are both encrypted and casefolded.
       - Switch to a new format for "no-key names" that prepares for the new
         dirhash method, and also fixes a longstanding bug where multiple
         filenames could map to the same no-key name.
       - Allow the crypto algorithms used by fscrypt to be built as loadable
         modules when the fscrypt-capable filesystems are.
       - Optimize fscrypt_zeroout_range().
       - Various cleanups.
      * tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt: (26 commits)
        fscrypt: improve format of no-key names
        ubifs: allow both hash and disk name to be provided in no-key names
        ubifs: don't trigger assertion on invalid no-key filename
        fscrypt: clarify what is meant by a per-file key
        fscrypt: derive dirhash key for casefolded directories
        fscrypt: don't allow v1 policies with casefolding
        fscrypt: add "fscrypt_" prefix to fname_encrypt()
        fscrypt: don't print name of busy file when removing key
        ubifs: use IS_ENCRYPTED() instead of ubifs_crypt_is_encrypted()
        fscrypt: document gfp_flags for bounce page allocation
        fscrypt: optimize fscrypt_zeroout_range()
        fscrypt: remove redundant bi_status check
        fscrypt: Allow modular crypto algorithms
        fscrypt: include <linux/ioctl.h> in UAPI header
        fscrypt: don't check for ENOKEY from fscrypt_get_encryption_info()
        fscrypt: remove fscrypt_is_direct_key_policy()
        fscrypt: move fscrypt_valid_enc_modes() to policy.c
        fscrypt: check for appropriate use of DIRECT_KEY flag earlier
        fscrypt: split up fscrypt_supported_policy() by policy version
        fscrypt: introduce fscrypt_needs_contents_encryption()
    • Linus Torvalds's avatar
      Merge tag 'fs-dedupe-last-block-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux · b5f7ab6b
      Linus Torvalds authored
      Pull fs deduplication fix from David Sterba:
       "This is a fix for deduplication bug: the last block of two files is
        allowed to deduplicated. This got broken in 5.1 by lifting some
        generic checks to VFS layer. The affected filesystems are btrfs and
        The patches are marked for stable as the bug decreases deduplication
      * tag 'fs-dedupe-last-block-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
        Btrfs: make deduplication with range including the last block work
        fs: allow deduplication of eof block into the end of the destination file
    • Linus Torvalds's avatar
      Merge tag 'for-5.6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux · 81a046b1
      Linus Torvalds authored
      Pull btrfs updates from David Sterba:
       "Features, highlights:
         - async discard
             - "mount -o discard=async" to enable it
             - freed extents are not discarded immediatelly, but grouped
               together and trimmed later, with IO rate limiting
             - the "sync" mode submits short extents that could have been
               ignored completely by the device, for SATA prior to 3.1 the
               requests are unqueued and have a big impact on performance
             - the actual discard IO requests have been moved out of
               transaction commit to a worker thread, improving commit latency
             - IO rate and request size can be tuned by sysfs files, for now
               enabled only with CONFIG_BTRFS_DEBUG as we might need to
               add/delete the files and don't have a stable-ish ABI for
               general use, defaults are conservative
         - export device state info in sysfs, eg. missing, writeable
         - no discard of extents known to be untouched on disk (eg. after
         - device stats reset is logged with process name and PID that called
           the ioctl
         - fix missing hole after hole punching and fsync when using NO_HOLES
         - writeback: range cyclic mode could miss some dirty pages and lead
           to OOM
         - two more corner cases for metadata_uuid change after power loss
           during the change
         - fix infinite loop during fsync after mix of rename operations
        Core changes:
         - qgroup assign returns ENOTCONN when quotas not enabled, used to
           return EINVAL that was confusing
         - device closing does not need to allocate memory anymore
         - snapshot aware code got removed, disabled for years due to
           performance problems, reimplmentation will allow to select wheter
           defrag breaks or does not break COW on shared extents
         - tree-checker:
             - check leaf chunk item size, cross check against number of
             - verify location keys for DIR_ITEM, DIR_INDEX and XATTR items
         - new self test for physical -> logical mapping code, used for super
           block range exclusion
         - assertion helpers/macros updated to avoid objtool "unreachable
           code" reports on older compilers or config option combinations"
      * tag 'for-5.6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: (84 commits)
        btrfs: free block groups after free'ing fs trees
        btrfs: Fix split-brain handling when changing FSID to metadata uuid
        btrfs: Handle another split brain scenario with metadata uuid feature
        btrfs: Factor out metadata_uuid code from find_fsid.
        btrfs: Call find_fsid from find_fsid_inprogress
        Btrfs: fix infinite loop during fsync after rename operations
        btrfs: set trans->drity in btrfs_commit_transaction
        btrfs: drop log root for dropped roots
        btrfs: sysfs, add devid/dev_state kobject and device attributes
        btrfs: Refactor btrfs_rmap_block to improve readability
        btrfs: Add self-tests for btrfs_rmap_block
        btrfs: selftests: Add support for dummy devices
        btrfs: Move and unexport btrfs_rmap_block
        btrfs: separate definition of assertion failure handlers
        btrfs: device stats, log when stats are zeroed
        btrfs: fix improper setting of scanned for range cyclic write cache pages
        btrfs: safely advance counter when looking up bio csums
        btrfs: remove unused member btrfs_device::work
        btrfs: remove unnecessary wrapper get_alloc_profile
        btrfs: add correction to handle -1 edge case in async discard
    • Linus Torvalds's avatar
      Merge branch 'x86-mtrr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 511fdb78
      Linus Torvalds authored
      Pull x86 mtrr updates from Ingo Molnar:
       "Two changes: restrict /proc/mtrr to CAP_SYS_ADMIN, plus a cleanup"
      * 'x86-mtrr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mtrr: Require CAP_SYS_ADMIN for all access
        x86/mtrr: Get rid of mtrr_seq_show() forward declaration
    • Linus Torvalds's avatar
      Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4d6245ce
      Linus Torvalds authored
      Pull x86 FPU updates from Ingo Molnar:
       "Three changes: fix a race that can result in FPU corruption, plus two
      * 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/fpu: Deactivate FPU state after failure during state load
        x86/fpu/xstate: Make xfeature_is_supervisor()/xfeature_is_user() return bool
        x86/fpu/xstate: Fix small issues
    • Linus Torvalds's avatar
      Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · c0275ae7
      Linus Torvalds authored
      Pull x86 cpu-features updates from Ingo Molnar:
       "The biggest change in this cycle was a large series from Sean
        Christopherson to clean up the handling of VMX features. This both
        fixes bugs/inconsistencies and makes the code more coherent and
        There are also two cleanups and a minor TSX syslog messages
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
        x86/cpu: Remove redundant cpu_detect_cache_sizes() call
        x86/cpu: Print "VMX disabled" error message iff KVM is enabled
        KVM: VMX: Allow KVM_INTEL when building for Centaur and/or Zhaoxin CPUs
        perf/x86: Provide stubs of KVM helpers for non-Intel CPUs
        KVM: VMX: Use VMX_FEATURE_* flags to define VMCS control bits
        KVM: VMX: Check for full VMX support when verifying CPU compatibility
        KVM: VMX: Use VMX feature flag to query BIOS enabling
        KVM: VMX: Drop initialization of IA32_FEAT_CTL MSR
        x86/cpufeatures: Add flag to track whether MSR IA32_FEAT_CTL is configured
        x86/cpu: Set synthetic VMX cpufeatures during init_ia32_feat_ctl()
        x86/cpu: Print VMX flags in /proc/cpuinfo using VMX_FEATURES_*
        x86/cpu: Detect VMX features on Intel, Centaur and Zhaoxin CPUs
        x86/vmx: Introduce VMX_FEATURES_*
        x86/cpu: Clear VMX feature flag if VMX is not fully enabled
        x86/zhaoxin: Use common IA32_FEAT_CTL MSR initialization
        x86/centaur: Use common IA32_FEAT_CTL MSR initialization
        x86/mce: WARN once if IA32_FEAT_CTL MSR is left unlocked
        x86/intel: Initialize IA32_FEAT_CTL MSR at boot
        tools/x86: Sync msr-index.h from kernel sources
        selftests, kvm: Replace manual MSR defs with common msr-index.h
    • Linus Torvalds's avatar
      Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f6170f0a
      Linus Torvalds authored
      Pull misc x86 updates from Ingo Molnar:
       "Misc changes:
         - Enhance #GP fault printouts by distinguishing between canonical and
           non-canonical address faults, and also add KASAN fault decoding.
         - Fix/enhance the x86 NMI handler by putting the duration check into
           a direct function call instead of an irq_work which we know to be
           broken in some cases.
         - Clean up do_general_protection() a bit"
      * 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/nmi: Remove irq_work from the long duration NMI handler
        x86/traps: Cleanup do_general_protection()
        x86/kasan: Print original address on #GP
        x86/dumpstack: Introduce die_addr() for die() with #GP fault address
        x86/traps: Print address on #GP
        x86/insn-eval: Add support for 64-bit kernel mode
    • Linus Torvalds's avatar
      Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 6da49d1a
      Linus Torvalds authored
      Pull x86 cleanups from Ingo Molnar:
       "Misc cleanups all around the map"
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/CPU/AMD: Remove amd_get_topology_early()
        x86/tsc: Remove redundant assignment
        x86/crash: Use resource_size()
        x86/cpu: Add a missing prototype for arch_smt_update()
        x86/nospec: Remove unused RSB_FILL_LOOPS
        x86/vdso: Provide missing include file
        x86/Kconfig: Correct spelling and punctuation
        Documentation/x86/boot: Fix typo
        x86/boot: Fix a comment's incorrect file reference
        x86/process: Remove set but not used variables prev and next
        x86/Kconfig: Fix Kconfig indentation
    • Linus Torvalds's avatar
      Merge branch 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4244057c
      Linus Torvalds authored
      Pull x86 resource control updates from Ingo Molnar:
       "The main change in this tree is the extension of the resctrl procfs
        ABI with a new file that helps tooling to navigate from tasks back to
        resctrl groups: /proc/{pid}/cpu_resctrl_groups.
        Also fix static key usage for certain feature combinations and
        simplify the task exit resctrl case"
      * 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/resctrl: Add task resctrl information display
        x86/resctrl: Check monitoring static key in the MBM overflow handler
        x86/resctrl: Do not reconfigure exiting tasks