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

Commit 701b259f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Davem says:

1) Fix JIT code generation on x86-64 for divide by zero, from Eric Dumazet.

2) tg3 header length computation correction from Eric Dumazet.

3) More build and reference counting fixes for socket memory cgroup
   code from Glauber Costa.

4) module.h snuck back into a core header after all the hard work we
   did to remove that, from Paul Gortmaker and Jesper Dangaard Brouer.

5) Fix PHY naming regression and add some new PCI IDs in stmmac, from
   Alessandro Rubini.

6) Netlink message generation fix in new team driver, should only advertise
   the entries that changed during events, from Jiri Pirko.

7) SRIOV VF registration and unregistration fixes, and also add a
   missing PCI ID, from Roopa Prabhu.

8) Fix infinite loop in tx queue flush code of brcmsmac, from Stanislaw Gruszka.

9) ftgmac100/ftmac100 build fix, missing interrupt.h include.

10) Memory leak fix in net/hyperv do_set_mutlicast() handling, from Wei Yongjun.

11) Off by one fix in netem packet scheduler, from Vijay Subramanian.

12) TCP loss detection fix from Yuchung Cheng.

13) TCP reset packet MD5 calculation uses wrong address, fix from Shawn Lu.

14) skge carrier assertion and DMA mapping fixes from Stephen Hemminger.

15) Congestion recovery undo performed at the wrong spot in BIC and CUBIC
    congestion control modules, fix from Neal Cardwell.

16) Ethtool ETHTOOL_GSSET_INFO is unnecessarily restrictive, from Michał Mirosław.

17) Fix triggerable race in ipv6 sysctl handling, from Francesco Ruggeri.

18) Statistics bug fixes in mlx4 from Eugenia Emantayev.

19) rds locking bug fix during info dumps, from your's truly.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (67 commits)
  rds: Make rds_sock_lock BH rather than IRQ safe.
  netprio_cgroup.h: dont include module.h from other includes
  net: flow_dissector.c missing include linux/export.h
  team: send only changed options/ports via netlink
  net/hyperv: fix possible memory leak in do_set_multicast()
  drivers/net: dsa/mv88e6xxx.c files need linux/module.h
  stmmac: added PCI identifiers
  llc: Fix race condition in llc_ui_recvmsg
  stmmac: fix phy naming inconsistency
  dsa: Add reporting of silicon revision for Marvell 88E6123/88E6161/88E6165 switches.
  tg3: fix ipv6 header length computation
  skge: add byte queue limit support
  mv643xx_eth: Add Rx Discard and Rx Overrun statistics
  bnx2x: fix compilation error with SOE in fw_dump
  bnx2x: handle CHIP_REVISION during init_one
  bnx2x: allow user to change ring size in ISCSI SD mode
  bnx2x: fix Big-Endianess in ethtool -t
  bnx2x: fixed ethtool statistics for MF modes
  bnx2x: credit-leakage fixup on vlan_mac_del_all
  macvlan: fix a possible use after free
  ...
parents d2346963 efc3dbc3

arch/x86/net/bpf_jit_comp.c

