Commit 902e7f37 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from ipsec.

  Current release - regressions:

   - sched: taprio: fix init procedure to avoid inf loop when dumping

   - sctp: move the active_key update after sh_keys is added

  Current release - new code bugs:

   - sparx5: fix build with old GCC & bitmask on 32-bit targets

  Previous releases - regressions:

   - xfrm: redo the PREEMPT_RT RCU vs hash_resize_mutex deadlock fix

   - xfrm: fixes for the compat netlink attribute translator

   - phy: micrel: Fix detection of ksz87xx switch

  Previous releases - always broken:

   - gro: set inner transport header offset in tcp/udp GRO hook to avoid
     crashes when such packets reach GSO

   - vsock: handle VIRTIO_VSOCK_OP_CREDIT_REQUEST, as required by spec

   - dsa: sja1105: fix static FDB entries on SJA1105P/Q/R/S and SJA1110

   - bridge: validate the NUD_PERMANENT bit when adding an extern_learn
     FDB entry

   - usb: lan78xx: don't modify phy_device state concurrently

   - usb: pegasus: check for errors of IO routines"

* tag 'net-5.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (48 commits)
  net: vxge: fix use-after-free in vxge_device_unregister
  net: fec: fix use-after-free in fec_drv_remove
  net: pegasus: fix uninit-value in get_interrupt_interval
  net: ethernet: ti: am65-cpsw: fix crash in am65_cpsw_port_offload_fwd_mark_update()
  bnx2x: fix an error code in bnx2x_nic_load()
  net: wwan: iosm: fix recursive lock acquire in unregister
  net: wwan: iosm: correct data protocol mask bit
  net: wwan: iosm: endianness type correction
  net: wwan: iosm: fix lkp buildbot warning
  net: usb: lan78xx: don't modify phy_device state concurrently
  docs: networking: netdevsim rules
  net: usb: pegasus: Remove the changelog and DRIVER_VERSION.
  net: usb: pegasus: Check the return value of get_geristers() and friends;
  net/prestera: Fix devlink groups leakage in error flow
  net: sched: fix lockdep_set_class() typo error for sch->seqlock
  net: dsa: qca: ar9331: reorder MDIO write sequence
  VSOCK: handle VIRTIO_VSOCK_OP_CREDIT_REQUEST
  mptcp: drop unused rcu member in mptcp_pm_addr_entry
  net: ipv6: fix returned variable type in ip6_skb_dst_mtu
  nfp: update ethtool reporting of pauseframe control
  ...
parents e0448092 6bb5318c

Documentation/networking/netdev-FAQ.rst

+17 −0
Original line number Diff line number Diff line
@@ -228,6 +228,23 @@ before posting to the mailing list. The patchwork build bot instance 
gets overloaded very easily and netdev@vger really doesn't need more

traffic if we can help it.



netdevsim is great, can I extend it for my out-of-tree tests?

-------------------------------------------------------------



No, `netdevsim` is a test vehicle solely for upstream tests.

(Please add your tests under tools/testing/selftests/.)



We also give no guarantees that `netdevsim` won't change in the future

in a way which would break what would normally be considered uAPI.



Is netdevsim considered a "user" of an API?

-------------------------------------------



Linux kernel has a long standing rule that no API should be added unless

it has a real, in-tree user. Mock-ups and tests based on `netdevsim` are

strongly encouraged when adding new APIs, but `netdevsim` in itself

is **not** considered a use case/user.



Any other tips to help ensure my net/net-next patch gets OK'd?

--------------------------------------------------------------

Attention to detail.  Re-read your own work as if you were the

Documentation/networking/operstates.rst

+4 −2
Original line number Diff line number Diff line
@@ -73,7 +73,9 @@ IF_OPER_LOWERLAYERDOWN (3): 
 state (f.e. VLAN).



IF_OPER_TESTING (4):

 Unused in current kernel.

 Interface is in testing mode, for example executing driver self-tests

 or media (cable) test. It can't be used for normal traffic until tests

 complete.



IF_OPER_DORMANT (5):

 Interface is L1 up, but waiting for an external event, f.e. for a
