Commit 4a16df54 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  Current release - regressions:

   - xfrm: fix XFRM_MSG_MAPPING ABI breakage caused by inserting a new
     value in the middle of an enum

   - unix: fix an issue in unix_shutdown causing the other end
     read/write failures

   - phy: mdio: fix memory leak

  Current release - new code bugs:

   - mlx5e: improve MQPRIO resiliency against bad configs

  Previous releases - regressions:

   - bpf: fix integer overflow leading to OOB access in map element
     pre-allocation

   - stmmac: dwmac-rk: fix ethernet on rk3399 based devices

   - netfilter: conntrack: fix boot failure with
     nf_conntrack.enable_hooks=1

   - brcmfmac: revert using ISO3166 country code and 0 rev as fallback

   - i40e: fix freeing of uninitialized misc IRQ vector

   - iavf: fix double unlock of crit_lock

  Previous releases - always broken:

   - bpf, arm: fix register clobbering in div/mod implementation

   - netfilter: nf_tables: correct issues in netlink rule change event
     notifications

   - dsa: tag_dsa: fix mask for trunked packets

   - usb: r8152: don't resubmit rx immediately to avoid soft lockup on
     device unplug

   - i40e: fix endless loop under rtnl if FW fails to correctly respond
     to capability query

   - mlx5e: fix rx checksum offload coexistence with ipsec offload

   - mlx5: force round second at 1PPS out start time and allow it only
     in supported clock modes

   - phy: pcs: xpcs: fix incorrect CL37 AN sequence, EEE disable
     sequence

  Misc:

   - xfrm: slightly rejig the new policy uAPI to make it less cryptic"

* tag 'net-5.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (66 commits)
  net: prefer socket bound to interface when not in VRF
  iavf: fix double unlock of crit_lock
  i40e: Fix freeing of uninitialized misc IRQ vector
  i40e: fix endless loop under rtnl
  dt-bindings: net: dsa: marvell: fix compatible in example
  ionic: move filter sync_needed bit set
  gve: report 64bit tx_bytes counter from gve_handle_report_stats()
  gve: fix gve_get_stats()
  rtnetlink: fix if_nlmsg_stats_size() under estimation
  gve: Properly handle errors in gve_assign_qpl
  gve: Avoid freeing NULL pointer
  gve: Correct available tx qpl check
  unix: Fix an issue in unix_shutdown causing the other end read/write failures
  net: stmmac: trigger PCS EEE to turn off on link down
  net: pcs: xpcs: fix incorrect steps on disable EEE
  netlink: annotate data races around nlk->bound
  net: pcs: xpcs: fix incorrect CL37 AN sequence
  net: sfp: Fix typo in state machine debug string
  net/sched: sch_taprio: properly cancel timer from taprio_destroy()
  net: bridge: fix under estimation in br_get_linkxstats_size()
  ...
parents 52bf8031 8d6c414c

CREDITS

+1 −0
Original line number Diff line number Diff line
@@ -971,6 +971,7 @@ D: PowerPC 
N: Daniel Drake

E: dsd@gentoo.org

D: USBAT02 CompactFlash support in usb-storage

D: ZD1211RW wireless driver

S: UK



N: Oleg Drokin

Documentation/devicetree/bindings/net/dsa/marvell.txt

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ Example: 
		#interrupt-cells = <2>;



		switch0: switch@0 {

			compatible = "marvell,mv88e6390";

			compatible = "marvell,mv88e6190";

			reg = <0>;

			reset-gpios = <&gpio5 1 GPIO_ACTIVE_LOW>;

MAINTAINERS

+1 −4
Original line number Diff line number Diff line
@@ -8609,9 +8609,8 @@ F: Documentation/devicetree/bindings/iio/humidity/st,hts221.yaml 
F:	drivers/iio/humidity/hts221*









HUAWEI ETHERNET DRIVER









M:	Bin Luo <luobin9@huawei.com>









L:	netdev@vger.kernel.org









S:	Supported









S:	Orphan









F:	Documentation/networking/device_drivers/ethernet/huawei/hinic.rst









F:	drivers/net/ethernet/huawei/hinic/
















@@ -17794,7 +17793,6 @@ F:	drivers/staging/nvec/















STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)









