Commit 411a44c2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from WiFi (mac80211), and BPF.

  Current release - regressions:

   - skb_expand_head: adjust skb->truesize to fix socket memory
     accounting

   - mptcp: fix corrupt receiver key in MPC + data + checksum

  Previous releases - regressions:

   - multicast: calculate csum of looped-back and forwarded packets

   - cgroup: fix memory leak caused by missing cgroup_bpf_offline

   - cfg80211: fix management registrations locking, prevent list
     corruption

   - cfg80211: correct false positive in bridge/4addr mode check

   - tcp_bpf: fix race in the tcp_bpf_send_verdict resulting in reusing
     previous verdict

  Previous releases - always broken:

   - sctp: enhancements for the verification tag, prevent attackers from
     killing SCTP sessions

   - tipc: fix size validations for the MSG_CRYPTO type

   - mac80211: mesh: fix HE operation element length check, prevent out
     of bound access

   - tls: fix sign of socket errors, prevent positive error codes being
     reported from read()/write()

   - cfg80211: scan: extend RCU protection in
     cfg80211_add_nontrans_list()

   - implement ->sock_is_readable() for UDP and AF_UNIX, fix poll() for
     sockets in a BPF sockmap

   - bpf: fix potential race in tail call compatibility check resulting
     in two operations which would make the map incompatible succeeding

   - bpf: prevent increasing bpf_jit_limit above max

   - bpf: fix error usage of map_fd and fdget() in generic batch update

   - phy: ethtool: lock the phy for consistency of results

   - prevent infinite while loop in skb_tx_hash() when Tx races with
     driver reconfiguring the queue <> traffic class mapping

   - usbnet: fixes for bad HW conjured by syzbot

   - xen: stop tx queues during live migration, prevent UAF

   - net-sysfs: initialize uid and gid before calling
     net_ns_get_ownership

   - mlxsw: prevent Rx stalls under memory pressure"

* tag 'net-5.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (67 commits)
  Revert "net: hns3: fix pause config problem after autoneg disabled"
  mptcp: fix corrupt receiver key in MPC + data + checksum
  riscv, bpf: Fix potential NULL dereference
  octeontx2-af: Fix possible null pointer dereference.
  octeontx2-af: Display all enabled PF VF rsrc_alloc entries.
  octeontx2-af: Check whether ipolicers exists
  net: ethernet: microchip: lan743x: Fix skb allocation failure
  net/tls: Fix flipped sign in async_wait.err assignment
  net/tls: Fix flipped sign in tls_err_abort() calls
  net/smc: Correct spelling mistake to TCPF_SYN_RECV
  net/smc: Fix smc_link->llc_testlink_time overflow
  nfp: bpf: relax prog rejection for mtu check through max_pkt_offset
  vmxnet3: do not stop tx queues after netif_device_detach()
  r8169: Add device 10ec:8162 to driver r8169
  ptp: Document the PTP_CLK_MAGIC ioctl number
  usbnet: fix error return code in usbnet_probe()
  net: hns3: adjust string spaces of some parameters of tx bd info in debugfs
  net: hns3: expand buffer len for some debugfs command
  net: hns3: add more string spaces for dumping packets number of queue info in debugfs
  net: hns3: fix data endian problem of some functions of debugfs
  ...
parents 4fb7d85b 35392da5

Documentation/userspace-api/ioctl/ioctl-number.rst

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ Code Seq# Include File Comments 
'8'   all                                                            SNP8023 advanced NIC card

                                                                     <mailto:mcr@solidum.com>

';'   64-7F  linux/vfio.h

'='   00-3f  uapi/linux/ptp_clock.h                                  <mailto:richardcochran@gmail.com>

'@'   00-0F  linux/radeonfb.h                                        conflict!

'@'   00-0F  drivers/video/aty/aty128fb.c                            conflict!

'A'   00-1F  linux/apm_bios.h                                        conflict!

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -11291,7 +11291,6 @@ F: Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst 
F:	drivers/net/ethernet/marvell/octeontx2/af/









MARVELL PRESTERA ETHERNET SWITCH DRIVER









M:	Vadym Kochan <vkochan@marvell.com>









M:	Taras Chornyi <tchornyi@marvell.com>









S:	Supported









W:	https://github.com/Marvell-switching/switchdev-prestera
































arch/arm64/net/bpf_jit_comp.c



