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

Commit 1c212c65 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking changes from David Miller:
 "Most importantly this should cure the ipv4-mapped ipv6 socket TCP
  crashes some people were seeing, otherwise:

   1) Fix e1000e autonegotiation handling regression, from Tushar Dave.

   2) Fix TX data corruption race on e1000e down, also from Tushar Dave.

   3) Fix bfin_sir IRDA driver build, from Sonic Zhang.

   4) AF_PACKET mmap() tests a flag in the TX ring shared between
      userspace and the kernel for an internal consistency check.  It
      really shouldn't do this to validate the kernel's own behavior
      because the user can corrupt it to be any value at all.  From
      Daniel Borkmann.

   5) Fix TCP metrics leak on netns dismantle, from Eric Dumazet.

   6) Orphan the anonymous TCP socket from the SKB in
      ip_send_unicast_reply() so that the rest of the stack needn't see
      it.  Otherwise we get selinux problems of all sorts, from Eric
      Dumazet.

      This is the best way to fix this since the socket is just a place
      holder for sending packets in a context where we have no real
      socket at all.

   7) Fix TUN detach crashes, from Stanislav Kinsbursky.

   8) dev_set_alias() leaks memory on krealloc() failure, from Alexey
      Khoroshilov.

   9) FIB trie must use call_rcu() not call_rcu_bh(), because this code
      is not universally invoked from software interrupts.  From Eric
      Dumazet.

  10) PPTP looks up ipv4 routes with the wrong network namespace, fix
      from Gao Feng."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (33 commits)
  bnx2x: Fix compiler warnings
  af_packet: remove BUG statement in tpacket_destruct_skb
  macvtap: rcu_dereference outside read-lock section
  codel: refine one condition to avoid a nul rec_inv_sqrt
  ixgbe: add missing braces
  ipv4: fix ip_send_skb()
  net: tcp: ipv6_mapped needs sk_rx_dst_set method
  ipv4: tcp: unicast_sock should not land outside of TCP stack
  bnx2x: Fix recovery flow cleanup during probe
  bnx2x: fix unload previous driver flow when flr-capable
  tun: don't zeroize sock->file on detach
  igb: Fix register defines for all non-82575 hardware
  e1000e: fix panic while dumping packets on Tx hang with IOMMU
  igb: fix panic while dumping packets on Tx hang with IOMMU
  tcp: must free metrics at net dismantle
  net/stmmac: mark probe function as __devinit
  lpc_eth: remove obsolete ifdefs
  net/core: Fix potential memory leak in dev_set_alias()
  cdc-phonet: Don't leak in usbpn_open
  batman-adv: Fix mem leak in the batadv_tt_local_event() function
  ...
parents f82202ba f57b07c0

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

+1 −1
Original line number Diff line number Diff line
@@ -1278,7 +1278,7 @@ struct bnx2x { 
#define BNX2X_FW_RX_ALIGN_START	(1UL << BNX2X_RX_ALIGN_SHIFT)



#define BNX2X_FW_RX_ALIGN_END					\

	max(1UL << BNX2X_RX_ALIGN_SHIFT, 			\

	max_t(u64, 1UL << BNX2X_RX_ALIGN_SHIFT,			\

	    SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))



#define BNX2X_PXP_DRAM_ALIGN		(BNX2X_RX_ALIGN_SHIFT - 5)

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

+28 −44
Original line number Diff line number Diff line
@@ -4041,20 +4041,6 @@ static bool bnx2x_get_load_status(struct bnx2x *bp, int engine) 
	return val != 0;

}



/*

 * Reset the load status for the current engine.

 */

static void bnx2x_clear_load_status(struct bnx2x *bp)

{

	u32 val;

	u32 mask = (BP_PATH(bp) ? BNX2X_PATH1_LOAD_CNT_MASK :

		    BNX2X_PATH0_LOAD_CNT_MASK);

	bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_RECOVERY_REG);

	val = REG_RD(bp, BNX2X_RECOVERY_GLOB_REG);

	REG_WR(bp, BNX2X_RECOVERY_GLOB_REG, val & (~mask));

	bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_RECOVERY_REG);

}



static void _print_next_block(int idx, const char *blk)

{

	pr_cont("%s%s", idx ? ", " : "", blk);
@@ -9384,32 +9370,24 @@ static int __devinit bnx2x_prev_mark_path(struct bnx2x *bp) 
	return rc;

}



static bool __devinit bnx2x_can_flr(struct bnx2x *bp)

