Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0058b0a5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from David Miller:

 1) BPF sample build fixes from Björn Töpel

 2) Fix powerpc bpf tail call implementation, from Eric Dumazet.

 3) DCCP leaks jiffies on the wire, fix also from Eric Dumazet.

 4) Fix crash in ebtables when using dnat target, from Florian Westphal.

 5) Fix port disable handling whne removing bcm_sf2 driver, from Florian
    Fainelli.

 6) Fix kTLS sk_msg trim on fallback to copy mode, from Jakub Kicinski.

 7) Various KCSAN fixes all over the networking, from Eric Dumazet.

 8) Memory leaks in mlx5 driver, from Alex Vesker.

 9) SMC interface refcounting fix, from Ursula Braun.

10) TSO descriptor handling fixes in stmmac driver, from Jose Abreu.

11) Add a TX lock to synchonize the kTLS TX path properly with crypto
    operations. From Jakub Kicinski.

12) Sock refcount during shutdown fix in vsock/virtio code, from Stefano
    Garzarella.

13) Infinite loop in Intel ice driver, from Colin Ian King.

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (108 commits)
  ixgbe: need_wakeup flag might not be set for Tx
  i40e: need_wakeup flag might not be set for Tx
  igb/igc: use ktime accessors for skb->tstamp
  i40e: Fix for ethtool -m issue on X722 NIC
  iavf: initialize ITRN registers with correct values
  ice: fix potential infinite loop because loop counter being too small
  qede: fix NULL pointer deref in __qede_remove()
  net: fix data-race in neigh_event_send()
  vsock/virtio: fix sock refcnt holding during the shutdown
  net: ethernet: octeon_mgmt: Account for second possible VLAN header
  mac80211: fix station inactive_time shortly after boot
  net/fq_impl: Switch to kvmalloc() for memory allocation
  mac80211: fix ieee80211_txq_setup_flows() failure path
  ipv4: Fix table id reference in fib_sync_down_addr
  ipv6: fixes rt6_probe() and fib6_nh->last_probe init
  net: hns: Fix the stray netpoll locks causing deadlock in NAPI path
  net: usb: qmi_wwan: add support for DW5821e with eSIM support
  CDC-NCM: handle incomplete transfer of MTU
  nfc: netlink: fix double device reference drop
  NFC: st21nfca: fix double free
  ...
parents 5cb8418c a2582cdc

Documentation/networking/tls-offload.rst

+4 −0
Original line number Diff line number Diff line
@@ -436,6 +436,10 @@ by the driver: 
   encryption.

 * ``tx_tls_ooo`` - number of TX packets which were part of a TLS stream

   but did not arrive in the expected order.

 * ``tx_tls_skip_no_sync_data`` - number of TX packets which were part of

   a TLS stream and arrived out-of-order, but skipped the HW offload routine

   and went to the regular transmit flow as they were retransmissions of the

   connection handshake.

 * ``tx_tls_drop_no_sync_data`` - number of TX packets which were part of

   a TLS stream dropped, because they arrived out of order and associated

   record could not be found.

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3053,6 +3053,7 @@ M: Daniel Borkmann <daniel@iogearbox.net> 
R:	Martin KaFai Lau <kafai@fb.com>

R:	Song Liu <songliubraving@fb.com>

R:	Yonghong Song <yhs@fb.com>

R:	Andrii Nakryiko <andriin@fb.com>

L:	netdev@vger.kernel.org

L:	bpf@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git

arch/powerpc/net/bpf_jit_comp64.c

