mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/nvme: save reftag when generating pi

Browse Source 
Prepare nvme_dif_pract_generate_dif() and nvme_dif_check() to be
callable in smaller increments by making the reftag a pointer parameter
updated by the function.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
This commit is contained in:
Klaus Jensen 2021-06-17 21:06:50 +02:00
parent d7d1474fd8
commit 0ca5c3ccac
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/nvme/ctrl.c
View File

@ -1968,7 +1968,7 @@ static void nvme_verify_cb(void *opaque, int ret)
req->status = nvme_dif_check(ns, ctx->data.bounce, ctx->data.iov.size, req->status = nvme_dif_check(ns, ctx->data.bounce, ctx->data.iov.size,
ctx->mdata.bounce, ctx->mdata.iov.size, ctx->mdata.bounce, ctx->mdata.iov.size,
ctrl, slba, apptag, appmask, reftag); ctrl, slba, apptag, appmask, &reftag);
} }
out: out:
@ -2204,7 +2204,7 @@ static void nvme_copy_in_complete(NvmeRequest *req)
reftag = le32_to_cpu(range->reftag); reftag = le32_to_cpu(range->reftag);
status = nvme_dif_check(ns, buf, len, mbuf, mlen, prinfor, slba, status = nvme_dif_check(ns, buf, len, mbuf, mlen, prinfor, slba,
apptag, appmask, reftag); apptag, appmask, &reftag);
if (status) { if (status) {
goto invalid; goto invalid;
} }
@ -2227,10 +2227,10 @@ static void nvme_copy_in_complete(NvmeRequest *req)
} }
nvme_dif_pract_generate_dif(ns, ctx->bounce, len, ctx->mbounce, nvme_dif_pract_generate_dif(ns, ctx->bounce, len, ctx->mbounce,
mlen, apptag, reftag); mlen, apptag, &reftag);
} else { } else {
status = nvme_dif_check(ns, ctx->bounce, len, ctx->mbounce, mlen, status = nvme_dif_check(ns, ctx->bounce, len, ctx->mbounce, mlen,
prinfow, sdlba, apptag, appmask, reftag); prinfow, sdlba, apptag, appmask, &reftag);
if (status) { if (status) {
goto invalid; goto invalid;
} }
@ -2370,7 +2370,7 @@ static void nvme_compare_mdata_cb(void *opaque, int ret)
status = nvme_dif_check(ns, ctx->data.bounce, ctx->data.iov.size, status = nvme_dif_check(ns, ctx->data.bounce, ctx->data.iov.size,
ctx->mdata.bounce, ctx->mdata.iov.size, ctrl, ctx->mdata.bounce, ctx->mdata.iov.size, ctrl,
slba, apptag, appmask, reftag); slba, apptag, appmask, &reftag);
if (status) { if (status) {
req->status = status; req->status = status;
goto out; goto out;

22
hw/nvme/dif.c
View File

@ -41,7 +41,7 @@ static uint16_t crc_t10dif(uint16_t crc, const unsigned char *buffer,
void nvme_dif_pract_generate_dif(NvmeNamespace *ns, uint8_t *buf, size_t len, void nvme_dif_pract_generate_dif(NvmeNamespace *ns, uint8_t *buf, size_t len,
uint8_t *mbuf, size_t mlen, uint16_t apptag, uint8_t *mbuf, size_t mlen, uint16_t apptag,
uint32_t reftag) uint32_t *reftag)
{ {
uint8_t *end = buf + len; uint8_t *end = buf + len;
int16_t pil = 0; int16_t pil = 0;
@ -51,7 +51,7 @@ void nvme_dif_pract_generate_dif(NvmeNamespace *ns, uint8_t *buf, size_t len,
} }
trace_pci_nvme_dif_pract_generate_dif(len, ns->lbasz, ns->lbasz + pil, trace_pci_nvme_dif_pract_generate_dif(len, ns->lbasz, ns->lbasz + pil,
apptag, reftag); apptag, *reftag);
for (; buf < end; buf += ns->lbasz, mbuf += ns->lbaf.ms) { for (; buf < end; buf += ns->lbasz, mbuf += ns->lbaf.ms) {
NvmeDifTuple *dif = (NvmeDifTuple *)(mbuf + pil); NvmeDifTuple *dif = (NvmeDifTuple *)(mbuf + pil);
@ -63,10 +63,10 @@ void nvme_dif_pract_generate_dif(NvmeNamespace *ns, uint8_t *buf, size_t len,
dif->guard = cpu_to_be16(crc); dif->guard = cpu_to_be16(crc);
dif->apptag = cpu_to_be16(apptag); dif->apptag = cpu_to_be16(apptag);
dif->reftag = cpu_to_be32(reftag); dif->reftag = cpu_to_be32(*reftag);
if (NVME_ID_NS_DPS_TYPE(ns->id_ns.dps) != NVME_ID_NS_DPS_TYPE_3) { if (NVME_ID_NS_DPS_TYPE(ns->id_ns.dps) != NVME_ID_NS_DPS_TYPE_3) {
reftag++; (*reftag)++;
} }
} }
} }
@ -132,13 +132,13 @@ static uint16_t nvme_dif_prchk(NvmeNamespace *ns, NvmeDifTuple *dif,
uint16_t nvme_dif_check(NvmeNamespace *ns, uint8_t *buf, size_t len, uint16_t nvme_dif_check(NvmeNamespace *ns, uint8_t *buf, size_t len,
uint8_t *mbuf, size_t mlen, uint16_t ctrl, uint8_t *mbuf, size_t mlen, uint16_t ctrl,
uint64_t slba, uint16_t apptag, uint64_t slba, uint16_t apptag,
uint16_t appmask, uint32_t reftag) uint16_t appmask, uint32_t *reftag)
{ {
uint8_t *end = buf + len; uint8_t *end = buf + len;
int16_t pil = 0; int16_t pil = 0;
uint16_t status; uint16_t status;
status = nvme_check_prinfo(ns, ctrl, slba, reftag); status = nvme_check_prinfo(ns, ctrl, slba, *reftag);
if (status) { if (status) {
return status; return status;
} }
@ -153,13 +153,13 @@ uint16_t nvme_dif_check(NvmeNamespace *ns, uint8_t *buf, size_t len,
NvmeDifTuple *dif = (NvmeDifTuple *)(mbuf + pil); NvmeDifTuple *dif = (NvmeDifTuple *)(mbuf + pil);
status = nvme_dif_prchk(ns, dif, buf, mbuf, pil, ctrl, apptag, status = nvme_dif_prchk(ns, dif, buf, mbuf, pil, ctrl, apptag,
appmask, reftag); appmask, *reftag);
if (status) { if (status) {
return status; return status;
} }
if (NVME_ID_NS_DPS_TYPE(ns->id_ns.dps) != NVME_ID_NS_DPS_TYPE_3) { if (NVME_ID_NS_DPS_TYPE(ns->id_ns.dps) != NVME_ID_NS_DPS_TYPE_3) {
reftag++; (*reftag)++;
} }
} }
@ -270,7 +270,7 @@ static void nvme_dif_rw_check_cb(void *opaque, int ret)
status = nvme_dif_check(ns, ctx->data.bounce, ctx->data.iov.size, status = nvme_dif_check(ns, ctx->data.bounce, ctx->data.iov.size,
ctx->mdata.bounce, ctx->mdata.iov.size, ctrl, ctx->mdata.bounce, ctx->mdata.iov.size, ctrl,
slba, apptag, appmask, reftag); slba, apptag, appmask, &reftag);
if (status) { if (status) {
req->status = status; req->status = status;
goto out; goto out;
@ -478,11 +478,11 @@ uint16_t nvme_dif_rw(NvmeCtrl *n, NvmeRequest *req)
/* splice generated protection information into the buffer */ /* splice generated protection information into the buffer */
nvme_dif_pract_generate_dif(ns, ctx->data.bounce, ctx->data.iov.size, nvme_dif_pract_generate_dif(ns, ctx->data.bounce, ctx->data.iov.size,
ctx->mdata.bounce, ctx->mdata.iov.size, ctx->mdata.bounce, ctx->mdata.iov.size,
apptag, reftag); apptag, &reftag);
} else { } else {
status = nvme_dif_check(ns, ctx->data.bounce, ctx->data.iov.size, status = nvme_dif_check(ns, ctx->data.bounce, ctx->data.iov.size,
ctx->mdata.bounce, ctx->mdata.iov.size, ctrl, ctx->mdata.bounce, ctx->mdata.iov.size, ctrl,
slba, apptag, appmask, reftag); slba, apptag, appmask, &reftag);
if (status) { if (status) {
goto err; goto err;
} }

4
hw/nvme/nvme.h
View File

@ -542,11 +542,11 @@ uint16_t nvme_dif_mangle_mdata(NvmeNamespace *ns, uint8_t *mbuf, size_t mlen,
uint64_t slba); uint64_t slba);
void nvme_dif_pract_generate_dif(NvmeNamespace *ns, uint8_t *buf, size_t len, void nvme_dif_pract_generate_dif(NvmeNamespace *ns, uint8_t *buf, size_t len,
uint8_t *mbuf, size_t mlen, uint16_t apptag, uint8_t *mbuf, size_t mlen, uint16_t apptag,
uint32_t reftag); uint32_t *reftag);
uint16_t nvme_dif_check(NvmeNamespace *ns, uint8_t *buf, size_t len, uint16_t nvme_dif_check(NvmeNamespace *ns, uint8_t *buf, size_t len,
uint8_t *mbuf, size_t mlen, uint16_t ctrl, uint8_t *mbuf, size_t mlen, uint16_t ctrl,
uint64_t slba, uint16_t apptag, uint64_t slba, uint16_t apptag,
uint16_t appmask, uint32_t reftag); uint16_t appmask, uint32_t *reftag);
uint16_t nvme_dif_rw(NvmeCtrl *n, NvmeRequest *req); uint16_t nvme_dif_rw(NvmeCtrl *n, NvmeRequest *req);