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

Commit 272911b8 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) Fix mvneta/bm dependencies, from Arnd Bergmann.

 2) RX completion hw bug workaround in bnxt_en, from Michael Chan.

 3) Kernel pointer leak in nf_conntrack, from Linus.

 4) Hoplimit route attribute limits not enforced properly, from Paolo
    Abeni.

 5) qlcnic driver NULL deref fix from Dan Carpenter.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  arm64: bpf: jit JMP_JSET_{X,K}
  net/route: enforce hoplimit max value
  nf_conntrack: avoid kernel pointer value leak in slab name
  drivers: net: xgene: fix register offset
  drivers: net: xgene: fix statistics counters race condition
  drivers: net: xgene: fix ununiform latency across queues
  drivers: net: xgene: fix sharing of irqs
  drivers: net: xgene: fix IPv4 forward crash
  xen-netback: fix extra_info handling in xenvif_tx_err()
  net: mvneta: bm: fix dependencies again
  bnxt_en: Add workaround to detect bad opaque in rx completion (part 2)
  bnxt_en: Add workaround to detect bad opaque in rx completion (part 1)
  qlcnic: potential NULL dereference in qlcnic_83xx_get_minidump_template()
parents 6ba5b85f 98397fc5

arch/arm64/net/bpf_jit_comp.c

+1 −0
Original line number Diff line number Diff line
@@ -476,6 +476,7 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx) 
		case BPF_JGE:

			jmp_cond = A64_COND_CS;

			break;

		case BPF_JSET:

		case BPF_JNE:

			jmp_cond = A64_COND_NE;

			break;

drivers/net/ethernet/apm/xgene/xgene_enet_cle.c

+6 −5
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ static void xgene_cle_idt_to_hw(u32 dstqid, u32 fpsel, 
static void xgene_cle_dbptr_to_hw(struct xgene_enet_pdata *pdata,

				  struct xgene_cle_dbptr *dbptr, u32 *buf)

{

	buf[0] = SET_VAL(CLE_DROP, dbptr->drop);

	buf[4] = SET_VAL(CLE_FPSEL, dbptr->fpsel) |

		 SET_VAL(CLE_DSTQIDL, dbptr->dstqid);
@@ -412,7 +413,7 @@ static int xgene_enet_cle_init(struct xgene_enet_pdata *pdata) 
			.branch = {

				{

					/* IPV4 */

					.valid = 0,

					.valid = 1,

					.next_packet_pointer = 22,

					.jump_bw = JMP_FW,

					.jump_rel = JMP_ABS,
@@ -420,7 +421,7 @@ static int xgene_enet_cle_init(struct xgene_enet_pdata *pdata) 
					.next_node = PKT_PROT_NODE,

					.next_branch = 0,

					.data = 0x8,

					.mask = 0xffff

					.mask = 0x0

				},

				{

					.valid = 0,
@@ -456,7 +457,7 @@ static int xgene_enet_cle_init(struct xgene_enet_pdata *pdata) 
					.next_node = RSS_IPV4_TCP_NODE,

					.next_branch = 0,

					.data = 0x0600,

					.mask = 0xffff

					.mask = 0x00ff

				},

				{

					/* UDP */
@@ -468,7 +469,7 @@ static int xgene_enet_cle_init(struct xgene_enet_pdata *pdata) 
					.next_node = RSS_IPV4_UDP_NODE,

					.next_branch = 0,

					.data = 0x1100,

					.mask = 0xffff

					.mask = 0x00ff

				},

				{

					.valid = 0,
@@ -642,7 +643,7 @@ static int xgene_enet_cle_init(struct xgene_enet_pdata *pdata) 
				{

					/* TCP DST Port */

					.valid = 0,

					.next_packet_pointer = 256,

					.next_packet_pointer = 258,

					.jump_bw = JMP_FW,

					.jump_rel = JMP_ABS,

					.operation = EQT,

drivers/net/ethernet/apm/xgene/xgene_enet_cle.h

+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ 
#define CLE_TYPE_POS		0

#define CLE_TYPE_LEN		2



#define CLE_DROP_POS		28

#define CLE_DROP_LEN		1

#define CLE_DSTQIDL_POS		25

#define CLE_DSTQIDL_LEN		7

#define CLE_DSTQIDH_POS		0

drivers/net/ethernet/apm/xgene/xgene_enet_hw.c

+11 −8
Original line number Diff line number Diff line
@@ -219,27 +219,30 @@ void xgene_enet_parse_error(struct xgene_enet_desc_ring *ring, 
			    struct xgene_enet_pdata *pdata,

			    enum xgene_enet_err_code status)

{

	struct rtnl_link_stats64 *stats = &pdata->stats;



	switch (status) {

	case INGRESS_CRC:

		stats->rx_crc_errors++;

		ring->rx_crc_errors++;

		ring->rx_dropped++;

		break;

	case INGRESS_CHECKSUM:

	case INGRESS_CHECKSUM_COMPUTE:

		stats->rx_errors++;

		ring->rx_errors++;

		ring->rx_dropped++;

		break;

	case INGRESS_TRUNC_FRAME:

		stats->rx_frame_errors++;

		ring->rx_frame_errors++;

		ring->rx_dropped++;

		break;

	case INGRESS_PKT_LEN:

		stats->rx_length_errors++;

		ring->rx_length_errors++;

		ring->rx_dropped++;

		break;

	case INGRESS_PKT_UNDER:

		stats->rx_frame_errors++;

		ring->rx_frame_errors++;

		ring->rx_dropped++;

		break;

	case INGRESS_FIFO_OVERRUN:

		stats->rx_fifo_errors++;

		ring->rx_fifo_errors++;

		break;

	default:

		break;

drivers/net/ethernet/apm/xgene/xgene_enet_hw.h

+5 −3
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ enum xgene_enet_rm { 
#define RINGADDRL_POS		5

#define RINGADDRL_LEN		27

#define RINGADDRH_POS		0

#define RINGADDRH_LEN		6

#define RINGADDRH_LEN		7

#define RINGSIZE_POS		23

#define RINGSIZE_LEN		3

#define RINGTYPE_POS		19
@@ -94,9 +94,9 @@ enum xgene_enet_rm { 
#define RINGMODE_POS		20

#define RINGMODE_LEN		3

#define RECOMTIMEOUTL_POS	28

#define RECOMTIMEOUTL_LEN	3

#define RECOMTIMEOUTL_LEN	4

#define RECOMTIMEOUTH_POS	0

#define RECOMTIMEOUTH_LEN	2

#define RECOMTIMEOUTH_LEN	3

#define NUMMSGSINQ_POS		1

#define NUMMSGSINQ_LEN		16

#define ACCEPTLERR		BIT(19)
@@ -201,6 +201,8 @@ enum xgene_enet_rm { 
#define USERINFO_LEN			32

#define FPQNUM_POS			32

#define FPQNUM_LEN			12

#define ELERR_POS                       46

#define ELERR_LEN                       2

#define NV_POS				50

#define NV_LEN				1

#define LL_POS				51