FAILED: patch "[PATCH] i40e: Fix issue when maximum queues is exceeded" failed to apply to 4.4-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From d701658a50a471591094b3eb3961b4926cc8f104 Mon Sep 17 00:00:00 2001
From: Jedrzej Jagielski <[email protected]>
Date: Fri, 5 Nov 2021 11:17:00 +0000
Subject: [PATCH] i40e: Fix issue when maximum queues is exceeded
Before this patch VF interface vanished when
maximum queue number was exceeded. Driver tried
to add next queues even if there was not enough
space. PF sent incorrect number of queues to
the VF when there were not enough of them.
Add an additional condition introduced to check available space in 'qp_pile' before proceeding. This condition makes it impossible to add queues if they number is greater than the number resulting from available space.
Also add the search for free space in PF queue pair piles.
Without this patch VF interfaces are not seen
when available space for queues has been
exceeded and following logs appears permanently
in dmesg:
"Unable to get VF config (-32)".
"VF 62 failed opcode 3, retval: -5"
"Unable to get VF config due to PF error condition, not retrying"
drivers/net/ethernet/intel/i40e/i40e.h +0 -1
@@ -174,7 +174,6 @@ enum i40e_interrupt_policy {struct i40e_lump_tracking {u16 num_entries; -u16 search_hint;u16 list[0 ];#define I40E_PILE_VALID_BIT 0x8000#define I40E_IWARP_IRQ_PILE_ID (I40E_PILE_VALID_BIT - 2)
drivers/net/ethernet/intel/i40e/i40e_main.c +2 -12
@@ -196,10 +196,6 @@ int i40e_free_virt_mem_d(struct i40e_hw *hw, struct i40e_virt_mem *mem)* @id: an owner id to stick on the items assigned * * Returns the base item index of the lump, or negative for error -* -* The search_hint trick and lack of advanced fit-finding only work -* because we're highly likely to have all the same size lump requests. -* Linear search time and any fragmentation should be minimal. **/ static int i40e_get_lump (struct i40e_pf *pf,struct i40e_lump_tracking *pile,u16 needed,u16 id)
@@ -214,8 +210,7 @@ static int i40e_get_lump(struct i40e_pf *pf, struct i40e_lump_tracking *pile,return -EINVAL ; } -/* start the linear search with an imperfect hint */ - i = pile->search_hint; + i =0 ;while (i < pile->num_entries) {/* skip already allocated entries */ if (pile->list[i] &I40E_PILE_VALID_BIT ) {
@@ -234,7 +229,6 @@ static int i40e_get_lump(struct i40e_pf *pf, struct i40e_lump_tracking *pile,for (j =0 ; j < needed; j++) pile->list[i+j] = id |I40E_PILE_VALID_BIT ; ret = i; - pile->search_hint = i + j;break ; }
@@ -257,7 +251,7 @@ static int i40e_put_lump(struct i40e_lump_tracking *pile, u16 index, u16 id) {int valid_id = (id |I40E_PILE_VALID_BIT );int count =0 ; -int i; +u16 i;if (!pile || index >= pile->num_entries)return -EINVAL ;
@@ -269,8 +263,6 @@ static int i40e_put_lump(struct i40e_lump_tracking *pile, u16 index, u16 id) count++; } -if (count && index < pile->search_hint) - pile->search_hint = index;return count; }
@@ -11786,7 +11778,6 @@ static int i40e_init_interrupt_scheme(struct i40e_pf *pf)return -ENOMEM ; pf->irq_pile->num_entries = vectors; - pf->irq_pile->search_hint =0 ;/* track first vector for misc interrupts, ignore return */ (void )i40e_get_lump (pf, pf->irq_pile,1 ,I40E_PILE_VALID_BIT -1 );
@@ -12589,7 +12580,6 @@ static int i40e_sw_init(struct i40e_pf *pf) goto sw_init_done; } pf->qp_pile->num_entries = pf->hw.func_caps.num_tx_qp; - pf->qp_pile->search_hint =0 ; pf->tx_timeout_recovery_level =1 ;
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +59 -0
71 lines not on this page · raw message