dmaengine: idxd: Remove shadow Event Log head stored in idxd
Subsystems (2)
PATCH v2 1/1 dmaengine: idxd: Remove shadow Event Log head stored in idxd
head is defined in idxd->evl as a shadow of head in the EVLSTATUS register. There are two issues related to the shadow head:
1. Mismatch between the shadow head and the state of the EVLSTATUS register:
If Event Log is supported, upon completion of the Enable Device command, the Event Log head in the variable idxd->evl->head should be cleared to match the state of the EVLSTATUS register. But the variable is not reset currently, leading mismatch between the variable and the register state. The mismatch causes incorrect processing of Event Log entries.
2. Unnecessary shadow head definition:
The shadow head is unnecessary as head can be read directly from the EVLSTATUS register. Reading head from the register incurs no additional cost because event log head and tail are always read together and tail is already read directly from the register as required by hardware.
Remove the shadow Event Log head stored in idxd->evl to address the mentioned issues.
---
Change Log:
- A previous patch tries to fix this issue in a different way:
https://lore.kernel.org/lkml/[email protected]/
After discussion with Dave Jiang, removing shadow head might be a right fix.
drivers/dma/idxd/cdev.c | 2 +- drivers/dma/idxd/debugfs.c | 2 +- drivers/dma/idxd/idxd.h | 1 - drivers/dma/idxd/irq.c | 3 +-- 4 files changed, 3 insertions(+), 5 deletions(-)
drivers/dma/idxd/cdev.c +1 -1
@@ -345,7 +345,7 @@ static void idxd_cdev_evl_drain_pasid(struct idxd_wq *wq, u32 pasid)spin_lock (&evl->lock); status.bits =ioread64 (idxd->reg_base +IDXD_EVLSTATUS_OFFSET ); t = status.tail; - h = evl->head; + h = status.head; size = evl->size;while (h != t) {
drivers/dma/idxd/debugfs.c +1 -1
@@ -68,9 +68,9 @@ static int debugfs_evl_show(struct seq_file *s, void *d)spin_lock (&evl->lock); - h = evl->head; evl_status.bits =ioread64 (idxd->reg_base +IDXD_EVLSTATUS_OFFSET ); t = evl_status.tail; + h = evl_status.head; evl_size = evl->size; seq_printf(s, "Event Log head %u tail %u interrupt pending %u\n\n",
drivers/dma/idxd/idxd.h +0 -1
@@ -300,7 +300,6 @@ struct idxd_evl {unsigned int log_size;/* The number of entries in the event log. */ u16 size; -u16 head;unsigned long *bmap;bool batch_fail[IDXD_MAX_BATCH_IDENT ]; };
drivers/dma/idxd/irq.c +1 -2
@@ -367,9 +367,9 @@ static void process_evl_entries(struct idxd_device *idxd)/* Clear interrupt pending bit */ iowrite32 (evl_status.bits_upper32, idxd->reg_base +IDXD_EVLSTATUS_OFFSET +sizeof (u32)); - h = evl->head; evl_status.bits =ioread64 (idxd->reg_base +IDXD_EVLSTATUS_OFFSET ); t = evl_status.tail; + h = evl_status.head; size = idxd->evl->size;while (h != t) {
@@ -378,7 +378,6 @@ static void process_evl_entries(struct idxd_device *idxd) h = (h +1 ) % size; } - evl->head = h; evl_status.head = h;iowrite32 (evl_status.bits_lower32, idxd->reg_base +IDXD_EVLSTATUS_OFFSET );spin_unlock (&evl->lock);
Signature · 1 line
2.37.1
Quoted 17 lines · Fenghua Yu
head is defined in
idxd->evlas a shadow of head in the EVLSTATUS register. There are two issues related to the shadow head:1. Mismatch between the shadow head and the state of the EVLSTATUS register:
If Event Log is supported, upon completion of the Enable Device command, the Event Log head in the variableidxd->evl->headshould be cleared to match the state of the EVLSTATUS register. But the variable is not reset currently, leading mismatch between the variable and the register state. The mismatch causes incorrect processing of Event Log entries.2. Unnecessary shadow head definition:
The shadow head is unnecessary as head can be read directly from the EVLSTATUS register. Reading head from the register incurs no additional cost because event log head and tail are always read together and tail is already read directly from the register as required by hardware.
Quoted 5 lines
Remove the shadow Event Log head stored in
idxd->evlto address the mentioned issues.Fixes 244da66cda35 ("dmaengine: idxd: setup event log configuration")Signed-off-by Fenghua Yu <[email protected]>
Much better fix.
Quoted 76 lines
---
Change Log:
- A previous patch tries to fix this issue in a different way:
https://lore.kernel.org/lkml/[email protected]/
After discussion with Dave Jiang, removing shadow head might be a right fix.drivers/dma/idxd/cdev.c | 2 +- drivers/dma/idxd/debugfs.c | 2 +- drivers/dma/idxd/idxd.h | 1 - drivers/dma/idxd/irq.c | 3 +-- 4 files changed, 3 insertions(+), 5 deletions(-)drivers/dma/idxd/cdev.c +1
-1@@ -345,7 +345,7 @@ static void idxd_cdev_evl_drain_pasid(struct idxd_wq *wq, u32 pasid)spin_lock (&evl->lock); status.bits =ioread64 (idxd->reg_base +IDXD_EVLSTATUS_OFFSET ); t = status.tail; - h = evl->head; + h = status.head; size = evl->size;while (h != t) {drivers/dma/idxd/debugfs.c +1
-1@@ -68,9 +68,9 @@ static int debugfs_evl_show(struct seq_file *s, void *d)spin_lock (&evl->lock); - h = evl->head; evl_status.bits =ioread64 (idxd->reg_base +IDXD_EVLSTATUS_OFFSET ); t = evl_status.tail; + h = evl_status.head; evl_size = evl->size; seq_printf(s, "Event Log head %u tail %u interrupt pending %u\n\n",drivers/dma/idxd/idxd.h +0
-1@@ -300,7 +300,6 @@ struct idxd_evl {unsigned int log_size;/* The number of entries in the event log. */ u16 size; -u16 head;unsigned long *bmap;bool batch_fail[IDXD_MAX_BATCH_IDENT ]; };drivers/dma/idxd/irq.c +1
-2@@ -367,9 +367,9 @@ static void process_evl_entries(struct idxd_device *idxd)/* Clear interrupt pending bit */ iowrite32 (evl_status.bits_upper32, idxd->reg_base +IDXD_EVLSTATUS_OFFSET +sizeof (u32)); - h = evl->head; evl_status.bits =ioread64 (idxd->reg_base +IDXD_EVLSTATUS_OFFSET ); t = evl_status.tail; + h = evl_status.head; size = idxd->evl->size;while (h != t) {@@ -378,7 +378,6 @@ static void process_evl_entries(struct idxd_device *idxd) h = (h +1 ) % size; } - evl->head = h; evl_status.head = h;iowrite32 (evl_status.bits_lower32, idxd->reg_base +IDXD_EVLSTATUS_OFFSET );spin_unlock (&evl->lock);
Quoted 11 lines · Fenghua Yu
head is defined in
idxd->evlas a shadow of head in the EVLSTATUS register. There are two issues related to the shadow head:1. Mismatch between the shadow head and the state of the EVLSTATUS register:
If Event Log is supported, upon completion of the Enable Device command, the Event Log head in the variableidxd->evl->headshould be cleared to match the state of the EVLSTATUS register. But the variable is not reset currently, leading mismatch between the variable and the register state. The mismatch causes incorrect processing of Event Log entries.
Quoted 1 line
[...]
Applied, thanks!
[1/1] dmaengine: idxd: Remove shadow Event Log head stored in idxd
commit: ecec7c9f29a7114a3e23a14020b1149ea7dffb4f
Best regards,
Signature · 1 line
~Vinod