nvme-pci: remove volatile cqes
Keith Busch
maintainerPATCH 1/1 nvme-pci: remove volatile cqes
The completion queue entry is not volatile once the phase is confirmed. Remove the volaitle keywords and check the phase using the appropriate READ_ONCE() accessor, allowing the compiler to optimize the remaining completion path.
--- drivers/nvme/host/pci.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/nvme/host/pci.c +5 -4
@@ -166,7 +166,7 @@ struct nvme_queue {void *sq_cmds;/* only used for poll queues: */ spinlock_t cq_poll_lock____cacheline_aligned_in_smp ; -volatile struct nvme_completion *cqes; +struct nvme_completion *cqes;dma_addr_t sq_dma_addr;dma_addr_t cq_dma_addr;u32 __iomem *q_db;
@@ -908,8 +908,9 @@ static void nvme_pci_complete_rq(struct request *req)/* We read the CQE phase first to check if the rest of the entry is valid */ static inline bool nvme_cqe_pending (struct nvme_queue *nvmeq) { -return (le16_to_cpu (nvmeq->cqes[nvmeq->cq_head].status) &1 ) == - nvmeq->cq_phase; +return (le16_to_cpu ( +READ_ONCE (nvmeq->cqes[nvmeq->cq_head].status)) &1 ) == + nvmeq->cq_phase; }static inline void nvme_ring_cq_doorbell (struct nvme_queue *nvmeq)
@@ -930,7 +931,7 @@ static inline struct blk_mq_tags *nvme_queue_tagset(struct nvme_queue *nvmeq)static inline void nvme_handle_cqe (struct nvme_queue *nvmeq,u16 idx) { -volatile struct nvme_completion *cqe = &nvmeq->cqes[idx]; +struct nvme_completion *cqe = &nvmeq->cqes[idx];struct request *req;if (unlikely (cqe->command_id >= nvmeq->q_depth)) {
Signature · 7 lines
2.24.1 _______________________________________________ linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Quoted 24 lines · Keith Busch
The completion queue entry is not volatile once the phase is confirmed. Remove the volaitle keywords and check the phase using the appropriate
READ_ONCE()accessor, allowing the compiler to optimize the remaining completion path.Signed-off-by Keith Busch <[email protected]>--- drivers/nvme/host/pci.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/nvme/host/pci.c +1
-1@@ -166,7 +166,7 @@ struct nvme_queue {void *sq_cmds;/* only used for poll queues: */ spinlock_t cq_poll_lock____cacheline_aligned_in_smp ; -volatile struct nvme_completion *cqes; +struct nvme_completion *cqes;dma_addr_t sq_dma_addr;dma_addr_t cq_dma_addr;u32 __iomem *q_db;
drivers/nvme/host/pci.c static void nvme_pci_complete_rq(struct request *req) · line 913
Quoted 8 lines
drivers/nvme/host/pci.c +3
-2@@ -908,8 +908,9 @@ static void nvme_pci_complete_rq(struct request *req)/* We read the CQE phase first to check if the rest of the entry is valid */ static inline bool nvme_cqe_pending (struct nvme_queue *nvmeq) { -return (le16_to_cpu (nvmeq->cqes[nvmeq->cq_head].status) &1 ) == - nvmeq->cq_phase; +return (le16_to_cpu ( +READ_ONCE (nvmeq->cqes[nvmeq->cq_head].status)) &1 ) == + nvmeq->cq_phase;
Despite the sound logic this just visually looks horrible. How about:
static inline bool nvme_cqe_pending(struct nvme_queue *nvmeq)
{
struct nvme_completion *hcqe = &nvmeq->cqes[nvmeq->cq_head];
return (le16_to_cpu(READ_ONCE(hcqe->status)) & 1) == nvmeq->cq_phase;
}Otherwise looks fine:
_______________________________________________
linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme