Commit 68533eb1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from can, rxrpc and wireguard.

  Previous releases - regressions:

   - igmp: respect RCU rules in ip_mc_source() and ip_mc_msfilter()

   - mld: respect RCU rules in ip6_mc_source() and ip6_mc_msfilter()

   - rds: acquire netns refcount on TCP sockets

   - rxrpc: enable IPv6 checksums on transport socket

   - nic: hinic: fix bug of wq out of bound access

   - nic: thunder: don't use pci_irq_vector() in atomic context

   - nic: bnxt_en: fix possible bnxt_open() failure caused by wrong RFS
     flag

   - nic: mlx5e:
      - lag, fix use-after-free in fib event handler
      - fix deadlock in sync reset flow

  Previous releases - always broken:

   - tcp: fix insufficient TCP source port randomness

   - can: grcan: grcan_close(): fix deadlock

   - nfc: reorder destructive operations in to avoid bugs

  Misc:

   - wireguard: improve selftests reliability"

* tag 'net-5.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (63 commits)
  NFC: netlink: fix sleep in atomic bug when firmware download timeout
  selftests: ocelot: tc_flower_chains: specify conform-exceed action for policer
  tcp: drop the hash_32() part from the index calculation
  tcp: increase source port perturb table to 2^16
  tcp: dynamically allocate the perturb table used by source ports
  tcp: add small random increments to the source port
  tcp: resalt the secret every 10 seconds
  tcp: use different parts of the port_offset for index and offset
  secure_seq: use the 64 bits of the siphash for port offset calculation
  wireguard: selftests: set panic_on_warn=1 from cmdline
  wireguard: selftests: bump package deps
  wireguard: selftests: restore support for ccache
  wireguard: selftests: use newer toolchains to fill out architectures
  wireguard: selftests: limit parallelism to $(nproc) tests at once
  wireguard: selftests: make routing loop test non-fatal
  net/mlx5: Fix matching on inner TTC
  net/mlx5: Avoid double clear or set of sync reset requested
  net/mlx5: Fix deadlock in sync reset flow
  net/mlx5e: Fix trust state reset in reload
  net/mlx5e: Avoid checking offload capability in post_parse action
  ...
parents a7391ad3 4071bf12

drivers/net/can/grcan.c

+24 −22
Original line number Diff line number Diff line
@@ -241,13 +241,14 @@ struct grcan_device_config { 
		.rxsize		= GRCAN_DEFAULT_BUFFER_SIZE,	\

		}



#define GRCAN_TXBUG_SAFE_GRLIB_VERSION	0x4100

#define GRCAN_TXBUG_SAFE_GRLIB_VERSION	4100

#define GRLIB_VERSION_MASK		0xffff



/* GRCAN private data structure */

struct grcan_priv {

	struct can_priv can;	/* must be the first member */

	struct net_device *dev;

	struct device *ofdev_dev;

	struct napi_struct napi;



	struct grcan_registers __iomem *regs;	/* ioremap'ed registers */
@@ -921,7 +922,7 @@ static void grcan_free_dma_buffers(struct net_device *dev) 
	struct grcan_priv *priv = netdev_priv(dev);

	struct grcan_dma *dma = &priv->dma;