+13 −0
Original line number Diff line number Diff line
@@ -1141,6 +1141,19 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp) 
		goto out_addrs;

	}



	/*

	 * If we have seen a tail call, we need a second pass.

	 * This is because bpf_jit_emit_common_epilogue() is called

	 * from bpf_jit_emit_tail_call() with a not yet stable ctx->seen.

	 */

	if (cgctx.seen & SEEN_TAILCALL) {

		cgctx.idx = 0;

		if (bpf_jit_build_body(fp, 0, &cgctx, addrs, false)) {

			fp = org_fp;

			goto out_addrs;

		}

	}



	/*

	 * Pretend to build prologue, given the features we've seen.  This will

	 * update ctgtx.idx as it pretends to output instructions, then we can

drivers/net/bonding/bond_main.c

+22 −22
Original line number Diff line number Diff line
@@ -2083,8 +2083,7 @@ static int bond_miimon_inspect(struct bonding *bond) 
	ignore_updelay = !rcu_dereference(bond->curr_active_slave);



	bond_for_each_slave_rcu(bond, slave, iter) {

		slave->new_link = BOND_LINK_NOCHANGE;

		slave->link_new_state = slave->link;

		bond_propose_link_state(slave, BOND_LINK_NOCHANGE);



		link_state = bond_check_dev_link(bond, slave->dev, 0);
@@ -2118,7 +2117,7 @@ static int bond_miimon_inspect(struct bonding *bond) 
			}



			if (slave->delay <= 0) {

				slave->new_link = BOND_LINK_DOWN;

				bond_propose_link_state(slave, BOND_LINK_DOWN);

				commit++;

				continue;

			}
@@ -2155,7 +2154,7 @@ static int bond_miimon_inspect(struct bonding *bond) 
				slave->delay = 0;



			if (slave->delay <= 0) {

				slave->new_link = BOND_LINK_UP;

				bond_propose_link_state(slave, BOND_LINK_UP);

				commit++;

				ignore_updelay = false;

				continue;
@@ -2193,7 +2192,7 @@ static void bond_miimon_commit(struct bonding *bond) 
	struct slave *slave, *primary;



	bond_for_each_slave(bond, slave, iter) {

		switch (slave->new_link) {

		switch (slave->link_new_state) {

		case BOND_LINK_NOCHANGE:

			/* For 802.3ad mode, check current slave speed and

			 * duplex again in case its port was disabled after
@@ -2265,8 +2264,8 @@ static void bond_miimon_commit(struct bonding *bond) 


		default:

			slave_err(bond->dev, slave->dev, "invalid new link %d on slave\n",

				  slave->new_link);

			slave->new_link = BOND_LINK_NOCHANGE;

				  slave->link_new_state);

			bond_propose_link_state(slave, BOND_LINK_NOCHANGE);



			continue;

		}
@@ -2674,13 +2673,13 @@ static void bond_loadbalance_arp_mon(struct bonding *bond) 
	bond_for_each_slave_rcu(bond, slave, iter) {

		unsigned long trans_start = dev_trans_start(slave->dev);



		slave->new_link = BOND_LINK_NOCHANGE;

		bond_propose_link_state(slave, BOND_LINK_NOCHANGE);



		if (slave->link != BOND_LINK_UP) {

			if (bond_time_in_interval(bond, trans_start, 1) &&

			    bond_time_in_interval(bond, slave->last_rx, 1)) {



				slave->new_link = BOND_LINK_UP;

				bond_propose_link_state(slave, BOND_LINK_UP);

				slave_state_changed = 1;



				/* primary_slave has no meaning in round-robin
@@ -2705,7 +2704,7 @@ static void bond_loadbalance_arp_mon(struct bonding *bond) 
			if (!bond_time_in_interval(bond, trans_start, 2) ||

			    !bond_time_in_interval(bond, slave->last_rx, 2)) {



				slave->new_link = BOND_LINK_DOWN;

				bond_propose_link_state(slave, BOND_LINK_DOWN);

				slave_state_changed = 1;



				if (slave->link_failure_count < UINT_MAX)
@@ -2736,8 +2735,8 @@ static void bond_loadbalance_arp_mon(struct bonding *bond) 
			goto re_arm;



		bond_for_each_slave(bond, slave, iter) {

			if (slave->new_link != BOND_LINK_NOCHANGE)

				slave->link = slave->new_link;

			if (slave->link_new_state != BOND_LINK_NOCHANGE)

				slave->link = slave->link_new_state;

		}



		if (slave_state_changed) {
@@ -2760,9 +2759,9 @@ static void bond_loadbalance_arp_mon(struct bonding *bond) 
}



/* Called to inspect slaves for active-backup mode ARP monitor link state

 * changes.  Sets new_link in slaves to specify what action should take

 * place for the slave.  Returns 0 if no changes are found, >0 if changes

 * to link states must be committed.

 * changes.  Sets proposed link state in slaves to specify what action

 * should take place for the slave.  Returns 0 if no changes are found, >0

 * if changes to link states must be committed.

 *

 * Called with rcu_read_lock held.

 */
