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

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

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

  Jakub is doing a lot of work to include the self-tests in our CI, as a
  result a significant amount of self-tests related fixes is flowing in
  (and will likely continue in the next few weeks).

  Current release - regressions:

   - bpf: fix a kernel crash for the riscv 64 JIT

   - bnxt_en: fix memory leak in bnxt_hwrm_get_rings()

   - revert "net: macsec: use skb_ensure_writable_head_tail to expand
     the skb"

  Previous releases - regressions:

   - core: fix removing a namespace with conflicting altnames

   - tc/flower: fix chain template offload memory leak

   - tcp:
      - make sure init the accept_queue's spinlocks once
      - fix autocork on CPUs with weak memory model

   - udp: fix busy polling

   - mlx5e:
      - fix out-of-bound read in port timestamping
      - fix peer flow lists corruption

   - iwlwifi: fix a memory corruption

  Previous releases - always broken:

   - netfilter:
      - nft_chain_filter: handle NETDEV_UNREGISTER for inet/ingress
        basechain
      - nft_limit: reject configurations that cause integer overflow

   - bpf: fix bpf_xdp_adjust_tail() with XSK zero-copy mbuf, avoiding a
     NULL pointer dereference upon shrinking

   - llc: make llc_ui_sendmsg() more robust against bonding changes

   - smc: fix illegal rmb_desc access in SMC-D connection dump

   - dpll: fix pin dump crash for rebound module

   - bnxt_en: fix possible crash after creating sw mqprio TCs

   - hv_netvsc: calculate correct ring size when PAGE_SIZE is not 4kB

  Misc:

   - several self-tests fixes for better integration with the netdev CI

   - added several missing modules descriptions"

* tag 'net-6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (88 commits)
  tsnep: Fix XDP_RING_NEED_WAKEUP for empty fill ring
  tsnep: Remove FCS for XDP data path
  net: fec: fix the unhandled context fault from smmu
  selftests: bonding: do not test arp/ns target with mode balance-alb/tlb
  fjes: fix memleaks in fjes_hw_setup
  i40e: update xdp_rxq_info::frag_size for ZC enabled Rx queue
  i40e: set xdp_rxq_info::frag_size
  xdp: reflect tail increase for MEM_TYPE_XSK_BUFF_POOL
  ice: update xdp_rxq_info::frag_size for ZC enabled Rx queue
  intel: xsk: initialize skb_frag_t::bv_offset in ZC drivers
  ice: remove redundant xdp_rxq_info registration
  i40e: handle multi-buffer packets that are shrunk by xdp prog
  ice: work on pre-XDP prog frag count
  xsk: fix usage of multi-buffer BPF helpers for ZC XDP
  xsk: make xsk_buff_pool responsible for clearing xdp_buff::flags
  xsk: recycle buffer in case Rx queue was full
  net: fill in MODULE_DESCRIPTION()s for rvu_mbox
  net: fill in MODULE_DESCRIPTION()s for litex
  net: fill in MODULE_DESCRIPTION()s for fsl_pq_mdio
  net: fill in MODULE_DESCRIPTION()s for fec
  ...
parents bdc01020 0a5bd0ff

arch/riscv/net/bpf_jit_comp64.c

+3 −2
Original line number Diff line number Diff line
@@ -795,6 +795,7 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, 
	struct bpf_tramp_links *fentry = &tlinks[BPF_TRAMP_FENTRY];

	struct bpf_tramp_links *fexit = &tlinks[BPF_TRAMP_FEXIT];

	struct bpf_tramp_links *fmod_ret = &tlinks[BPF_TRAMP_MODIFY_RETURN];

	bool is_struct_ops = flags & BPF_TRAMP_F_INDIRECT;

	void *orig_call = func_addr;

	bool save_ret;

	u32 insn;
