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

dmaengine: idxd: assign MSIX vectors to each WQ rather than roundrobin 

IOPS increased when changing MSIX vector to per WQ from roundrobin.
Allows descriptor to be completed by the submitter improves caching
locality.

Suggested-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Link: https://lore.kernel.org/r/162456717326.1130457.15258077196523268356.stgit@djiang5-desk3.ch.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Dave Jiang 2021-06-24 13:39:33 -07:00 committed by Vinod Koul
parent ac24a2dc06
commit 6cfd9e62e3
2 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/dma/idxd/idxd.h
View File

@ -153,7 +153,6 @@ struct idxd_wq {
enum idxd_wq_state state; enum idxd_wq_state state;
unsigned long flags; unsigned long flags;
union wqcfg *wqcfg; union wqcfg *wqcfg;
u32 vec_ptr; /* interrupt steering */
struct dsa_hw_desc **hw_descs; struct dsa_hw_desc **hw_descs;
int num_descs; int num_descs;
union { union {
@ -290,7 +289,6 @@ struct idxd_desc {
struct list_head list; struct list_head list;
int id; int id;
int cpu; int cpu;
unsigned int vector;
struct idxd_wq *wq; struct idxd_wq *wq;
}; };

36
drivers/dma/idxd/submit.c
View File

@ -22,22 +22,13 @@ static struct idxd_desc *__get_desc(struct idxd_wq *wq, int idx, int cpu)
desc->hw->pasid = idxd->pasid; desc->hw->pasid = idxd->pasid;
/* /*
* Descriptor completion vectors are 1...N for MSIX. We will round * On host, MSIX vecotr 0 is used for misc interrupt. Therefore when we match
* robin through the N vectors. * vector 1:1 to the WQ id, we need to add 1
*/ */
wq->vec_ptr = (wq->vec_ptr % idxd->num_wq_irqs) + 1; if (!idxd->int_handles)
if (!idxd->int_handles) { desc->hw->int_handle = wq->id + 1;
desc->hw->int_handle = wq->vec_ptr; else
} else { desc->hw->int_handle = idxd->int_handles[wq->id];
desc->vector = wq->vec_ptr;
/*
* int_handles are only for descriptor completion. However for device
* MSIX enumeration, vec 0 is used for misc interrupts. Therefore even
* though we are rotating through 1...N for descriptor interrupts, we
* need to acqurie the int_handles from 0..N-1.
*/
desc->hw->int_handle = idxd->int_handles[desc->vector - 1];
}
return desc; return desc;
} }
@ -130,19 +121,8 @@ int idxd_submit_desc(struct idxd_wq *wq, struct idxd_desc *desc)
* Pending the descriptor to the lockless list for the irq_entry * Pending the descriptor to the lockless list for the irq_entry
* that we designated the descriptor to. * that we designated the descriptor to.
*/ */
if (desc->hw->flags & IDXD_OP_FLAG_RCI) { if (desc->hw->flags & IDXD_OP_FLAG_RCI)
int vec; llist_add(&desc->llnode, &idxd->irq_entries[wq->id + 1].pending_llist);
/*
* If the driver is on host kernel, it would be the value
* assigned to interrupt handle, which is index for MSIX
* vector. If it's guest then can't use the int_handle since
* that is the index to IMS for the entire device. The guest
* device local index will be used.
*/
vec = !idxd->int_handles ? desc->hw->int_handle : desc->vector;
llist_add(&desc->llnode, &idxd->irq_entries[vec].pending_llist);
}
return 0; return 0;
} }