{

	int pos;

	u32 cap;

	struct pci_dev *dev = bp->pdev;



	pos = pci_pcie_cap(dev);

	if (!pos)

		return false;



	pci_read_config_dword(dev, pos + PCI_EXP_DEVCAP, &cap);

	if (!(cap & PCI_EXP_DEVCAP_FLR))

		return false;



	return true;

}



static int __devinit bnx2x_do_flr(struct bnx2x *bp)

{

	int i, pos;

	u16 status;

	struct pci_dev *dev = bp->pdev;



	/* probe the capability first */

	if (bnx2x_can_flr(bp))

		return -ENOTTY;



	if (CHIP_IS_E1x(bp)) {

		BNX2X_DEV_INFO("FLR not supported in E1/E1H\n");

		return -EINVAL;

	}



	/* only bootcode REQ_BC_VER_4_INITIATE_FLR and onwards support flr */

	if (bp->common.bc_ver < REQ_BC_VER_4_INITIATE_FLR) {

		BNX2X_ERR("FLR not supported by BC_VER: 0x%x\n",

			  bp->common.bc_ver);

		return -EINVAL;

	}



	pos = pci_pcie_cap(dev);

	if (!pos)
@@ -9429,12 +9407,8 @@ static int __devinit bnx2x_do_flr(struct bnx2x *bp) 
		"transaction is not cleared; proceeding with reset anyway\n");



clear:

	if (bp->common.bc_ver < REQ_BC_VER_4_INITIATE_FLR) {

		BNX2X_ERR("FLR not supported by BC_VER: 0x%x\n",

			  bp->common.bc_ver);

		return -EINVAL;

	}



	BNX2X_DEV_INFO("Initiating FLR\n");

	bnx2x_fw_command(bp, DRV_MSG_CODE_INITIATE_FLR, 0);



	return 0;
@@ -9454,8 +9428,21 @@ static int __devinit bnx2x_prev_unload_uncommon(struct bnx2x *bp) 
	 * the one required, then FLR will be sufficient to clean any residue

	 * left by previous driver

	 */

	if (bnx2x_test_firmware_version(bp, false) && bnx2x_can_flr(bp))

		return bnx2x_do_flr(bp);

	rc = bnx2x_test_firmware_version(bp, false);



	if (!rc) {

		/* fw version is good */

		BNX2X_DEV_INFO("FW version matches our own. Attempting FLR\n");

		rc = bnx2x_do_flr(bp);

	}



	if (!rc) {

		/* FLR was performed */

		BNX2X_DEV_INFO("FLR successful\n");

		return 0;

	}



	BNX2X_DEV_INFO("Could not FLR\n");



	/* Close the MCP request, return failure*/

	rc = bnx2x_prev_mcp_done(bp);
