From: "Zhijian Li (Fujitsu)" <lizhijian@fujitsu.com>
To: Li Ming <ming4.li@outlook.com>,
"linux-cxl@vger.kernel.org" <linux-cxl@vger.kernel.org>,
"dave.jiang@intel.com" <dave.jiang@intel.com>
Subject: Re: [RFC PATCH 1/1] cxl/pci: Fake bandwidth for platform devices
Date: Wed, 27 Nov 2024 03:44:38 +0000 [thread overview]
Message-ID: <2c96fbd5-4dd9-4abf-83ab-3938dcd8fd8e@fujitsu.com> (raw)
In-Reply-To: <VI1PR10MB2016B406BFB45480FEDDCA50CE232@VI1PR10MB2016.EURPRD10.PROD.OUTLOOK.COM>
On 22/11/2024 15:20, Li Ming wrote:
> cxl-test environment always hits below call trace with KASAN
> enabled
>
> BUG: KASAN: slab-out-of-bounds in pcie_capability_read_word+0x1df/0x220
> Call Trace:
> <TASK>
> dump_stack_lvl+0x82/0xd0
> print_report+0xcb/0x5d0
> kasan_report+0xbd/0xf0
> pcie_capability_read_word+0x1df/0x220
> pcie_link_speed_mbps+0x6a/0x130
> cxl_pci_get_bandwidth+0x68/0x1c0 [cxl_core]
> cxl_endpoint_gather_bandwidth.constprop.0+0x352/0x780 [cxl_core]
> cxl_region_shared_upstream_bandwidth_update+0x257/0x1640 [cxl_core]
> cxl_region_attach+0x1025/0x1e80 [cxl_core]
> cxl_add_to_region+0x121/0x14c0 [cxl_core]
> discover_region+0xa5/0x150 [cxl_port]
Is this testing on the upstream kernel?
I guessed this have been fixed by
cce3cd647721 cxl/core: Return error when cxl_endpoint_gather_bandwidth() handles a non-PCI device
Thanks
Zhijian
>
> cxl-test environment creates cxl memory devices based on platform devices
> rather than PCI devices for testing. but cxl_endpoint_gather_bandwidth()
> always assumes the device is a PCI device, it will cause the issue in
> cxl_pci_get_bandwidth().
>
> The fixup is that faking a maximun bandwidth in cxl_pci_get_bandwidth()
> for a platform device so that the cxl-test environment can be used to
> validate the functionality of region bandwidth.
>
> Fixes: a5ab0de0ebaa ("cxl: Calculate region bandwidth of targets with shared upstream link")
> Signed-off-by: Li Ming <ming4.li@outlook.com>
> ---
> drivers/cxl/core/cdat.c | 5 ++---
> drivers/cxl/core/core.h | 2 +-
> drivers/cxl/core/pci.c | 24 +++++++++++++++++-------
> 3 files changed, 20 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/cxl/core/cdat.c b/drivers/cxl/core/cdat.c
> index 438869df241a..c67ef0d1b1a6 100644
> --- a/drivers/cxl/core/cdat.c
> +++ b/drivers/cxl/core/cdat.c
> @@ -634,7 +634,6 @@ static int cxl_endpoint_gather_bandwidth(struct cxl_region *cxlr,
> struct access_coordinate ep_coord[ACCESS_COORDINATE_MAX];
> struct cxl_memdev *cxlmd = cxled_to_memdev(cxled);
> struct cxl_dev_state *cxlds = cxlmd->cxlds;
> - struct pci_dev *pdev = to_pci_dev(cxlds->dev);
> struct cxl_perf_ctx *perf_ctx;
> struct cxl_dpa_perf *perf;
> unsigned long index;
> @@ -675,7 +674,7 @@ static int cxl_endpoint_gather_bandwidth(struct cxl_region *cxlr,
> }
>
> /* Direct upstream link from EP bandwidth */
> - rc = cxl_pci_get_bandwidth(pdev, pci_coord);
> + rc = cxl_pci_get_bandwidth(cxlds->dev, pci_coord);
> if (rc < 0)
> return rc;
>
> @@ -809,7 +808,7 @@ static struct xarray *cxl_switch_gather_bandwidth(struct cxl_region *cxlr,
> return ERR_PTR(-EINVAL);
>
> /* Retrieve the upstream link bandwidth */
> - rc = cxl_pci_get_bandwidth(to_pci_dev(dev), coords);
> + rc = cxl_pci_get_bandwidth(dev, coords);
> if (rc)
> return ERR_PTR(-ENXIO);
>
> diff --git a/drivers/cxl/core/core.h b/drivers/cxl/core/core.h
> index 800466f96a68..1c16c06d201e 100644
> --- a/drivers/cxl/core/core.h
> +++ b/drivers/cxl/core/core.h
> @@ -108,7 +108,7 @@ enum cxl_poison_trace_type {
> };
>
> long cxl_pci_get_latency(struct pci_dev *pdev);
> -int cxl_pci_get_bandwidth(struct pci_dev *pdev, struct access_coordinate *c);
> +int cxl_pci_get_bandwidth(struct device *dev, struct access_coordinate *c);
> int cxl_update_hmat_access_coordinates(int nid, struct cxl_region *cxlr,
> enum access_coordinate_class access);
> bool cxl_need_node_perf_attrs_update(int nid);
> diff --git a/drivers/cxl/core/pci.c b/drivers/cxl/core/pci.c
> index 5b46bc46aaa9..bd0448c3c9a8 100644
> --- a/drivers/cxl/core/pci.c
> +++ b/drivers/cxl/core/pci.c
> @@ -7,6 +7,7 @@
> #include <linux/pci.h>
> #include <linux/pci-doe.h>
> #include <linux/aer.h>
> +#include <linux/platform_device.h>
> #include <cxlpci.h>
> #include <cxlmem.h>
> #include <cxl.h>
> @@ -1032,19 +1033,28 @@ bool cxl_endpoint_decoder_reset_detected(struct cxl_port *port)
> }
> EXPORT_SYMBOL_NS_GPL(cxl_endpoint_decoder_reset_detected, CXL);
>
> -int cxl_pci_get_bandwidth(struct pci_dev *pdev, struct access_coordinate *c)
> +int cxl_pci_get_bandwidth(struct device *dev, struct access_coordinate *c)
> {
> int speed, bw;
> u16 lnksta;
> u32 width;
>
> - speed = pcie_link_speed_mbps(pdev);
> - if (speed < 0)
> - return speed;
> - speed /= BITS_PER_BYTE;
> + if (dev_is_platform(dev)) {
> + /* PCIE_SPEED_64_0GT as fake speed for platform device */
> + speed = 64000 / BITS_PER_BYTE;
> + /* PCI_EXP_LNKSTA_NLW_X8 as fake width for platform device */
> + width = FIELD_GET(PCI_EXP_LNKSTA_NLW, PCI_EXP_LNKSTA_NLW_X8);
> + } else {
> + struct pci_dev *pdev = to_pci_dev(dev);
> +
> + speed = pcie_link_speed_mbps(pdev);
> + if (speed < 0)
> + return speed;
> + speed /= BITS_PER_BYTE;
>
> - pcie_capability_read_word(pdev, PCI_EXP_LNKSTA, &lnksta);
> - width = FIELD_GET(PCI_EXP_LNKSTA_NLW, lnksta);
> + pcie_capability_read_word(pdev, PCI_EXP_LNKSTA, &lnksta);
> + width = FIELD_GET(PCI_EXP_LNKSTA_NLW, lnksta);
> + }
> bw = speed * width;
>
> for (int i = 0; i < ACCESS_COORDINATE_MAX; i++) {
next prev parent reply other threads:[~2024-11-27 3:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20241122072001.94758-1-ming4.li@outlook.com>
2024-11-22 7:20 ` [RFC PATCH 1/1] cxl/pci: Fake bandwidth for platform devices Li Ming
2024-11-26 15:03 ` Jonathan Cameron
2024-11-27 2:23 ` Li Ming
2024-11-27 3:44 ` Zhijian Li (Fujitsu) [this message]
2024-11-27 4:06 ` Li Ming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2c96fbd5-4dd9-4abf-83ab-3938dcd8fd8e@fujitsu.com \
--to=lizhijian@fujitsu.com \
--cc=dave.jiang@intel.com \
--cc=linux-cxl@vger.kernel.org \
--cc=ming4.li@outlook.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox