Commit 66ad4829 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Quite smaller than usual. Notably it includes the fix for the unix
  regression from the past weeks. The TCP window fix will require some
  follow-up, already queued.

  Current release - regressions:

   - af_unix: fix garbage collection of embryos

  Previous releases - regressions:

   - af_unix: fix race between GC and receive path

   - ipv6: sr: fix missing sk_buff release in seg6_input_core

   - tcp: remove 64 KByte limit for initial tp->rcv_wnd value

   - eth: r8169: fix rx hangup

   - eth: lan966x: remove ptp traps in case the ptp is not enabled

   - eth: ixgbe: fix link breakage vs cisco switches

   - eth: ice: prevent ethtool from corrupting the channels

  Previous releases - always broken:

   - openvswitch: set the skbuff pkt_type for proper pmtud support

   - tcp: Fix shift-out-of-bounds in dctcp_update_alpha()

  Misc:

   - a bunch of selftests stabilization patches"

* tag 'net-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (25 commits)
  r8169: Fix possible ring buffer corruption on fragmented Tx packets.
  idpf: Interpret .set_channels() input differently
  ice: Interpret .set_channels() input differently
  nfc: nci: Fix handling of zero-length payload packets in nci_rx_work()
  net: relax socket state check at accept time.
  tcp: remove 64 KByte limit for initial tp->rcv_wnd value
  net: ti: icssg_prueth: Fix NULL pointer dereference in prueth_probe()
  tls: fix missing memory barrier in tls_init
  net: fec: avoid lock evasion when reading pps_enable
  Revert "ixgbe: Manual AN-37 for troublesome link partners for X550 SFI"
  testing: net-drv: use stats64 for testing
  net: mana: Fix the extra HZ in mana_hwc_send_request
  net: lan966x: Remove ptp traps in case the ptp is not enabled.
  openvswitch: Set the skbuff pkt_type for proper pmtud support.
  selftest: af_unix: Make SCM_RIGHTS into OOB data.
  af_unix: Fix garbage collection of embryos carrying OOB with SCM_RIGHTS
  tcp: Fix shift-out-of-bounds in dctcp_update_alpha().
  selftests/net: use tc rule to filter the na packet
  ipv6: sr: fix memleak in seg6_hmac_init_algo
  af_unix: Update unix_sk(sk)->oob_skb under sk_receive_queue lock.
  ...
parents 404001dd c71e3a5c

drivers/net/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -49,7 +49,9 @@ obj-$(CONFIG_MHI_NET) += mhi_net.o 
obj-$(CONFIG_ARCNET) += arcnet/

obj-$(CONFIG_CAIF) += caif/

obj-$(CONFIG_CAN) += can/

obj-$(CONFIG_NET_DSA) += dsa/

ifdef CONFIG_NET_DSA

obj-y += dsa/

endif

obj-$(CONFIG_ETHERNET) += ethernet/

obj-$(CONFIG_FDDI) += fddi/

obj-$(CONFIG_HIPPI) += hippi/

drivers/net/ethernet/freescale/fec_ptp.c

