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

Commit a95cfad9 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) Track alignment in BPF verifier so that legitimate programs won't be
    rejected on !CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS architectures.

 2) Make tail calls work properly in arm64 BPF JIT, from Deniel
    Borkmann.

 3) Make the configuration and semantics Generic XDP make more sense and
    don't allow both generic XDP and a driver specific instance to be
    active at the same time. Also from Daniel.

 4) Don't crash on resume in xen-netfront, from Vitaly Kuznetsov.

 5) Fix use-after-free in VRF driver, from Gao Feng.

 6) Use netdev_alloc_skb_ip_align() to avoid unaligned IP headers in
    qca_spi driver, from Stefan Wahren.

 7) Always run cleanup routines in BPF samples when we get SIGTERM, from
    Andy Gospodarek.

 8) The mdio phy code should bring PHYs out of reset using the shared
    GPIO lines before invoking bus->reset(). From Florian Fainelli.

 9) Some USB descriptor access endian fixes in various drivers from
    Johan Hovold.

10) Handle PAUSE advertisements properly in mlx5 driver, from Gal
    Pressman.

11) Fix reversed test in mlx5e_setup_tc(), from Saeed Mahameed.

12) Cure netdev leak in AF_PACKET when using timestamping via control
    messages. From Douglas Caetano dos Santos.

13) netcp doesn't support HWTSTAMP_FILTER_ALl, reject it. From Miroslav
    Lichvar.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (52 commits)
  ldmvsw: stop the clean timer at beginning of remove
  ldmvsw: unregistering netdev before disable hardware
  net: netcp: fix check of requested timestamping filter
  ipv6: avoid dad-failures for addresses with NODAD
  qed: Fix uninitialized data in aRFS infrastructure
  mdio: mux: fix device_node_continue.cocci warnings
  net/packet: fix missing net_device reference release
  net/mlx4_core: Use min3 to select number of MSI-X vectors
  macvlan: Fix performance issues with vlan tagged packets
  net: stmmac: use correct pointer when printing normal descriptor ring
  net/mlx5: Use underlay QPN from the root name space
  net/mlx5e: IPoIB, Only support regular RQ for now
  net/mlx5e: Fix setup TC ndo
  net/mlx5e: Fix ethtool pause support and advertise reporting
  net/mlx5e: Use the correct pause values for ethtool advertising
  vmxnet3: ensure that adapter is in proper state during force_close
  sfc: revert changes to NIC revision numbers
  net: ch9200: add missing USB-descriptor endianness conversions
  net: irda: irda-usb: fix firmware name on big-endian hosts
  net: dsa: mv88e6xxx: add default case to switch
  ...
parents 1319a285 66f4bc81

arch/arm64/net/bpf_jit_comp.c

+3 −2
Original line number Diff line number Diff line
@@ -253,8 +253,9 @@ static int emit_bpf_tail_call(struct jit_ctx *ctx) 
	 */

	off = offsetof(struct bpf_array, ptrs);

	emit_a64_mov_i64(tmp, off, ctx);

	emit(A64_LDR64(tmp, r2, tmp), ctx);

	emit(A64_LDR64(prg, tmp, r3), ctx);

	emit(A64_ADD(1, tmp, r2, tmp), ctx);

	emit(A64_LSL(1, prg, r3, 3), ctx);

	emit(A64_LDR64(prg, tmp, prg), ctx);

	emit(A64_CBZ(1, prg, jmp_offset), ctx);



	/* goto *(prog->bpf_func + prologue_size); */

drivers/net/dsa/mv88e6xxx/chip.c

+3 −0
Original line number Diff line number Diff line
@@ -849,6 +849,9 @@ static uint64_t _mv88e6xxx_get_ethtool_stat(struct mv88e6xxx_chip *chip, 
		mv88e6xxx_g1_stats_read(chip, reg, &low);

		if (s->sizeof_stat == 8)

			mv88e6xxx_g1_stats_read(chip, reg + 1, &high);

		break;

	default:

		return UINT64_MAX;

	}

	value = (((u64)high) << 16) | low;

	return value;

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c

+1 −12
Original line number Diff line number Diff line
@@ -200,29 +200,18 @@ static int hw_atl_a0_hw_rss_set(struct aq_hw_s *self, 
static int hw_atl_a0_hw_offload_set(struct aq_hw_s *self,

				    struct aq_nic_cfg_s *aq_nic_cfg)

{

	int err = 0;



	/* TX checksums offloads*/

	tpo_ipv4header_crc_offload_en_set(self, 1);

	tpo_tcp_udp_crc_offload_en_set(self, 1);

	if (err < 0)

		goto err_exit;



	/* RX checksums offloads*/

	rpo_ipv4header_crc_offload_en_set(self, 1);

	rpo_tcp_udp_crc_offload_en_set(self, 1);

	if (err < 0)

		goto err_exit;



	/* LSO offloads*/

	tdm_large_send_offload_en_set(self, 0xFFFFFFFFU);

	if (err < 0)

		goto err_exit;



	err = aq_hw_err_from_flags(self);



err_exit:

	return err;

	return aq_hw_err_from_flags(self);

}



static int hw_atl_a0_hw_init_tx_path(struct aq_hw_s *self)

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c

+1 −11
Original line number Diff line number Diff line
@@ -200,25 +200,18 @@ static int hw_atl_b0_hw_rss_set(struct aq_hw_s *self, 
static int hw_atl_b0_hw_offload_set(struct aq_hw_s *self,

				    struct aq_nic_cfg_s *aq_nic_cfg)

{

	int err = 0;

	unsigned int i;



	/* TX checksums offloads*/

	tpo_ipv4header_crc_offload_en_set(self, 1);

	tpo_tcp_udp_crc_offload_en_set(self, 1);

	if (err < 0)

		goto err_exit;



	/* RX checksums offloads*/

	rpo_ipv4header_crc_offload_en_set(self, 1);

	rpo_tcp_udp_crc_offload_en_set(self, 1);

	if (err < 0)

		goto err_exit;



	/* LSO offloads*/

	tdm_large_send_offload_en_set(self, 0xFFFFFFFFU);

	if (err < 0)

		goto err_exit;



/* LRO offloads */

	{
@@ -245,10 +238,7 @@ static int hw_atl_b0_hw_offload_set(struct aq_hw_s *self, 


		rpo_lro_en_set(self, aq_nic_cfg->is_lro ? 0xFFFFFFFFU : 0U);

	}

	err = aq_hw_err_from_flags(self);



err_exit:

	return err;

	return aq_hw_err_from_flags(self);

}



static int hw_atl_b0_hw_init_tx_path(struct aq_hw_s *self)

drivers/net/ethernet/mellanox/mlx4/main.c

+4 −6
Original line number Diff line number Diff line
@@ -2862,12 +2862,10 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev) 
	int port = 0;



	if (msi_x) {

		int nreq = dev->caps.num_ports * num_online_cpus() + 1;



		nreq = min_t(int, dev->caps.num_eqs - dev->caps.reserved_eqs,

			     nreq);

		if (nreq > MAX_MSIX)

			nreq = MAX_MSIX;

		int nreq = min3(dev->caps.num_ports *

				(int)num_online_cpus() + 1,

				dev->caps.num_eqs - dev->caps.reserved_eqs,

				MAX_MSIX);



		entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL);

		if (!entries)