	dma_free_coherent(&dev->dev, dma->base_size, dma->base_buf,

	dma_free_coherent(priv->ofdev_dev, dma->base_size, dma->base_buf,

			  dma->base_handle);

	memset(dma, 0, sizeof(*dma));

}
@@ -946,7 +947,7 @@ static int grcan_allocate_dma_buffers(struct net_device *dev, 


	/* Extra GRCAN_BUFFER_ALIGNMENT to allow for alignment */

	dma->base_size = lsize + ssize + GRCAN_BUFFER_ALIGNMENT;

	dma->base_buf = dma_alloc_coherent(&dev->dev,

	dma->base_buf = dma_alloc_coherent(priv->ofdev_dev,

					   dma->base_size,

					   &dma->base_handle,

					   GFP_KERNEL);
@@ -1102,8 +1103,10 @@ static int grcan_close(struct net_device *dev) 


	priv->closing = true;

	if (priv->need_txbug_workaround) {

		spin_unlock_irqrestore(&priv->lock, flags);

		del_timer_sync(&priv->hang_timer);

		del_timer_sync(&priv->rr_timer);

		spin_lock_irqsave(&priv->lock, flags);

	}

	netif_stop_queue(dev);

	grcan_stop_hardware(dev);
@@ -1122,7 +1125,7 @@ static int grcan_close(struct net_device *dev) 
	return 0;

}



static int grcan_transmit_catch_up(struct net_device *dev, int budget)

static void grcan_transmit_catch_up(struct net_device *dev)

{

	struct grcan_priv *priv = netdev_priv(dev);

	unsigned long flags;
@@ -1130,7 +1133,7 @@ static int grcan_transmit_catch_up(struct net_device *dev, int budget) 


	spin_lock_irqsave(&priv->lock, flags);



	work_done = catch_up_echo_skb(dev, budget, true);

	work_done = catch_up_echo_skb(dev, -1, true);

	if (work_done) {

		if (!priv->resetting && !priv->closing &&

		    !(priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY))
@@ -1144,8 +1147,6 @@ static int grcan_transmit_catch_up(struct net_device *dev, int budget) 
	}



	spin_unlock_irqrestore(&priv->lock, flags);



	return work_done;

}



static int grcan_receive(struct net_device *dev, int budget)
@@ -1227,19 +1228,13 @@ static int grcan_poll(struct napi_struct *napi, int budget) 
	struct net_device *dev = priv->dev;

	struct grcan_registers __iomem *regs = priv->regs;

	unsigned long flags;

	int tx_work_done, rx_work_done;

	int rx_budget = budget / 2;

	int tx_budget = budget - rx_budget;

	int work_done;



	/* Half of the budget for receiving messages */

	rx_work_done = grcan_receive(dev, rx_budget);

	work_done = grcan_receive(dev, budget);



	/* Half of the budget for transmitting messages as that can trigger echo

	 * frames being received

	 */

	tx_work_done = grcan_transmit_catch_up(dev, tx_budget);

	grcan_transmit_catch_up(dev);



	if (rx_work_done < rx_budget && tx_work_done < tx_budget) {

	if (work_done < budget) {

		napi_complete(napi);



		/* Guarantee no interference with a running reset that otherwise
@@ -1256,7 +1251,7 @@ static int grcan_poll(struct napi_struct *napi, int budget) 
		spin_unlock_irqrestore(&priv->lock, flags);

	}



	return rx_work_done + tx_work_done;

	return work_done;

}



/* Work tx bug by waiting while for the risky situation to clear. If that fails,
@@ -1587,6 +1582,7 @@ static int grcan_setup_netdev(struct platform_device *ofdev, 
	memcpy(&priv->config, &grcan_module_config,

	       sizeof(struct grcan_device_config));

	priv->dev = dev;

	priv->ofdev_dev = &ofdev->dev;

	priv->regs = base;

	priv->can.bittiming_const = &grcan_bittiming_const;

	priv->can.do_set_bittiming = grcan_set_bittiming;
@@ -1639,6 +1635,7 @@ static int grcan_setup_netdev(struct platform_device *ofdev, 
static int grcan_probe(struct platform_device *ofdev)

{

	struct device_node *np = ofdev->dev.of_node;

	struct device_node *sysid_parent;

	u32 sysid, ambafreq;

	int irq, err;

	void __iomem *base;
@@ -1647,10 +1644,15 @@ static int grcan_probe(struct platform_device *ofdev) 
	/* Compare GRLIB version number with the first that does not

	 * have the tx bug (see start_xmit)

	 */

	err = of_property_read_u32(np, "systemid", &sysid);

	if (!err && ((sysid & GRLIB_VERSION_MASK)

		     >= GRCAN_TXBUG_SAFE_GRLIB_VERSION))

	sysid_parent = of_find_node_by_path("/ambapp0");

	if (sysid_parent) {

		of_node_get(sysid_parent);

		err = of_property_read_u32(sysid_parent, "systemid", &sysid);

		if (!err && ((sysid & GRLIB_VERSION_MASK) >=

			     GRCAN_TXBUG_SAFE_GRLIB_VERSION))

			txbug = false;

		of_node_put(sysid_parent);

	}



	err = of_property_read_u32(np, "freq", &ambafreq);

	if (err) {

drivers/net/dsa/b53/b53_common.c

+7 −29
Original line number Diff line number Diff line
@@ -1354,46 +1354,25 @@ static void b53_phylink_get_caps(struct dsa_switch *ds, int port, 
	config->legacy_pre_march2020 = false;

}



int b53_phylink_mac_link_state(struct dsa_switch *ds, int port,

			       struct phylink_link_state *state)

static struct phylink_pcs *b53_phylink_mac_select_pcs(struct dsa_switch *ds,

						      int port,

						      phy_interface_t interface)

{

	struct b53_device *dev = ds->priv;

	int ret = -EOPNOTSUPP;



	if ((phy_interface_mode_is_8023z(state->interface) ||

	     state->interface == PHY_INTERFACE_MODE_SGMII) &&

	     dev->ops->serdes_link_state)

		ret = dev->ops->serdes_link_state(dev, port, state);

	if (!dev->ops->phylink_mac_select_pcs)

		return NULL;



	return ret;

	return dev->ops->phylink_mac_select_pcs(dev, port, interface);

}

EXPORT_SYMBOL(b53_phylink_mac_link_state);



void b53_phylink_mac_config(struct dsa_switch *ds, int port,

			    unsigned int mode,

			    const struct phylink_link_state *state)

{

	struct b53_device *dev = ds->priv;



	if (mode == MLO_AN_PHY || mode == MLO_AN_FIXED)

		return;



	if ((phy_interface_mode_is_8023z(state->interface) ||

	     state->interface == PHY_INTERFACE_MODE_SGMII) &&

	     dev->ops->serdes_config)

		dev->ops->serdes_config(dev, port, mode, state);

}

EXPORT_SYMBOL(b53_phylink_mac_config);



void b53_phylink_mac_an_restart(struct dsa_switch *ds, int port)

{

	struct b53_device *dev = ds->priv;



	if (dev->ops->serdes_an_restart)

		dev->ops->serdes_an_restart(dev, port);

}

EXPORT_SYMBOL(b53_phylink_mac_an_restart);



void b53_phylink_mac_link_down(struct dsa_switch *ds, int port,

			       unsigned int mode,

			       phy_interface_t interface)
@@ -2269,9 +2248,8 @@ static const struct dsa_switch_ops b53_switch_ops = { 
	.phy_write		= b53_phy_write16,

	.adjust_link		= b53_adjust_link,

	.phylink_get_caps	= b53_phylink_get_caps,

	.phylink_mac_link_state	= b53_phylink_mac_link_state,

	.phylink_mac_select_pcs	= b53_phylink_mac_select_pcs,

	.phylink_mac_config	= b53_phylink_mac_config,

	.phylink_mac_an_restart	= b53_phylink_mac_an_restart,

	.phylink_mac_link_down	= b53_phylink_mac_link_down,

	.phylink_mac_link_up	= b53_phylink_mac_link_up,

	.port_enable		= b53_enable_port,

drivers/net/dsa/b53/b53_priv.h

+13 −11
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


#include <linux/kernel.h>

#include <linux/mutex.h>

#include <linux/phy.h>

#include <linux/phylink.h>

#include <linux/etherdevice.h>

#include <net/dsa.h>
@@ -29,7 +29,6 @@ 


struct b53_device;

struct net_device;

struct phylink_link_state;



struct b53_io_ops {

	int (*read8)(struct b53_device *dev, u8 page, u8 reg, u8 *value);
@@ -48,13 +47,10 @@ struct b53_io_ops { 
	void (*irq_disable)(struct b53_device *dev, int port);

	void (*phylink_get_caps)(struct b53_device *dev, int port,

				 struct phylink_config *config);

	struct phylink_pcs *(*phylink_mac_select_pcs)(struct b53_device *dev,

						      int port,

						      phy_interface_t interface);

	u8 (*serdes_map_lane)(struct b53_device *dev, int port);

	int (*serdes_link_state)(struct b53_device *dev, int port,

				 struct phylink_link_state *state);

	void (*serdes_config)(struct b53_device *dev, int port,

			      unsigned int mode,

			      const struct phylink_link_state *state);

	void (*serdes_an_restart)(struct b53_device *dev, int port);

	void (*serdes_link_set)(struct b53_device *dev, int port,

				unsigned int mode, phy_interface_t interface,

				bool link_up);
@@ -85,8 +81,15 @@ enum { 
	BCM7278_DEVICE_ID = 0x7278,

};



struct b53_pcs {

	struct phylink_pcs pcs;

	struct b53_device *dev;

	u8 lane;

};



#define B53_N_PORTS	9

#define B53_N_PORTS_25	6

#define B53_N_PCS	2



struct b53_port {

	u16		vlan_ctl_mask;
@@ -143,6 +146,8 @@ struct b53_device { 
	bool vlan_enabled;

	unsigned int num_ports;

	struct b53_port *ports;



	struct b53_pcs pcs[B53_N_PCS];

};



#define b53_for_each_port(dev, i) \
@@ -336,12 +341,9 @@ int b53_br_flags(struct dsa_switch *ds, int port, 
		 struct netlink_ext_ack *extack);

int b53_setup_devlink_resources(struct dsa_switch *ds);

void b53_port_event(struct dsa_switch *ds, int port);

int b53_phylink_mac_link_state(struct dsa_switch *ds, int port,

			       struct phylink_link_state *state);

void b53_phylink_mac_config(struct dsa_switch *ds, int port,

			    unsigned int mode,

			    const struct phylink_link_state *state);

void b53_phylink_mac_an_restart(struct dsa_switch *ds, int port);

void b53_phylink_mac_link_down(struct dsa_switch *ds, int port,

			       unsigned int mode,

			       phy_interface_t interface);

drivers/net/dsa/b53/b53_serdes.c

+51 −23
Original line number Diff line number Diff line
@@ -17,6 +17,11 @@ 
#include "b53_serdes.h"

#include "b53_regs.h"



static inline struct b53_pcs *pcs_to_b53_pcs(struct phylink_pcs *pcs)

{

	return container_of(pcs, struct b53_pcs, pcs);

}



static void b53_serdes_write_blk(struct b53_device *dev, u8 offset, u16 block,

				 u16 value)

{
@@ -60,51 +65,47 @@ static u16 b53_serdes_read(struct b53_device *dev, u8 lane, 
	return b53_serdes_read_blk(dev, offset, block);

}



void b53_serdes_config(struct b53_device *dev, int port, unsigned int mode,

		       const struct phylink_link_state *state)

static int b53_serdes_config(struct phylink_pcs *pcs, unsigned int mode,

			     phy_interface_t interface,

			     const unsigned long *advertising,

			     bool permit_pause_to_mac)

{

	u8 lane = b53_serdes_map_lane(dev, port);

	struct b53_device *dev = pcs_to_b53_pcs(pcs)->dev;

	u8 lane = pcs_to_b53_pcs(pcs)->lane;

	u16 reg;



	if (lane == B53_INVALID_LANE)

		return;



	reg = b53_serdes_read(dev, lane, B53_SERDES_DIGITAL_CONTROL(1),

			      SERDES_DIGITAL_BLK);

	if (state->interface == PHY_INTERFACE_MODE_1000BASEX)

	if (interface == PHY_INTERFACE_MODE_1000BASEX)

		reg |= FIBER_MODE_1000X;

	else

		reg &= ~FIBER_MODE_1000X;

	b53_serdes_write(dev, lane, B53_SERDES_DIGITAL_CONTROL(1),

			 SERDES_DIGITAL_BLK, reg);



	return 0;

}

EXPORT_SYMBOL(b53_serdes_config);



void b53_serdes_an_restart(struct b53_device *dev, int port)

static void b53_serdes_an_restart(struct phylink_pcs *pcs)

{

	u8 lane = b53_serdes_map_lane(dev, port);

	struct b53_device *dev = pcs_to_b53_pcs(pcs)->dev;

	u8 lane = pcs_to_b53_pcs(pcs)->lane;

	u16 reg;



	if (lane == B53_INVALID_LANE)

		return;



	reg = b53_serdes_read(dev, lane, B53_SERDES_MII_REG(MII_BMCR),

			      SERDES_MII_BLK);

	reg |= BMCR_ANRESTART;

	b53_serdes_write(dev, lane, B53_SERDES_MII_REG(MII_BMCR),

			 SERDES_MII_BLK, reg);

}

EXPORT_SYMBOL(b53_serdes_an_restart);



int b53_serdes_link_state(struct b53_device *dev, int port,

static void b53_serdes_get_state(struct phylink_pcs *pcs,

				  struct phylink_link_state *state)

{

	u8 lane = b53_serdes_map_lane(dev, port);

	struct b53_device *dev = pcs_to_b53_pcs(pcs)->dev;

	u8 lane = pcs_to_b53_pcs(pcs)->lane;

	u16 dig, bmsr;



	if (lane == B53_INVALID_LANE)

		return 1;



	dig = b53_serdes_read(dev, lane, B53_SERDES_DIGITAL_STATUS,

			      SERDES_DIGITAL_BLK);

	bmsr = b53_serdes_read(dev, lane, B53_SERDES_MII_REG(MII_BMSR),
@@ -133,10 +134,7 @@ int b53_serdes_link_state(struct b53_device *dev, int port, 
		state->pause |= MLO_PAUSE_RX;

	if (dig & PAUSE_RESOLUTION_TX_SIDE)

		state->pause |= MLO_PAUSE_TX;



	return 0;

}

EXPORT_SYMBOL(b53_serdes_link_state);



void b53_serdes_link_set(struct b53_device *dev, int port, unsigned int mode,

			 phy_interface_t interface, bool link_up)
@@ -158,6 +156,12 @@ void b53_serdes_link_set(struct b53_device *dev, int port, unsigned int mode, 
}

EXPORT_SYMBOL(b53_serdes_link_set);



static const struct phylink_pcs_ops b53_pcs_ops = {

	.pcs_get_state = b53_serdes_get_state,

	.pcs_config = b53_serdes_config,

	.pcs_an_restart = b53_serdes_an_restart,

};



void b53_serdes_phylink_get_caps(struct b53_device *dev, int port,

				 struct phylink_config *config)

{
@@ -187,9 +191,28 @@ void b53_serdes_phylink_get_caps(struct b53_device *dev, int port, 
}

EXPORT_SYMBOL(b53_serdes_phylink_get_caps);



struct phylink_pcs *b53_serdes_phylink_mac_select_pcs(struct b53_device *dev,

						      int port,

						      phy_interface_t interface)

{

	u8 lane = b53_serdes_map_lane(dev, port);



	if (lane == B53_INVALID_LANE || lane >= B53_N_PCS ||

	    !dev->pcs[lane].dev)

		return NULL;



	if (!phy_interface_mode_is_8023z(interface) &&

	    interface != PHY_INTERFACE_MODE_SGMII)

		return NULL;



	return &dev->pcs[lane].pcs;

}

EXPORT_SYMBOL(b53_serdes_phylink_mac_select_pcs);



int b53_serdes_init(struct b53_device *dev, int port)

{

	u8 lane = b53_serdes_map_lane(dev, port);

	struct b53_pcs *pcs;

	u16 id0, msb, lsb;



	if (lane == B53_INVALID_LANE)
@@ -212,6 +235,11 @@ int b53_serdes_init(struct b53_device *dev, int port) 
		 (id0 >> SERDES_ID0_REV_NUM_SHIFT) & SERDES_ID0_REV_NUM_MASK,

		 (u32)msb << 16 | lsb);



	pcs = &dev->pcs[lane];

	pcs->dev = dev;

	pcs->lane = lane;

	pcs->pcs.ops = &b53_pcs_ops;



	return 0;

}

EXPORT_SYMBOL(b53_serdes_init);

drivers/net/dsa/b53/b53_serdes.h

+3 −6
Original line number Diff line number Diff line
@@ -107,14 +107,11 @@ static inline u8 b53_serdes_map_lane(struct b53_device *dev, int port) 
	return dev->ops->serdes_map_lane(dev, port);

}



int b53_serdes_get_link(struct b53_device *dev, int port);

int b53_serdes_link_state(struct b53_device *dev, int port,

			  struct phylink_link_state *state);

void b53_serdes_config(struct b53_device *dev, int port, unsigned int mode,

		       const struct phylink_link_state *state);

void b53_serdes_an_restart(struct b53_device *dev, int port);

void b53_serdes_link_set(struct b53_device *dev, int port, unsigned int mode,

			 phy_interface_t interface, bool link_up);

struct phylink_pcs *b53_serdes_phylink_mac_select_pcs(struct b53_device *dev,

						      int port,

						      phy_interface_t interface);

void b53_serdes_phylink_get_caps(struct b53_device *dev, int port,

				 struct phylink_config *config);

#if IS_ENABLED(CONFIG_B53_SERDES)