@@ -111,7 +113,7 @@ it as lower layer. 


Note that for certain kind of soft-devices, which are not managing any

real hardware, it is possible to set this bit from userspace.  One

should use TVL IFLA_CARRIER to do so.

should use TLV IFLA_CARRIER to do so.



netif_carrier_ok() can be used to query that bit.

drivers/bus/mhi/core/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ void mhi_rddm_prepare(struct mhi_controller *mhi_cntrl, 
		      struct image_info *img_info);

void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl);

int mhi_prepare_channel(struct mhi_controller *mhi_cntrl,

			struct mhi_chan *mhi_chan);

			struct mhi_chan *mhi_chan, unsigned int flags);

int mhi_init_chan_ctxt(struct mhi_controller *mhi_cntrl,

		       struct mhi_chan *mhi_chan);

void mhi_deinit_chan_ctxt(struct mhi_controller *mhi_cntrl,

drivers/bus/mhi/core/main.c

+6 −3
Original line number Diff line number Diff line
@@ -1430,7 +1430,7 @@ static void mhi_unprepare_channel(struct mhi_controller *mhi_cntrl, 
}



int mhi_prepare_channel(struct mhi_controller *mhi_cntrl,

			struct mhi_chan *mhi_chan)

			struct mhi_chan *mhi_chan, unsigned int flags)

{

	int ret = 0;

	struct device *dev = &mhi_chan->mhi_dev->dev;
@@ -1455,6 +1455,9 @@ int mhi_prepare_channel(struct mhi_controller *mhi_cntrl, 
	if (ret)

		goto error_pm_state;



	if (mhi_chan->dir == DMA_FROM_DEVICE)

		mhi_chan->pre_alloc = !!(flags & MHI_CH_INBOUND_ALLOC_BUFS);

	

	/* Pre-allocate buffer for xfer ring */

	if (mhi_chan->pre_alloc) {

		int nr_el = get_nr_avail_ring_elements(mhi_cntrl,
@@ -1610,7 +1613,7 @@ void mhi_reset_chan(struct mhi_controller *mhi_cntrl, struct mhi_chan *mhi_chan) 
}



/* Move channel to start state */

int mhi_prepare_for_transfer(struct mhi_device *mhi_dev)

int mhi_prepare_for_transfer(struct mhi_device *mhi_dev, unsigned int flags)

{

	int ret, dir;

	struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl;
@@ -1621,7 +1624,7 @@ int mhi_prepare_for_transfer(struct mhi_device *mhi_dev) 
		if (!mhi_chan)

			continue;



		ret = mhi_prepare_channel(mhi_cntrl, mhi_chan);

		ret = mhi_prepare_channel(mhi_cntrl, mhi_chan, flags);

		if (ret)

			goto error_open_chan;

	}

drivers/net/dsa/qca/ar9331.c

+11 −3
Original line number Diff line number Diff line
@@ -837,16 +837,24 @@ static int ar9331_mdio_write(void *ctx, u32 reg, u32 val) 
		return 0;

	}



	ret = __ar9331_mdio_write(sbus, AR9331_SW_MDIO_PHY_MODE_REG, reg, val);

	/* In case of this switch we work with 32bit registers on top of 16bit

	 * bus. Some registers (for example access to forwarding database) have

	 * trigger bit on the first 16bit half of request, the result and

	 * configuration of request in the second half.

	 * To make it work properly, we should do the second part of transfer

	 * before the first one is done.

	 */

	ret = __ar9331_mdio_write(sbus, AR9331_SW_MDIO_PHY_MODE_REG, reg + 2,

				  val >> 16);

	if (ret < 0)

		goto error;



	ret = __ar9331_mdio_write(sbus, AR9331_SW_MDIO_PHY_MODE_REG, reg + 2,

				  val >> 16);

	ret = __ar9331_mdio_write(sbus, AR9331_SW_MDIO_PHY_MODE_REG, reg, val);

	if (ret < 0)

		goto error;



	return 0;



error:

	dev_err_ratelimited(&sbus->dev, "Bus error. Failed to write register.\n");

	return ret;