@@ -11427,9 +11414,6 @@ static int __devinit bnx2x_init_dev(struct pci_dev *pdev, 
	if (!chip_is_e1x)

		REG_WR(bp, PGLUE_B_REG_INTERNAL_PFID_ENABLE_TARGET_READ, 1);



	/* Reset the load counter */

	bnx2x_clear_load_status(bp);



	dev->watchdog_timeo = TX_TIMEOUT;



	dev->netdev_ops = &bnx2x_netdev_ops;

drivers/net/ethernet/intel/e1000e/82571.c

+5 −5
Original line number Diff line number Diff line
@@ -999,7 +999,7 @@ static s32 e1000_set_d0_lplu_state_82571(struct e1000_hw *hw, bool active) 
 **/

static s32 e1000_reset_hw_82571(struct e1000_hw *hw)

{

	u32 ctrl, ctrl_ext, eecd;

	u32 ctrl, ctrl_ext, eecd, tctl;

	s32 ret_val;



	/*
@@ -1014,7 +1014,9 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw) 
	ew32(IMC, 0xffffffff);



	ew32(RCTL, 0);

	ew32(TCTL, E1000_TCTL_PSP);

	tctl = er32(TCTL);

	tctl &= ~E1000_TCTL_EN;

	ew32(TCTL, tctl);

	e1e_flush();



	usleep_range(10000, 20000);
@@ -1601,10 +1603,8 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw) 
			 * auto-negotiation in the TXCW register and disable

			 * forced link in the Device Control register in an

			 * attempt to auto-negotiate with our link partner.

			 * If the partner code word is null, stop forcing

			 * and restart auto negotiation.

			 */

			if ((rxcw & E1000_RXCW_C) || !(rxcw & E1000_RXCW_CW))  {

			if (rxcw & E1000_RXCW_C) {

				/* Enable autoneg, and unforce link up */

				ew32(TXCW, mac->txcw);

				ew32(CTRL, (ctrl & ~E1000_CTRL_SLU));

drivers/net/ethernet/intel/e1000e/netdev.c

+26 −10
Original line number Diff line number Diff line
@@ -178,6 +178,24 @@ static void e1000_regdump(struct e1000_hw *hw, struct e1000_reg_info *reginfo) 
	pr_info("%-15s %08x %08x\n", rname, regs[0], regs[1]);

}



static void e1000e_dump_ps_pages(struct e1000_adapter *adapter,

				 struct e1000_buffer *bi)

{

	int i;

	struct e1000_ps_page *ps_page;



	for (i = 0; i < adapter->rx_ps_pages; i++) {

		ps_page = &bi->ps_pages[i];



		if (ps_page->page) {

			pr_info("packet dump for ps_page %d:\n", i);

			print_hex_dump(KERN_INFO, "", DUMP_PREFIX_ADDRESS,

				       16, 1, page_address(ps_page->page),

				       PAGE_SIZE, true);

		}

	}

}



/*

 * e1000e_dump - Print registers, Tx-ring and Rx-ring

 */
@@ -299,10 +317,10 @@ static void e1000e_dump(struct e1000_adapter *adapter) 
			(unsigned long long)buffer_info->time_stamp,

			buffer_info->skb, next_desc);



		if (netif_msg_pktdata(adapter) && buffer_info->dma != 0)

		if (netif_msg_pktdata(adapter) && buffer_info->skb)

			print_hex_dump(KERN_INFO, "", DUMP_PREFIX_ADDRESS,

				       16, 1, phys_to_virt(buffer_info->dma),

				       buffer_info->length, true);

				       16, 1, buffer_info->skb->data,

				       buffer_info->skb->len, true);

	}



	/* Print Rx Ring Summary */
@@ -381,10 +399,8 @@ static void e1000e_dump(struct e1000_adapter *adapter) 
					buffer_info->skb, next_desc);



				if (netif_msg_pktdata(adapter))

					print_hex_dump(KERN_INFO, "",

						DUMP_PREFIX_ADDRESS, 16, 1,

						phys_to_virt(buffer_info->dma),

						adapter->rx_ps_bsize0, true);

					e1000e_dump_ps_pages(adapter,

							     buffer_info);

			}

		}

		break;
@@ -444,12 +460,12 @@ static void e1000e_dump(struct e1000_adapter *adapter) 
					(unsigned long long)buffer_info->dma,

					buffer_info->skb, next_desc);



				if (netif_msg_pktdata(adapter))

				if (netif_msg_pktdata(adapter) &&

				    buffer_info->skb)

					print_hex_dump(KERN_INFO, "",

						       DUMP_PREFIX_ADDRESS, 16,

						       1,

						       phys_to_virt

						       (buffer_info->dma),

						       buffer_info->skb->data,

						       adapter->rx_buffer_len,

						       true);

			}

drivers/net/ethernet/intel/igb/e1000_regs.h

+6 −2
Original line number Diff line number Diff line
@@ -156,8 +156,12 @@ 
				    : (0x0E018 + ((_n) * 0x40)))

#define E1000_TXDCTL(_n)  ((_n) < 4 ? (0x03828 + ((_n) * 0x100)) \

				    : (0x0E028 + ((_n) * 0x40)))

#define E1000_DCA_TXCTRL(_n) (0x03814 + (_n << 8))

#define E1000_DCA_RXCTRL(_n) (0x02814 + (_n << 8))

#define E1000_RXCTL(_n)	  ((_n) < 4 ? (0x02814 + ((_n) * 0x100)) : \

				      (0x0C014 + ((_n) * 0x40)))

#define E1000_DCA_RXCTRL(_n)	E1000_RXCTL(_n)

#define E1000_TXCTL(_n)   ((_n) < 4 ? (0x03814 + ((_n) * 0x100)) : \

				      (0x0E014 + ((_n) * 0x40)))

#define E1000_DCA_TXCTRL(_n) E1000_TXCTL(_n)

#define E1000_TDWBAL(_n)  ((_n) < 4 ? (0x03838 + ((_n) * 0x100)) \

				    : (0x0E038 + ((_n) * 0x40)))

#define E1000_TDWBAH(_n)  ((_n) < 4 ? (0x0383C + ((_n) * 0x100)) \