| Message ID | 166377440119.430546.15623409728442106946.stgit@djiang5-desk3.ch.intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Introduce security commands for CXL pmem device | expand |
On Wed, 21 Sep 2022, Dave Jiang wrote: >Set the cxlds->serial as the dimm_id to be fed to __nvdimm_create(). The >security code uses that as the key description for the security key of the >memory device. The nvdimm unlock code cannot find the respective key >without the dimm_id. Maybe I'm being daft but I don't see why cxlds->serial could not just be used for __nvdimm_create() instead of adding a new member.
On 9/23/2022 3:31 AM, Davidlohr Bueso wrote: > On Wed, 21 Sep 2022, Dave Jiang wrote: > >> Set the cxlds->serial as the dimm_id to be fed to __nvdimm_create(). The >> security code uses that as the key description for the security key >> of the >> memory device. The nvdimm unlock code cannot find the respective key >> without the dimm_id. > > Maybe I'm being daft but I don't see why cxlds->serial could not just be > used for __nvdimm_create() instead of adding a new member. > The reason is cxlds->serial is a u64 and __nvdimm_create() wants a string for dimm_id. And also __nvdimm_create() just points to the original string instead of duplicating it. So we need a string member defined instead of creating a temp string derived from cxlds->serial for __nvdimm_create().
On Wed, 21 Sep 2022 08:33:21 -0700 Dave Jiang <dave.jiang@intel.com> wrote: > Set the cxlds->serial as the dimm_id to be fed to __nvdimm_create(). The > security code uses that as the key description for the security key of the > memory device. The nvdimm unlock code cannot find the respective key > without the dimm_id. > > Signed-off-by: Dave Jiang <dave.jiang@intel.com> Seems reasonable. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/cxl/cxlmem.h | 3 +++ > drivers/cxl/pci.c | 4 ++++ > drivers/cxl/pmem.c | 4 +++- > tools/testing/cxl/test/mem.c | 4 ++++ > 4 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h > index 1266df3b2d3d..24d1c66a30ed 100644 > --- a/drivers/cxl/cxlmem.h > +++ b/drivers/cxl/cxlmem.h > @@ -178,6 +178,8 @@ struct cxl_endpoint_dvsec_info { > struct range dvsec_range[2]; > }; > > +#define CXL_DEV_ID_LEN 32 > + > /** > * struct cxl_dev_state - The driver device state > * > @@ -244,6 +246,7 @@ struct cxl_dev_state { > > resource_size_t component_reg_phys; > u64 serial; > + u8 dev_id[CXL_DEV_ID_LEN]; /* for nvdimm, string of 'serial' */ > > struct xarray doe_mbs; > > diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c > index faeb5d9d7a7a..de5f37e0fe6f 100644 > --- a/drivers/cxl/pci.c > +++ b/drivers/cxl/pci.c > @@ -451,6 +451,10 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) > return PTR_ERR(cxlds); > > cxlds->serial = pci_get_dsn(pdev); > + rc = snprintf(cxlds->dev_id, CXL_DEV_ID_LEN, "%llu", cxlds->serial); > + if (rc <= 0) > + return -ENXIO; > + > cxlds->cxl_dvsec = pci_find_dvsec_capability( > pdev, PCI_DVSEC_VENDOR_ID_CXL, CXL_DVSEC_PCIE_DEVICE); > if (!cxlds->cxl_dvsec) > diff --git a/drivers/cxl/pmem.c b/drivers/cxl/pmem.c > index cb303edb925d..444f18c09848 100644 > --- a/drivers/cxl/pmem.c > +++ b/drivers/cxl/pmem.c > @@ -113,9 +113,11 @@ static int cxl_nvdimm_probe(struct device *dev) > set_bit(ND_CMD_GET_CONFIG_SIZE, &cmd_mask); > set_bit(ND_CMD_GET_CONFIG_DATA, &cmd_mask); > set_bit(ND_CMD_SET_CONFIG_DATA, &cmd_mask); > + > nvdimm = __nvdimm_create(cxl_nvb->nvdimm_bus, cxl_nvd, > cxl_dimm_attribute_groups, flags, > - cmd_mask, 0, NULL, NULL, cxl_security_ops, NULL); > + cmd_mask, 0, NULL, cxlds->dev_id, > + cxl_security_ops, NULL); > if (!nvdimm) { > rc = -ENOMEM; > goto out; > diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c > index a0a58156c15a..ca1d8f2fc6a4 100644 > --- a/tools/testing/cxl/test/mem.c > +++ b/tools/testing/cxl/test/mem.c > @@ -556,6 +556,10 @@ static int cxl_mock_mem_probe(struct platform_device *pdev) > return PTR_ERR(cxlds); > > cxlds->serial = pdev->id; > + rc = snprintf(cxlds->dev_id, CXL_DEV_ID_LEN, "%llu", cxlds->serial); > + if (rc <= 0) > + return -ENXIO; > + > cxlds->mbox_send = cxl_mock_mbox_send; > cxlds->payload_size = SZ_4K; > > >
diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h index 1266df3b2d3d..24d1c66a30ed 100644 --- a/drivers/cxl/cxlmem.h +++ b/drivers/cxl/cxlmem.h @@ -178,6 +178,8 @@ struct cxl_endpoint_dvsec_info { struct range dvsec_range[2]; }; +#define CXL_DEV_ID_LEN 32 + /** * struct cxl_dev_state - The driver device state * @@ -244,6 +246,7 @@ struct cxl_dev_state { resource_size_t component_reg_phys; u64 serial; + u8 dev_id[CXL_DEV_ID_LEN]; /* for nvdimm, string of 'serial' */ struct xarray doe_mbs; diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c index faeb5d9d7a7a..de5f37e0fe6f 100644 --- a/drivers/cxl/pci.c +++ b/drivers/cxl/pci.c @@ -451,6 +451,10 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) return PTR_ERR(cxlds); cxlds->serial = pci_get_dsn(pdev); + rc = snprintf(cxlds->dev_id, CXL_DEV_ID_LEN, "%llu", cxlds->serial); + if (rc <= 0) + return -ENXIO; + cxlds->cxl_dvsec = pci_find_dvsec_capability( pdev, PCI_DVSEC_VENDOR_ID_CXL, CXL_DVSEC_PCIE_DEVICE); if (!cxlds->cxl_dvsec) diff --git a/drivers/cxl/pmem.c b/drivers/cxl/pmem.c index cb303edb925d..444f18c09848 100644 --- a/drivers/cxl/pmem.c +++ b/drivers/cxl/pmem.c @@ -113,9 +113,11 @@ static int cxl_nvdimm_probe(struct device *dev) set_bit(ND_CMD_GET_CONFIG_SIZE, &cmd_mask); set_bit(ND_CMD_GET_CONFIG_DATA, &cmd_mask); set_bit(ND_CMD_SET_CONFIG_DATA, &cmd_mask); + nvdimm = __nvdimm_create(cxl_nvb->nvdimm_bus, cxl_nvd, cxl_dimm_attribute_groups, flags, - cmd_mask, 0, NULL, NULL, cxl_security_ops, NULL); + cmd_mask, 0, NULL, cxlds->dev_id, + cxl_security_ops, NULL); if (!nvdimm) { rc = -ENOMEM; goto out; diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c index a0a58156c15a..ca1d8f2fc6a4 100644 --- a/tools/testing/cxl/test/mem.c +++ b/tools/testing/cxl/test/mem.c @@ -556,6 +556,10 @@ static int cxl_mock_mem_probe(struct platform_device *pdev) return PTR_ERR(cxlds); cxlds->serial = pdev->id; + rc = snprintf(cxlds->dev_id, CXL_DEV_ID_LEN, "%llu", cxlds->serial); + if (rc <= 0) + return -ENXIO; + cxlds->mbox_send = cxl_mock_mbox_send; cxlds->payload_size = SZ_4K;
Set the cxlds->serial as the dimm_id to be fed to __nvdimm_create(). The security code uses that as the key description for the security key of the memory device. The nvdimm unlock code cannot find the respective key without the dimm_id. Signed-off-by: Dave Jiang <dave.jiang@intel.com> --- drivers/cxl/cxlmem.h | 3 +++ drivers/cxl/pci.c | 4 ++++ drivers/cxl/pmem.c | 4 +++- tools/testing/cxl/test/mem.c | 4 ++++ 4 files changed, 14 insertions(+), 1 deletion(-)