Commit 50108c35 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from bpf, WiFi and netfilter.

  Current release - regressions:

   - ipv6: fix address dump when IPv6 is disabled on an interface

  Current release - new code bugs:

   - bpf: temporarily disable atomic operations in BPF arena

   - nexthop: fix uninitialized variable in nla_put_nh_group_stats()

  Previous releases - regressions:

   - bpf: protect against int overflow for stack access size

   - hsr: fix the promiscuous mode in offload mode

   - wifi: don't always use FW dump trig

   - tls: adjust recv return with async crypto and failed copy to
     userspace

   - tcp: properly terminate timers for kernel sockets

   - ice: fix memory corruption bug with suspend and rebuild

   - at803x: fix kernel panic with at8031_probe

   - qeth: handle deferred cc1

  Previous releases - always broken:

   - bpf: fix bug in BPF_LDX_MEMSX

   - netfilter: reject table flag and netdev basechain updates

   - inet_defrag: prevent sk release while still in use

   - wifi: pick the version of SESSION_PROTECTION_NOTIF

   - wwan: t7xx: split 64bit accesses to fix alignment issues

   - mlxbf_gige: call request_irq() after NAPI initialized

   - hns3: fix kernel crash when devlink reload during pf
     initialization"

* tag 'net-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (81 commits)
  inet: inet_defrag: prevent sk release while still in use
  Octeontx2-af: fix pause frame configuration in GMP mode
  net: lan743x: Add set RFE read fifo threshold for PCI1x1x chips
  net: bcmasp: Remove phy_{suspend/resume}
  net: bcmasp: Bring up unimac after PHY link up
  net: phy: qcom: at803x: fix kernel panic with at8031_probe
  netfilter: arptables: Select NETFILTER_FAMILY_ARP when building arp_tables.c
  netfilter: nf_tables: skip netdev hook unregistration if table is dormant
  netfilter: nf_tables: reject table flag and netdev basechain updates
  netfilter: nf_tables: reject destroy command to remove basechain hooks
  bpf: update BPF LSM designated reviewer list
  bpf: Protect against int overflow for stack access size
  bpf: Check bloom filter map value size
  bpf: fix warning for crash_kexec
  selftests: netdevsim: set test timeout to 10 minutes
  net: wan: framer: Add missing static inline qualifiers
  mlxbf_gige: call request_irq() after NAPI initialized
  tls: get psock ref after taking rxlock to avoid leak
  selftests: tls: add test with a partially invalid iov
  tls: adjust recv return with async crypto and failed copy to userspace
  ...
parents 8d025e20 18685451

.mailmap

+2 −1
Original line number Diff line number Diff line
@@ -498,7 +498,8 @@ Prasad Sodagudi <quic_psodagud@quicinc.com> <psodagud@codeaurora.org> 
Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>

Qais Yousef <qyousef@layalina.io> <qais.yousef@imgtec.com>

Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>

Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>

Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>

Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>

Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>

Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>

MAINTAINERS

+33 −7
Original line number Diff line number Diff line
@@ -3942,8 +3942,7 @@ F: kernel/bpf/ringbuf.c 








BPF [SECURITY & LSM] (Security Audit and Enforcement using BPF)









M:	KP Singh <kpsingh@kernel.org>









R:	Florent Revest <revest@chromium.org>









R:	Brendan Jackman <jackmanb@chromium.org>









R:	Matt Bobrowski <mattbobrowski@google.com>









L:	bpf@vger.kernel.org









S:	Maintained









F:	Documentation/bpf/prog_lsm.rst








@@ -3968,7 +3967,7 @@ F:	kernel/bpf/bpf_lru*







F:	kernel/bpf/cgroup.c

















BPF [TOOLING] (bpftool)









M:	Quentin Monnet <quentin@isovalent.com>









M:	Quentin Monnet <qmo@kernel.org>









L:	bpf@vger.kernel.org









S:	Maintained









F:	kernel/bpf/disasm.*








@@ -13134,6 +13133,7 @@ F:	drivers/net/ethernet/marvell/mvpp2/















MARVELL MWIFIEX WIRELESS DRIVER









M:	Brian Norris <briannorris@chromium.org>









R:	Francesco Dolcini <francesco@dolcini.it>









L:	linux-wireless@vger.kernel.org









S:	Odd Fixes









F:	drivers/net/wireless/marvell/mwifiex/








@@ -18645,18 +18645,21 @@ REALTEK WIRELESS DRIVER (rtlwifi family)







M:	Ping-Ke Shih <pkshih@realtek.com>









L:	linux-wireless@vger.kernel.org









S:	Maintained









T:	git https://github.com/pkshih/rtw.git









F:	drivers/net/wireless/realtek/rtlwifi/

















REALTEK WIRELESS DRIVER (rtw88)









