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

Commit a8787645 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) There was a simplification in the ipv6 ndisc packet sending
    attempted here, which avoided using memory accounting on the
    per-netns ndisc socket for sending NDISC packets.  It did fix some
    important issues, but it causes regressions so it gets reverted here
    too.  Specifically, the problem with this change is that the IPV6
    output path really depends upon there being a valid skb->sk
    attached.

    The reason we want to do this change in some form when we figure out
    how to do it right, is that if a device goes down the ndisc_sk
    socket send queue will fill up and block NDISC packets that we want
    to send to other devices too.  That's really bad behavior.

    Hopefully Thomas can come up with a better version of this change.

 2) Fix a severe TCP performance regression by reverting a change made
    to dev_pick_tx() quite some time ago.  From Eric Dumazet.

 3) TIPC returns wrongly signed error codes, fix from Erik Hugne.

 4) Fix OOPS when doing IPSEC over ipv4 tunnels due to orphaning the
    skb->sk too early.  Fix from Li Hongjun.

 5) RAW ipv4 sockets can use the wrong routing key during lookup, from
    Chris Clark.

 6) Similar to #1 revert an older change that tried to use plain
    alloc_skb() for SYN/ACK TCP packets, this broke the netfilter owner
    mark which needs to see the skb->sk for such frames.  From Phil
    Oester.

 7) BNX2x driver bug fixes from Ariel Elior and Yuval Mintz,
    specifically in the handling of virtual functions.

 8) IPSEC path error propagations to sockets is not done properly when
    we have v4 in v6, and v6 in v4 type rules.  Fix from Hannes Frederic
    Sowa.

 9) Fix missing channel context release in mac80211, from Johannes Berg.

10) Fix network namespace handing wrt.  SCM_RIGHTS, from Andy
    Lutomirski.

11) Fix usage of bogus NAPI weight in jme, netxen, and ps3_gelic
    drivers.  From Michal Schmidt.

12) Hopefully a complete and correct fix for the genetlink dump locking
    and module reference counting.  From Pravin B Shelar.

13) sk_busy_loop() must do a cpu_relax(), from Eliezer Tamir.

14) Fix handling of timestamp offset when restoring a snapshotted TCP
    socket.  From Andrew Vagin.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (44 commits)
  net: fec: fix time stamping logic after napi conversion
  net: bridge: convert MLDv2 Query MRC into msecs_to_jiffies for max_delay
  mISDN: return -EINVAL on error in dsp_control_req()
  net: revert 8728c544 ("net: dev_pick_tx() fix")
  Revert "ipv6: Don't depend on per socket memory for neighbour discovery messages"
  ipv4 tunnels: fix an oops when using ipip/sit with IPsec
  tipc: set sk_err correctly when connection fails
  tcp: tcp_make_synack() should use sock_wmalloc
  bridge: separate querier and query timer into IGMP/IPv4 and MLD/IPv6 ones
  ipv6: Don't depend on per socket memory for neighbour discovery messages
  ipv4: sendto/hdrincl: don't use destination address found in header
  tcp: don't apply tsoffset if rcv_tsecr is zero
  tcp: initialize rcv_tstamp for restored sockets
  net: xilinx: fix memleak
  net: usb: Add HP hs2434 device to ZLP exception table
  net: add cpu_relax to busy poll loop
  net: stmmac: fixed the pbl setting with DT
  genl: Hold reference on correct module while netlink-dump.
  genl: Fix genl dumpit() locking.
  xfrm: Fix potential null pointer dereference in xdst_queue_output
  ...
parents de80963e 0affdf34

drivers/isdn/mISDN/dsp_core.c

