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

Commit 40e196a9 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 suspend and resume in mt76x0u USB driver, from Stanislaw
    Gruszka.

 2) Missing memory barriers in xsk, from Magnus Karlsson.

 3) rhashtable fixes in mac80211 from Herbert Xu.

 4) 32-bit MIPS eBPF JIT fixes from Paul Burton.

 5) Fix for_each_netdev_feature() on big endian, from Hauke Mehrtens.

 6) GSO validation fixes from Willem de Bruijn.

 7) Endianness fix for dwmac4 timestamp handling, from Alexandre Torgue.

 8) More strict checks in tcp_v4_err(), from Eric Dumazet.

 9) af_alg_release should NULL out the sk after the sock_put(), from Mao
    Wenan.

10) Missing unlock in mac80211 mesh error path, from Wei Yongjun.

11) Missing device put in hns driver, from Salil Mehta.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (44 commits)
  sky2: Increase D3 delay again
  vhost: correctly check the return value of translate_desc() in log_used()
  net: netcp: Fix ethss driver probe issue
  net: hns: Fixes the missing put_device in positive leg for roce reset
  net: stmmac: Fix a race in EEE enable callback
  qed: Fix iWARP syn packet mac address validation.
  qed: Fix iWARP buffer size provided for syn packet processing.
  r8152: Add support for MAC address pass through on RTL8153-BD
  mac80211: mesh: fix missing unlock on error in table_path_del()
  net/mlx4_en: fix spelling mistake: "quiting" -> "quitting"
  net: crypto set sk to NULL when af_alg_release.
  net: Do not allocate page fragments that are not skb aligned
  mm: Use fixed constant in page_frag_alloc instead of size + 1
  tcp: tcp_v4_err() should be more careful
  tcp: clear icsk_backoff in tcp_write_queue_purge()
  net: mv643xx_eth: disable clk on error path in mv643xx_eth_shared_probe()
  qmi_wwan: apply SET_DTR quirk to Sierra WP7607
  net: stmmac: handle endianness in dwmac4_get_timestamp
  doc: Mention MSG_ZEROCOPY implementation for UDP
  mlxsw: __mlxsw_sp_port_headroom_set(): Fix a use of local variable
  ...
parents b5372fe5 1765f5dc

Documentation/networking/msg_zerocopy.rst

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ Intro 
=====



The MSG_ZEROCOPY flag enables copy avoidance for socket send calls.

The feature is currently implemented for TCP sockets.

The feature is currently implemented for TCP and UDP sockets.





Opportunity and Caveats

arch/mips/net/ebpf_jit.c

