Skip to content

Commit b5f96cb

Browse files
birkelundChristoph Hellwig
authored andcommitted
nvme-pci: fix doorbell buffer value endianness
When using shadow doorbells, the event index and the doorbell values are written to host memory. Prior to this patch, the values written would erroneously be written in host endianness. This causes trouble on big-endian platforms. Fix this by adding missing endian conversions. This issue was noticed by Guenter while testing various big-endian platforms under QEMU[1]. A similar fix required for hw/nvme in QEMU is up for review as well[2]. [1]: https://lore.kernel.org/qemu-devel/[email protected]/ [2]: https://lore.kernel.org/qemu-devel/[email protected]/ Fixes: f9f38e3 ("nvme: improve performance for virtual NVMe devices") Reported-by: Guenter Roeck <[email protected]> Signed-off-by: Klaus Jensen <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]>
1 parent 53eab8e commit b5f96cb

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

drivers/nvme/host/pci.c

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ struct nvme_dev {
144144
mempool_t *iod_mempool;
145145

146146
/* shadow doorbell buffer support: */
147-
u32 *dbbuf_dbs;
147+
__le32 *dbbuf_dbs;
148148
dma_addr_t dbbuf_dbs_dma_addr;
149-
u32 *dbbuf_eis;
149+
__le32 *dbbuf_eis;
150150
dma_addr_t dbbuf_eis_dma_addr;
151151

152152
/* host memory buffer support: */
@@ -208,10 +208,10 @@ struct nvme_queue {
208208
#define NVMEQ_SQ_CMB 1
209209
#define NVMEQ_DELETE_ERROR 2
210210
#define NVMEQ_POLLED 3
211-
u32 *dbbuf_sq_db;
212-
u32 *dbbuf_cq_db;
213-
u32 *dbbuf_sq_ei;
214-
u32 *dbbuf_cq_ei;
211+
__le32 *dbbuf_sq_db;
212+
__le32 *dbbuf_cq_db;
213+
__le32 *dbbuf_sq_ei;
214+
__le32 *dbbuf_cq_ei;
215215
struct completion delete_done;
216216
};
217217

@@ -343,20 +343,20 @@ static inline int nvme_dbbuf_need_event(u16 event_idx, u16 new_idx, u16 old)
343343
}
344344

345345
/* Update dbbuf and return true if an MMIO is required */
346-
static bool nvme_dbbuf_update_and_check_event(u16 value, u32 *dbbuf_db,
347-
volatile u32 *dbbuf_ei)
346+
static bool nvme_dbbuf_update_and_check_event(u16 value, __le32 *dbbuf_db,
347+
volatile __le32 *dbbuf_ei)
348348
{
349349
if (dbbuf_db) {
350-
u16 old_value;
350+
u16 old_value, event_idx;
351351

352352
/*
353353
* Ensure that the queue is written before updating
354354
* the doorbell in memory
355355
*/
356356
wmb();
357357

358-
old_value = *dbbuf_db;
359-
*dbbuf_db = value;
358+
old_value = le32_to_cpu(*dbbuf_db);
359+
*dbbuf_db = cpu_to_le32(value);
360360

361361
/*
362362
* Ensure that the doorbell is updated before reading the event
@@ -366,7 +366,8 @@ static bool nvme_dbbuf_update_and_check_event(u16 value, u32 *dbbuf_db,
366366
*/
367367
mb();
368368

369-
if (!nvme_dbbuf_need_event(*dbbuf_ei, value, old_value))
369+
event_idx = le32_to_cpu(*dbbuf_ei);
370+
if (!nvme_dbbuf_need_event(event_idx, value, old_value))
370371
return false;
371372
}
372373

0 commit comments

Comments
 (0)