+3 −1
Original line number Diff line number Diff line
@@ -288,8 +288,10 @@ dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb) 
	u8 *data;

	int len;



	if (skb->len < sizeof(int))

	if (skb->len < sizeof(int)) {

		printk(KERN_ERR "%s: PH_CONTROL message too short\n", __func__);

		return -EINVAL;

	}

	cont = *((int *)skb->data);

	len = skb->len - sizeof(int);

	data = skb->data + sizeof(int);

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+8 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ static inline void bnx2x_move_fp(struct bnx2x *bp, int from, int to) 
	struct bnx2x_fp_stats *to_fp_stats = &bp->fp_stats[to];

	int old_max_eth_txqs, new_max_eth_txqs;

	int old_txdata_index = 0, new_txdata_index = 0;

	struct bnx2x_agg_info *old_tpa_info = to_fp->tpa_info;



	/* Copy the NAPI object as it has been already initialized */

	from_fp->napi = to_fp->napi;
@@ -61,6 +62,11 @@ static inline void bnx2x_move_fp(struct bnx2x *bp, int from, int to) 
	memcpy(to_fp, from_fp, sizeof(*to_fp));

	to_fp->index = to;



	/* Retain the tpa_info of the original `to' version as we don't want

	 * 2 FPs to contain the same tpa_info pointer.

	 */

	to_fp->tpa_info = old_tpa_info;



	/* move sp_objs contents as well, as their indices match fp ones */

	memcpy(to_sp_objs, from_sp_objs, sizeof(*to_sp_objs));
@@ -2956,8 +2962,9 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link) 
	if (IS_PF(bp)) {

		if (CNIC_LOADED(bp))

			bnx2x_free_mem_cnic(bp);

		bnx2x_free_mem(bp);

	}

	bnx2x_free_mem(bp);



	bp->state = BNX2X_STATE_CLOSED;

	bp->cnic_loaded = false;

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+6 −3
Original line number Diff line number Diff line
@@ -7855,12 +7855,15 @@ void bnx2x_free_mem(struct bnx2x *bp) 
{

	int i;



	BNX2X_PCI_FREE(bp->def_status_blk, bp->def_status_blk_mapping,

		       sizeof(struct host_sp_status_block));



	BNX2X_PCI_FREE(bp->fw_stats, bp->fw_stats_mapping,

		       bp->fw_stats_data_sz + bp->fw_stats_req_sz);



	if (IS_VF(bp))

		return;



	BNX2X_PCI_FREE(bp->def_status_blk, bp->def_status_blk_mapping,

		       sizeof(struct host_sp_status_block));



	BNX2X_PCI_FREE(bp->slowpath, bp->slowpath_mapping,

		       sizeof(struct bnx2x_slowpath));

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c

+27 −36
Original line number Diff line number Diff line
@@ -522,23 +522,6 @@ static int bnx2x_vfop_set_user_req(struct bnx2x *bp, 
	return 0;

}



static int

bnx2x_vfop_config_vlan0(struct bnx2x *bp,

			struct bnx2x_vlan_mac_ramrod_params *vlan_mac,

			bool add)

{

	int rc;



	vlan_mac->user_req.cmd = add ? BNX2X_VLAN_MAC_ADD :

		BNX2X_VLAN_MAC_DEL;

	vlan_mac->user_req.u.vlan.vlan = 0;



	rc = bnx2x_config_vlan_mac(bp, vlan_mac);

	if (rc == -EEXIST)

		rc = 0;

	return rc;

}



static int bnx2x_vfop_config_list(struct bnx2x *bp,

				  struct bnx2x_vfop_filters *filters,

				  struct bnx2x_vlan_mac_ramrod_params *vlan_mac)
@@ -643,30 +626,14 @@ static void bnx2x_vfop_vlan_mac(struct bnx2x *bp, struct bnx2x_virtf *vf) 


	case BNX2X_VFOP_VLAN_CONFIG_LIST:

		/* next state */

		vfop->state = BNX2X_VFOP_VLAN_CONFIG_LIST_0;



		/* remove vlan0 - could be no-op */

		vfop->rc = bnx2x_vfop_config_vlan0(bp, vlan_mac, false);

		if (vfop->rc)

			goto op_err;

		vfop->state = BNX2X_VFOP_VLAN_MAC_CHK_DONE;



		/* Do vlan list config. if this operation fails we try to

		 * restore vlan0 to keep the queue is working order

		 */

		/* do list config */

		vfop->rc = bnx2x_vfop_config_list(bp, filters, vlan_mac);

		if (!vfop->rc) {

			set_bit(RAMROD_CONT, &vlan_mac->ramrod_flags);

			vfop->rc = bnx2x_config_vlan_mac(bp, vlan_mac);

		}

		bnx2x_vfop_finalize(vf, vfop->rc, VFOP_CONT); /* fall-through */



	case BNX2X_VFOP_VLAN_CONFIG_LIST_0:

		/* next state */

		vfop->state = BNX2X_VFOP_VLAN_MAC_CHK_DONE;



		if (list_empty(&obj->head))

			/* add vlan0 */

			vfop->rc = bnx2x_vfop_config_vlan0(bp, vlan_mac, true);

		bnx2x_vfop_finalize(vf, vfop->rc, VFOP_DONE);



	default:
@@ -2819,6 +2786,18 @@ int bnx2x_vf_init(struct bnx2x *bp, struct bnx2x_virtf *vf, dma_addr_t *sb_map) 
	return 0;

}