+22 −14
Original line number Diff line number Diff line
@@ -151,17 +151,18 @@ void bpf_jit_compile(struct sk_filter *fp) 
	cleanup_addr = proglen; /* epilogue address */



	for (pass = 0; pass < 10; pass++) {

		u8 seen_or_pass0 = (pass == 0) ? (SEEN_XREG | SEEN_DATAREF | SEEN_MEM) : seen;

		/* no prologue/epilogue for trivial filters (RET something) */

		proglen = 0;

		prog = temp;



		if (seen) {

		if (seen_or_pass0) {

			EMIT4(0x55, 0x48, 0x89, 0xe5); /* push %rbp; mov %rsp,%rbp */

			EMIT4(0x48, 0x83, 0xec, 96);	/* subq  $96,%rsp	*/

			/* note : must save %rbx in case bpf_error is hit */

			if (seen & (SEEN_XREG | SEEN_DATAREF))

			if (seen_or_pass0 & (SEEN_XREG | SEEN_DATAREF))

				EMIT4(0x48, 0x89, 0x5d, 0xf8); /* mov %rbx, -8(%rbp) */

			if (seen & SEEN_XREG)

			if (seen_or_pass0 & SEEN_XREG)

				CLEAR_X(); /* make sure we dont leek kernel memory */



			/*
@@ -170,7 +171,7 @@ void bpf_jit_compile(struct sk_filter *fp) 
			 *  r9 = skb->len - skb->data_len

			 *  r8 = skb->data

			 */

			if (seen & SEEN_DATAREF) {

			if (seen_or_pass0 & SEEN_DATAREF) {

				if (offsetof(struct sk_buff, len) <= 127)

					/* mov    off8(%rdi),%r9d */

					EMIT4(0x44, 0x8b, 0x4f, offsetof(struct sk_buff, len));
@@ -260,9 +261,14 @@ void bpf_jit_compile(struct sk_filter *fp) 
			case BPF_S_ALU_DIV_X: /* A /= X; */

				seen |= SEEN_XREG;

				EMIT2(0x85, 0xdb);	/* test %ebx,%ebx */

				if (pc_ret0 != -1)

					EMIT_COND_JMP(X86_JE, addrs[pc_ret0] - (addrs[i] - 4));

				else {

				if (pc_ret0 > 0) {

					/* addrs[pc_ret0 - 1] is start address of target

					 * (addrs[i] - 4) is the address following this jmp

					 * ("xor %edx,%edx; div %ebx" being 4 bytes long)

					 */

					EMIT_COND_JMP(X86_JE, addrs[pc_ret0 - 1] -

								(addrs[i] - 4));

				} else {

					EMIT_COND_JMP(X86_JNE, 2 + 5);

					CLEAR_A();

					EMIT1_off32(0xe9, cleanup_addr - (addrs[i] - 4)); /* jmp .+off32 */
@@ -335,12 +341,12 @@ void bpf_jit_compile(struct sk_filter *fp) 
				}

				/* fallinto */

			case BPF_S_RET_A:

				if (seen) {

				if (seen_or_pass0) {

					if (i != flen - 1) {

						EMIT_JMP(cleanup_addr - addrs[i]);

						break;

					}

					if (seen & SEEN_XREG)

					if (seen_or_pass0 & SEEN_XREG)

						EMIT4(0x48, 0x8b, 0x5d, 0xf8);  /* mov  -8(%rbp),%rbx */

					EMIT1(0xc9);		/* leaveq */

				}
@@ -483,8 +489,9 @@ common_load: seen |= SEEN_DATAREF; 
				goto common_load;

			case BPF_S_LDX_B_MSH:

				if ((int)K < 0) {

					if (pc_ret0 != -1) {

						EMIT_JMP(addrs[pc_ret0] - addrs[i]);

					if (pc_ret0 > 0) {

						/* addrs[pc_ret0 - 1] is the start address */

						EMIT_JMP(addrs[pc_ret0 - 1] - addrs[i]);

						break;

					}

					CLEAR_A();
@@ -599,13 +606,14 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i]; 
		 * use it to give the cleanup instruction(s) addr

		 */

		cleanup_addr = proglen - 1; /* ret */

		if (seen)

		if (seen_or_pass0)

			cleanup_addr -= 1; /* leaveq */

		if (seen & SEEN_XREG)

		if (seen_or_pass0 & SEEN_XREG)

			cleanup_addr -= 4; /* mov  -8(%rbp),%rbx */



		if (image) {

			WARN_ON(proglen != oldproglen);

			if (proglen != oldproglen)

				pr_err("bpb_jit_compile proglen=%u != oldproglen=%u\n", proglen, oldproglen);

			break;

		}

		if (proglen == oldproglen) {

drivers/net/bonding/bond_alb.c

+9 −18
Original line number Diff line number Diff line
@@ -909,16 +909,12 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[]) 
	}

}



/* hw is a boolean parameter that determines whether we should try and

 * set the hw address of the device as well as the hw address of the

 * net_device

 */

static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[], int hw)

static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[])

{

	struct net_device *dev = slave->dev;

	struct sockaddr s_addr;



	if (!hw) {

	if (slave->bond->params.mode == BOND_MODE_TLB) {

		memcpy(dev->dev_addr, addr, dev->addr_len);

		return 0;

	}
@@ -948,8 +944,8 @@ static void alb_swap_mac_addr(struct bonding *bond, struct slave *slave1, struct 
	u8 tmp_mac_addr[ETH_ALEN];



	memcpy(tmp_mac_addr, slave1->dev->dev_addr, ETH_ALEN);

	alb_set_slave_mac_addr(slave1, slave2->dev->dev_addr, bond->alb_info.rlb_enabled);

	alb_set_slave_mac_addr(slave2, tmp_mac_addr, bond->alb_info.rlb_enabled);

	alb_set_slave_mac_addr(slave1, slave2->dev->dev_addr);

	alb_set_slave_mac_addr(slave2, tmp_mac_addr);



}
@@ -1096,8 +1092,7 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav 


		/* Try setting slave mac to bond address and fall-through

		   to code handling that situation below... */

		alb_set_slave_mac_addr(slave, bond->dev->dev_addr,

				       bond->alb_info.rlb_enabled);

		alb_set_slave_mac_addr(slave, bond->dev->dev_addr);

	}



	/* The slave's address is equal to the address of the bond.
@@ -1133,8 +1128,7 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav 
	}



	if (free_mac_slave) {

		alb_set_slave_mac_addr(slave, free_mac_slave->perm_hwaddr,

				       bond->alb_info.rlb_enabled);

		alb_set_slave_mac_addr(slave, free_mac_slave->perm_hwaddr);



		pr_warning("%s: Warning: the hw address of slave %s is in use by the bond; giving it the hw address of %s\n",

			   bond->dev->name, slave->dev->name,
@@ -1491,8 +1485,7 @@ int bond_alb_init_slave(struct bonding *bond, struct slave *slave) 
{

	int res;



	res = alb_set_slave_mac_addr(slave, slave->perm_hwaddr,

				     bond->alb_info.rlb_enabled);

	res = alb_set_slave_mac_addr(slave, slave->perm_hwaddr);

	if (res) {

		return res;

	}
@@ -1643,8 +1636,7 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave 
		alb_swap_mac_addr(bond, swap_slave, new_slave);

	} else {

		/* set the new_slave to the bond mac address */

		alb_set_slave_mac_addr(new_slave, bond->dev->dev_addr,

				       bond->alb_info.rlb_enabled);

		alb_set_slave_mac_addr(new_slave, bond->dev->dev_addr);

	}



	if (swap_slave) {
@@ -1704,8 +1696,7 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr) 
		alb_swap_mac_addr(bond, swap_slave, bond->curr_active_slave);

		alb_fasten_mac_swap(bond, swap_slave, bond->curr_active_slave);

	} else {

		alb_set_slave_mac_addr(bond->curr_active_slave, bond_dev->dev_addr,

				       bond->alb_info.rlb_enabled);

		alb_set_slave_mac_addr(bond->curr_active_slave, bond_dev->dev_addr);



		read_lock(&bond->lock);

		alb_send_learning_packets(bond->curr_active_slave, bond_dev->dev_addr);

drivers/net/dsa/mv88e6060.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



#include <linux/list.h>

#include <linux/module.h>

#include <linux/netdevice.h>

#include <linux/phy.h>

#include <net/dsa.h>

drivers/net/dsa/mv88e6123_61_65.c

+18 −4
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



#include <linux/list.h>

#include <linux/module.h>

#include <linux/netdevice.h>

#include <linux/phy.h>

#include <net/dsa.h>
@@ -20,12 +21,25 @@ static char *mv88e6123_61_65_probe(struct mii_bus *bus, int sw_addr) 


	ret = __mv88e6xxx_reg_read(bus, sw_addr, REG_PORT(0), 0x03);

	if (ret >= 0) {

		ret &= 0xfff0;

		if (ret == 0x1210)

		if (ret == 0x1212)

			return "Marvell 88E6123 (A1)";

		if (ret == 0x1213)

			return "Marvell 88E6123 (A2)";

		if ((ret & 0xfff0) == 0x1210)

			return "Marvell 88E6123";

		if (ret == 0x1610)



		if (ret == 0x1612)

			return "Marvell 88E6161 (A1)";

		if (ret == 0x1613)

			return "Marvell 88E6161 (A2)";

		if ((ret & 0xfff0) == 0x1610)

			return "Marvell 88E6161";

		if (ret == 0x1650)



		if (ret == 0x1652)

			return "Marvell 88E6165 (A1)";

		if (ret == 0x1653)

			return "Marvell 88e6165 (A2)";

		if ((ret & 0xfff0) == 0x1650)

			return "Marvell 88E6165";

	}

drivers/net/dsa/mv88e6131.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



#include <linux/list.h>

#include <linux/module.h>

#include <linux/netdevice.h>

#include <linux/phy.h>

#include <net/dsa.h>