+12 −12
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ enum reg_val_type { 
	REG_64BIT_32BIT,

	/* 32-bit compatible, need truncation for 64-bit ops. */

	REG_32BIT,

	/* 32-bit zero extended. */

	REG_32BIT_ZERO_EX,

	/* 32-bit no sign/zero extension needed. */

	REG_32BIT_POS

};
@@ -343,12 +341,15 @@ static int build_int_epilogue(struct jit_ctx *ctx, int dest_reg) 
	const struct bpf_prog *prog = ctx->skf;

	int stack_adjust = ctx->stack_size;

	int store_offset = stack_adjust - 8;

	enum reg_val_type td;

	int r0 = MIPS_R_V0;



	if (dest_reg == MIPS_R_RA &&

	    get_reg_val_type(ctx, prog->len, BPF_REG_0) == REG_32BIT_ZERO_EX)

	if (dest_reg == MIPS_R_RA) {

		/* Don't let zero extended value escape. */

		td = get_reg_val_type(ctx, prog->len, BPF_REG_0);

		if (td == REG_64BIT)

			emit_instr(ctx, sll, r0, r0, 0);

	}



	if (ctx->flags & EBPF_SAVE_RA) {

		emit_instr(ctx, ld, MIPS_R_RA, store_offset, MIPS_R_SP);
@@ -692,7 +693,7 @@ static int build_one_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, 
		if (dst < 0)

			return dst;

		td = get_reg_val_type(ctx, this_idx, insn->dst_reg);

		if (td == REG_64BIT || td == REG_32BIT_ZERO_EX) {

		if (td == REG_64BIT) {

			/* sign extend */

			emit_instr(ctx, sll, dst, dst, 0);

		}
@@ -707,7 +708,7 @@ static int build_one_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, 
		if (dst < 0)

			return dst;

		td = get_reg_val_type(ctx, this_idx, insn->dst_reg);

		if (td == REG_64BIT || td == REG_32BIT_ZERO_EX) {

		if (td == REG_64BIT) {

			/* sign extend */

			emit_instr(ctx, sll, dst, dst, 0);

		}
@@ -721,7 +722,7 @@ static int build_one_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, 
		if (dst < 0)

			return dst;

		td = get_reg_val_type(ctx, this_idx, insn->dst_reg);

		if (td == REG_64BIT || td == REG_32BIT_ZERO_EX)

		if (td == REG_64BIT)

			/* sign extend */

			emit_instr(ctx, sll, dst, dst, 0);

		if (insn->imm == 1) {
@@ -860,13 +861,13 @@ static int build_one_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, 
		if (src < 0 || dst < 0)

			return -EINVAL;

		td = get_reg_val_type(ctx, this_idx, insn->dst_reg);

		if (td == REG_64BIT || td == REG_32BIT_ZERO_EX) {

		if (td == REG_64BIT) {

			/* sign extend */

			emit_instr(ctx, sll, dst, dst, 0);

		}

		did_move = false;

		ts = get_reg_val_type(ctx, this_idx, insn->src_reg);

		if (ts == REG_64BIT || ts == REG_32BIT_ZERO_EX) {

		if (ts == REG_64BIT) {

			int tmp_reg = MIPS_R_AT;



			if (bpf_op == BPF_MOV) {
@@ -1254,8 +1255,7 @@ static int build_one_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, 
		if (insn->imm == 64 && td == REG_32BIT)

			emit_instr(ctx, dinsu, dst, MIPS_R_ZERO, 32, 32);



		if (insn->imm != 64 &&

		    (td == REG_64BIT || td == REG_32BIT_ZERO_EX)) {

		if (insn->imm != 64 && td == REG_64BIT) {

			/* sign extend */

			emit_instr(ctx, sll, dst, dst, 0);

		}

crypto/af_alg.c

+3 −1
Original line number Diff line number Diff line
@@ -122,8 +122,10 @@ static void alg_do_release(const struct af_alg_type *type, void *private) 


int af_alg_release(struct socket *sock)

{

	if (sock->sk)

	if (sock->sk) {

		sock_put(sock->sk);

		sock->sk = NULL;

	}

	return 0;

}

EXPORT_SYMBOL_GPL(af_alg_release);

drivers/net/dsa/b53/b53_common.c

+71 −19
Original line number Diff line number Diff line
@@ -344,7 +344,8 @@ static void b53_set_forwarding(struct b53_device *dev, int enable) 
	b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, mgmt);

}



static void b53_enable_vlan(struct b53_device *dev, bool enable)

static void b53_enable_vlan(struct b53_device *dev, bool enable,

			    bool enable_filtering)

{

	u8 mgmt, vc0, vc1, vc4 = 0, vc5;
@@ -369,8 +370,13 @@ static void b53_enable_vlan(struct b53_device *dev, bool enable) 
		vc0 |= VC0_VLAN_EN | VC0_VID_CHK_EN | VC0_VID_HASH_VID;

		vc1 |= VC1_RX_MCST_UNTAG_EN | VC1_RX_MCST_FWD_EN;

		vc4 &= ~VC4_ING_VID_CHECK_MASK;

		if (enable_filtering) {

			vc4 |= VC4_ING_VID_VIO_DROP << VC4_ING_VID_CHECK_S;

			vc5 |= VC5_DROP_VTABLE_MISS;

		} else {

			vc4 |= VC4_ING_VID_VIO_FWD << VC4_ING_VID_CHECK_S;

			vc5 &= ~VC5_DROP_VTABLE_MISS;

		}



		if (is5325(dev))

			vc0 &= ~VC0_RESERVED_1;
@@ -420,6 +426,9 @@ static void b53_enable_vlan(struct b53_device *dev, bool enable) 
	}



	b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, mgmt);



	dev->vlan_enabled = enable;

	dev->vlan_filtering_enabled = enable_filtering;

}



static int b53_set_jumbo(struct b53_device *dev, bool enable, bool allow_10_100)
@@ -632,25 +641,35 @@ static void b53_enable_mib(struct b53_device *dev) 
	b53_write8(dev, B53_MGMT_PAGE, B53_GLOBAL_CONFIG, gc);

}



static u16 b53_default_pvid(struct b53_device *dev)

{

	if (is5325(dev) || is5365(dev))

		return 1;

	else

		return 0;

}



int b53_configure_vlan(struct dsa_switch *ds)

{

	struct b53_device *dev = ds->priv;

	struct b53_vlan vl = { 0 };

	int i;

	int i, def_vid;



	def_vid = b53_default_pvid(dev);



	/* clear all vlan entries */

	if (is5325(dev) || is5365(dev)) {

		for (i = 1; i < dev->num_vlans; i++)

		for (i = def_vid; i < dev->num_vlans; i++)

			b53_set_vlan_entry(dev, i, &vl);

	} else {

		b53_do_vlan_op(dev, VTA_CMD_CLEAR);

	}



	b53_enable_vlan(dev, false);

	b53_enable_vlan(dev, false, dev->vlan_filtering_enabled);



	b53_for_each_port(dev, i)

		b53_write16(dev, B53_VLAN_PAGE,

			    B53_VLAN_PORT_DEF_TAG(i), 1);

			    B53_VLAN_PORT_DEF_TAG(i), def_vid);



	if (!is5325(dev) && !is5365(dev))

		b53_set_jumbo(dev, dev->enable_jumbo, false);
@@ -1255,6 +1274,46 @@ EXPORT_SYMBOL(b53_phylink_mac_link_up); 


int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering)

{

	struct b53_device *dev = ds->priv;

	struct net_device *bridge_dev;

	unsigned int i;

	u16 pvid, new_pvid;



	/* Handle the case were multiple bridges span the same switch device

	 * and one of them has a different setting than what is being requested

	 * which would be breaking filtering semantics for any of the other

	 * bridge devices.

	 */

	b53_for_each_port(dev, i) {

		bridge_dev = dsa_to_port(ds, i)->bridge_dev;

		if (bridge_dev &&

		    bridge_dev != dsa_to_port(ds, port)->bridge_dev &&

		    br_vlan_enabled(bridge_dev) != vlan_filtering) {

			netdev_err(bridge_dev,

				   "VLAN filtering is global to the switch!\n");

			return -EINVAL;

		}

	}



	b53_read16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port), &pvid);

	new_pvid = pvid;

	if (dev->vlan_filtering_enabled && !vlan_filtering) {

		/* Filtering is currently enabled, use the default PVID since

		 * the bridge does not expect tagging anymore

		 */

		dev->ports[port].pvid = pvid;

		new_pvid = b53_default_pvid(dev);

	} else if (!dev->vlan_filtering_enabled && vlan_filtering) {

		/* Filtering is currently disabled, restore the previous PVID */

		new_pvid = dev->ports[port].pvid;

	}



	if (pvid != new_pvid)

		b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port),

			    new_pvid);



	b53_enable_vlan(dev, dev->vlan_enabled, vlan_filtering);



	return 0;

}