struct set_vf_state_cookie {

	struct bnx2x_virtf *vf;

	u8 state;

};



void bnx2x_set_vf_state(void *cookie)

{

	struct set_vf_state_cookie *p = (struct set_vf_state_cookie *)cookie;



	p->vf->state = p->state;

}



/* VFOP close (teardown the queues, delete mcasts and close HW) */

static void bnx2x_vfop_close(struct bnx2x *bp, struct bnx2x_virtf *vf)

{
@@ -2869,7 +2848,19 @@ static void bnx2x_vfop_close(struct bnx2x *bp, struct bnx2x_virtf *vf) 
op_err:

	BNX2X_ERR("VF[%d] CLOSE error: rc %d\n", vf->abs_vfid, vfop->rc);

op_done:

	vf->state = VF_ACQUIRED;



	/* need to make sure there are no outstanding stats ramrods which may

	 * cause the device to access the VF's stats buffer which it will free

	 * as soon as we return from the close flow.

	 */

	{

		struct set_vf_state_cookie cookie;



		cookie.vf = vf;

		cookie.state = VF_ACQUIRED;

		bnx2x_stats_safe_exec(bp, bnx2x_set_vf_state, &cookie);

	}



	DP(BNX2X_MSG_IOV, "set state to acquired\n");

	bnx2x_vfop_end(bp, vf, vfop);

}

drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c

+19 −12
Original line number Diff line number Diff line
@@ -522,12 +522,7 @@ static void bnx2x_func_stats_init(struct bnx2x *bp) 
/* should be called under stats_sema */

static void __bnx2x_stats_start(struct bnx2x *bp)

{

	/* vfs travel through here as part of the statistics FSM, but no action

	 * is required

	 */

	if (IS_VF(bp))

		return;



	if (IS_PF(bp)) {

		if (bp->port.pmf)

			bnx2x_port_stats_init(bp);
@@ -536,6 +531,7 @@ static void __bnx2x_stats_start(struct bnx2x *bp) 


		bnx2x_hw_stats_post(bp);

		bnx2x_storm_stats_post(bp);

	}



	bp->stats_started = true;

}
@@ -1997,3 +1993,14 @@ void bnx2x_afex_collect_stats(struct bnx2x *bp, void *void_afex_stats, 
		       estats->mac_discard);

	}

}



void bnx2x_stats_safe_exec(struct bnx2x *bp,

			   void (func_to_exec)(void *cookie),

			   void *cookie){

	if (down_timeout(&bp->stats_sema, HZ/10))

		BNX2X_ERR("Unable to acquire stats lock\n");

	bnx2x_stats_comp(bp);

	func_to_exec(cookie);

	__bnx2x_stats_start(bp);

	up(&bp->stats_sema);

}