Re: [PATCH v7 07/10] hw/nvme: add helper functions for converting reservation types

[Klaus Jensen <its@irrelevant.dk>]

[-- Attachment #1: Type: text/plain, Size: 4018 bytes --]

On Jul  5 18:56, Changqi Lu wrote:
> This commit introduces two helper functions
> that facilitate the conversion between the
> reservation types used in the NVME protocol
> and those used in the block layer.
> 
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> Signed-off-by: Changqi Lu <luchangqi.123@bytedance.com>
> Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
> ---
>  hw/nvme/nvme.h | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 84 insertions(+)
> 
> diff --git a/hw/nvme/nvme.h b/hw/nvme/nvme.h
> index bed8191bd5..6d0e456348 100644
> --- a/hw/nvme/nvme.h
> +++ b/hw/nvme/nvme.h
> @@ -474,6 +474,90 @@ static inline const char *nvme_io_opc_str(uint8_t opc)
>      }
>  }
>  
> +static inline NvmeResvType block_pr_type_to_nvme(BlockPrType type)
> +{
> +    switch (type) {
> +    case BLK_PR_WRITE_EXCLUSIVE:
> +        return NVME_RESV_WRITE_EXCLUSIVE;
> +    case BLK_PR_EXCLUSIVE_ACCESS:
> +        return NVME_RESV_EXCLUSIVE_ACCESS;
> +    case BLK_PR_WRITE_EXCLUSIVE_REGS_ONLY:
> +        return NVME_RESV_WRITE_EXCLUSIVE_REGS_ONLY;
> +    case BLK_PR_EXCLUSIVE_ACCESS_REGS_ONLY:
> +        return NVME_RESV_EXCLUSIVE_ACCESS_REGS_ONLY;
> +    case BLK_PR_WRITE_EXCLUSIVE_ALL_REGS:
> +        return NVME_RESV_WRITE_EXCLUSIVE_ALL_REGS;
> +    case BLK_PR_EXCLUSIVE_ACCESS_ALL_REGS:
> +        return NVME_RESV_EXCLUSIVE_ACCESS_ALL_REGS;
> +    }
> +
> +    return 0;
> +}
> +
> +static inline BlockPrType nvme_pr_type_to_block(NvmeResvType type)
> +{
> +    switch (type) {
> +    case NVME_RESV_WRITE_EXCLUSIVE:
> +        return BLK_PR_WRITE_EXCLUSIVE;
> +    case NVME_RESV_EXCLUSIVE_ACCESS:
> +        return BLK_PR_EXCLUSIVE_ACCESS;
> +    case NVME_RESV_WRITE_EXCLUSIVE_REGS_ONLY:
> +        return BLK_PR_WRITE_EXCLUSIVE_REGS_ONLY;
> +    case NVME_RESV_EXCLUSIVE_ACCESS_REGS_ONLY:
> +        return BLK_PR_EXCLUSIVE_ACCESS_REGS_ONLY;
> +    case NVME_RESV_WRITE_EXCLUSIVE_ALL_REGS:
> +        return BLK_PR_WRITE_EXCLUSIVE_ALL_REGS;
> +    case NVME_RESV_EXCLUSIVE_ACCESS_ALL_REGS:
> +        return BLK_PR_EXCLUSIVE_ACCESS_ALL_REGS;
> +    }
> +
> +    return 0;
> +}
> +
> +static inline uint8_t nvme_pr_cap_to_block(uint16_t nvme_pr_cap)
> +{
> +    uint8_t res = 0;
> +
> +    res |= (nvme_pr_cap & NVME_PR_CAP_PTPL) ?
> +           NVME_PR_CAP_PTPL : 0;
> +    res |= (nvme_pr_cap & NVME_PR_CAP_WR_EX) ?
> +           BLK_PR_CAP_WR_EX : 0;
> +    res |= (nvme_pr_cap & NVME_PR_CAP_EX_AC) ?
> +           BLK_PR_CAP_EX_AC : 0;
> +    res |= (nvme_pr_cap & NVME_PR_CAP_WR_EX_RO) ?
> +           BLK_PR_CAP_WR_EX_RO : 0;
> +    res |= (nvme_pr_cap & NVME_PR_CAP_EX_AC_RO) ?
> +           BLK_PR_CAP_EX_AC_RO : 0;
> +    res |= (nvme_pr_cap & NVME_PR_CAP_WR_EX_AR) ?
> +           BLK_PR_CAP_WR_EX_AR : 0;
> +    res |= (nvme_pr_cap & NVME_PR_CAP_EX_AC_AR) ?
> +           BLK_PR_CAP_EX_AC_AR : 0;
> +
> +    return res;
> +}
> +
> +static inline uint8_t block_pr_cap_to_nvme(uint8_t block_pr_cap)
> +{
> +    uint16_t res = 0;
> +
> +    res |= (block_pr_cap & BLK_PR_CAP_PTPL) ?
> +              NVME_PR_CAP_PTPL : 0;
> +    res |= (block_pr_cap & BLK_PR_CAP_WR_EX) ?
> +              NVME_PR_CAP_WR_EX : 0;
> +    res |= (block_pr_cap & BLK_PR_CAP_EX_AC) ?
> +              NVME_PR_CAP_EX_AC : 0;
> +    res |= (block_pr_cap & BLK_PR_CAP_WR_EX_RO) ?
> +              NVME_PR_CAP_WR_EX_RO : 0;
> +    res |= (block_pr_cap & BLK_PR_CAP_EX_AC_RO) ?
> +              NVME_PR_CAP_EX_AC_RO : 0;
> +    res |= (block_pr_cap & BLK_PR_CAP_WR_EX_AR) ?
> +              NVME_PR_CAP_WR_EX_AR : 0;
> +    res |= (block_pr_cap & BLK_PR_CAP_EX_AC_AR) ?
> +              NVME_PR_CAP_EX_AC_AR : 0;
> +
> +    return res;
> +}
> +
>  typedef struct NvmeSQueue {
>      struct NvmeCtrl *ctrl;
>      uint16_t    sqid;
> -- 
> 2.20.1
> 

Reviewed-by: Klaus Jensen <k.jensen@samsung.com>

-- 
One of us - No more doubt, silence or taboo about mental illness.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]