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

Commit 80971dfb authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2017-06-06

This series contains fixes to i40e and i40evf only.

Mauro S. M. Rodrigues fixes a flood in the kernel log which was introduced
in a previous commit because of a mistaken substitution of __I40E_VSI_DOWN
instead of __I40E_DOWN when testing the state of the PF.

Björn Töpel fixes an issue introduced in a previous commit where the
offset was incorrect and could lead to data corruption for architectures
using PAGE_SIZE larger than 8191.  Fixed the issue by updating the
page_offset correctly using the proper setting for truesize.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f4eb17e1 2aae918c

drivers/net/ethernet/intel/i40e/i40e_main.c

+18 −18
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ struct i40e_vsi *i40e_find_vsi_from_id(struct i40e_pf *pf, u16 id) 
 **/

void i40e_service_event_schedule(struct i40e_pf *pf)

{

	if (!test_bit(__I40E_VSI_DOWN, pf->state) &&

	if (!test_bit(__I40E_DOWN, pf->state) &&

	    !test_bit(__I40E_RESET_RECOVERY_PENDING, pf->state))

		queue_work(i40e_wq, &pf->service_task);

}
@@ -3611,7 +3611,7 @@ static irqreturn_t i40e_intr(int irq, void *data) 
		 * this is not a performance path and napi_schedule()

		 * can deal with rescheduling.

		 */

		if (!test_bit(__I40E_VSI_DOWN, pf->state))

		if (!test_bit(__I40E_DOWN, pf->state))

			napi_schedule_irqoff(&q_vector->napi);

	}