+8 −6
Original line number Diff line number Diff line
@@ -104,14 +104,13 @@ static int fec_ptp_enable_pps(struct fec_enet_private *fep, uint enable) 
	struct timespec64 ts;

	u64 ns;



	if (fep->pps_enable == enable)

		return 0;



	fep->pps_channel = DEFAULT_PPS_CHANNEL;

	fep->reload_period = PPS_OUPUT_RELOAD_PERIOD;



	spin_lock_irqsave(&fep->tmreg_lock, flags);



	if (fep->pps_enable == enable) {

		spin_unlock_irqrestore(&fep->tmreg_lock, flags);

		return 0;

	}



	if (enable) {

		/* clear capture or output compare interrupt status if have.

		 */
@@ -532,6 +531,9 @@ static int fec_ptp_enable(struct ptp_clock_info *ptp, 
	int ret = 0;



	if (rq->type == PTP_CLK_REQ_PPS) {

		fep->pps_channel = DEFAULT_PPS_CHANNEL;

		fep->reload_period = PPS_OUPUT_RELOAD_PERIOD;



		ret = fec_ptp_enable_pps(fep, on);



		return ret;

drivers/net/ethernet/intel/ice/ice_ethtool.c

+2 −17
Original line number Diff line number Diff line
@@ -3593,7 +3593,6 @@ static int ice_set_channels(struct net_device *dev, struct ethtool_channels *ch) 
	struct ice_pf *pf = vsi->back;

	int new_rx = 0, new_tx = 0;

	bool locked = false;

	u32 curr_combined;

	int ret = 0;



	/* do not support changing channels in Safe Mode */
@@ -3615,22 +3614,8 @@ static int ice_set_channels(struct net_device *dev, struct ethtool_channels *ch) 
		return -EOPNOTSUPP;

	}



	curr_combined = ice_get_combined_cnt(vsi);



	/* these checks are for cases where user didn't specify a particular

	 * value on cmd line but we get non-zero value anyway via

	 * get_channels(); look at ethtool.c in ethtool repository (the user

	 * space part), particularly, do_schannels() routine

	 */

	if (ch->rx_count == vsi->num_rxq - curr_combined)

		ch->rx_count = 0;

	if (ch->tx_count == vsi->num_txq - curr_combined)

		ch->tx_count = 0;

	if (ch->combined_count == curr_combined)

		ch->combined_count = 0;



	if (!(ch->combined_count || (ch->rx_count && ch->tx_count))) {

		netdev_err(dev, "Please specify at least 1 Rx and 1 Tx channel\n");

	if (ch->rx_count && ch->tx_count) {

		netdev_err(dev, "Dedicated RX or TX channels cannot be used simultaneously\n");

		return -EINVAL;

	}

drivers/net/ethernet/intel/idpf/idpf_ethtool.c

+6 −15
Original line number Diff line number Diff line
@@ -222,14 +222,19 @@ static int idpf_set_channels(struct net_device *netdev, 
			     struct ethtool_channels *ch)

{

	struct idpf_vport_config *vport_config;

	u16 combined, num_txq, num_rxq;

	unsigned int num_req_tx_q;

	unsigned int num_req_rx_q;

	struct idpf_vport *vport;

	u16 num_txq, num_rxq;

	struct device *dev;

	int err = 0;

	u16 idx;



	if (ch->rx_count && ch->tx_count) {

		netdev_err(netdev, "Dedicated RX or TX channels cannot be used simultaneously\n");

		return -EINVAL;

	}



	idpf_vport_ctrl_lock(netdev);

	vport = idpf_netdev_to_vport(netdev);
@@ -239,20 +244,6 @@ static int idpf_set_channels(struct net_device *netdev, 
	num_txq = vport_config->user_config.num_req_tx_qs;

	num_rxq = vport_config->user_config.num_req_rx_qs;



	combined = min(num_txq, num_rxq);



	/* these checks are for cases where user didn't specify a particular

	 * value on cmd line but we get non-zero value anyway via

	 * get_channels(); look at ethtool.c in ethtool repository (the user

	 * space part), particularly, do_schannels() routine

	 */

	if (ch->combined_count == combined)

		ch->combined_count = 0;

	if (ch->combined_count && ch->rx_count == num_rxq - combined)

		ch->rx_count = 0;

	if (ch->combined_count && ch->tx_count == num_txq - combined)

		ch->tx_count = 0;



	num_req_tx_q = ch->combined_count + ch->tx_count;

	num_req_rx_q = ch->combined_count + ch->rx_count;

drivers/net/ethernet/intel/ixgbe/ixgbe_type.h

+0 −3
Original line number Diff line number Diff line
@@ -3675,9 +3675,7 @@ struct ixgbe_info { 
#define IXGBE_KRM_LINK_S1(P)		((P) ? 0x8200 : 0x4200)

#define IXGBE_KRM_LINK_CTRL_1(P)	((P) ? 0x820C : 0x420C)

#define IXGBE_KRM_AN_CNTL_1(P)		((P) ? 0x822C : 0x422C)

#define IXGBE_KRM_AN_CNTL_4(P)		((P) ? 0x8238 : 0x4238)

#define IXGBE_KRM_AN_CNTL_8(P)		((P) ? 0x8248 : 0x4248)

#define IXGBE_KRM_PCS_KX_AN(P)		((P) ? 0x9918 : 0x5918)

#define IXGBE_KRM_SGMII_CTRL(P)		((P) ? 0x82A0 : 0x42A0)

#define IXGBE_KRM_LP_BASE_PAGE_HIGH(P)	((P) ? 0x836C : 0x436C)

#define IXGBE_KRM_DSP_TXFFE_STATE_4(P)	((P) ? 0x8634 : 0x4634)
@@ -3687,7 +3685,6 @@ struct ixgbe_info { 
#define IXGBE_KRM_PMD_FLX_MASK_ST20(P)	((P) ? 0x9054 : 0x5054)

#define IXGBE_KRM_TX_COEFF_CTRL_1(P)	((P) ? 0x9520 : 0x5520)

#define IXGBE_KRM_RX_ANA_CTL(P)		((P) ? 0x9A00 : 0x5A00)

#define IXGBE_KRM_FLX_TMRS_CTRL_ST31(P)	((P) ? 0x9180 : 0x5180)



#define IXGBE_KRM_PMD_FLX_MASK_ST20_SFI_10G_DA		~(0x3 << 20)

#define IXGBE_KRM_PMD_FLX_MASK_ST20_SFI_10G_SR		BIT(20)