| Message ID | 20250219040029.515451-2-wangyuquan1236@phytium.com.cn |
|---|---|
| State | Accepted |
| Commit | e4199d3c89cb08730eedbb8790feac69da6307ce |
| Headers | show |
| Series | cxl/pmem: debug invalid serial number data | expand |
On Wed, Feb 19, 2025 at 12:00:29PM +0800, Yuquan Wang wrote: > In a nvdimm interleave-set each device with an invalid or zero > serial number may cause pmem region initialization to fail, but in > cxl case such device could still set cookies of nd_interleave_set > and create a nvdimm pmem region. > > This adds the validation of serial number in cxl pmem region creation. > The event of no serial number would cause to fail to set the cookie > and pmem region. > > For cxl-test to work properly, always +1 on mock device's serial > number. > > Signed-off-by: Yuquan Wang <wangyuquan1236@phytium.com.cn> Re-applying my tag- Reviewed-by: Alison Schofield <alison.schofield@intel.com> snip >
Yuquan Wang wrote: > In a nvdimm interleave-set each device with an invalid or zero > serial number may cause pmem region initialization to fail, but in > cxl case such device could still set cookies of nd_interleave_set > and create a nvdimm pmem region. > > This adds the validation of serial number in cxl pmem region creation. > The event of no serial number would cause to fail to set the cookie > and pmem region. > > For cxl-test to work properly, always +1 on mock device's serial > number. > > Signed-off-by: Yuquan Wang <wangyuquan1236@phytium.com.cn> Seems good. Reviewed-by: Ira Weiny <ira.weiny@intel.com> [snip]
On Wed, 19 Feb 2025 12:00:29 +0800 Yuquan Wang <wangyuquan1236@phytium.com.cn> wrote: > In a nvdimm interleave-set each device with an invalid or zero > serial number may cause pmem region initialization to fail, but in > cxl case such device could still set cookies of nd_interleave_set > and create a nvdimm pmem region. > > This adds the validation of serial number in cxl pmem region creation. > The event of no serial number would cause to fail to set the cookie > and pmem region. > > For cxl-test to work properly, always +1 on mock device's serial > number. > > Signed-off-by: Yuquan Wang <wangyuquan1236@phytium.com.cn> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
On 2/18/25 9:00 PM, Yuquan Wang wrote: > In a nvdimm interleave-set each device with an invalid or zero > serial number may cause pmem region initialization to fail, but in > cxl case such device could still set cookies of nd_interleave_set > and create a nvdimm pmem region. > > This adds the validation of serial number in cxl pmem region creation. > The event of no serial number would cause to fail to set the cookie > and pmem region. > > For cxl-test to work properly, always +1 on mock device's serial > number. > > Signed-off-by: Yuquan Wang <wangyuquan1236@phytium.com.cn> Applied to cxl/next > --- > drivers/cxl/pmem.c | 12 ++++++++++-- > tools/testing/cxl/test/mem.c | 2 +- > 2 files changed, 11 insertions(+), 3 deletions(-) > > diff --git a/drivers/cxl/pmem.c b/drivers/cxl/pmem.c > index f9c95996e937..11c5a65acacf 100644 > --- a/drivers/cxl/pmem.c > +++ b/drivers/cxl/pmem.c > @@ -375,6 +375,16 @@ static int cxl_pmem_region_probe(struct device *dev) > goto out_nvd; > } > > + if (cxlds->serial == 0) { > + /* include missing alongside invalid in this error message. */ > + dev_err(dev, "%s: invalid or missing serial number\n", > + dev_name(&cxlmd->dev)); > + rc = -ENXIO; > + goto out_nvd; > + } > + info[i].serial = cxlds->serial; > + info[i].offset = m->start; > + > m->cxl_nvd = cxl_nvd; > mappings[i] = (struct nd_mapping_desc) { > .nvdimm = nvdimm, > @@ -382,8 +392,6 @@ static int cxl_pmem_region_probe(struct device *dev) > .size = m->size, > .position = i, > }; > - info[i].offset = m->start; > - info[i].serial = cxlds->serial; > } > ndr_desc.num_mappings = cxlr_pmem->nr_mappings; > ndr_desc.mapping = mappings; > diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c > index 8d731bd63988..9e098cf06603 100644 > --- a/tools/testing/cxl/test/mem.c > +++ b/tools/testing/cxl/test/mem.c > @@ -1533,7 +1533,7 @@ static int cxl_mock_mem_probe(struct platform_device *pdev) > mds->event.buf = (struct cxl_get_event_payload *) mdata->event_buf; > INIT_DELAYED_WORK(&mds->security.poll_dwork, cxl_mockmem_sanitize_work); > > - cxlds->serial = pdev->id; > + cxlds->serial = pdev->id + 1; > if (is_rcd(pdev)) > cxlds->rcd = true; >
diff --git a/drivers/cxl/pmem.c b/drivers/cxl/pmem.c index f9c95996e937..11c5a65acacf 100644 --- a/drivers/cxl/pmem.c +++ b/drivers/cxl/pmem.c @@ -375,6 +375,16 @@ static int cxl_pmem_region_probe(struct device *dev) goto out_nvd; } + if (cxlds->serial == 0) { + /* include missing alongside invalid in this error message. */ + dev_err(dev, "%s: invalid or missing serial number\n", + dev_name(&cxlmd->dev)); + rc = -ENXIO; + goto out_nvd; + } + info[i].serial = cxlds->serial; + info[i].offset = m->start; + m->cxl_nvd = cxl_nvd; mappings[i] = (struct nd_mapping_desc) { .nvdimm = nvdimm, @@ -382,8 +392,6 @@ static int cxl_pmem_region_probe(struct device *dev) .size = m->size, .position = i, }; - info[i].offset = m->start; - info[i].serial = cxlds->serial; } ndr_desc.num_mappings = cxlr_pmem->nr_mappings; ndr_desc.mapping = mappings; diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c index 8d731bd63988..9e098cf06603 100644 --- a/tools/testing/cxl/test/mem.c +++ b/tools/testing/cxl/test/mem.c @@ -1533,7 +1533,7 @@ static int cxl_mock_mem_probe(struct platform_device *pdev) mds->event.buf = (struct cxl_get_event_payload *) mdata->event_buf; INIT_DELAYED_WORK(&mds->security.poll_dwork, cxl_mockmem_sanitize_work); - cxlds->serial = pdev->id; + cxlds->serial = pdev->id + 1; if (is_rcd(pdev)) cxlds->rcd = true;
In a nvdimm interleave-set each device with an invalid or zero serial number may cause pmem region initialization to fail, but in cxl case such device could still set cookies of nd_interleave_set and create a nvdimm pmem region. This adds the validation of serial number in cxl pmem region creation. The event of no serial number would cause to fail to set the cookie and pmem region. For cxl-test to work properly, always +1 on mock device's serial number. Signed-off-by: Yuquan Wang <wangyuquan1236@phytium.com.cn> --- drivers/cxl/pmem.c | 12 ++++++++++-- tools/testing/cxl/test/mem.c | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-)