@@ -3687,7 +3687,7 @@ static irqreturn_t i40e_intr(int irq, void *data) 
enable_intr:

	/* re-enable interrupt causes */

	wr32(hw, I40E_PFINT_ICR0_ENA, ena_mask);

	if (!test_bit(__I40E_VSI_DOWN, pf->state)) {

	if (!test_bit(__I40E_DOWN, pf->state)) {

		i40e_service_event_schedule(pf);

		i40e_irq_dynamic_enable_icr0(pf, false);

	}
@@ -6203,7 +6203,7 @@ static void i40e_fdir_reinit_subtask(struct i40e_pf *pf) 
{



	/* if interface is down do nothing */

	if (test_bit(__I40E_VSI_DOWN, pf->state))

	if (test_bit(__I40E_DOWN, pf->state))

		return;



	if (test_bit(__I40E_FD_FLUSH_REQUESTED, pf->state))
@@ -6344,7 +6344,7 @@ static void i40e_watchdog_subtask(struct i40e_pf *pf) 
	int i;



	/* if interface is down do nothing */

	if (test_bit(__I40E_VSI_DOWN, pf->state) ||

	if (test_bit(__I40E_DOWN, pf->state) ||

	    test_bit(__I40E_CONFIG_BUSY, pf->state))

		return;
@@ -6399,9 +6399,9 @@ static void i40e_reset_subtask(struct i40e_pf *pf) 
		reset_flags |= BIT(__I40E_GLOBAL_RESET_REQUESTED);

		clear_bit(__I40E_GLOBAL_RESET_REQUESTED, pf->state);

	}

	if (test_bit(__I40E_VSI_DOWN_REQUESTED, pf->state)) {

		reset_flags |= BIT(__I40E_VSI_DOWN_REQUESTED);

		clear_bit(__I40E_VSI_DOWN_REQUESTED, pf->state);

	if (test_bit(__I40E_DOWN_REQUESTED, pf->state)) {

		reset_flags |= BIT(__I40E_DOWN_REQUESTED);

		clear_bit(__I40E_DOWN_REQUESTED, pf->state);

	}



	/* If there's a recovery already waiting, it takes
@@ -6415,7 +6415,7 @@ static void i40e_reset_subtask(struct i40e_pf *pf) 


	/* If we're already down or resetting, just bail */

	if (reset_flags &&

	    !test_bit(__I40E_VSI_DOWN, pf->state) &&

	    !test_bit(__I40E_DOWN, pf->state) &&

	    !test_bit(__I40E_CONFIG_BUSY, pf->state)) {

		rtnl_lock();

		i40e_do_reset(pf, reset_flags, true);
@@ -7002,7 +7002,7 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired) 
	u32 val;

	int v;



	if (test_bit(__I40E_VSI_DOWN, pf->state))

	if (test_bit(__I40E_DOWN, pf->state))

		goto clear_recovery;

	dev_dbg(&pf->pdev->dev, "Rebuilding internal switch\n");
@@ -9767,7 +9767,7 @@ int i40e_vsi_release(struct i40e_vsi *vsi) 
		return -ENODEV;

	}

	if (vsi == pf->vsi[pf->lan_vsi] &&

	    !test_bit(__I40E_VSI_DOWN, pf->state)) {

	    !test_bit(__I40E_DOWN, pf->state)) {

		dev_info(&pf->pdev->dev, "Can't remove PF VSI\n");

		return -ENODEV;

	}
@@ -11003,7 +11003,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	}

	pf->next_vsi = 0;

	pf->pdev = pdev;

	set_bit(__I40E_VSI_DOWN, pf->state);

	set_bit(__I40E_DOWN, pf->state);



	hw = &pf->hw;

	hw->back = pf;
@@ -11293,7 +11293,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	 * before setting up the misc vector or we get a race and the vector

	 * ends up disabled forever.

	 */

	clear_bit(__I40E_VSI_DOWN, pf->state);

	clear_bit(__I40E_DOWN, pf->state);



	/* In case of MSIX we are going to setup the misc vector right here

	 * to handle admin queue events etc. In case of legacy and MSI
@@ -11448,7 +11448,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	/* Unwind what we've done if something failed in the setup */

err_vsis:

	set_bit(__I40E_VSI_DOWN, pf->state);

	set_bit(__I40E_DOWN, pf->state);

	i40e_clear_interrupt_scheme(pf);

	kfree(pf->vsi);

err_switch_setup:
@@ -11500,7 +11500,7 @@ static void i40e_remove(struct pci_dev *pdev) 


	/* no more scheduling of any task */

	set_bit(__I40E_SUSPENDED, pf->state);

	set_bit(__I40E_VSI_DOWN, pf->state);

	set_bit(__I40E_DOWN, pf->state);

	if (pf->service_timer.data)

		del_timer_sync(&pf->service_timer);

	if (pf->service_task.func)
@@ -11740,7 +11740,7 @@ static void i40e_shutdown(struct pci_dev *pdev) 
	struct i40e_hw *hw = &pf->hw;



	set_bit(__I40E_SUSPENDED, pf->state);

	set_bit(__I40E_VSI_DOWN, pf->state);

	set_bit(__I40E_DOWN, pf->state);

	rtnl_lock();

	i40e_prep_for_reset(pf, true);

	rtnl_unlock();
@@ -11789,7 +11789,7 @@ static int i40e_suspend(struct pci_dev *pdev, pm_message_t state) 
	int retval = 0;



	set_bit(__I40E_SUSPENDED, pf->state);

	set_bit(__I40E_VSI_DOWN, pf->state);

	set_bit(__I40E_DOWN, pf->state);



	if (pf->wol_en && (pf->flags & I40E_FLAG_WOL_MC_MAGIC_PKT_WAKE))

		i40e_enable_mc_magic_wake(pf);
@@ -11841,7 +11841,7 @@ static int i40e_resume(struct pci_dev *pdev) 


	/* handling the reset will rebuild the device state */

	if (test_and_clear_bit(__I40E_SUSPENDED, pf->state)) {

		clear_bit(__I40E_VSI_DOWN, pf->state);

		clear_bit(__I40E_DOWN, pf->state);

		rtnl_lock();

		i40e_reset_and_rebuild(pf, false, true);

		rtnl_unlock();

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+2 −1
Original line number Diff line number Diff line
@@ -1854,7 +1854,8 @@ static struct sk_buff *i40e_build_skb(struct i40e_ring *rx_ring, 
#if (PAGE_SIZE < 8192)

	unsigned int truesize = i40e_rx_pg_size(rx_ring) / 2;

#else

	unsigned int truesize = SKB_DATA_ALIGN(size);

	unsigned int truesize = SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) +

				SKB_DATA_ALIGN(I40E_SKB_PAD + size);

#endif

	struct sk_buff *skb;

drivers/net/ethernet/intel/i40evf/i40e_txrx.c

+2 −1
Original line number Diff line number Diff line
@@ -1190,7 +1190,8 @@ static struct sk_buff *i40e_build_skb(struct i40e_ring *rx_ring, 
#if (PAGE_SIZE < 8192)

	unsigned int truesize = i40e_rx_pg_size(rx_ring) / 2;

#else

	unsigned int truesize = SKB_DATA_ALIGN(size);

	unsigned int truesize = SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) +

				SKB_DATA_ALIGN(I40E_SKB_PAD + size);

#endif

	struct sk_buff *skb;