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

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

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

Pull networking fixes from David Miller:
 "A little more than usual this time around. Been travelling, so that is
  part of it.

  Anyways, here are the highlights:

   1) Deal with memcontrol races wrt. listener dismantle, from Eric
      Dumazet.

   2) Handle page allocation failures properly in nfp driver, from Jaku
      Kicinski.

   3) Fix memory leaks in macsec, from Sabrina Dubroca.

   4) Fix crashes in pppol2tp_session_ioctl(), from Guillaume Nault.

   5) Several fixes in bnxt_en driver, including preventing potential
      NVRAM parameter corruption from Michael Chan.

   6) Fix for KRACK attacks in wireless, from Johannes Berg.

   7) rtnetlink event generation fixes from Xin Long.

   8) Deadlock in mlxsw driver, from Ido Schimmel.

   9) Disallow arithmetic operations on context pointers in bpf, from
      Jakub Kicinski.

  10) Missing sock_owned_by_user() check in sctp_icmp_redirect(), from
      Xin Long.

  11) Only TCP is supported for sockmap, make that explicit with a
      check, from John Fastabend.

  12) Fix IP options state races in DCCP and TCP, from Eric Dumazet.

  13) Fix panic in packet_getsockopt(), also from Eric Dumazet.

  14) Add missing locked in hv_sock layer, from Dexuan Cui.

  15) Various aquantia bug fixes, including several statistics handling
      cures. From Igor Russkikh et al.

  16) Fix arithmetic overflow in devmap code, from John Fastabend.

  17) Fix busted socket memory accounting when we get a fault in the tcp
      zero copy paths. From Willem de Bruijn.

  18) Don't leave opt->tot_len uninitialized in ipv6, from Eric Dumazet"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (106 commits)
  stmmac: Don't access tx_q->dirty_tx before netif_tx_lock
  ipv6: flowlabel: do not leave opt->tot_len with garbage
  of_mdio: Fix broken PHY IRQ in case of probe deferral
  textsearch: fix typos in library helpers
  rxrpc: Don't release call mutex on error pointer
  net: stmmac: Prevent infinite loop in get_rx_timestamp_status()
  net: stmmac: Fix stmmac_get_rx_hwtstamp()
  net: stmmac: Add missing call to dev_kfree_skb()
  mlxsw: spectrum_router: Configure TIGCR on init
  mlxsw: reg: Add Tunneling IPinIP General Configuration Register
  net: ethtool: remove error check for legacy setting transceiver type
  soreuseport: fix initialization race
  net: bridge: fix returning of vlan range op errors
  sock: correct sk_wmem_queued accounting on efault in tcp zerocopy
  bpf: add test cases to bpf selftests to cover all access tests
  bpf: fix pattern matches for direct packet access
  bpf: fix off by one for range markings with L{T, E} patterns
  bpf: devmap fix arithmetic overflow in bitmap_size calculation
  net: aquantia: Bad udp rate on default interrupt coalescing
  net: aquantia: Enable coalescing management via ethtool interface
  ...
parents e5f468b3 8d5f4b07

drivers/net/can/flexcan.c

+76 −15
Original line number Diff line number Diff line
@@ -182,22 +182,23 @@ 
/* FLEXCAN hardware feature flags

 *

 * Below is some version info we got:

 *    SOC   Version   IP-Version  Glitch- [TR]WRN_INT Memory err RTR re-

 *                                Filter? connected?  detection  ception in MB

 *   MX25  FlexCAN2  03.00.00.00     no        no         no        no

 *   MX28  FlexCAN2  03.00.04.00    yes       yes         no        no

 *   MX35  FlexCAN2  03.00.00.00     no        no         no        no

 *   MX53  FlexCAN2  03.00.00.00    yes        no         no        no

 *   MX6s  FlexCAN3  10.00.12.00    yes       yes         no       yes

 *   VF610 FlexCAN3  ?               no       yes        yes       yes?

 *    SOC   Version   IP-Version  Glitch- [TR]WRN_INT IRQ Err Memory err RTR re-

 *                                Filter? connected?  Passive detection  ception in MB

 *   MX25  FlexCAN2  03.00.00.00     no        no         ?       no        no

 *   MX28  FlexCAN2  03.00.04.00    yes       yes        no       no        no

 *   MX35  FlexCAN2  03.00.00.00     no        no         ?       no        no

 *   MX53  FlexCAN2  03.00.00.00    yes        no        no       no        no

 *   MX6s  FlexCAN3  10.00.12.00    yes       yes        no       no       yes

 *   VF610 FlexCAN3  ?               no       yes         ?      yes       yes?

 *

 * Some SOCs do not have the RX_WARN & TX_WARN interrupt line connected.

 */