M:	Ping-Ke Shih <pkshih@realtek.com>









L:	linux-wireless@vger.kernel.org









S:	Maintained









T:	git https://github.com/pkshih/rtw.git









F:	drivers/net/wireless/realtek/rtw88/

















REALTEK WIRELESS DRIVER (rtw89)









M:	Ping-Ke Shih <pkshih@realtek.com>









L:	linux-wireless@vger.kernel.org









S:	Maintained









T:	git https://github.com/pkshih/rtw.git









F:	drivers/net/wireless/realtek/rtw89/

















REDPINE WIRELESS DRIVER








@@ -18727,13 +18730,24 @@ S:	Supported







F:	Documentation/devicetree/bindings/i2c/renesas,iic-emev2.yaml









F:	drivers/i2c/busses/i2c-emev2.c

















RENESAS ETHERNET DRIVERS









RENESAS ETHERNET AVB DRIVER









R:	Sergey Shtylyov <s.shtylyov@omp.ru>









L:	netdev@vger.kernel.org









L:	linux-renesas-soc@vger.kernel.org









F:	Documentation/devicetree/bindings/net/renesas,*.yaml









F:	drivers/net/ethernet/renesas/









F:	include/linux/sh_eth.h









F:	Documentation/devicetree/bindings/net/renesas,etheravb.yaml









F:	drivers/net/ethernet/renesas/Kconfig









F:	drivers/net/ethernet/renesas/Makefile









F:	drivers/net/ethernet/renesas/ravb*

















RENESAS ETHERNET SWITCH DRIVER









R:	Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>









L:	netdev@vger.kernel.org









L:	linux-renesas-soc@vger.kernel.org









F:	Documentation/devicetree/bindings/net/renesas,*ether-switch.yaml









F:	drivers/net/ethernet/renesas/Kconfig









F:	drivers/net/ethernet/renesas/Makefile









F:	drivers/net/ethernet/renesas/rcar_gen4*









F:	drivers/net/ethernet/renesas/rswitch*

















RENESAS IDT821034 ASoC CODEC









M:	Herve Codina <herve.codina@bootlin.com>








@@ -18843,6 +18857,16 @@ S:	Supported







F:	Documentation/devicetree/bindings/i2c/renesas,rzv2m.yaml









F:	drivers/i2c/busses/i2c-rzv2m.c

















RENESAS SUPERH ETHERNET DRIVER









R:	Sergey Shtylyov <s.shtylyov@omp.ru>









L:	netdev@vger.kernel.org









L:	linux-renesas-soc@vger.kernel.org









F:	Documentation/devicetree/bindings/net/renesas,ether.yaml









F:	drivers/net/ethernet/renesas/Kconfig









F:	drivers/net/ethernet/renesas/Makefile









F:	drivers/net/ethernet/renesas/sh_eth*









F:	include/linux/sh_eth.h

















RENESAS USB PHY DRIVER









M:	Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>









L:	linux-renesas-soc@vger.kernel.org








@@ -19179,12 +19203,14 @@ M:	Hin-Tak Leung <hintak.leung@gmail.com>







M:	Larry Finger <Larry.Finger@lwfinger.net>









L:	linux-wireless@vger.kernel.org









S:	Maintained









T:	git https://github.com/pkshih/rtw.git









F:	drivers/net/wireless/realtek/rtl818x/rtl8187/

















RTL8XXXU WIRELESS DRIVER (rtl8xxxu)









M:	Jes Sorensen <Jes.Sorensen@gmail.com>









L:	linux-wireless@vger.kernel.org









S:	Maintained









T:	git https://github.com/pkshih/rtw.git









F:	drivers/net/wireless/realtek/rtl8xxxu/

















RTRS TRANSPORT DRIVERS

























arch/arm64/net/bpf_jit_comp.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -943,7 +943,7 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,







			emit(A64_UXTH(is64, dst, dst), ctx);









			break;









		case 32:









			emit(A64_REV32(is64, dst, dst), ctx);









			emit(A64_REV32(0, dst, dst), ctx);









			/* upper 32 bits already cleared */









			break;









		case 64:








@@ -1256,7 +1256,7 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,







			} else {









				emit_a64_mov_i(1, tmp, off, ctx);









				if (sign_extend)









					emit(A64_LDRSW(dst, src_adj, off_adj), ctx);









					emit(A64_LDRSW(dst, src, tmp), ctx);









				else









					emit(A64_LDR32(dst, src, tmp), ctx);









			}
































arch/riscv/net/bpf_jit_comp64.c



+16
−0






























Original line number
Diff line number
Diff line