@@ -878,7 +879,7 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, 


	stack_size = round_up(stack_size, 16);



	if (func_addr) {

	if (!is_struct_ops) {

		/* For the trampoline called from function entry,

		 * the frame of traced function and the frame of

		 * trampoline need to be considered.
@@ -998,7 +999,7 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, 


	emit_ld(RV_REG_S1, -sreg_off, RV_REG_FP, ctx);



	if (func_addr) {

	if (!is_struct_ops) {

		/* trampoline called from function entry */

		emit_ld(RV_REG_T0, stack_size - 8, RV_REG_SP, ctx);

		emit_ld(RV_REG_FP, stack_size - 16, RV_REG_SP, ctx);

drivers/dpll/dpll_core.c

+57 −11
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ static u32 dpll_pin_xa_id; 
	WARN_ON_ONCE(!xa_get_mark(&dpll_device_xa, (d)->id, DPLL_REGISTERED))

#define ASSERT_DPLL_NOT_REGISTERED(d)	\

	WARN_ON_ONCE(xa_get_mark(&dpll_device_xa, (d)->id, DPLL_REGISTERED))

#define ASSERT_PIN_REGISTERED(p)	\

	WARN_ON_ONCE(!xa_get_mark(&dpll_pin_xa, (p)->id, DPLL_REGISTERED))



struct dpll_device_registration {

	struct list_head list;
@@ -425,6 +423,53 @@ void dpll_device_unregister(struct dpll_device *dpll, 
}

EXPORT_SYMBOL_GPL(dpll_device_unregister);



static void dpll_pin_prop_free(struct dpll_pin_properties *prop)

{

	kfree(prop->package_label);

	kfree(prop->panel_label);

	kfree(prop->board_label);

	kfree(prop->freq_supported);

}



static int dpll_pin_prop_dup(const struct dpll_pin_properties *src,

			     struct dpll_pin_properties *dst)

{

	memcpy(dst, src, sizeof(*dst));

	if (src->freq_supported && src->freq_supported_num) {

		size_t freq_size = src->freq_supported_num *

				   sizeof(*src->freq_supported);

		dst->freq_supported = kmemdup(src->freq_supported,

					      freq_size, GFP_KERNEL);

		if (!src->freq_supported)

			return -ENOMEM;

	}

	if (src->board_label) {

		dst->board_label = kstrdup(src->board_label, GFP_KERNEL);

		if (!dst->board_label)

			goto err_board_label;

	}

	if (src->panel_label) {

		dst->panel_label = kstrdup(src->panel_label, GFP_KERNEL);

		if (!dst->panel_label)

			goto err_panel_label;

	}

	if (src->package_label) {

		dst->package_label = kstrdup(src->package_label, GFP_KERNEL);

		if (!dst->package_label)

			goto err_package_label;

	}



	return 0;



err_package_label:

	kfree(dst->panel_label);

err_panel_label:

	kfree(dst->board_label);

err_board_label:

	kfree(dst->freq_supported);

	return -ENOMEM;

}



static struct dpll_pin *

dpll_pin_alloc(u64 clock_id, u32 pin_idx, struct module *module,

	       const struct dpll_pin_properties *prop)
@@ -441,20 +486,24 @@ dpll_pin_alloc(u64 clock_id, u32 pin_idx, struct module *module, 
	if (WARN_ON(prop->type < DPLL_PIN_TYPE_MUX ||

		    prop->type > DPLL_PIN_TYPE_MAX)) {

		ret = -EINVAL;

		goto err;

		goto err_pin_prop;

	}

	pin->prop = prop;

	ret = dpll_pin_prop_dup(prop, &pin->prop);

	if (ret)

		goto err_pin_prop;

	refcount_set(&pin->refcount, 1);

	xa_init_flags(&pin->dpll_refs, XA_FLAGS_ALLOC);

	xa_init_flags(&pin->parent_refs, XA_FLAGS_ALLOC);

	ret = xa_alloc_cyclic(&dpll_pin_xa, &pin->id, pin, xa_limit_32b,

			      &dpll_pin_xa_id, GFP_KERNEL);

	if (ret)

		goto err;

		goto err_xa_alloc;

	return pin;

err:

err_xa_alloc:

	xa_destroy(&pin->dpll_refs);

	xa_destroy(&pin->parent_refs);

	dpll_pin_prop_free(&pin->prop);

err_pin_prop:

	kfree(pin);

	return ERR_PTR(ret);

}
@@ -514,6 +563,7 @@ void dpll_pin_put(struct dpll_pin *pin) 
		xa_destroy(&pin->dpll_refs);

		xa_destroy(&pin->parent_refs);

		xa_erase(&dpll_pin_xa, pin->id);

		dpll_pin_prop_free(&pin->prop);

		kfree(pin);

	}

	mutex_unlock(&dpll_lock);
@@ -564,8 +614,6 @@ dpll_pin_register(struct dpll_device *dpll, struct dpll_pin *pin, 
	    WARN_ON(!ops->state_on_dpll_get) ||

	    WARN_ON(!ops->direction_get))

		return -EINVAL;

	if (ASSERT_DPLL_REGISTERED(dpll))

		return -EINVAL;



	mutex_lock(&dpll_lock);

	if (WARN_ON(!(dpll->module == pin->module &&
@@ -636,15 +684,13 @@ int dpll_pin_on_pin_register(struct dpll_pin *parent, struct dpll_pin *pin, 
	unsigned long i, stop;

	int ret;



	if (WARN_ON(parent->prop->type != DPLL_PIN_TYPE_MUX))

	if (WARN_ON(parent->prop.type != DPLL_PIN_TYPE_MUX))

		return -EINVAL;



	if (WARN_ON(!ops) ||

	    WARN_ON(!ops->state_on_pin_get) ||

	    WARN_ON(!ops->direction_get))

		return -EINVAL;

	if (ASSERT_PIN_REGISTERED(parent))

		return -EINVAL;



	mutex_lock(&dpll_lock);

	ret = dpll_xa_ref_pin_add(&pin->parent_refs, parent, ops, priv);

drivers/dpll/dpll_core.h

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ struct dpll_device { 
 * @module:		module of creator

 * @dpll_refs:		hold referencees to dplls pin was registered with

 * @parent_refs:	hold references to parent pins pin was registered with

 * @prop:		pointer to pin properties given by registerer

 * @prop:		pin properties copied from the registerer

 * @rclk_dev_name:	holds name of device when pin can recover clock from it

 * @refcount:		refcount

 **/
@@ -55,7 +55,7 @@ struct dpll_pin { 
	struct module *module;

	struct xarray dpll_refs;

	struct xarray parent_refs;

	const struct dpll_pin_properties *prop;

	struct dpll_pin_properties prop;

	refcount_t refcount;

};

drivers/dpll/dpll_netlink.c

+41 −16
Original line number Diff line number Diff line
@@ -303,17 +303,17 @@ dpll_msg_add_pin_freq(struct sk_buff *msg, struct dpll_pin *pin, 
	if (nla_put_64bit(msg, DPLL_A_PIN_FREQUENCY, sizeof(freq), &freq,

			  DPLL_A_PIN_PAD))

		return -EMSGSIZE;

	for (fs = 0; fs < pin->prop->freq_supported_num; fs++) {

	for (fs = 0; fs < pin->prop.freq_supported_num; fs++) {

		nest = nla_nest_start(msg, DPLL_A_PIN_FREQUENCY_SUPPORTED);

		if (!nest)

			return -EMSGSIZE;

		freq = pin->prop->freq_supported[fs].min;

		freq = pin->prop.freq_supported[fs].min;

		if (nla_put_64bit(msg, DPLL_A_PIN_FREQUENCY_MIN, sizeof(freq),

				  &freq, DPLL_A_PIN_PAD)) {

			nla_nest_cancel(msg, nest);

			return -EMSGSIZE;

		}

		freq = pin->prop->freq_supported[fs].max;

		freq = pin->prop.freq_supported[fs].max;

		if (nla_put_64bit(msg, DPLL_A_PIN_FREQUENCY_MAX, sizeof(freq),

				  &freq, DPLL_A_PIN_PAD)) {

			nla_nest_cancel(msg, nest);
@@ -329,9 +329,9 @@ static bool dpll_pin_is_freq_supported(struct dpll_pin *pin, u32 freq) 
{

	int fs;



	for (fs = 0; fs < pin->prop->freq_supported_num; fs++)

		if (freq >= pin->prop->freq_supported[fs].min &&

		    freq <= pin->prop->freq_supported[fs].max)

	for (fs = 0; fs < pin->prop.freq_supported_num; fs++)

		if (freq >= pin->prop.freq_supported[fs].min &&

		    freq <= pin->prop.freq_supported[fs].max)

			return true;

	return false;

}
@@ -421,7 +421,7 @@ static int 
dpll_cmd_pin_get_one(struct sk_buff *msg, struct dpll_pin *pin,

		     struct netlink_ext_ack *extack)

{

	const struct dpll_pin_properties *prop = pin->prop;

	const struct dpll_pin_properties *prop = &pin->prop;

	struct dpll_pin_ref *ref;

	int ret;
@@ -553,6 +553,24 @@ __dpll_device_change_ntf(struct dpll_device *dpll) 
	return dpll_device_event_send(DPLL_CMD_DEVICE_CHANGE_NTF, dpll);

}



static bool dpll_pin_available(struct dpll_pin *pin)

{

	struct dpll_pin_ref *par_ref;

	unsigned long i;



	if (!xa_get_mark(&dpll_pin_xa, pin->id, DPLL_REGISTERED))

		return false;

	xa_for_each(&pin->parent_refs, i, par_ref)

		if (xa_get_mark(&dpll_pin_xa, par_ref->pin->id,

				DPLL_REGISTERED))

			return true;

	xa_for_each(&pin->dpll_refs, i, par_ref)

		if (xa_get_mark(&dpll_device_xa, par_ref->dpll->id,

				DPLL_REGISTERED))

			return true;

	return false;

}



/**

 * dpll_device_change_ntf - notify that the dpll device has been changed

 * @dpll: registered dpll pointer
@@ -579,7 +597,7 @@ dpll_pin_event_send(enum dpll_cmd event, struct dpll_pin *pin) 
	int ret = -ENOMEM;

	void *hdr;



	if (WARN_ON(!xa_get_mark(&dpll_pin_xa, pin->id, DPLL_REGISTERED)))

	if (!dpll_pin_available(pin))

		return -ENODEV;



	msg = genlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
@@ -717,7 +735,7 @@ dpll_pin_on_pin_state_set(struct dpll_pin *pin, u32 parent_idx, 
	int ret;



	if (!(DPLL_PIN_CAPABILITIES_STATE_CAN_CHANGE &

	      pin->prop->capabilities)) {

	      pin->prop.capabilities)) {

		NL_SET_ERR_MSG(extack, "state changing is not allowed");

		return -EOPNOTSUPP;

	}
@@ -753,7 +771,7 @@ dpll_pin_state_set(struct dpll_device *dpll, struct dpll_pin *pin, 
	int ret;



	if (!(DPLL_PIN_CAPABILITIES_STATE_CAN_CHANGE &

	      pin->prop->capabilities)) {

	      pin->prop.capabilities)) {

		NL_SET_ERR_MSG(extack, "state changing is not allowed");

		return -EOPNOTSUPP;

	}
@@ -780,7 +798,7 @@ dpll_pin_prio_set(struct dpll_device *dpll, struct dpll_pin *pin, 
	int ret;



	if (!(DPLL_PIN_CAPABILITIES_PRIORITY_CAN_CHANGE &

	      pin->prop->capabilities)) {

	      pin->prop.capabilities)) {

		NL_SET_ERR_MSG(extack, "prio changing is not allowed");

		return -EOPNOTSUPP;

	}
@@ -808,7 +826,7 @@ dpll_pin_direction_set(struct dpll_pin *pin, struct dpll_device *dpll, 
	int ret;



	if (!(DPLL_PIN_CAPABILITIES_DIRECTION_CAN_CHANGE &

	      pin->prop->capabilities)) {

	      pin->prop.capabilities)) {

		NL_SET_ERR_MSG(extack, "direction changing is not allowed");

		return -EOPNOTSUPP;

	}
@@ -838,8 +856,8 @@ dpll_pin_phase_adj_set(struct dpll_pin *pin, struct nlattr *phase_adj_attr, 
	int ret;



	phase_adj = nla_get_s32(phase_adj_attr);

	if (phase_adj > pin->prop->phase_range.max ||

	    phase_adj < pin->prop->phase_range.min) {

	if (phase_adj > pin->prop.phase_range.max ||

	    phase_adj < pin->prop.phase_range.min) {

		NL_SET_ERR_MSG_ATTR(extack, phase_adj_attr,

				    "phase adjust value not supported");

		return -EINVAL;
@@ -1023,7 +1041,7 @@ dpll_pin_find(u64 clock_id, struct nlattr *mod_name_attr, 
	unsigned long i;



	xa_for_each_marked(&dpll_pin_xa, i, pin, DPLL_REGISTERED) {

		prop = pin->prop;

		prop = &pin->prop;

		cid_match = clock_id ? pin->clock_id == clock_id : true;

		mod_match = mod_name_attr && module_name(pin->module) ?

			!nla_strcmp(mod_name_attr,
@@ -1130,6 +1148,10 @@ int dpll_nl_pin_id_get_doit(struct sk_buff *skb, struct genl_info *info) 
	}

	pin = dpll_pin_find_from_nlattr(info);

	if (!IS_ERR(pin)) {

		if (!dpll_pin_available(pin)) {

			nlmsg_free(msg);

			return -ENODEV;

		}

		ret = dpll_msg_add_pin_handle(msg, pin);

		if (ret) {

			nlmsg_free(msg);
@@ -1179,6 +1201,8 @@ int dpll_nl_pin_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb) 


	xa_for_each_marked_start(&dpll_pin_xa, i, pin, DPLL_REGISTERED,

				 ctx->idx) {

		if (!dpll_pin_available(pin))

			continue;

		hdr = genlmsg_put(skb, NETLINK_CB(cb->skb).portid,

				  cb->nlh->nlmsg_seq,

				  &dpll_nl_family, NLM_F_MULTI,
@@ -1441,7 +1465,8 @@ int dpll_pin_pre_doit(const struct genl_split_ops *ops, struct sk_buff *skb, 
	}

	info->user_ptr[0] = xa_load(&dpll_pin_xa,

				    nla_get_u32(info->attrs[DPLL_A_PIN_ID]));

	if (!info->user_ptr[0]) {

	if (!info->user_ptr[0] ||

	    !dpll_pin_available(info->user_ptr[0])) {

		NL_SET_ERR_MSG(info->extack, "pin not found");

		ret = -ENODEV;

		goto unlock_dev;

drivers/net/ethernet/8390/8390.c

+1 −0
Original line number Diff line number Diff line
@@ -100,4 +100,5 @@ static void __exit ns8390_module_exit(void) 
module_init(ns8390_module_init);

module_exit(ns8390_module_exit);

#endif /* MODULE */

MODULE_DESCRIPTION("National Semiconductor 8390 core driver");

MODULE_LICENSE("GPL");