EXPORT_SYMBOL(b53_vlan_filtering);
@@ -1270,7 +1329,7 @@ int b53_vlan_prepare(struct dsa_switch *ds, int port, 
	if (vlan->vid_end > dev->num_vlans)

		return -ERANGE;



	b53_enable_vlan(dev, true);

	b53_enable_vlan(dev, true, dev->vlan_filtering_enabled);



	return 0;

}
@@ -1300,7 +1359,7 @@ void b53_vlan_add(struct dsa_switch *ds, int port, 
		b53_fast_age_vlan(dev, vid);

	}



	if (pvid) {

	if (pvid && !dsa_is_cpu_port(ds, port)) {

		b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port),

			    vlan->vid_end);

		b53_fast_age_vlan(dev, vid);
@@ -1326,12 +1385,8 @@ int b53_vlan_del(struct dsa_switch *ds, int port, 


		vl->members &= ~BIT(port);



		if (pvid == vid) {

			if (is5325(dev) || is5365(dev))

				pvid = 1;

			else

				pvid = 0;

		}

		if (pvid == vid)

			pvid = b53_default_pvid(dev);



		if (untagged && !dsa_is_cpu_port(ds, port))

			vl->untag &= ~(BIT(port));
@@ -1644,10 +1699,7 @@ void b53_br_leave(struct dsa_switch *ds, int port, struct net_device *br) 
	b53_write16(dev, B53_PVLAN_PAGE, B53_PVLAN_PORT_MASK(port), pvlan);

	dev->ports[port].vlan_ctl_mask = pvlan;



	if (is5325(dev) || is5365(dev))

		pvid = 1;

	else

		pvid = 0;

	pvid = b53_default_pvid(dev);



	/* Make this port join all VLANs without VLAN entries */

	if (is58xx(dev)) {

drivers/net/dsa/b53/b53_priv.h

+3 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ enum { 
struct b53_port {

	u16		vlan_ctl_mask;

	struct ethtool_eee eee;

	u16		pvid;

};



struct b53_vlan {
@@ -137,6 +138,8 @@ struct b53_device { 


	unsigned int num_vlans;

	struct b53_vlan *vlans;

	bool vlan_enabled;

	bool vlan_filtering_enabled;

	unsigned int num_ports;

	struct b53_port *ports;

};