@@ -2774,12 +2773,12 @@ static int bond_ab_arp_inspect(struct bonding *bond) 
	int commit = 0;



	bond_for_each_slave_rcu(bond, slave, iter) {

		slave->new_link = BOND_LINK_NOCHANGE;

		bond_propose_link_state(slave, BOND_LINK_NOCHANGE);

		last_rx = slave_last_rx(bond, slave);



		if (slave->link != BOND_LINK_UP) {

			if (bond_time_in_interval(bond, last_rx, 1)) {

				slave->new_link = BOND_LINK_UP;

				bond_propose_link_state(slave, BOND_LINK_UP);

				commit++;

			}

			continue;
@@ -2807,7 +2806,7 @@ static int bond_ab_arp_inspect(struct bonding *bond) 
		if (!bond_is_active_slave(slave) &&

		    !rcu_access_pointer(bond->current_arp_slave) &&

		    !bond_time_in_interval(bond, last_rx, 3)) {

			slave->new_link = BOND_LINK_DOWN;

			bond_propose_link_state(slave, BOND_LINK_DOWN);

			commit++;

		}
@@ -2820,7 +2819,7 @@ static int bond_ab_arp_inspect(struct bonding *bond) 
		if (bond_is_active_slave(slave) &&

		    (!bond_time_in_interval(bond, trans_start, 2) ||

		     !bond_time_in_interval(bond, last_rx, 2))) {

			slave->new_link = BOND_LINK_DOWN;

			bond_propose_link_state(slave, BOND_LINK_DOWN);

			commit++;

		}

	}
@@ -2840,7 +2839,7 @@ static void bond_ab_arp_commit(struct bonding *bond) 
	struct slave *slave;



	bond_for_each_slave(bond, slave, iter) {

		switch (slave->new_link) {

		switch (slave->link_new_state) {

		case BOND_LINK_NOCHANGE:

			continue;
@@ -2890,8 +2889,9 @@ static void bond_ab_arp_commit(struct bonding *bond) 
			continue;



		default:

			slave_err(bond->dev, slave->dev, "impossible: new_link %d on slave\n",

				  slave->new_link);

			slave_err(bond->dev, slave->dev,

				  "impossible: link_new_state %d on slave\n",

				  slave->link_new_state);

			continue;

		}

drivers/net/can/c_can/c_can.c

+64 −7
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#define CONTROL_EX_PDR		BIT(8)



/* control register */

#define CONTROL_SWR		BIT(15)

#define CONTROL_TEST		BIT(7)

#define CONTROL_CCE		BIT(6)

#define CONTROL_DISABLE_AR	BIT(5)
@@ -97,6 +98,9 @@ 
#define BTR_TSEG2_SHIFT		12

#define BTR_TSEG2_MASK		(0x7 << BTR_TSEG2_SHIFT)



/* interrupt register */

#define INT_STS_PENDING		0x8000



/* brp extension register */

#define BRP_EXT_BRPE_MASK	0x0f

#define BRP_EXT_BRPE_SHIFT	0
@@ -569,6 +573,26 @@ static void c_can_configure_msg_objects(struct net_device *dev) 
				   IF_MCONT_RCV_EOB);

}



static int c_can_software_reset(struct net_device *dev)

{

	struct c_can_priv *priv = netdev_priv(dev);

	int retry = 0;



	if (priv->type != BOSCH_D_CAN)

		return 0;



	priv->write_reg(priv, C_CAN_CTRL_REG, CONTROL_SWR | CONTROL_INIT);

	while (priv->read_reg(priv, C_CAN_CTRL_REG) & CONTROL_SWR) {

		msleep(20);

		if (retry++ > 100) {

			netdev_err(dev, "CCTRL: software reset failed\n");

			return -EIO;

		}

	}



	return 0;

}



/*

 * Configure C_CAN chip:

 * - enable/disable auto-retransmission
@@ -578,6 +602,11 @@ static void c_can_configure_msg_objects(struct net_device *dev) 
static int c_can_chip_config(struct net_device *dev)

{

	struct c_can_priv *priv = netdev_priv(dev);

	int err;



	err = c_can_software_reset(dev);

	if (err)

		return err;



	/* enable automatic retransmission */

	priv->write_reg(priv, C_CAN_CTRL_REG, CONTROL_ENABLE_AR);
@@ -886,6 +915,9 @@ static int c_can_handle_state_change(struct net_device *dev, 
	struct can_berr_counter bec;



	switch (error_type) {

	case C_CAN_NO_ERROR:

		priv->can.state = CAN_STATE_ERROR_ACTIVE;

		break;

	case C_CAN_ERROR_WARNING:

		/* error warning state */

		priv->can.can_stats.error_warning++;
@@ -916,6 +948,13 @@ static int c_can_handle_state_change(struct net_device *dev, 
				ERR_CNT_RP_SHIFT;



	switch (error_type) {

	case C_CAN_NO_ERROR:

		/* error warning state */

		cf->can_id |= CAN_ERR_CRTL;

		cf->data[1] = CAN_ERR_CRTL_ACTIVE;

		cf->data[6] = bec.txerr;

		cf->data[7] = bec.rxerr;

		break;

	case C_CAN_ERROR_WARNING:

		/* error warning state */

		cf->can_id |= CAN_ERR_CRTL;
@@ -1029,10 +1068,16 @@ static int c_can_poll(struct napi_struct *napi, int quota) 
	u16 curr, last = priv->last_status;

	int work_done = 0;



	/* Only read the status register if a status interrupt was pending */

	if (atomic_xchg(&priv->sie_pending, 0)) {

		priv->last_status = curr = priv->read_reg(priv, C_CAN_STS_REG);

		/* Ack status on C_CAN. D_CAN is self clearing */

		if (priv->type != BOSCH_D_CAN)

			priv->write_reg(priv, C_CAN_STS_REG, LEC_UNUSED);

	} else {

		/* no change detected ... */

		curr = last;

	}



	/* handle state changes */

	if ((curr & STATUS_EWARN) && (!(last & STATUS_EWARN))) {
@@ -1054,11 +1099,17 @@ static int c_can_poll(struct napi_struct *napi, int quota) 
	/* handle bus recovery events */

	if ((!(curr & STATUS_BOFF)) && (last & STATUS_BOFF)) {

		netdev_dbg(dev, "left bus off state\n");

		priv->can.state = CAN_STATE_ERROR_ACTIVE;

		work_done += c_can_handle_state_change(dev, C_CAN_ERROR_PASSIVE);

	}



	if ((!(curr & STATUS_EPASS)) && (last & STATUS_EPASS)) {

		netdev_dbg(dev, "left error passive state\n");

		priv->can.state = CAN_STATE_ERROR_ACTIVE;

		work_done += c_can_handle_state_change(dev, C_CAN_ERROR_WARNING);

	}



	if ((!(curr & STATUS_EWARN)) && (last & STATUS_EWARN)) {

		netdev_dbg(dev, "left error warning state\n");

		work_done += c_can_handle_state_change(dev, C_CAN_NO_ERROR);

	}



	/* handle lec errors on the bus */
@@ -1083,10 +1134,16 @@ static irqreturn_t c_can_isr(int irq, void *dev_id) 
{

	struct net_device *dev = (struct net_device *)dev_id;

	struct c_can_priv *priv = netdev_priv(dev);

	int reg_int;



	if (!priv->read_reg(priv, C_CAN_INT_REG))

	reg_int = priv->read_reg(priv, C_CAN_INT_REG);

	if (!reg_int)

		return IRQ_NONE;



	/* save for later use */

	if (reg_int & INT_STS_PENDING)

		atomic_set(&priv->sie_pending, 1);



	/* disable all interrupts and schedule the NAPI */

	c_can_irq_control(priv, false);

	napi_schedule(&priv->napi);