#define FLEXCAN_QUIRK_BROKEN_ERR_STATE	BIT(1) /* [TR]WRN_INT not connected */

#define FLEXCAN_QUIRK_BROKEN_WERR_STATE	BIT(1) /* [TR]WRN_INT not connected */

#define FLEXCAN_QUIRK_DISABLE_RXFG	BIT(2) /* Disable RX FIFO Global mask */

#define FLEXCAN_QUIRK_ENABLE_EACEN_RRS	BIT(3) /* Enable EACEN and RRS bit in ctrl2 */

#define FLEXCAN_QUIRK_DISABLE_MECR	BIT(4) /* Disable Memory error detection */

#define FLEXCAN_QUIRK_USE_OFF_TIMESTAMP	BIT(5) /* Use timestamp based offloading */

#define FLEXCAN_QUIRK_BROKEN_PERR_STATE	BIT(6) /* No interrupt for error passive */



/* Structure of the message buffer */

struct flexcan_mb {
@@ -281,14 +282,17 @@ struct flexcan_priv { 
};



static const struct flexcan_devtype_data fsl_p1010_devtype_data = {

	.quirks = FLEXCAN_QUIRK_BROKEN_ERR_STATE,

	.quirks = FLEXCAN_QUIRK_BROKEN_WERR_STATE |

		FLEXCAN_QUIRK_BROKEN_PERR_STATE,

};



static const struct flexcan_devtype_data fsl_imx28_devtype_data;

static const struct flexcan_devtype_data fsl_imx28_devtype_data = {

	.quirks = FLEXCAN_QUIRK_BROKEN_PERR_STATE,

};



static const struct flexcan_devtype_data fsl_imx6q_devtype_data = {

	.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |

		FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,

		FLEXCAN_QUIRK_USE_OFF_TIMESTAMP | FLEXCAN_QUIRK_BROKEN_PERR_STATE,

};



static const struct flexcan_devtype_data fsl_vf610_devtype_data = {
@@ -335,6 +339,22 @@ static inline void flexcan_write(u32 val, void __iomem *addr) 
}

#endif



static inline void flexcan_error_irq_enable(const struct flexcan_priv *priv)

{

	struct flexcan_regs __iomem *regs = priv->regs;

	u32 reg_ctrl = (priv->reg_ctrl_default | FLEXCAN_CTRL_ERR_MSK);



	flexcan_write(reg_ctrl, &regs->ctrl);

}



static inline void flexcan_error_irq_disable(const struct flexcan_priv *priv)

{

	struct flexcan_regs __iomem *regs = priv->regs;

	u32 reg_ctrl = (priv->reg_ctrl_default & ~FLEXCAN_CTRL_ERR_MSK);



	flexcan_write(reg_ctrl, &regs->ctrl);

}



static inline int flexcan_transceiver_enable(const struct flexcan_priv *priv)

{

	if (!priv->reg_xceiver)
@@ -713,6 +733,7 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id) 
	struct flexcan_regs __iomem *regs = priv->regs;

	irqreturn_t handled = IRQ_NONE;

	u32 reg_iflag1, reg_esr;

	enum can_state last_state = priv->can.state;



	reg_iflag1 = flexcan_read(&regs->iflag1);
@@ -765,8 +786,10 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id) 
		flexcan_write(reg_esr & FLEXCAN_ESR_ALL_INT, &regs->esr);

	}



	/* state change interrupt */

	if (reg_esr & FLEXCAN_ESR_ERR_STATE)

	/* state change interrupt or broken error state quirk fix is enabled */

	if ((reg_esr & FLEXCAN_ESR_ERR_STATE) ||

	    (priv->devtype_data->quirks & (FLEXCAN_QUIRK_BROKEN_WERR_STATE |

	                                   FLEXCAN_QUIRK_BROKEN_PERR_STATE)))

		flexcan_irq_state(dev, reg_esr);



	/* bus error IRQ - handle if bus error reporting is activated */
