It is not possible to get 64-bit results from the passthru commands, what prevents from getting for the Capabilities (CAP) property value. As a result, it is not possible to implement IOL's NVMe Conformance test 4.3 Case 1 for Fabrics targets [1] (page 123). This issue has been already discussed [2], but without a solution. This patch solves the problem by adding new ioctls with a new passthru structure, including 64-bit results. The older ioctls stay unchanged. [1] https://www.iol.unh.edu/sites/default/files/testsuites/nvme/UNH-IOL_NVMe_Conformance_Test_Suite_v11.0.pdf [2] http://lists.infradead.org/pipermail/linux-nvme/2018-June/018791.html
Showing the changes to include/uapi/linux (1 of 2 files). Show all
Unified · Split
| @@ -45,6 +45,27 @@ struct nvme_passthru_cmd { · 44 unmodified lines | ||
| 45 | 45 | __u32 result; |
| 46 | 46 | }; |
| 47 | 47 | |
| 48 | +struct nvme_passthru_cmd64 { | |
| 49 | + __u8 opcode; | |
| 50 | + __u8 flags; | |
| 51 | + __u16 rsvd1; | |
| 52 | + __u32 nsid; | |
| 53 | + __u32 cdw2; | |
| 54 | + __u32 cdw3; | |
| 55 | + __u64 metadata; | |
| 56 | + __u64 addr; | |
| 57 | + __u32 metadata_len; | |
| 58 | + __u32 data_len; | |
| 59 | + __u32 cdw10; | |
| 60 | + __u32 cdw11; | |
| 61 | + __u32 cdw12; | |
| 62 | + __u32 cdw13; | |
| 63 | + __u32 cdw14; | |
| 64 | + __u32 cdw15; | |
| 65 | + __u32 timeout_ms; | |
| 66 | + __u64 result; | |
| 67 | +}; | |
| 68 | + | |
| 48 | 69 | #define nvme_admin_cmd nvme_passthru_cmd |
| 49 | 70 | |
| 50 | 71 | #define NVME_IOCTL_ID _IO('N', 0x40) |
| @@ -54,5 +75,7 @@ struct nvme_passthru_cmd { · 3 unmodified lines | ||
| 54 | 75 | #define NVME_IOCTL_RESET _IO('N', 0x44) |
| 55 | 76 | #define NVME_IOCTL_SUBSYS_RESET _IO('N', 0x45) |
| 56 | 77 | #define NVME_IOCTL_RESCAN _IO('N', 0x46) |
| 78 | +#define NVME_IOCTL_ADMIN64_CMD _IOWR('N', 0x47, struct nvme_passthru_cmd64) | |
| 79 | +#define NVME_IOCTL_IO64_CMD _IOWR('N', 0x48, struct nvme_passthru_cmd64) | |
| 57 | 80 | |
| 58 | 81 | #endif /* _UAPI_LINUX_NVME_IOCTL_H */ |