Commit 27605c8c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from bluetooth and wireless.

  Current release - regressions:

   - af_unix: allow passing cred for embryo without SO_PASSCRED/SO_PASSPIDFD

  Current release - new code bugs:

   - eth: airoha: correct enable mask for RX queues 16-31

   - veth: prevent NULL pointer dereference in veth_xdp_rcv when peer
     disappears under traffic

   - ipv6: move fib6_config_validate() to ip6_route_add(), prevent
     invalid routes

  Previous releases - regressions:

   - phy: phy_caps: don't skip better duplex match on non-exact match

   - dsa: b53: fix untagged traffic sent via cpu tagged with VID 0

   - Revert "wifi: mwifiex: Fix HT40 bandwidth issue.", it caused
     transient packet loss, exact reason not fully understood, yet

  Previous releases - always broken:

   - net: clear the dst when BPF is changing skb protocol (IPv4 <> IPv6)

   - sched: sfq: fix a potential crash on gso_skb handling

   - Bluetooth: intel: improve rx buffer posting to avoid causing issues
     in the firmware

   - eth: intel: i40e: make reset handling robust against multiple
     requests

   - eth: mlx5: ensure FW pages are always allocated on the local NUMA
     node, even when device is configure to 'serve' another node

   - wifi: ath12k: fix GCC_GCC_PCIE_HOT_RST definition for WCN7850,
     prevent kernel crashes

   - wifi: ath11k: avoid burning CPU in ath11k_debugfs_fw_stats_request()
     for 3 sec if fw_stats_done is not set"

* tag 'net-6.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (70 commits)
  selftests: drv-net: rss_ctx: Add test for ntuple rules targeting default RSS context
  net: ethtool: Don't check if RSS context exists in case of context 0
  af_unix: Allow passing cred for embryo without SO_PASSCRED/SO_PASSPIDFD.
  ipv6: Move fib6_config_validate() to ip6_route_add().
  net: drv: netdevsim: don't napi_complete() from netpoll
  net/mlx5: HWS, Add error checking to hws_bwc_rule_complex_hash_node_get()
  veth: prevent NULL pointer dereference in veth_xdp_rcv
  net_sched: remove qdisc_tree_flush_backlog()
  net_sched: ets: fix a race in ets_qdisc_change()
  net_sched: tbf: fix a race in tbf_change()
  net_sched: red: fix a race in __red_change()
  net_sched: prio: fix a race in prio_tune()
  net_sched: sch_sfq: reject invalid perturb period
  net: phy: phy_caps: Don't skip better duplex macth on non-exact match
  MAINTAINERS: Update Kuniyuki Iwashima's email address.
  selftests: net: add test case for NAT46 looping back dst
  net: clear the dst when changing skb protocol
  net/mlx5e: Fix number of lanes to UNKNOWN when using data_rate_oper
  net/mlx5e: Fix leak of Geneve TLV option object
  net/mlx5: HWS, make sure the uplink is the last destination
  ...
parents 9cc7d590 d5705afb

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -426,6 +426,9 @@ Krzysztof Wilczyński <kwilczynski@kernel.org> <krzysztof.wilczynski@linux.com> 
Krzysztof Wilczyński <kwilczynski@kernel.org> <kw@linux.com>

Kshitiz Godara <quic_kgodara@quicinc.com> <kgodara@codeaurora.org>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Kuniyuki Iwashima <kuniyu@google.com> <kuniyu@amazon.com>

Kuniyuki Iwashima <kuniyu@google.com> <kuniyu@amazon.co.jp>

Kuniyuki Iwashima <kuniyu@google.com> <kuni1840@gmail.com>

Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>

Lee Jones <lee@kernel.org> <joneslee@google.com>

Lee Jones <lee@kernel.org> <lee.jones@canonical.com>

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -17494,7 +17494,7 @@ F: tools/testing/selftests/net/srv6* 
NETWORKING [TCP]

