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

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from netfilter, wireless and ebpf.

  Current release - regressions:

   - netfilter: conntrack: gre: don't set assured flag for clash entries

   - wifi: iwlwifi: remove 'use_tfh' config to fix crash

  Previous releases - regressions:

   - ipv6: fix a potential refcount underflow for idev

   - icmp6: ifix null-ptr-deref of ip6_null_entry->rt6i_idev in
     icmp6_dev()

   - bpf: fix max stack depth check for async callbacks

   - eth: mlx5e:
      - check for NOT_READY flag state after locking
      - fix page_pool page fragment tracking for XDP

   - eth: igc:
      - fix tx hang issue when QBV gate is closed
      - fix corner cases for TSN offload

   - eth: octeontx2-af: Move validation of ptp pointer before its usage

   - eth: ena: fix shift-out-of-bounds in exponential backoff

  Previous releases - always broken:

   - core: prevent skb corruption on frag list segmentation

   - sched:
      - cls_fw: fix improper refcount update leads to use-after-free
      - sch_qfq: account for stab overhead in qfq_enqueue

   - netfilter:
      - report use refcount overflow
      - prevent OOB access in nft_byteorder_eval

   - wifi: mt7921e: fix init command fail with enabled device

   - eth: ocelot: fix oversize frame dropping for preemptible TCs

   - eth: fec: recycle pages for transmitted XDP frames"

* tag 'net-6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (79 commits)
  selftests: tc-testing: add test for qfq with stab overhead
  net/sched: sch_qfq: account for stab overhead in qfq_enqueue
  selftests: tc-testing: add tests for qfq mtu sanity check
  net/sched: sch_qfq: reintroduce lmax bound check for MTU
  wifi: cfg80211: fix receiving mesh packets without RFC1042 header
  wifi: rtw89: debug: fix error code in rtw89_debug_priv_send_h2c_set()
  net: txgbe: fix eeprom calculation error
  net/sched: make psched_mtu() RTNL-less safe
  net: ena: fix shift-out-of-bounds in exponential backoff
  netdevsim: fix uninitialized data in nsim_dev_trap_fa_cookie_write()
  net/sched: flower: Ensure both minimum and maximum ports are specified
  MAINTAINERS: Add another mailing list for QUALCOMM ETHQOS ETHERNET DRIVER
  docs: netdev: update the URL of the status page
  wifi: iwlwifi: remove 'use_tfh' config to fix crash
  xdp: use trusted arguments in XDP hints kfuncs
  bpf: cpumap: Fix memory leak in cpu_map_update_elem
  wifi: airo: avoid uninitialized warning in airo_get_rate()
  octeontx2-pf: Add additional check for MCAM rules
  net: dsa: Removed unneeded of_node_put in felix_parse_ports_node
  net: fec: use netdev_err_once() instead of netdev_err()
  ...
parents ebc27aac 9d23aac8

Documentation/process/maintainer-netdev.rst

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ If you aren't subscribed to netdev and/or are simply unsure if 
repository link above for any new networking-related commits.  You may

also check the following website for the current status:



  http://vger.kernel.org/~davem/net-next.html

  https://patchwork.hopto.org/net-next.html



The ``net`` tree continues to collect fixes for the vX.Y content, and is

fed back to Linus at regular (~weekly) intervals.  Meaning that the

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -17543,6 +17543,7 @@ QUALCOMM ETHQOS ETHERNET DRIVER 
M:	Vinod Koul <vkoul@kernel.org>

R:	Bhupesh Sharma <bhupesh.sharma@linaro.org>

L:	netdev@vger.kernel.org

L:	linux-arm-msm@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/net/qcom,ethqos.yaml

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

arch/riscv/net/bpf_jit.h

