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

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

Pull networking fixes from Paolo Abeni:
 "No fixes from any subtree.

  Current release - regressions:

   - net: fix the missing unlock for detached devices

  Previous releases - regressions:

   - sched: fix UAF vulnerability in HFSC qdisc

   - lwtunnel: disable BHs when required

   - mptcp: pm: defer freeing of MPTCP userspace path manager entries

   - tipc: fix NULL pointer dereference in tipc_mon_reinit_self()

   - eth: virtio-net: disable delayed refill when pausing rx

  Previous releases - always broken:

   - phylink: fix suspend/resume with WoL enabled and link down

   - eth:
       - mlx5: fix null-ptr-deref in mlx5_create_{inner_,}ttc_table()
       - xen-netfront: handle NULL returned by xdp_convert_buff_to_frame()
       - enetc: fix frame corruption on bpf_xdp_adjust_head/tail() and XDP_PASS
       - stmmac: fix dwmac1000 ptp timestamp status offset
       - pds_core: prevent possible adminq overflow/stuck condition

  Misc:

   - a bunch of MAINTAINERS updates"

* tag 'net-6.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (32 commits)
  net: stmmac: fix multiplication overflow when reading timestamp
  net: stmmac: fix dwmac1000 ptp timestamp status offset
  net: dp83822: Fix OF_MDIO config check
  pds_core: make wait_context part of q_info
  pds_core: Remove unnecessary check in pds_client_adminq_cmd()
  pds_core: handle unsupported PDS_CORE_CMD_FW_CONTROL result
  pds_core: Prevent possible adminq overflow/stuck condition
  net: dsa: mt7530: sync driver-specific behavior of MT7531 variants
  selftests/tc-testing: Add test for HFSC queue emptying during peek operation
  net_sched: hfsc: Fix a potential UAF in hfsc_dequeue() too
  net_sched: hfsc: Fix a UAF vulnerability in class handling
  selftests: mptcp: diag: use mptcp_lib_get_info_value
  mptcp: pm: Defer freeing of MPTCP userspace path manager entries
  net: ethernet: mtk_eth_soc: net: revise NETSYSv3 hardware configuration
  tipc: fix NULL pointer dereference in tipc_mon_reinit_self()
  virtio-net: disable delayed refill when pausing rx
  net: phy: leds: fix memory leak
  net: phylink: mac_link_(up|down)() clarifications
  net: phylink: fix suspend/resume with WoL enabled and link down
  net: lwtunnel: disable BHs when required
  ...
parents 288537d9 cc0dec3f

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -3191,6 +3191,12 @@ M: Dinh Nguyen <dinguyen@kernel.org> 
S:	Maintained

F:	drivers/clk/socfpga/









ARM/SOCFPGA DWMAC GLUE LAYER









M:	Maxime Chevallier <maxime.chevallier@bootlin.com>









S:	Maintained









F:	Documentation/devicetree/bindings/net/socfpga-dwmac.txt









F:	drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c

















ARM/SOCFPGA EDAC BINDINGS









M:	Matthew Gerlach <matthew.gerlach@altera.com>









S:	Maintained








@@ -16812,6 +16818,7 @@ F:	Documentation/networking/net_cachelines/net_device.rst







F:	drivers/connector/









F:	drivers/net/









F:	drivers/ptp/









F:	drivers/s390/net/









F:	include/dt-bindings/net/









F:	include/linux/cn_proc.h









F:	include/linux/etherdevice.h








@@ -16821,6 +16828,7 @@ F:	include/linux/fddidevice.h







F:	include/linux/hippidevice.h









F:	include/linux/if_*









F:	include/linux/inetdevice.h









F:	include/linux/ism.h









F:	include/linux/netdev*









F:	include/linux/platform_data/wiznet.h









F:	include/uapi/linux/cn_proc.h








@@ -21312,6 +21320,7 @@ L:	linux-s390@vger.kernel.org







L:	netdev@vger.kernel.org









S:	Supported









F:	drivers/s390/net/









F:	include/linux/ism.h

















S390 PCI SUBSYSTEM









M:	Niklas Schnelle <schnelle@linux.ibm.com>

























drivers/net/dsa/mt7530.c



+3
−3






























Original line number
Diff line number
Diff line







@@ -2419,6 +2419,9 @@ mt7531_setup_common(struct dsa_switch *ds)







	struct mt7530_priv *priv = ds->priv;









	int ret, i;



















	ds->assisted_learning_on_cpu_port = true;









	ds->mtu_enforcement_ingress = true;



















	mt753x_trap_frames(priv);



















	/* Enable and reset MIB counters */








@@ -2571,9 +2574,6 @@ mt7531_setup(struct dsa_switch *ds)







	if (ret)









		return ret;



















	ds->assisted_learning_on_cpu_port = true;









	ds->mtu_enforcement_ingress = true;



















	return 0;









}










































drivers/net/ethernet/amd/pds_core/adminq.c



+14
−22






























Original line number
Diff line number
Diff line







@@ -5,11 +5,6 @@

















#include "core.h"



















struct pdsc_wait_context {









	struct pdsc_qcq *qcq;









	struct completion wait_completion;









};



















static int pdsc_process_notifyq(struct pdsc_qcq *qcq)