M:	Eric Dumazet <edumazet@google.com>

M:	Neal Cardwell <ncardwell@google.com>

R:	Kuniyuki Iwashima <kuniyu@amazon.com>

R:	Kuniyuki Iwashima <kuniyu@google.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	Documentation/networking/net_cachelines/tcp_sock.rst
@@ -17524,7 +17524,7 @@ F: net/tls/* 








NETWORKING [SOCKETS]









M:	Eric Dumazet <edumazet@google.com>









M:	Kuniyuki Iwashima <kuniyu@amazon.com>









M:	Kuniyuki Iwashima <kuniyu@google.com>









M:	Paolo Abeni <pabeni@redhat.com>









M:	Willem de Bruijn <willemb@google.com>









S:	Maintained








@@ -17539,7 +17539,7 @@ F:	net/core/scm.c







F:	net/socket.c

















NETWORKING [UNIX SOCKETS]









M:	Kuniyuki Iwashima <kuniyu@amazon.com>









M:	Kuniyuki Iwashima <kuniyu@google.com>









S:	Maintained









F:	include/net/af_unix.h









F:	include/net/netns/unix.h

























drivers/bluetooth/btintel_pcie.c



+18
−13






























Original line number
Diff line number
Diff line







@@ -396,8 +396,13 @@ static int btintel_pcie_submit_rx(struct btintel_pcie_data *data)







static int btintel_pcie_start_rx(struct btintel_pcie_data *data)









{









	int i, ret;









	struct rxq *rxq = &data->rxq;



















	/* Post (BTINTEL_PCIE_RX_DESCS_COUNT - 3) buffers to overcome the









	 * hardware issues leading to race condition at the firmware.









	 */



















	for (i = 0; i < BTINTEL_PCIE_RX_MAX_QUEUE; i++) {









	for (i = 0; i < rxq->count - 3; i++) {









		ret = btintel_pcie_submit_rx(data);









		if (ret)









			return ret;








@@ -1782,8 +1787,8 @@ static int btintel_pcie_alloc(struct btintel_pcie_data *data)







	 *  + size of index * Number of queues(2) * type of index array(4)









	 *  + size of context information









	 */









	total = (sizeof(struct tfd) + sizeof(struct urbd0) + sizeof(struct frbd)









		+ sizeof(struct urbd1)) * BTINTEL_DESCS_COUNT;









	total = (sizeof(struct tfd) + sizeof(struct urbd0)) * BTINTEL_PCIE_TX_DESCS_COUNT;









	total += (sizeof(struct frbd) + sizeof(struct urbd1)) * BTINTEL_PCIE_RX_DESCS_COUNT;



















	/* Add the sum of size of index array and size of ci struct */









	total += (sizeof(u16) * BTINTEL_PCIE_NUM_QUEUES * 4) + sizeof(struct ctx_info);








@@ -1808,36 +1813,36 @@ static int btintel_pcie_alloc(struct btintel_pcie_data *data)







	data->dma_v_addr = v_addr;



















	/* Setup descriptor count */









	data->txq.count = BTINTEL_DESCS_COUNT;









	data->rxq.count = BTINTEL_DESCS_COUNT;









	data->txq.count = BTINTEL_PCIE_TX_DESCS_COUNT;









	data->rxq.count = BTINTEL_PCIE_RX_DESCS_COUNT;



















	/* Setup tfds */









	data->txq.tfds_p_addr = p_addr;









	data->txq.tfds = v_addr;



















	p_addr += (sizeof(struct tfd) * BTINTEL_DESCS_COUNT);









	v_addr += (sizeof(struct tfd) * BTINTEL_DESCS_COUNT);









	p_addr += (sizeof(struct tfd) * BTINTEL_PCIE_TX_DESCS_COUNT);









	v_addr += (sizeof(struct tfd) * BTINTEL_PCIE_TX_DESCS_COUNT);



















	/* Setup urbd0 */









	data->txq.urbd0s_p_addr = p_addr;









	data->txq.urbd0s = v_addr;



















	p_addr += (sizeof(struct urbd0) * BTINTEL_DESCS_COUNT);









	v_addr += (sizeof(struct urbd0) * BTINTEL_DESCS_COUNT);









	p_addr += (sizeof(struct urbd0) * BTINTEL_PCIE_TX_DESCS_COUNT);









	v_addr += (sizeof(struct urbd0) * BTINTEL_PCIE_TX_DESCS_COUNT);



















	/* Setup FRBD*/









	data->rxq.frbds_p_addr = p_addr;









	data->rxq.frbds = v_addr;



















	p_addr += (sizeof(struct frbd) * BTINTEL_DESCS_COUNT);









	v_addr += (sizeof(struct frbd) * BTINTEL_DESCS_COUNT);









	p_addr += (sizeof(struct frbd) * BTINTEL_PCIE_RX_DESCS_COUNT);









	v_addr += (sizeof(struct frbd) * BTINTEL_PCIE_RX_DESCS_COUNT);



















	/* Setup urbd1 */









	data->rxq.urbd1s_p_addr = p_addr;









	data->rxq.urbd1s = v_addr;



















	p_addr += (sizeof(struct urbd1) * BTINTEL_DESCS_COUNT);









	v_addr += (sizeof(struct urbd1) * BTINTEL_DESCS_COUNT);









	p_addr += (sizeof(struct urbd1) * BTINTEL_PCIE_RX_DESCS_COUNT);









	v_addr += (sizeof(struct urbd1) * BTINTEL_PCIE_RX_DESCS_COUNT);



















	/* Setup data buffers for txq */









	err = btintel_pcie_setup_txq_bufs(data, &data->txq);
































drivers/bluetooth/btintel_pcie.h



+5
−5






























Original line number
Diff line number
Diff line







@@ -154,8 +154,11 @@ enum msix_mbox_int_causes {







/* Default interrupt timeout in msec */









#define BTINTEL_DEFAULT_INTR_TIMEOUT_MS	3000



















/* The number of descriptors in TX/RX queues */









#define BTINTEL_DESCS_COUNT	16









/* The number of descriptors in TX queues */









#define BTINTEL_PCIE_TX_DESCS_COUNT	32



















/* The number of descriptors in RX queues */









#define BTINTEL_PCIE_RX_DESCS_COUNT	64



















/* Number of Queue for TX and RX









 * It indicates the index of the IA(Index Array)








@@ -177,9 +180,6 @@ enum {







/* Doorbell vector for TFD */









#define BTINTEL_PCIE_TX_DB_VEC	0



















/* Number of pending RX requests for downlink */









#define BTINTEL_PCIE_RX_MAX_QUEUE	6



















/* Doorbell vector for FRBD */









#define BTINTEL_PCIE_RX_DB_VEC	513










































drivers/net/dsa/b53/b53_common.c



+1
−5






























Original line number
Diff line number
Diff line







@@ -2034,9 +2034,6 @@ int b53_br_join(struct dsa_switch *ds, int port, struct dsa_bridge bridge,

















		b53_get_vlan_entry(dev, pvid, vl);









		vl->members &= ~BIT(port);









		if (vl->members == BIT(cpu_port))









			vl->members &= ~BIT(cpu_port);









		vl->untag = vl->members;









		b53_set_vlan_entry(dev, pvid, vl);









	}


















@@ -2115,8 +2112,7 @@ void b53_br_leave(struct dsa_switch *ds, int port, struct dsa_bridge bridge)







		}



















		b53_get_vlan_entry(dev, pvid, vl);









		vl->members |= BIT(port) | BIT(cpu_port);









		vl->untag |= BIT(port) | BIT(cpu_port);









		vl->members |= BIT(port);









		b53_set_vlan_entry(dev, pvid, vl);









	}









}