@@ -1463,6 +1463,22 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,







		if (ret < 0)









			return ret;



















		if (insn->src_reg == BPF_PSEUDO_KFUNC_CALL) {









			const struct btf_func_model *fm;









			int idx;



















			fm = bpf_jit_find_kfunc_model(ctx->prog, insn);









			if (!fm)









				return -EINVAL;



















			for (idx = 0; idx < fm->nr_args; idx++) {









				u8 reg = bpf_to_rv_reg(BPF_REG_1 + idx, ctx);



















				if (fm->arg_size[idx] == sizeof(int))









					emit_sextw(reg, reg, ctx);









			}









		}



















		ret = emit_call(addr, fixed_addr, ctx);









		if (ret)









			return ret;
































arch/s390/net/bpf_jit_comp.c



+20
−26






























Original line number
Diff line number
Diff line







@@ -516,11 +516,12 @@ static void bpf_skip(struct bpf_jit *jit, int size)







 * PLT for hotpatchable calls. The calling convention is the same as for the









 * ftrace hotpatch trampolines: %r0 is return address, %r1 is clobbered.









 */









extern const char bpf_plt[];









extern const char bpf_plt_ret[];









extern const char bpf_plt_target[];









extern const char bpf_plt_end[];









#define BPF_PLT_SIZE 32









struct bpf_plt {









	char code[16];









	void *ret;









	void *target;









} __packed;









extern const struct bpf_plt bpf_plt;









asm(









	".pushsection .rodata\n"









	"	.balign 8\n"








@@ -531,15 +532,14 @@ asm(







	"	.balign 8\n"









	"bpf_plt_ret: .quad 0\n"









	"bpf_plt_target: .quad 0\n"









	"bpf_plt_end:\n"









	"	.popsection\n"









);



















static void bpf_jit_plt(void *plt, void *ret, void *target)









static void bpf_jit_plt(struct bpf_plt *plt, void *ret, void *target)









{









	memcpy(plt, bpf_plt, BPF_PLT_SIZE);









	*(void **)((char *)plt + (bpf_plt_ret - bpf_plt)) = ret;









	*(void **)((char *)plt + (bpf_plt_target - bpf_plt)) = target ?: ret;









	memcpy(plt, &bpf_plt, sizeof(*plt));









	plt->ret = ret;









	plt->target = target;









}



















/*








@@ -662,9 +662,9 @@ static void bpf_jit_epilogue(struct bpf_jit *jit, u32 stack_depth)







	jit->prg = ALIGN(jit->prg, 8);









	jit->prologue_plt = jit->prg;









	if (jit->prg_buf)









		bpf_jit_plt(jit->prg_buf + jit->prg,









		bpf_jit_plt((struct bpf_plt *)(jit->prg_buf + jit->prg),









			    jit->prg_buf + jit->prologue_plt_ret, NULL);









	jit->prg += BPF_PLT_SIZE;









	jit->prg += sizeof(struct bpf_plt);









}



















static int get_probe_mem_regno(const u8 *insn)








@@ -2040,9 +2040,6 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)







	struct bpf_jit jit;









	int pass;



















	if (WARN_ON_ONCE(bpf_plt_end - bpf_plt != BPF_PLT_SIZE))









		return orig_fp;



















	if (!fp->jit_requested)









		return orig_fp;


















@@ -2148,14 +2145,11 @@ bool bpf_jit_supports_far_kfunc_call(void)







int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type t,









		       void *old_addr, void *new_addr)









{









	struct bpf_plt expected_plt, current_plt, new_plt, *plt;









	struct {









		u16 opc;









		s32 disp;









	} __packed insn;









	char expected_plt[BPF_PLT_SIZE];









	char current_plt[BPF_PLT_SIZE];









	char new_plt[BPF_PLT_SIZE];









	char *plt;









	char *ret;









	int err;


















@@ -2174,18 +2168,18 @@ int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type t,







		 */









	} else {









		/* Verify the PLT. */









		plt = (char *)ip + (insn.disp << 1);









		err = copy_from_kernel_nofault(current_plt, plt, BPF_PLT_SIZE);









		plt = ip + (insn.disp << 1);









		err = copy_from_kernel_nofault(&current_plt, plt,









					       sizeof(current_plt));









		if (err < 0)









			return err;









		ret = (char *)ip + 6;









		bpf_jit_plt(expected_plt, ret, old_addr);









		if (memcmp(current_plt, expected_plt, BPF_PLT_SIZE))









		bpf_jit_plt(&expected_plt, ret, old_addr);









		if (memcmp(&current_plt, &expected_plt, sizeof(current_plt)))









			return -EINVAL;









		/* Adjust the call address. */









		bpf_jit_plt(new_plt, ret, new_addr);









		s390_kernel_write(plt + (bpf_plt_target - bpf_plt),









				  new_plt + (bpf_plt_target - bpf_plt),









		bpf_jit_plt(&new_plt, ret, new_addr);









		s390_kernel_write(&plt->target, &new_plt.target,









				  sizeof(void *));









	}