+5
−0






























Original line number
Diff line number
Diff line







@@ -1136,6 +1136,11 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)







	return prog;









}



















u64 bpf_jit_alloc_exec_limit(void)









{









	return BPF_JIT_REGION_SIZE;









}



















void *bpf_jit_alloc_exec(unsigned long size)









{









	return __vmalloc_node_range(size, PAGE_SIZE, BPF_JIT_REGION_START,
































arch/riscv/net/bpf_jit_core.c



+7
−1






























Original line number
Diff line number
Diff line







@@ -125,6 +125,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)

















	if (i == NR_JIT_ITERATIONS) {









		pr_err("bpf-jit: image did not converge in <%d passes!\n", i);









		if (jit_data->header)









			bpf_jit_binary_free(jit_data->header);









		prog = orig_prog;









		goto out_offset;








@@ -166,6 +167,11 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)







	return prog;









}



















u64 bpf_jit_alloc_exec_limit(void)









{









	return BPF_JIT_REGION_SIZE;









}



















void *bpf_jit_alloc_exec(unsigned long size)









{









	return __vmalloc_node_range(size, PAGE_SIZE, BPF_JIT_REGION_START,
































drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c



+8
−8






























Original line number
Diff line number
Diff line







@@ -137,7 +137,7 @@ static struct hns3_dbg_cmd_info hns3_dbg_cmd[] = {







		.name = "uc",









		.cmd = HNAE3_DBG_CMD_MAC_UC,









		.dentry = HNS3_DBG_DENTRY_MAC,









		.buf_len = HNS3_DBG_READ_LEN,









		.buf_len = HNS3_DBG_READ_LEN_128KB,









		.init = hns3_dbg_common_file_init,









	},









	{








@@ -256,7 +256,7 @@ static struct hns3_dbg_cmd_info hns3_dbg_cmd[] = {







		.name = "tqp",









		.cmd = HNAE3_DBG_CMD_REG_TQP,









		.dentry = HNS3_DBG_DENTRY_REG,









		.buf_len = HNS3_DBG_READ_LEN,









		.buf_len = HNS3_DBG_READ_LEN_128KB,









		.init = hns3_dbg_common_file_init,









	},









	{








@@ -298,7 +298,7 @@ static struct hns3_dbg_cmd_info hns3_dbg_cmd[] = {







		.name = "fd_tcam",









		.cmd = HNAE3_DBG_CMD_FD_TCAM,









		.dentry = HNS3_DBG_DENTRY_FD,









		.buf_len = HNS3_DBG_READ_LEN,









		.buf_len = HNS3_DBG_READ_LEN_1MB,









		.init = hns3_dbg_common_file_init,









	},









	{








@@ -462,7 +462,7 @@ static const struct hns3_dbg_item rx_queue_info_items[] = {







	{ "TAIL", 2 },









	{ "HEAD", 2 },









	{ "FBDNUM", 2 },









	{ "PKTNUM", 2 },









	{ "PKTNUM", 5 },









	{ "COPYBREAK", 2 },









	{ "RING_EN", 2 },









	{ "RX_RING_EN", 2 },








@@ -565,7 +565,7 @@ static const struct hns3_dbg_item tx_queue_info_items[] = {







	{ "HEAD", 2 },









	{ "FBDNUM", 2 },









	{ "OFFSET", 2 },









	{ "PKTNUM", 2 },









	{ "PKTNUM", 5 },









	{ "RING_EN", 2 },









	{ "TX_RING_EN", 2 },









	{ "BASE_ADDR", 10 },








@@ -790,13 +790,13 @@ static int hns3_dbg_rx_bd_info(struct hns3_dbg_data *d, char *buf, int len)







}



















static const struct hns3_dbg_item tx_bd_info_items[] = {









	{ "BD_IDX", 5 },









	{ "ADDRESS", 2 },









	{ "BD_IDX", 2 },









	{ "ADDRESS", 13 },









	{ "VLAN_TAG", 2 },









	{ "SIZE", 2 },









	{ "T_CS_VLAN_TSO", 2 },









	{ "OT_VLAN_TAG", 3 },









	{ "TV", 2 },









	{ "TV", 5 },









	{ "OLT_VLAN_LEN", 2 },









	{ "PAYLEN_OL4CS", 2 },









	{ "BD_FE_SC_VLD", 2 },