UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iwlwifi: pcie: fix emergency path 

Allocator swaps the pending requests with 0 when it starts
working. This means that relying on it n RX path to decide if
to move to emergency is not always a good idea, since it may
be zero, but there are still a lot of unallocated RBs in the
system. Change allocator to decrement the pending requests on
real time. It is more expensive since it accesses the atomic
variable more times, but it gives the RX path a better idea
of the system's status.

Reported-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Fixes: 868a1e863f ("iwlwifi: pcie: avoid empty free RB queue")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
This commit is contained in:
Sara Sharon 2018-12-13 14:47:40 +02:00 committed by Luca Coelho
parent d9b10c6ba9
commit c6ac9f9fb9
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/wireless/intel/iwlwifi/pcie/rx.c
View File

@ -538,7 +538,7 @@ static void iwl_pcie_rx_allocator(struct iwl_trans *trans)
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
struct iwl_rb_allocator *rba = &trans_pcie->rba; struct iwl_rb_allocator *rba = &trans_pcie->rba;
struct list_head local_empty; struct list_head local_empty;
int pending = atomic_xchg(&rba->req_pending, 0); int pending = atomic_read(&rba->req_pending);
IWL_DEBUG_RX(trans, "Pending allocation requests = %d\n", pending); IWL_DEBUG_RX(trans, "Pending allocation requests = %d\n", pending);
@ -593,11 +593,13 @@ static void iwl_pcie_rx_allocator(struct iwl_trans *trans)
i++; i++;
} }
atomic_dec(&rba->req_pending);
pending--; pending--;
if (!pending) { if (!pending) {
pending = atomic_xchg(&rba->req_pending, 0); pending = atomic_read(&rba->req_pending);
IWL_DEBUG_RX(trans, IWL_DEBUG_RX(trans,
"Pending allocation requests = %d\n", "Got more pending allocation requests = %d\n",
pending); pending);
} }
@ -609,12 +611,15 @@ static void iwl_pcie_rx_allocator(struct iwl_trans *trans)
spin_unlock(&rba->lock); spin_unlock(&rba->lock);
atomic_inc(&rba->req_ready); atomic_inc(&rba->req_ready);
} }
spin_lock(&rba->lock); spin_lock(&rba->lock);
/* return unused rbds to the allocator empty list */ /* return unused rbds to the allocator empty list */
list_splice_tail(&local_empty, &rba->rbd_empty); list_splice_tail(&local_empty, &rba->rbd_empty);
spin_unlock(&rba->lock); spin_unlock(&rba->lock);
IWL_DEBUG_RX(trans, "%s, exit.\n", __func__);
} }
/* /*