Commit ded746bf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-5.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Jakub Kicinski:
 "Including fixes from bpf, can and netfilter.

  Current release - regressions:

   - bpf, sockmap: re-evaluate proto ops when psock is removed from
     sockmap

  Current release - new code bugs:

   - bpf: fix bpf_check_mod_kfunc_call for built-in modules

   - ice: fixes for TC classifier offloads

   - vrf: don't run conntrack on vrf with !dflt qdisc

  Previous releases - regressions:

   - bpf: fix the off-by-two error in range markings

   - seg6: fix the iif in the IPv6 socket control block

   - devlink: fix netns refcount leak in devlink_nl_cmd_reload()

   - dsa: mv88e6xxx: fix "don't use PHY_DETECT on internal PHY's"

   - dsa: mv88e6xxx: allow use of PHYs on CPU and DSA ports

  Previous releases - always broken:

   - ethtool: do not perform operations on net devices being
     unregistered

   - udp: use datalen to cap max gso segments

   - ice: fix races in stats collection

   - fec: only clear interrupt of handling queue in fec_enet_rx_queue()

   - m_can: pci: fix incorrect reference clock rate

   - m_can: disable and ignore ELO interrupt

   - mvpp2: fix XDP rx queues registering

  Misc:

   - treewide: add missing includes masked by cgroup -> bpf.h
     dependency"

* tag 'net-5.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (82 commits)
  net: dsa: mv88e6xxx: allow use of PHYs on CPU and DSA ports
  net: wwan: iosm: fixes unable to send AT command during mbim tx
  net: wwan: iosm: fixes net interface nonfunctional after fw flash
  net: wwan: iosm: fixes unnecessary doorbell send
  net: dsa: felix: Fix memory leak in felix_setup_mmio_filtering
  MAINTAINERS: s390/net: remove myself as maintainer
  net/sched: fq_pie: prevent dismantle issue
  net: mana: Fix memory leak in mana_hwc_create_wq
  seg6: fix the iif in the IPv6 socket control block
  nfp: Fix memory leak in nfp_cpp_area_cache_add()
  nfc: fix potential NULL pointer deref in nfc_genl_dump_ses_done
  nfc: fix segfault in nfc_genl_dump_devices_done
  udp: using datalen to cap max gso segments
  net: dsa: mv88e6xxx: error handling for serdes_power functions
  can: kvaser_usb: get CAN clock frequency from device
  can: kvaser_pciefd: kvaser_pciefd_rx_error_frame(): increase correct stats->{rx,tx}_errors counter
  net: mvpp2: fix XDP rx queues registering
  vmxnet3: fix minimum vectors alloc issue
  net, neigh: clear whole pneigh_entry at alloc time
  net: dsa: mv88e6xxx: fix "don't use PHY_DETECT on internal PHY's"
  ...
parents 27698cd2 04ec4e62

Documentation/locking/locktypes.rst

+3 −6
Original line number Diff line number Diff line
@@ -439,11 +439,9 @@ preemption. The following substitution works on both kernels:: 
  spin_lock(&p->lock);

  p->count += this_cpu_read(var2);



On a non-PREEMPT_RT kernel migrate_disable() maps to preempt_disable()

which makes the above code fully equivalent. On a PREEMPT_RT kernel

migrate_disable() ensures that the task is pinned on the current CPU which

in turn guarantees that the per-CPU access to var1 and var2 are staying on

the same CPU.

the same CPU while the task remains preemptible.



The migrate_disable() substitution is not valid for the following

scenario::
@@ -456,9 +454,8 @@ scenario:: 
    p = this_cpu_ptr(&var1);

    p->val = func2();



While correct on a non-PREEMPT_RT kernel, this breaks on PREEMPT_RT because

here migrate_disable() does not protect against reentrancy from a

preempting task. A correct substitution for this case is::

This breaks because migrate_disable() does not protect against reentrancy from

a preempting task. A correct substitution for this case is::



  func()

  {

MAINTAINERS

+1 −3
Original line number Diff line number Diff line
@@ -12180,8 +12180,8 @@ F: drivers/net/ethernet/mellanox/mlx5/core/fpga/* 
F:	include/linux/mlx5/mlx5_ifc_fpga.h









MELLANOX ETHERNET SWITCH DRIVERS









M:	Jiri Pirko <jiri@nvidia.com>









M:	Ido Schimmel <idosch@nvidia.com>









M:	Petr Machata <petrm@nvidia.com>









L:	netdev@vger.kernel.org









S:	Supported









W:	http://www.mellanox.com








@@ -16629,7 +16629,6 @@ W:	http://www.ibm.com/developerworks/linux/linux390/







F:	drivers/iommu/s390-iommu.c

















S390 IUCV NETWORK LAYER









M:	Julian Wiedmann <jwi@linux.ibm.com>









M:	Alexandra Winter <wintera@linux.ibm.com>









M:	Wenjia Zhang <wenjia@linux.ibm.com>









L:	linux-s390@vger.kernel.org








@@ -16641,7 +16640,6 @@ F:	include/net/iucv/







F:	net/iucv/

















S390 NETWORK DRIVERS









M:	Julian Wiedmann <jwi@linux.ibm.com>









M:	Alexandra Winter <wintera@linux.ibm.com>









M:	Wenjia Zhang <wenjia@linux.ibm.com>









L:	linux-s390@vger.kernel.org
































arch/mips/net/bpf_jit_comp.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -98,7 +98,7 @@ do {								\







#define emit(...) __emit(__VA_ARGS__)



















/* Workaround for R10000 ll/sc errata */









#ifdef CONFIG_WAR_R10000









#ifdef CONFIG_WAR_R10000_LLSC









#define LLSC_beqz	beqzl









#else









#define LLSC_beqz	beqz
































block/fops.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -15,6 +15,7 @@







#include <linux/falloc.h>









#include <linux/suspend.h>









#include <linux/fs.h>









#include <linux/module.h>









#include "blk.h"



















static inline struct inode *bdev_file_inode(struct file *file)
































drivers/gpu/drm/drm_gem_shmem_helper.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -9,6 +9,7 @@







#include <linux/shmem_fs.h>









#include <linux/slab.h>









#include <linux/vmalloc.h>









#include <linux/module.h>



















#ifdef CONFIG_X86









#include <asm/set_memory.h>