@@ -774,6 +797,44 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id) 
	    (priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING))

		flexcan_irq_bus_err(dev, reg_esr);



	/* availability of error interrupt among state transitions in case

	 * bus error reporting is de-activated and

	 * FLEXCAN_QUIRK_BROKEN_PERR_STATE is enabled:

	 *  +--------------------------------------------------------------+

	 *  | +----------------------------------------------+ [stopped /  |

	 *  | |                                              |  sleeping] -+

	 *  +-+-> active <-> warning <-> passive -> bus off -+

	 *        ___________^^^^^^^^^^^^_______________________________

	 *        disabled(1)  enabled             disabled

	 *

	 * (1): enabled if FLEXCAN_QUIRK_BROKEN_WERR_STATE is enabled

	 */

	if ((last_state != priv->can.state) &&

	    (priv->devtype_data->quirks & FLEXCAN_QUIRK_BROKEN_PERR_STATE) &&

	    !(priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING)) {

		switch (priv->can.state) {

		case CAN_STATE_ERROR_ACTIVE:

			if (priv->devtype_data->quirks &

			    FLEXCAN_QUIRK_BROKEN_WERR_STATE)

				flexcan_error_irq_enable(priv);

			else

				flexcan_error_irq_disable(priv);

			break;



		case CAN_STATE_ERROR_WARNING:

			flexcan_error_irq_enable(priv);

			break;



		case CAN_STATE_ERROR_PASSIVE:

		case CAN_STATE_BUS_OFF:

			flexcan_error_irq_disable(priv);

			break;



		default:

			break;

		}

	}



	return handled;

}
@@ -887,7 +948,7 @@ static int flexcan_chip_start(struct net_device *dev) 
	 * on most Flexcan cores, too. Otherwise we don't get

	 * any error warning or passive interrupts.

	 */

	if (priv->devtype_data->quirks & FLEXCAN_QUIRK_BROKEN_ERR_STATE ||

	if (priv->devtype_data->quirks & FLEXCAN_QUIRK_BROKEN_WERR_STATE ||

	    priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING)

		reg_ctrl |= FLEXCAN_CTRL_ERR_MSK;

	else

drivers/net/can/usb/esd_usb2.c

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ static void esd_usb2_rx_can_msg(struct esd_usb2_net_priv *priv, 
		}



		cf->can_id = id & ESD_IDMASK;

		cf->can_dlc = get_can_dlc(msg->msg.rx.dlc);

		cf->can_dlc = get_can_dlc(msg->msg.rx.dlc & ~ESD_RTR);



		if (id & ESD_EXTID)

			cf->can_id |= CAN_EFF_FLAG;

drivers/net/can/usb/gs_usb.c

+2 −8
Original line number Diff line number Diff line
@@ -375,6 +375,8 @@ static void gs_usb_receive_bulk_callback(struct urb *urb) 


		gs_free_tx_context(txc);



		atomic_dec(&dev->active_tx_urbs);



		netif_wake_queue(netdev);

	}
@@ -463,14 +465,6 @@ static void gs_usb_xmit_callback(struct urb *urb) 
			  urb->transfer_buffer_length,

			  urb->transfer_buffer,

			  urb->transfer_dma);



	atomic_dec(&dev->active_tx_urbs);



	if (!netif_device_present(netdev))

		return;



	if (netif_queue_stopped(netdev))

		netif_wake_queue(netdev);

}



static netdev_tx_t gs_can_start_xmit(struct sk_buff *skb,

drivers/net/dsa/mv88e6060.c

+8 −2
Original line number Diff line number Diff line
@@ -214,8 +214,14 @@ static int mv88e6060_setup(struct dsa_switch *ds) 


static int mv88e6060_set_addr(struct dsa_switch *ds, u8 *addr)

{

	/* Use the same MAC Address as FD Pause frames for all ports */

	REG_WRITE(REG_GLOBAL, GLOBAL_MAC_01, (addr[0] << 9) | addr[1]);

	u16 val = addr[0] << 8 | addr[1];



	/* The multicast bit is always transmitted as a zero, so the switch uses

	 * bit 8 for "DiffAddr", where 0 means all ports transmit the same SA.

	 */

	val &= 0xfeff;



	REG_WRITE(REG_GLOBAL, GLOBAL_MAC_01, val);

	REG_WRITE(REG_GLOBAL, GLOBAL_MAC_23, (addr[2] << 8) | addr[3]);

	REG_WRITE(REG_GLOBAL, GLOBAL_MAC_45, (addr[4] << 8) | addr[5]);

drivers/net/ethernet/amazon/ena/ena_ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -742,8 +742,8 @@ static void ena_get_channels(struct net_device *netdev, 
{

	struct ena_adapter *adapter = netdev_priv(netdev);



	channels->max_rx = ENA_MAX_NUM_IO_QUEUES;

	channels->max_tx = ENA_MAX_NUM_IO_QUEUES;

	channels->max_rx = adapter->num_queues;

	channels->max_tx = adapter->num_queues;

	channels->max_other = 0;

	channels->max_combined = 0;

	channels->rx_count = adapter->num_queues;