+3 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ struct rv_jit_context { 
	struct bpf_prog *prog;

	u16 *insns;		/* RV insns */

	int ninsns;

	int body_len;

	int prologue_len;

	int epilogue_offset;

	int *offset;		/* BPF to RV */

	int nexentries;
@@ -216,8 +216,8 @@ static inline int rv_offset(int insn, int off, struct rv_jit_context *ctx) 
	int from, to;



	off++; /* BPF branch is from PC+1, RV is from PC */

	from = (insn > 0) ? ctx->offset[insn - 1] : 0;

	to = (insn + off > 0) ? ctx->offset[insn + off - 1] : 0;

	from = (insn > 0) ? ctx->offset[insn - 1] : ctx->prologue_len;

	to = (insn + off > 0) ? ctx->offset[insn + off - 1] : ctx->prologue_len;

	return ninsns_rvoff(to - from);

}

arch/riscv/net/bpf_jit_core.c

+13 −6
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) 
	unsigned int prog_size = 0, extable_size = 0;

	bool tmp_blinded = false, extra_pass = false;

	struct bpf_prog *tmp, *orig_prog = prog;

	int pass = 0, prev_ninsns = 0, prologue_len, i;

	int pass = 0, prev_ninsns = 0, i;

	struct rv_jit_data *jit_data;

	struct rv_jit_context *ctx;
@@ -83,6 +83,12 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) 
		prog = orig_prog;

		goto out_offset;

	}



	if (build_body(ctx, extra_pass, NULL)) {

		prog = orig_prog;

		goto out_offset;

	}



	for (i = 0; i < prog->len; i++) {

		prev_ninsns += 32;

		ctx->offset[i] = prev_ninsns;
@@ -91,12 +97,15 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) 
	for (i = 0; i < NR_JIT_ITERATIONS; i++) {

		pass++;

		ctx->ninsns = 0;



		bpf_jit_build_prologue(ctx);

		ctx->prologue_len = ctx->ninsns;



		if (build_body(ctx, extra_pass, ctx->offset)) {

			prog = orig_prog;

			goto out_offset;

		}

		ctx->body_len = ctx->ninsns;

		bpf_jit_build_prologue(ctx);



		ctx->epilogue_offset = ctx->ninsns;

		bpf_jit_build_epilogue(ctx);
@@ -162,10 +171,8 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) 


	if (!prog->is_func || extra_pass) {

		bpf_jit_binary_lock_ro(jit_data->header);

		prologue_len = ctx->epilogue_offset - ctx->body_len;

		for (i = 0; i < prog->len; i++)

			ctx->offset[i] = ninsns_rvoff(prologue_len +

						      ctx->offset[i]);

			ctx->offset[i] = ninsns_rvoff(ctx->offset[i]);

		bpf_prog_fill_jited_linfo(prog, ctx->offset);

out_offset:

		kfree(ctx->offset);

drivers/net/dsa/ocelot/felix.c

+4 −6
Original line number Diff line number Diff line
@@ -1286,7 +1286,6 @@ static int felix_parse_ports_node(struct felix *felix, 
		if (err < 0) {

			dev_info(dev, "Unsupported PHY mode %s on port %d\n",

				 phy_modes(phy_mode), port);

			of_node_put(child);



			/* Leave port_phy_modes[port] = 0, which is also

			 * PHY_INTERFACE_MODE_NA. This will perform a
@@ -1786,16 +1785,15 @@ static int felix_change_mtu(struct dsa_switch *ds, int port, int new_mtu) 
{

	struct ocelot *ocelot = ds->priv;

	struct ocelot_port *ocelot_port = ocelot->ports[port];

	struct felix *felix = ocelot_to_felix(ocelot);



	ocelot_port_set_maxlen(ocelot, port, new_mtu);



	mutex_lock(&ocelot->tas_lock);

	mutex_lock(&ocelot->fwd_domain_lock);



	if (ocelot_port->taprio && felix->info->tas_guard_bands_update)

		felix->info->tas_guard_bands_update(ocelot, port);

	if (ocelot_port->taprio && ocelot->ops->tas_guard_bands_update)

		ocelot->ops->tas_guard_bands_update(ocelot, port);



	mutex_unlock(&ocelot->tas_lock);

	mutex_unlock(&ocelot->fwd_domain_lock);



	return 0;

}