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

Commit 62967898 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:

 1) Need to save away the IV across tls async operations, from Dave
    Watson.

 2) Upon successful packet processing, we should liberate the SKB with
    dev_consume_skb{_irq}(). From Yang Wei.

 3) Only apply RX hang workaround on effected macb chips, from Harini
    Katakam.

 4) Dummy netdev need a proper namespace assigned to them, from Josh
    Elsasser.

 5) Some paths of nft_compat run lockless now, and thus we need to use a
    proper refcnt_t. From Florian Westphal.

 6) Avoid deadlock in mlx5 by doing IRQ locking, from Moni Shoua.

 7) netrom does not refcount sockets properly wrt. timers, fix that by
    using the sock timer API. From Cong Wang.

 8) Fix locking of inexact inserts of xfrm policies, from Florian
    Westphal.

 9) Missing xfrm hash generation bump, also from Florian.

10) Missing of_node_put() in hns driver, from Yonglong Liu.

11) Fix DN_IFREQ_SIZE, from Johannes Berg.

12) ip6mr notifier is invoked during traversal of wrong table, from Nir
    Dotan.

13) TX promisc settings not performed correctly in qed, from Manish
    Chopra.

14) Fix OOB access in vhost, from Jason Wang.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (52 commits)
  MAINTAINERS: Add entry for XDP (eXpress Data Path)
  net: set default network namespace in init_dummy_netdev()
  net: b44: replace dev_kfree_skb_xxx by dev_consume_skb_xxx for drop profiles
  net: caif: call dev_consume_skb_any when skb xmit done
  net: 8139cp: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles
  net: macb: Apply RXUBR workaround only to versions with errata
  net: ti: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles
  net: apple: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles
  net: amd8111e: replace dev_kfree_skb_irq by dev_consume_skb_irq
  net: alteon: replace dev_kfree_skb_irq by dev_consume_skb_irq
  net: tls: Fix deadlock in free_resources tx
  net: tls: Save iv in tls_rec for async crypto requests
  vhost: fix OOB in get_rx_bufs()
  qed: Fix stack out of bounds bug
  qed: Fix system crash in ll2 xmit
  qed: Fix VF probe failure while FLR
  qed: Fix LACP pdu drops for VFs
  qed: Fix bug in tx promiscuous mode settings
  net: i825xx: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles
  netfilter: ipt_CLUSTERIP: fix warning unused variable cn
  ...
parents 4aa9fc2a d07e1e0f

MAINTAINERS

+18 −0
Original line number Diff line number Diff line
@@ -16673,6 +16673,24 @@ T: git git://linuxtv.org/media_tree.git 
S:	Maintained

F:	drivers/media/tuners/tuner-xc2028.*



XDP (eXpress Data Path)

M:	Alexei Starovoitov <ast@kernel.org>

M:	Daniel Borkmann <daniel@iogearbox.net>

M:	David S. Miller <davem@davemloft.net>

M:	Jakub Kicinski <jakub.kicinski@netronome.com>

M:	Jesper Dangaard Brouer <hawk@kernel.org>

M:	John Fastabend <john.fastabend@gmail.com>

L:	netdev@vger.kernel.org

L:	xdp-newbies@vger.kernel.org

S:	Supported

F:	net/core/xdp.c

F:	include/net/xdp.h

F:	kernel/bpf/devmap.c

F:	kernel/bpf/cpumap.c

F:	include/trace/events/xdp.h

K:	xdp

N:	xdp



XDP SOCKETS (AF_XDP)

M:	Björn Töpel <bjorn.topel@intel.com>

M:	Magnus Karlsson <magnus.karlsson@intel.com>

drivers/net/caif/caif_serial.c

+1 −4
Original line number Diff line number Diff line
@@ -257,10 +257,7 @@ static int handle_tx(struct ser_device *ser) 
		if (skb->len == 0) {

			struct sk_buff *tmp = skb_dequeue(&ser->head);

			WARN_ON(tmp != skb);

			if (in_interrupt())

				dev_kfree_skb_irq(skb);

			else

				kfree_skb(skb);

			dev_consume_skb_any(skb);

		}

	}

	/* Send flow off if queue is empty */

drivers/net/dsa/mv88e6xxx/serdes.c

+1 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ int mv88e6390_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port) 
	if (port < 9)

		return 0;



	return mv88e6390_serdes_irq_setup(chip, port);

	return mv88e6390x_serdes_irq_setup(chip, port);

}



void mv88e6390x_serdes_irq_free(struct mv88e6xxx_chip *chip, int port)

drivers/net/ethernet/alteon/acenic.c

+1 −1
Original line number Diff line number Diff line
@@ -2059,7 +2059,7 @@ static inline void ace_tx_int(struct net_device *dev, 
		if (skb) {

			dev->stats.tx_packets++;

			dev->stats.tx_bytes += skb->len;

			dev_kfree_skb_irq(skb);

			dev_consume_skb_irq(skb);

			info->skb = NULL;

		}

drivers/net/ethernet/altera/altera_msgdma.c

+2 −1
Original line number Diff line number Diff line
@@ -145,7 +145,8 @@ u32 msgdma_tx_completions(struct altera_tse_private *priv) 
			& 0xffff;



	if (inuse) { /* Tx FIFO is not empty */

		ready = priv->tx_prod - priv->tx_cons - inuse - 1;

		ready = max_t(int,

			      priv->tx_prod - priv->tx_cons - inuse - 1, 0);

	} else {

		/* Check for buffered last packet */

		status = csrrd32(priv->tx_dma_csr, msgdma_csroffs(status));