M:	Jens Frederich <jfrederich@gmail.com>









M:	Daniel Drake <dsd@laptop.org>









M:	Jon Nettleton <jon.nettleton@gmail.com>









S:	Maintained









W:	http://wiki.laptop.org/go/DCON








@@ -20700,7 +20698,6 @@ S:	Maintained







F:	mm/zbud.c

















ZD1211RW WIRELESS DRIVER









M:	Daniel Drake <dsd@gentoo.org>









M:	Ulrich Kunitz <kune@deine-taler.de>









L:	linux-wireless@vger.kernel.org









L:	zd1211-devs@lists.sourceforge.net (subscribers-only)

























arch/arm/net/bpf_jit_32.c



+19
−0






























Original line number
Diff line number
Diff line







@@ -36,6 +36,10 @@







 *                        +-----+









 *                        |RSVD | JIT scratchpad









 * current ARM_SP =>      +-----+ <= (BPF_FP - STACK_SIZE + SCRATCH_SIZE)









 *                        | ... | caller-saved registers









 *                        +-----+









 *                        | ... | arguments passed on stack









 * ARM_SP during call =>  +-----|









 *                        |     |









 *                        | ... | Function call stack









 *                        |     |








@@ -63,6 +67,12 @@







 *









 * When popping registers off the stack at the end of a BPF function, we









 * reference them via the current ARM_FP register.









 *









 * Some eBPF operations are implemented via a call to a helper function.









 * Such calls are "invisible" in the eBPF code, so it is up to the calling









 * program to preserve any caller-saved ARM registers during the call. The









 * JIT emits code to push and pop those registers onto the stack, immediately









 * above the callee stack frame.









 */









#define CALLEE_MASK	(1 << ARM_R4 | 1 << ARM_R5 | 1 << ARM_R6 | \









			 1 << ARM_R7 | 1 << ARM_R8 | 1 << ARM_R9 | \








@@ -70,6 +80,8 @@







#define CALLEE_PUSH_MASK (CALLEE_MASK | 1 << ARM_LR)









#define CALLEE_POP_MASK  (CALLEE_MASK | 1 << ARM_PC)



















#define CALLER_MASK	(1 << ARM_R0 | 1 << ARM_R1 | 1 << ARM_R2 | 1 << ARM_R3)



















enum {









	/* Stack layout - these are offsets from (top of stack - 4) */









	BPF_R2_HI,








@@ -464,6 +476,7 @@ static inline int epilogue_offset(const struct jit_ctx *ctx)

















static inline void emit_udivmod(u8 rd, u8 rm, u8 rn, struct jit_ctx *ctx, u8 op)









{









	const int exclude_mask = BIT(ARM_R0) | BIT(ARM_R1);









	const s8 *tmp = bpf2a32[TMP_REG_1];



















#if __LINUX_ARM_ARCH__ == 7








@@ -495,11 +508,17 @@ static inline void emit_udivmod(u8 rd, u8 rm, u8 rn, struct jit_ctx *ctx, u8 op)







		emit(ARM_MOV_R(ARM_R0, rm), ctx);









	}



















	/* Push caller-saved registers on stack */









	emit(ARM_PUSH(CALLER_MASK & ~exclude_mask), ctx);



















	/* Call appropriate function */









	emit_mov_i(ARM_IP, op == BPF_DIV ?









		   (u32)jit_udiv32 : (u32)jit_mod32, ctx);









	emit_blx_r(ARM_IP, ctx);



















	/* Restore caller-saved registers from stack */









	emit(ARM_POP(CALLER_MASK & ~exclude_mask), ctx);



















	/* Save return value */









	if (rd != ARM_R0)









		emit(ARM_MOV_R(rd, ARM_R0), ctx);
































arch/powerpc/boot/dts/fsl/t1023rdb.dts



+1
−1






























Original line number
Diff line number
Diff line







@@ -154,7 +154,7 @@

















			fm1mac3: ethernet@e4000 {









				phy-handle = <&sgmii_aqr_phy3>;









				phy-connection-type = "sgmii-2500";









				phy-connection-type = "2500base-x";









				sleep = <&rcpm 0x20000000>;









			};