{









	union pds_core_notifyq_comp *comp;








@@ -109,10 +104,10 @@ void pdsc_process_adminq(struct pdsc_qcq *qcq)







		q_info = &q->info[q->tail_idx];









		q->tail_idx = (q->tail_idx + 1) & (q->num_descs - 1);



















		/* Copy out the completion data */









		if (!completion_done(&q_info->completion)) {









			memcpy(q_info->dest, comp, sizeof(*comp));



















		complete_all(&q_info->wc->wait_completion);









			complete(&q_info->completion);









		}



















		if (cq->tail_idx == cq->num_descs - 1)









			cq->done_color = !cq->done_color;








@@ -162,8 +157,7 @@ irqreturn_t pdsc_adminq_isr(int irq, void *data)







static int __pdsc_adminq_post(struct pdsc *pdsc,









			      struct pdsc_qcq *qcq,









			      union pds_core_adminq_cmd *cmd,









			      union pds_core_adminq_comp *comp,









			      struct pdsc_wait_context *wc)









			      union pds_core_adminq_comp *comp)









{









	struct pdsc_queue *q = &qcq->q;









	struct pdsc_q_info *q_info;








@@ -205,9 +199,9 @@ static int __pdsc_adminq_post(struct pdsc *pdsc,







	/* Post the request */









	index = q->head_idx;









	q_info = &q->info[index];









	q_info->wc = wc;









	q_info->dest = comp;









	memcpy(q_info->desc, cmd, sizeof(*cmd));









	reinit_completion(&q_info->completion);



















	dev_dbg(pdsc->dev, "head_idx %d tail_idx %d\n",









		q->head_idx, q->tail_idx);








@@ -231,16 +225,13 @@ int pdsc_adminq_post(struct pdsc *pdsc,







		     union pds_core_adminq_comp *comp,









		     bool fast_poll)









{









	struct pdsc_wait_context wc = {









		.wait_completion =









			COMPLETION_INITIALIZER_ONSTACK(wc.wait_completion),









	};









	unsigned long poll_interval = 1;









	unsigned long poll_jiffies;









	unsigned long time_limit;









	unsigned long time_start;









	unsigned long time_done;









	unsigned long remaining;









	struct completion *wc;









	int err = 0;









	int index;


















@@ -250,20 +241,19 @@ int pdsc_adminq_post(struct pdsc *pdsc,







		return -ENXIO;









	}



















	wc.qcq = &pdsc->adminqcq;









	index = __pdsc_adminq_post(pdsc, &pdsc->adminqcq, cmd, comp, &wc);









	index = __pdsc_adminq_post(pdsc, &pdsc->adminqcq, cmd, comp);









	if (index < 0) {









		err = index;









		goto err_out;









	}



















	wc = &pdsc->adminqcq.q.info[index].completion;









	time_start = jiffies;









	time_limit = time_start + HZ * pdsc->devcmd_timeout;









	do {









		/* Timeslice the actual wait to catch IO errors etc early */









		poll_jiffies = msecs_to_jiffies(poll_interval);









		remaining = wait_for_completion_timeout(&wc.wait_completion,









							poll_jiffies);









		remaining = wait_for_completion_timeout(wc, poll_jiffies);









		if (remaining)









			break;


















@@ -292,9 +282,11 @@ int pdsc_adminq_post(struct pdsc *pdsc,







	dev_dbg(pdsc->dev, "%s: elapsed %d msecs\n",









		__func__, jiffies_to_msecs(time_done - time_start));



















	/* Check the results */









	if (time_after_eq(time_done, time_limit))









	/* Check the results and clear an un-completed timeout */









	if (time_after_eq(time_done, time_limit) && !completion_done(wc)) {









		err = -ETIMEDOUT;









		complete(wc);









	}



















	dev_dbg(pdsc->dev, "read admin queue completion idx %d:\n", index);









	dynamic_hex_dump("comp ", DUMP_PREFIX_OFFSET, 16, 1,
































drivers/net/ethernet/amd/pds_core/auxbus.c



+0
−3






























Original line number
Diff line number
Diff line







@@ -107,9 +107,6 @@ int pds_client_adminq_cmd(struct pds_auxiliary_dev *padev,







	dev_dbg(pf->dev, "%s: %s opcode %d\n",









		__func__, dev_name(&padev->aux_dev.dev), req->opcode);



















	if (pf->state)









		return -ENXIO;



















	/* Wrap the client's request */









	cmd.client_request.opcode = PDS_AQ_CMD_CLIENT_CMD;









	cmd.client_request.client_id = cpu_to_le16(padev->client_id);
































drivers/net/ethernet/amd/pds_core/core.c



+4
−5






























Original line number
Diff line number
Diff line







@@ -167,8 +167,10 @@ static void pdsc_q_map(struct pdsc_queue *q, void *base, dma_addr_t base_pa)







	q->base = base;









	q->base_pa = base_pa;



















	for (i = 0, cur = q->info; i < q->num_descs; i++, cur++)









	for (i = 0, cur = q->info; i < q->num_descs; i++, cur++) {









		cur->desc = base + (i * q->desc_size);









		init_completion(&cur->completion);









	}









}



















static void pdsc_cq_map(struct pdsc_cq *cq, void *base, dma_addr_t base_pa)








@@ -325,10 +327,7 @@ static int pdsc_core_init(struct pdsc *pdsc)







	size_t sz;









	int err;



















	/* Scale the descriptor ring length based on number of CPUs and VFs */









	numdescs = max_t(int, PDSC_ADMINQ_MIN_LENGTH, num_online_cpus());









	numdescs += 2 * pci_sriov_get_totalvfs(pdsc->pdev);









	numdescs = roundup_pow_of_two(numdescs);









	numdescs = PDSC_ADMINQ_MAX_LENGTH;









	err = pdsc_qcq_alloc(pdsc, PDS_CORE_QTYPE_ADMINQ, 0, "adminq",









			     PDS_CORE_QCQ_F_CORE | PDS_CORE_QCQ_F_INTR,









			     numdescs,