CXL: Read CDAT and DSMAS data from the device
v8 cover CXL: Read CDAT and DSMAS data from the device
From: Ira Weiny <[email protected]>
Changes from V7:[4]
Avoid code bloat by making pci-doe.c conditional on CONFIG_PCI_DOE
which is auto selected by the CXL_PCI config option.
Minor code clean ups
Fix bug in pci_doe_supports_prot()
Rebase to cxl-pending
Changes from V6:[3]
The big change is the removal of the auxiliary bus code from the PCI layer. The auxiliary bus usage is now in the CXL layer. The PCI layer provides helpers for subsystems to utilize DOE mailboxes by creating a pci_doe_mb object which controls a state machine for that mailbox capability. The CXL layer wraps this object in an auxiliary device and driver which can then be used to determine if the kernel is controlling the capability or it is available to be used by user space. Reads from user space via lspci are allowed. Writes are allowed but flagged via a tainting the kernel.
Feedback from Bjorn, Jonathan, and Dan
Details in each patch
Changes from V5:[0]
Rework the patch set to split PCI vs CXL changes
Also make each change a bit more stand alone for easier review
Add cxl_cdat structure
Put CDAT related data structures in cdat.h
Clarify some device lifetimes with comments
Incorporate feedback from Jonathan, Bjorn and Dan
The bigest change is placing the DOE scanning code into the
pci_doe driver (part of the PCI codre).
Validate the CDAT when it is read rather than before DSMAS
parsing
Do not report DSMAS failure as an error, report a warning and
keep going.
Retry reading the table 1 time.
Update commit messages and this cover letter
CXL drivers need various data which are provided through generic DOE mailboxes as defined in the PCIe 6.0 spec.[1]
One such data is the Coherent Device Atribute Table (CDAT). CDAT data provides coherent information about the various devices in the system. It was developed because systems no longer have a priori knowledge of all coherent devices within a system. CDAT describes the coherent characteristics of the components on the CXL bus separate from system configurations. The OS can then, for example, use this information to form correct interleave sets.
To begin reading the CDAT the OS must have support to access the DOE mailboxes provided by the CXL devices.
Because DOE is not specific to DOE but is provided within the PCI spec, the series adds PCI DOE capability library functions. These functions allow for the iteration of the DOE capabilities on a device as well as creating pci_doe_mb structures which can control the operation of the DOE state machine.
CXL iterates the DOE capabilities creates auxiliary bus devices. These devices are driven by a CXL DOE auxiliary driver which calls into the PCI DOE library functions as appropriate.
The auxiliary bus architecture allows for root users to control which DOE mailboxes are controlled by the kernel and which should be allowed for unrestricted access by user space. One such use case is to allow for CXL Compliance Testing (CXL 2.0 14.16.4 Compliance Mode DOE). By default the kernel controls all mailboxes found.
After the devices are created and the driver attaches, CDAT data is read from the device and DSMAS information parsed from that CDAT blob for use later.
This work was tested using qemu with additional patches.
[0] https://lore.kernel.org/linux-cxl/[email protected]/
[1] https://pcisig.com/specifications
[2] https://lore.kernel.org/qemu-devel/[email protected]/
[3] https://lore.kernel.org/linux-cxl/[email protected]/
[4] https://lore.kernel.org/linux-cxl/[email protected]/
Ira Weiny (7):
PCI: Replace magic constant for PCI Sig Vendor ID cxl/pci: Create auxiliary devices for each DOE mailbox cxl/pci: Create DOE auxiliary driver
cxl/pci: Find the DOE mailbox which supports CDAT cxl/cdat: Introduce cxl_cdat_valid()
cxl/mem: Retry reading CDAT on failure cxl/port: Parse out DSMAS data from CDAT table
Jonathan Cameron (3):
PCI: Add vendor ID for the PCI SIG
PCI: Create PCI library functions in support of DOE mailboxes. cxl/mem: Read CDAT table
drivers/cxl/Kconfig | 14 +drivers/cxl/Makefile | 2 +drivers/cxl/cdat.h | 116 +++++++ drivers/cxl/core/memdev.c | 38 +++drivers/cxl/cxl.h | 8 +drivers/cxl/cxlmem.h | 28 ++drivers/cxl/cxlpci.h | 35 ++drivers/cxl/doe.c | 90 +++++drivers/cxl/pci.c | 423 +++++++++++++++++++++++ drivers/cxl/port.c | 65 ++++drivers/pci/Kconfig | 3 +drivers/pci/Makefile | 1 +drivers/pci/pci-doe.c | 607 ++++++++++++++++++++++++++++++++++ drivers/pci/probe.c | 2 +-include/linux/pci-doe.h | 119 +++++++ include/linux/pci_ids.h | 1 + include/uapi/linux/pci_regs.h | 30 +-
17 files changed, 1580 insertions(+), 2 deletions(-)
create mode 100644 drivers/cxl/cdat.h
create mode 100644 drivers/cxl/doe.c
create mode 100644 drivers/pci/pci-doe.c
create mode 100644 include/linux/pci-doe.h
base-commit: 4f497e0dd3530981f8c897d5d47ee880b62baefb --
2.35.1
PATCH v8 1/10 PCI: Add vendor ID for the PCI SIG
From: Jonathan Cameron <[email protected]>
This ID is used in DOE headers to identify protocols that are defined within the PCI Express Base Specification, PCIe r6.0, sec 6.30.1.1 table 6-32.
--- include/linux/pci_ids.h | 1 + 1 file changed, 1 insertion(+)
include/linux/pci_ids.h +1 -0
@@ -151,6 +151,7 @@#define PCI_CLASS_OTHERS 0xff/* Vendors and devices. Sort key: vendor first, device next. */ +#define PCI_VENDOR_ID_PCI_SIG 0x0001#define PCI_VENDOR_ID_LOONGSON 0x0014
Signature · 1 line
2.35.1
PATCH v8 2/10 PCI: Replace magic constant for PCI Sig Vendor ID
In reply to [email protected]From: Ira Weiny <[email protected]>
Replace the magic value in pci_bus_crs_vendor_id() with PCI_VENDOR_ID_PCI_SIG.
---
Changes from V6
Simplify commit message
--- drivers/pci/probe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/probe.c +1 -1
@@ -2312,7 +2312,7 @@ EXPORT_SYMBOL(pci_alloc_dev);static bool pci_bus_crs_vendor_id (u32 l) { -return (l &0xffff ) ==0x0001 ; +return (l &0xffff ) ==PCI_VENDOR_ID_PCI_SIG ; } static bool pci_bus_wait_crs(struct pci_bus *bus, int devfn, u32 *l,
Signature · 1 line
2.35.1
PATCH v8 3/10 PCI: Create PCI library functions in support of DOE mailboxes.
In reply to [email protected]From: Jonathan Cameron <[email protected]>
Introduced in a PCI v6.0[1], DOE provides a config space based mailbox with standard protocol discovery. Each mailbox is accessed through a DOE Extended Capability.
Each DOE mailbox must support the DOE discovery protocol in addition to any number of additional protocols.
Define core PCI functionality to manage a single PCI DOE mailbox at a defined config space offset. Functionality includes creating, supported protocol queries, submit tasks to, and destroying the new state objects.
If interrupts are desired, interrupts vectors should be allocated prior to asking for irq's when creating a mailbox object.
[1] https://members.pcisig.com/wg/PCI-SIG/document/16609
---
Changes from V7
Add a Kconfig for this functionality
Fix bug in pci_doe_supports_prot()
Rebased on cxl-pending
Changes from V6
Clean up signed off by lines
Make this functionality all PCI library functions
Clean up header files
s/pci_doe_irq/pci_doe_irq_handler
Use pci_{request,free}_irq
Remove irq_name (maintained by pci_request_irq)
Fix checks to use an irq
Consistently use u16 for cap_offset
Cleanup kdocs and comments
Create a helper retire_cur_task() to handle locking of the
current task pointer.
Remove devm_ calls from PCI layer.
The devm_ calls do not allow for the pci_doe_mb objects to be tied to an auxiliary device. Leave it to the caller to use devm_ if desired.
From Dan Williams
s/cb/end_task/; Pass pci_doe_task to end_task Clarify exchange/task/request/response.
Merge pci_doe_task and pci_doe_exchange into pci_doe_task which represents a single request/response task for the state machine to process.
Simplify submitting work to the mailbox
Replace pci_doe_exchange_sync() with pci_doe_submit_task() Consumers of the mailbox are now responsible for setting up callbacks within a task object and submitting them to the mailbox to be processed.
Remove WARN_ON when task != NULL and be sure to abort that task. Convert abort/dead to atomic flags s/state_lock/task_lock to better define what the lock is
protecting
Remove all the auxiliary bus code from the PCI layer
The PCI layer provides helpers to use the DOE Mailboxes. Each subsystem can then use the helpers as they see fit. The CXL layer in this series uses aux devices to manage the new pci_doe_mb objects.
From Bjorn
Clarify the fact that DOE mailboxes are capabilities of
the device.
Code clean ups
Cleanup Makefile
Update references to PCI SIG spec v6.0
Move this attribution here:
This code is based on Jonathan's V4 series here:
https://lore.kernel.org/linux-cxl/[email protected]/
Changes from V5
From Bjorn
s/pci_WARN/pci_warn
Add timeout period to print
Trim to 80 chars
Use Tabs for DOE define spacing
Use %#x for clarity
From Jonathan
Addresses concerns about the order of unwinding stuff s/doe/doe_dev in pci_doe_exhcnage_sync
Correct kernel Doc comment
Move pci_doe_task_complete() down in the file. Rework pci_doe_irq()
process STATUS_ERROR first
Return IRQ_NONE if the irq is not processed Use PCI_DOE_STATUS_INT_STATUS explicitly to
clear the irq
Clean up goto label s/err_free_irqs/err_free_irq
use devm_kzalloc for doe struct
clean up error paths in pci_doe_probe s/pci_doe_drv/pci_doe
remove include mutex.h
remove device name and define, move it in the next patch which uses it use devm_kasprintf() for irq_name
use devm_request_irq()
remove pci_doe_unregister()
[get/put]_device() were unneeded and with the use of devm_* this function can be removed completely.
refactor pci_doe_register and s/pci_doe_register/pci_doe_reg_irq
make this function just a registration of the irq and move pci_doe_abort() into pci_doe_probe()
use devm_* to allocate the protocol array
Changes from Jonathan's V4
Move the DOE MB code into the DOE auxiliary driver Remove Task List in favor of a wait queue
Changes from Ben
remove CXL references
propagate rc from pci functions on error
squash: make PCI_DOE optional based on selecting by those who need it.
squash: Create PCI library functions
Fix bug in protocol support check
--- drivers/pci/Kconfig | 3 + drivers/pci/Makefile | 1 + drivers/pci/pci-doe.c | 607 ++++++++++++++++++++++++++++++++++ include/linux/pci-doe.h | 119 +++++++ include/uapi/linux/pci_regs.h | 29 +- 5 files changed, 758 insertions(+), 1 deletion(-) create mode 100644 drivers/pci/pci-doe.c create mode 100644 include/linux/pci-doe.h
drivers/pci/Kconfig +3 -0
@@ -121,6 +121,9 @@ config XEN_PCIDEV_FRONTEND config PCI_ATS bool +config PCI_DOE + bool + config PCI_ECAM bool
drivers/pci/Makefile +1 -0
@@ -31,6 +31,7 @@ obj-$(CONFIG_PCI_ECAM) += ecam.o obj-$(CONFIG_PCI_P2PDMA) += p2pdma.o obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o obj-$(CONFIG_VGA_ARB) += vgaarb.o +obj-$(CONFIG_PCI_DOE) += pci-doe.o # Endpoint library must be initialized before its users obj-$(CONFIG_PCI_ENDPOINT) += endpoint/
drivers/pci/pci-doe.c new file +607 -0
607 lines not on this page · raw message
include/linux/pci-doe.h new file +119 -0
119 lines not on this page · raw message
include/uapi/linux/pci_regs.h +28 -1
@@ -736,7 +736,8 @@#define PCI_EXT_CAP_ID_DVSEC 0x23/* Designated Vendor-Specific */ #define PCI_EXT_CAP_ID_DLF 0x25/* Data Link Feature */ #define PCI_EXT_CAP_ID_PL_16GT 0x26/* Physical Layer 16.0 GT/s */ -#define PCI_EXT_CAP_ID_MAX PCI_EXT_CAP_ID_PL_16GT +#define PCI_EXT_CAP_ID_DOE 0x2E/* Data Object Exchange */ +#define PCI_EXT_CAP_ID_MAX PCI_EXT_CAP_ID_DOE#define PCI_EXT_CAP_DSN_SIZEOF 12#define PCI_EXT_CAP_MCAST_ENDPOINT_SIZEOF 40
@@ -1102,4 +1103,30 @@#define PCI_PL_16GT_LE_CTRL_USP_TX_PRESET_MASK 0x000000F0#define PCI_PL_16GT_LE_CTRL_USP_TX_PRESET_SHIFT 4 +/* Data Object Exchange */ +#define PCI_DOE_CAP 0x04/* DOE Capabilities Register */ +#define PCI_DOE_CAP_INT 0x00000001/* Interrupt Support */ +#define PCI_DOE_CAP_IRQ 0x00000ffe/* Interrupt Message Number */ +#define PCI_DOE_CTRL 0x08/* DOE Control Register */ +#define PCI_DOE_CTRL_ABORT 0x00000001/* DOE Abort */ +#define PCI_DOE_CTRL_INT_EN 0x00000002/* DOE Interrupt Enable */ +#define PCI_DOE_CTRL_GO 0x80000000/* DOE Go */ +#define PCI_DOE_STATUS 0x0c/* DOE Status Register */ +#define PCI_DOE_STATUS_BUSY 0x00000001/* DOE Busy */ +#define PCI_DOE_STATUS_INT_STATUS 0x00000002/* DOE Interrupt Status */ +#define PCI_DOE_STATUS_ERROR 0x00000004/* DOE Error */ +#define PCI_DOE_STATUS_DATA_OBJECT_READY 0x80000000/* Data Object Ready */ +#define PCI_DOE_WRITE 0x10/* DOE Write Data Mailbox Register */ +#define PCI_DOE_READ 0x14/* DOE Read Data Mailbox Register */ + +/* DOE Data Object - note not actually registers */ +#define PCI_DOE_DATA_OBJECT_HEADER_1_VID 0x0000ffff +#define PCI_DOE_DATA_OBJECT_HEADER_1_TYPE 0x00ff0000 +#define PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH 0x0003ffff + +#define PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX 0x000000ff +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID 0x0000ffff +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL 0x00ff0000 +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX 0xff000000 +#endif /* LINUX_PCI_REGS_H */
Signature · 1 line
2.35.1
Re: [PATCH V8 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
Quoted 3 lines · On Thu, Apr 14, 2022 at 01:32:30PM -0700, [email protected] wrote:
From: Jonathan Cameron <[email protected]>
Introduced in a PCI v6.0[1], DOE provides a config space based mailbox
Introduced in PCIe r6.0, sec 6.30, DOE ...
Quoted 6 lines
with standard protocol discovery. Each mailbox is accessed through a DOE Extended Capability.
Each DOE mailbox must support the DOE discovery protocol in addition to any number of additional protocols.
Quoted 6 lines
Define core PCI functionality to manage a single PCI DOE mailbox at a defined config space offset. Functionality includes creating, supported protocol queries, submit tasks to, and destroying the new state objects.
If interrupts are desired, interrupts vectors should be allocated prior to asking for irq's when creating a mailbox object.
IRQs
Quoted 1 line
The link is only useful for PCI-SIG members, and only as long as the SIG maintains this structure. I think "PCIe r6.0" is sufficient.
Quoted 4 lines
Cc Christoph Hellwig <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>Co-developed-by Ira Weiny <[email protected]>Signed-off-by Ira Weiny <[email protected]>
Minor comments below.
Quoted 131 lines
---
Changes from V7
Add aKconfigfor this functionality
Fix bug inpci_doe_supports_prot()
Rebased on cxl-pendingChanges from V6
Clean up signed off by lines
Make this functionality all PCI library functions
Clean up header files
s/pci_doe_irq/pci_doe_irq_handler
Use pci_{request,free}_irq
Removeirq_name(maintained bypci_request_irq)
Fix checks to use an irq
Consistently use u16 forcap_offset
Cleanup kdocs and comments
Create a helperretire_cur_task()to handle locking of the
current task pointer.
Removedevm_calls from PCI layer.
Thedevm_calls do not allow for thepci_doe_mbobjects to be tied to an auxiliary device. Leave it to the caller to usedevm_if desired.
From Dan Williams
s/cb/end_task/; Passpci_doe_tasktoend_taskClarify exchange/task/request/response.
Mergepci_doe_taskandpci_doe_exchangeintopci_doe_taskwhich represents a single request/response task for the state machine to process.
Simplify submitting work to the mailbox
Replacepci_doe_exchange_sync()withpci_doe_submit_task()Consumers of the mailbox are now responsible for setting up callbacks within a task object and submitting them to the mailbox to be processed.
RemoveWARN_ONwhen task != NULL and be sure to abort that task. Convert abort/dead to atomic flags s/state_lock/task_lock to better define what the lock is
protecting
Remove all the auxiliary bus code from the PCI layer
The PCI layer provides helpers to use the DOE Mailboxes. Each subsystem can then use the helpers as they see fit. The CXL layer in this series uses aux devices to manage the newpci_doe_mbobjects.From Bjorn
Clarify the fact that DOE mailboxes are capabilities of
the device.
Code clean ups
CleanupMakefile
Update references to PCI SIG spec v6.0
Move this attribution here:
This code is based on Jonathan's V4 series here:
https://lore.kernel.org/linux-cxl/[email protected]/Changes from V5
From Bjorn
s/pci_WARN/pci_warn
Add timeout period to print
Trim to 80 chars
Use Tabs for DOE define spacing
Use %#x for clarity
From Jonathan
Addresses concerns about the order of unwinding stuff s/doe/doe_dev inpci_doe_exhcnage_sync
Correct kernel Doc comment
Movepci_doe_task_complete()down in the file. Reworkpci_doe_irq()
processSTATUS_ERRORfirst
ReturnIRQ_NONEif the irq is not processed UsePCI_DOE_STATUS_INT_STATUSexplicitly to
clear the irq
Clean up goto label s/err_free_irqs/err_free_irq
usedevm_kzallocfor doe struct
clean up error paths inpci_doe_probes/pci_doe_drv/pci_doe
remove includemutex.h
remove device name and define, move it in the next patch which uses it usedevm_kasprintf()forirq_name
usedevm_request_irq()
removepci_doe_unregister()
[get/put]_device() were unneeded and with the use of devm_* this function can be removed completely.
refactorpci_doe_registerand s/pci_doe_register/pci_doe_reg_irq
make this function just a registration of the irq and movepci_doe_abort()intopci_doe_probe()
use devm_* to allocate the protocol arrayChanges from Jonathan's V4
Move the DOE MB code into the DOE auxiliary driver Remove Task List in favor of a wait queueChanges from Ben
remove CXL references
propagate rc from pci functions on errorsquash: make
PCI_DOEoptional based on selecting by those who need it.squash: Create PCI library functions
Fix bug in protocol support check
--- drivers/pci/Kconfig | 3 + drivers/pci/Makefile | 1 + drivers/pci/pci-doe.c | 607 ++++++++++++++++++++++++++++++++++ include/linux/pci-doe.h | 119 +++++++ include/uapi/linux/pci_regs.h | 29 +- 5 files changed, 758 insertions(+), 1 deletion(-) create mode 100644 drivers/pci/pci-doe.c create mode 100644 include/linux/pci-doe.hdrivers/pci/Kconfig +3
-0@@ -121,6 +121,9 @@ config XEN_PCIDEV_FRONTEND config PCI_ATS bool +config PCI_DOE + bool + config PCI_ECAM booldrivers/pci/Makefile +0
-0
drivers/pci/Makefile obj-$(CONFIG_PCI_ECAM) += ecam.o · line 34
Quoted 4 lines
drivers/pci/Makefile +1
-0@@ -31,6 +31,7 @@ obj-$(CONFIG_PCI_ECAM) += ecam.o obj-$(CONFIG_PCI_P2PDMA) += p2pdma.o obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o obj-$(CONFIG_VGA_ARB) += vgaarb.o +obj-$(CONFIG_PCI_DOE) += pci-doe.o
Is there value in the "pci-" prefix? There are a few other files with the prefix, but I can't remember why. Most things are of the form "doe.c".
drivers/pci/pci-doe.c line 4
Quoted 12 lines
drivers/pci/Makefile +0
-0# Endpoint library must be initialized before its users obj-$(CONFIG_PCI_ENDPOINT) += endpoint/drivers/pci/pci-doe.c new file +4
-0@@ -0,0 +1,607 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Data Object Exchange +* https://members.pcisig.com/wg/PCI-SIG/document/16609
I think "PCIe r6.0, sec 6.30" is more generally useful.
Quoted 11 lines
drivers/pci/pci-doe.c new file +11
-0+* Copyright (C) 2021 Huawei +* Jonathan Cameron <[email protected]> +* +* Copyright (C) 2022 Intel Corporation +* Ira Weiny <[email protected]> +*/ + +#include <linux/bitfield.h> +#include <linux/delay.h> +#include <linux/jiffies.h> +#include <linux/mutex.h>
drivers/pci/pci-doe.c line 26
Quoted 10 lines
drivers/pci/pci-doe.c new file +10
-0+#include <linux/pci.h> +#include <linux/pci-doe.h> +#include <linux/workqueue.h> + +#define PCI_DOE_PROTOCOL_DISCOVERY 0 + +#define PCI_DOE_BUSY_MAX_RETRIES 16 +#define PCI_DOE_POLL_INTERVAL (HZ / 128) + +/* Timeout of 1 second from 6.30.2 Operation, PCI Spec v6.0 */
Pedantic: the PCI specs use "r6.0", not "v6.0". Reverse for ACPI. Of course. Even worse, PCI uses "Revision" for the major, "Version" for the minor.
drivers/pci/pci-doe.c line 38
Quoted 12 lines
drivers/pci/pci-doe.c new file +12
-0+#define PCI_DOE_TIMEOUT HZ + +static irqreturn_t pci_doe_irq_handler (int irq,void *data) +{ +struct pci_doe_mb *doe_mb = data; +struct pci_dev *pdev = doe_mb->pdev; +int offset = doe_mb->cap_offset; +u32 val; + +pci_read_config_dword (pdev, offset +PCI_DOE_STATUS , &val); + +/* Leave the error case to be handled outside IRQ */
s/irq/IRQ/ for similar comment and log message uses below.
Quoted 26 lines
drivers/pci/pci-doe.c new file +26
-0+if (FIELD_GET (PCI_DOE_STATUS_ERROR , val)) { +mod_delayed_work (system_wq, &doe_mb->statemachine,0 ); +return IRQ_HANDLED ; + } + +if (FIELD_GET (PCI_DOE_STATUS_INT_STATUS , val)) { +pci_write_config_dword (pdev, offset +PCI_DOE_STATUS , +PCI_DOE_STATUS_INT_STATUS ); +mod_delayed_work (system_wq, &doe_mb->statemachine,0 ); +return IRQ_HANDLED ; + } + +return IRQ_NONE ; +} + +/* +* Only called when safe to directly access the DOE from +* doe_statemachine_work(). Outside access is not protected. Users who +* perform such access are left with the pieces. +*/ +static void pci_doe_abort_start (struct pci_doe_mb *doe_mb) +{ +struct pci_dev *pdev = doe_mb->pdev; +int offset = doe_mb->cap_offset; +u32 val; +
drivers/pci/pci-doe.c line 74
Quoted 10 lines
drivers/pci/pci-doe.c new file +10
-0+ val =PCI_DOE_CTRL_ABORT ; +if (doe_mb->irq >=0 ) + val |=PCI_DOE_CTRL_INT_EN ; +pci_write_config_dword (pdev, offset +PCI_DOE_CTRL , val); + + doe_mb->timeout_jiffies = jiffies +HZ ; +schedule_delayed_work (&doe_mb->statemachine,HZ ); +} + +static int pci_doe_send_req (struct pci_doe_mb *doe_mb,struct pci_doe_task *task)
Wrap to fit in 80 columns, like the rest of drivers/pci/*
Quoted 45 lines
drivers/pci/pci-doe.c new file +45
-0+{ +struct pci_dev *pdev = doe_mb->pdev; +int offset = doe_mb->cap_offset; +u32 val; +int i; + +/* +* Check the DOE busy bit is not set. If it is set, this could indicate +* someone other than Linux (e.g. firmware) is using the mailbox. Note +* it is expected that firmware and OS will negotiate access rights via +* an, as yet to be defined method. +*/ +pci_read_config_dword (pdev, offset +PCI_DOE_STATUS , &val); +if (FIELD_GET (PCI_DOE_STATUS_BUSY , val)) +return -EBUSY ; + +if (FIELD_GET (PCI_DOE_STATUS_ERROR , val)) +return -EIO ; + +/* Write DOE Header */ + val =FIELD_PREP (PCI_DOE_DATA_OBJECT_HEADER_1_VID , task->prot.vid) | +FIELD_PREP (PCI_DOE_DATA_OBJECT_HEADER_1_TYPE , task->prot.type); +pci_write_config_dword (pdev, offset +PCI_DOE_WRITE , val); +/* Length is 2 DW of header + length of payload in DW */ +pci_write_config_dword (pdev, offset +PCI_DOE_WRITE , +FIELD_PREP (PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH , +2 + task->request_pl_sz / +sizeof (u32))); +for (i =0 ; i < task->request_pl_sz /sizeof (u32); i++) +pci_write_config_dword (pdev, offset +PCI_DOE_WRITE , + task->request_pl[i]); + + val =PCI_DOE_CTRL_GO ; +if (doe_mb->irq >=0 ) + val |=PCI_DOE_CTRL_INT_EN ; + +pci_write_config_dword (pdev, offset +PCI_DOE_CTRL , val); +/* Request is sent - now wait for poll or IRQ */ +return 0 ; +} + +static int pci_doe_recv_resp (struct pci_doe_mb *doe_mb,struct pci_doe_task *task) +{ +struct pci_dev *pdev = doe_mb->pdev; +int offset = doe_mb->cap_offset;
drivers/pci/pci-doe.c line 129
Quoted 10 lines
drivers/pci/pci-doe.c new file +10
-0+size_t length; +u32 val; +int i; + +/* Read the first dword to get the protocol */ +pci_read_config_dword (pdev, offset +PCI_DOE_READ , &val); +if ((FIELD_GET (PCI_DOE_DATA_OBJECT_HEADER_1_VID , val) != task->prot.vid) || + (FIELD_GET (PCI_DOE_DATA_OBJECT_HEADER_1_TYPE , val) != task->prot.type)) { + pci_err(pdev, + "Expected [VID, Protocol] = [%#x, %#x], got [%#x, %#x]\n",
Needs a "DOE" or similar hint for where to look when you see this error.
"%04x" is the typical way we print a PCI vendor ID. I guess a leading "0x" isn't a disaster, but I do think it should be 4 hex digits so it doesn't look like a length or something.
It looks like you anticipate multiple DOE capabilities. Maybe messages should include the capability offset to be specific? I see you print with %u in pci_doe_create_mb(). I'm pretty sure "lspci -vv" prints them in hex, and it's probably useful to match.
Quoted 64 lines
drivers/pci/pci-doe.c new file +64
-0+ task->prot.vid, task->prot.type, +FIELD_GET (PCI_DOE_DATA_OBJECT_HEADER_1_VID , val), + FIELD_GET(PCI_DOE_DATA_OBJECT_HEADER_1_TYPE, val)); +return -EIO ; + } + +pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); +/* Read the second dword to get the length */ +pci_read_config_dword (pdev, offset +PCI_DOE_READ , &val); +pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); + + length =FIELD_GET (PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH , val); +if (length >SZ_1M || length <2 ) +return -EIO ; + +/* First 2 dwords have already been read */ + length -=2 ; +/* Read the rest of the response payload */ +for (i =0 ; i <min (length, task->response_pl_sz /sizeof (u32)); i++) { +pci_read_config_dword (pdev, offset +PCI_DOE_READ , + &task->response_pl[i]); +pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); + } + +/* Flush excess length */ +for (; i < length; i++) { +pci_read_config_dword (pdev, offset +PCI_DOE_READ , &val); +pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); + } +/* Final error check to pick up on any since Data Object Ready */ +pci_read_config_dword (pdev, offset +PCI_DOE_STATUS , &val); +if (FIELD_GET (PCI_DOE_STATUS_ERROR , val)) +return -EIO ; + +return min (length, task->response_pl_sz /sizeof (u32)) *sizeof (u32); +} + +static void signal_task_complete (struct pci_doe_task *task,int rv) +{ + task->rv = rv; + task->complete (task); +} + +static void retire_cur_task (struct pci_doe_mb *doe_mb) +{ +mutex_lock (&doe_mb->task_lock); + doe_mb->cur_task =NULL ; +mutex_unlock (&doe_mb->task_lock); +wake_up_interruptible (&doe_mb->wq); +} + +static void doe_statemachine_work (struct work_struct *work) +{ +struct delayed_work *w =to_delayed_work (work); + struct pci_doe_mb *doe_mb = container_of(w, struct pci_doe_mb, + statemachine); +struct pci_dev *pdev = doe_mb->pdev; +int offset = doe_mb->cap_offset; +struct pci_doe_task *task; +u32 val; +int rc; + +mutex_lock (&doe_mb->task_lock); + task = doe_mb->cur_task;
drivers/pci/pci-doe.c line 203
Quoted 10 lines
drivers/pci/pci-doe.c new file +10
-0+mutex_unlock (&doe_mb->task_lock); + +if (test_and_clear_bit (PCI_DOE_FLAG_ABORT , &doe_mb->flags)) { +/* +* Currently only used during init - care needed if +* pci_doe_abort() is generally exposed as it would impact +* queries in flight. +*/ +if (task) +pr_err ("Aborting with active task!\n" );
This should be a dev_err() and probably include "DOE" or some kind of hint about what this applies to.
drivers/pci/pci-doe.c line 214
Quoted 11 lines
drivers/pci/pci-doe.c new file +11
-0+ doe_mb->state =DOE_WAIT_ABORT ; +pci_doe_abort_start (doe_mb); +return ; + } + +switch (doe_mb->state) { +case DOE_IDLE : +if (task ==NULL ) +return ; + + rc =pci_doe_send_req (doe_mb, task);
Add blank line before block comment.
Quoted 155 lines
drivers/pci/pci-doe.c new file +155
-0+/* +* The specification does not provide any guidance on how long +* some other entity could keep the DOE busy, so try for 1 +* second then fail. Busy handling is best effort only, because +* there is no way of avoiding racing against another user of +* the DOE. +*/ +if (rc == -EBUSY ) { + doe_mb->busy_retries++; +if (doe_mb->busy_retries ==PCI_DOE_BUSY_MAX_RETRIES ) { +/* Long enough, fail this request */ +pci_warn (pdev, +"DOE busy for too long (> 1 sec)\n" ); + doe_mb->busy_retries =0 ; + goto err_busy; + } +schedule_delayed_work (w,HZ /PCI_DOE_BUSY_MAX_RETRIES ); +return ; + } +if (rc) + goto err_abort; + doe_mb->busy_retries =0 ; + + doe_mb->state =DOE_WAIT_RESP ; + doe_mb->timeout_jiffies = jiffies +HZ ; +/* Now poll or wait for IRQ with timeout */ +if (doe_mb->irq >=0 ) +schedule_delayed_work (w,PCI_DOE_TIMEOUT ); +else +schedule_delayed_work (w,PCI_DOE_POLL_INTERVAL ); +return ; + +case DOE_WAIT_RESP : +/* Not possible to get here with NULL task */ +pci_read_config_dword (pdev, offset +PCI_DOE_STATUS , &val); +if (FIELD_GET (PCI_DOE_STATUS_ERROR , val)) { + rc = -EIO ; + goto err_abort; + } + +if (!FIELD_GET (PCI_DOE_STATUS_DATA_OBJECT_READY , val)) { +/* If not yet at timeout reschedule otherwise abort */ +if (time_after (jiffies, doe_mb->timeout_jiffies)) { + rc = -ETIMEDOUT ; + goto err_abort; + } +schedule_delayed_work (w,PCI_DOE_POLL_INTERVAL ); +return ; + } + + rc =pci_doe_recv_resp (doe_mb, task); +if (rc <0 ) + goto err_abort; + + doe_mb->state =DOE_IDLE ; + +retire_cur_task (doe_mb); +/* Set the return value to the length of received payload */ +signal_task_complete (task, rc); + +return ; + +case DOE_WAIT_ABORT : +case DOE_WAIT_ABORT_ON_ERR : +pci_read_config_dword (pdev, offset +PCI_DOE_STATUS , &val); + +if (!FIELD_GET (PCI_DOE_STATUS_ERROR , val) && + !FIELD_GET (PCI_DOE_STATUS_BUSY , val)) { +/* Back to normal state - carry on */ +retire_cur_task (doe_mb); + +/* +* For deliberately triggered abort, someone is +* waiting. +*/ +if (doe_mb->state ==DOE_WAIT_ABORT ) { +if (task) +signal_task_complete (task, -EFAULT ); +complete (&doe_mb->abort_c); + } + + doe_mb->state =DOE_IDLE ; +return ; + } +if (time_after (jiffies, doe_mb->timeout_jiffies)) { +/* Task has timed out and is dead - abort */ +pci_err (pdev,"DOE ABORT timed out\n" ); +set_bit (PCI_DOE_FLAG_DEAD , &doe_mb->flags); +retire_cur_task (doe_mb); + +if (doe_mb->state ==DOE_WAIT_ABORT ) { +if (task) +signal_task_complete (task, -EFAULT ); +complete (&doe_mb->abort_c); + } + } +return ; + } + +err_abort: + doe_mb->state =DOE_WAIT_ABORT_ON_ERR ; +pci_doe_abort_start (doe_mb); +err_busy: +signal_task_complete (task, rc); +if (doe_mb->state ==DOE_IDLE ) +retire_cur_task (doe_mb); +} + +static void pci_doe_task_complete (struct pci_doe_task *task) +{ +complete (task->private); +} + +static int pci_doe_discovery (struct pci_doe_mb *doe_mb,u8 *index,u16 *vid, +u8 *protocol) +{ +u32 request_pl =FIELD_PREP (PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX , + *index); +u32 response_pl; +DECLARE_COMPLETION_ONSTACK (c); +struct pci_doe_task task = { + .prot.vid =PCI_VENDOR_ID_PCI_SIG , + .prot.type =PCI_DOE_PROTOCOL_DISCOVERY , + .request_pl = &request_pl, + .request_pl_sz =sizeof (request_pl), + .response_pl = &response_pl, + .response_pl_sz =sizeof (response_pl), + .complete = pci_doe_task_complete, + .private = &c, + }; +int ret; + + ret =pci_doe_submit_task (doe_mb, &task); +if (ret <0 ) +return ret; + +wait_for_completion (&c); + +if (task.rv !=sizeof (response_pl)) +return -EIO ; + + *vid =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID , response_pl); + *protocol =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL , + response_pl); + *index =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX , + response_pl); + +return 0 ; +} + +static int pci_doe_cache_protocols (struct pci_doe_mb *doe_mb) +{ +u8 index =0 ; +int num_prots; +int rc;
drivers/pci/pci-doe.c line 379
Quoted 10 lines
drivers/pci/pci-doe.c new file +10
-0+ +/* Discovery protocol must always be supported and must report itself */ + num_prots =1 ; + + doe_mb->prots =kcalloc (num_prots,sizeof (*doe_mb->prots),GFP_KERNEL ); +if (!doe_mb->prots) +return -ENOMEM ; + +/* +* NOTE: doe_mb_prots is freed by pci_doe_free_mb automatically on
"pci_doe_free_mb()" to match other function name references.
Quoted 133 lines
drivers/pci/pci-doe.c new file +133
-0+* error if pci_doe_cache_protocols() fails past this point. +*/ +do { +struct pci_doe_protocol *prot; + + prot = &doe_mb->prots[num_prots -1 ]; + rc =pci_doe_discovery (doe_mb, &index, &prot->vid, &prot->type); +if (rc) +return rc; + +if (index) { +struct pci_doe_protocol *prot_new; + + num_prots++; + prot_new =krealloc (doe_mb->prots, +sizeof (*doe_mb->prots) * num_prots, +GFP_KERNEL ); +if (!prot_new) +return -ENOMEM ; + + doe_mb->prots = prot_new; + } + }while (index); + + doe_mb->num_prots = num_prots; +return 0 ; +} + +static int pci_doe_abort (struct pci_doe_mb *doe_mb) +{ +reinit_completion (&doe_mb->abort_c); +set_bit (PCI_DOE_FLAG_ABORT , &doe_mb->flags); +schedule_delayed_work (&doe_mb->statemachine,0 ); +wait_for_completion (&doe_mb->abort_c); + +if (test_bit (PCI_DOE_FLAG_DEAD , &doe_mb->flags)) +return -EIO ; + +return 0 ; +} + +static int pci_doe_request_irq (struct pci_doe_mb *doe_mb) +{ +struct pci_dev *pdev = doe_mb->pdev; +int offset = doe_mb->cap_offset; +int doe_irq, rc; +u32 val; + +pci_read_config_dword (pdev, offset +PCI_DOE_CAP , &val); + +if (!FIELD_GET (PCI_DOE_CAP_INT , val)) +return -EOPNOTSUPP ; + + doe_irq =FIELD_GET (PCI_DOE_CAP_IRQ , val); + rc =pci_request_irq (pdev, doe_irq, pci_doe_irq_handler, +NULL , doe_mb, +"DOE[%d:%s]" , doe_irq,pci_name (pdev)); +if (rc) +return rc; + + doe_mb->irq = doe_irq; +pci_write_config_dword (pdev, offset +PCI_DOE_CTRL , +PCI_DOE_CTRL_INT_EN ); +return 0 ; +} + +static void pci_doe_free_mb (struct pci_doe_mb *doe_mb) +{ +if (doe_mb->irq >=0 ) +pci_free_irq (doe_mb->pdev, doe_mb->irq, doe_mb); +kfree (doe_mb->prots); +kfree (doe_mb); +} + +/** +* pci_doe_create_mb() - Create a DOE mailbox object +* +* @pdev: PCI device to create the DOE mailbox for +* @cap_offset: Offset of the DOE mailbox +* @use_irq: Should the state machine use an irq +* +* Create a single mailbox object to manage the mailbox protocol at the +* cap_offset specified. +* +* Caller should allocate PCI irq vectors before setting use_irq. +* +* RETURNS: created mailbox object on success +* ERR_PTR(-errno) on failure +*/ +struct pci_doe_mb *pci_doe_create_mb (struct pci_dev *pdev,u16 cap_offset, +bool use_irq) +{ +struct pci_doe_mb *doe_mb; +int rc; + + doe_mb =kzalloc (sizeof (*doe_mb),GFP_KERNEL ); +if (!doe_mb) +return ERR_PTR (-ENOMEM ); + + doe_mb->pdev = pdev; +init_completion (&doe_mb->abort_c); + doe_mb->irq =-1 ; + doe_mb->cap_offset = cap_offset; + +init_waitqueue_head (&doe_mb->wq); +mutex_init (&doe_mb->task_lock); +INIT_DELAYED_WORK (&doe_mb->statemachine, doe_statemachine_work); + doe_mb->state =DOE_IDLE ; + +if (use_irq) { + rc =pci_doe_request_irq (doe_mb); +if (rc) +pci_err (pdev,"DOE request irq failed for mailbox @ %u : %d\n" , + cap_offset, rc); + } + +/* Reset the mailbox by issuing an abort */ + rc =pci_doe_abort (doe_mb); +if (rc) { +pci_err (pdev,"DOE failed to reset the mailbox @ %u : %d\n" , + cap_offset, rc); +pci_doe_free_mb (doe_mb); +return ERR_PTR (rc); + } + + rc =pci_doe_cache_protocols (doe_mb); +if (rc) { +pci_err (pdev,"DOE failed to cache protocols for mailbox @ %u : %d\n" , + cap_offset, rc); +pci_doe_free_mb (doe_mb); +return ERR_PTR (rc); + } +
drivers/pci/pci-doe.c line 522
Quoted 10 lines
drivers/pci/pci-doe.c new file +10
-0+return doe_mb; +} +EXPORT_SYMBOL_GPL (pci_doe_create_mb); + +/** +* pci_doe_supports_prot() - Return if the DOE instance supports the given +* protocol +* @doe_mb: DOE mailbox capability to query +* @vid: Protocol Vendor ID +* @type: protocol type
Protocol
drivers/pci/pci-doe.c line 523
Quoted 2 lines
drivers/pci/pci-doe.c new file +2
-0+* +* RETURNS: True if the DOE device supports the protocol specified
I think you typically use "DOE mailbox", not "DOE device".
Quoted 89 lines
drivers/pci/pci-doe.c new file +83
-0+*/ +bool pci_doe_supports_prot (struct pci_doe_mb *doe_mb,u16 vid,u8 type) +{ +int i; + +/* The discovery protocol must always be supported */ +if (vid ==PCI_VENDOR_ID_PCI_SIG && type ==PCI_DOE_PROTOCOL_DISCOVERY ) +return true; + +for (i =0 ; i < doe_mb->num_prots; i++) +if ((doe_mb->prots[i].vid == vid) && + (doe_mb->prots[i].type == type)) +return true; + +return false; +} +EXPORT_SYMBOL_GPL (pci_doe_supports_prot); + +/** +* pci_doe_submit_task() - Submit a task to be processed by the state machine +* +* @doe_mb: DOE mailbox capability to submit to +* @task: task to be queued +* +* Submit a DOE task (request/response) to the DOE mailbox to be processed. +* Returns upon queueing the task object. If the queue is full this function +* will sleep until there is room in the queue. +* +* task->complete will be called when the state machine is done processing this +* task. +* +* Excess data will be discarded. +* +* RETURNS: 0 when task has been successful queued, -ERRNO on error +*/ +int pci_doe_submit_task (struct pci_doe_mb *doe_mb,struct pci_doe_task *task) +{ +if (!pci_doe_supports_prot (doe_mb, task->prot.vid, task->prot.type)) +return -EINVAL ; + +/* DOE requests must be a whole number of DW */ +if (task->request_pl_sz %sizeof (u32)) +return -EINVAL ; + +again: +mutex_lock (&doe_mb->task_lock); +if (doe_mb->cur_task) { +mutex_unlock (&doe_mb->task_lock); +wait_event_interruptible (doe_mb->wq, doe_mb->cur_task ==NULL ); + goto again; + } + +if (test_bit (PCI_DOE_FLAG_DEAD , &doe_mb->flags)) { +mutex_unlock (&doe_mb->task_lock); +return -EIO ; + } + doe_mb->cur_task = task; +mutex_unlock (&doe_mb->task_lock); +schedule_delayed_work (&doe_mb->statemachine,0 ); + +return 0 ; +} +EXPORT_SYMBOL_GPL (pci_doe_submit_task); + +/** +* pci_doe_destroy_mb() - Destroy a DOE mailbox object created with +* pci_doe_create_mb() +* +* @doe_mb: DOE mailbox capability structure to destroy +* +* The mailbox becomes invalid and should not be used after this call. +*/ +void pci_doe_destroy_mb (struct pci_doe_mb *doe_mb) +{ +/* abort any work in progress */ +pci_doe_abort (doe_mb); + +/* halt the state machine */ +cancel_delayed_work_sync (&doe_mb->statemachine); + +pci_doe_free_mb (doe_mb); +} +EXPORT_SYMBOL_GPL (pci_doe_destroy_mb);include/linux/pci-doe.h new file +0
-0
include/linux/pci-doe.h line 4
Quoted 4 lines
include/linux/pci-doe.h new file +4
-0@@ -0,0 +1,119 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Data Object Exchange +* https://members.pcisig.com/wg/PCI-SIG/document/16609
Ditto.
Quoted 163 lines
include/linux/pci-doe.h new file +115
-0+* +* Copyright (C) 2021 Huawei +* Jonathan Cameron <[email protected]> +* +* Copyright (C) 2022 Intel Corporation +* Ira Weiny <[email protected]> +*/ + +#ifndef LINUX_PCI_DOE_H +#define LINUX_PCI_DOE_H + +#include <linux/completion.h> + +enum pci_doe_state { +DOE_IDLE , +DOE_WAIT_RESP , +DOE_WAIT_ABORT , +DOE_WAIT_ABORT_ON_ERR , +}; + +#define PCI_DOE_FLAG_ABORT 0 +#define PCI_DOE_FLAG_DEAD 1 + +struct pci_doe_protocol { +u16 vid; +u8 type; +}; + +/** +* struct pci_doe_task - represents a single query/response +* +* @prot: DOE Protocol +* @request_pl: The request payload +* @request_pl_sz: Size of the request payload +* @response_pl: The response payload +* @response_pl_sz: Size of the response payload +* @rv: Return value. Length of received response or error +* @complete: Called when task is complete +* @private: Private data for the consumer +*/ +struct pci_doe_task { +struct pci_doe_protocol prot; +u32 *request_pl; +size_t request_pl_sz; +u32 *response_pl; +size_t response_pl_sz; +int rv; +void (*complete)(struct pci_doe_task *task); +void *private; +}; + +/** +* struct pci_doe_mb - State for a single DOE mailbox +* +* This state is used to manage a single DOE mailbox capability. All fields +* should be considered opaque to the consumers and the structure passed into +* the helpers below after being created by devm_pci_doe_create() +* +* @pdev: PCI device this belongs to mailbox belongs to +* @abort_c: Completion used for initial abort handling +* @irq: Interrupt used for signaling DOE ready or abort +* @prots: Array of protocols supported on this DOE +* @num_prots: Size of prots array +* @cap_offset: Capability offset +* @wq: Wait queue to wait on if a query is in progress +* @cur_task: Current task the state machine is working on +* @task_lock: Protect cur_task +* @statemachine: Work item for the DOE state machine +* @state: Current state of this DOE +* @timeout_jiffies: 1 second after GO set +* @busy_retries: Count of retry attempts +* @flags: Bit array of PCI_DOE_FLAG_* flags +* +* Note: prots can't be allocated with struct size because the number of +* protocols is not known until after this structure is in use. However, the +* single discovery protocol is always required to query for the number of +* protocols. +*/ +struct pci_doe_mb { +struct pci_dev *pdev; +struct completion abort_c; +int irq; +struct pci_doe_protocol *prots; +int num_prots; +u16 cap_offset; + +wait_queue_head_t wq; +struct pci_doe_task *cur_task; +struct mutex task_lock; +struct delayed_work statemachine; +enum pci_doe_state state; +unsigned long timeout_jiffies; +unsigned int busy_retries; +unsigned long flags; +}; + +/** +* pci_doe_for_each_off - Iterate each DOE capability +* @pdev: struct pci_dev to iterate +* @off: u16 of config space offset of each mailbox capability found +*/ +#define pci_doe_for_each_off (pdev, off) \ + for (off = pci_find_next_ext_capability(pdev, off, \ + PCI_EXT_CAP_ID_DOE); \ + off > 0; \ + off = pci_find_next_ext_capability(pdev, off, \ + PCI_EXT_CAP_ID_DOE)) + +struct pci_doe_mb *pci_doe_create_mb (struct pci_dev *pdev,u16 cap_offset, +bool use_irq); +void pci_doe_destroy_mb (struct pci_doe_mb *doe_mb); +bool pci_doe_supports_prot (struct pci_doe_mb *doe_mb,u16 vid,u8 type); +int pci_doe_submit_task (struct pci_doe_mb *doe_mb,struct pci_doe_task *task); + +#endif include/uapi/linux/pci_regs.h +28
-1@@ -736,7 +736,8 @@#define PCI_EXT_CAP_ID_DVSEC 0x23/* Designated Vendor-Specific */ #define PCI_EXT_CAP_ID_DLF 0x25/* Data Link Feature */ #define PCI_EXT_CAP_ID_PL_16GT 0x26/* Physical Layer 16.0 GT/s */ -#define PCI_EXT_CAP_ID_MAX PCI_EXT_CAP_ID_PL_16GT +#define PCI_EXT_CAP_ID_DOE 0x2E/* Data Object Exchange */ +#define PCI_EXT_CAP_ID_MAX PCI_EXT_CAP_ID_DOE#define PCI_EXT_CAP_DSN_SIZEOF 12#define PCI_EXT_CAP_MCAST_ENDPOINT_SIZEOF 40@@ -1102,4 +1103,30 @@#define PCI_PL_16GT_LE_CTRL_USP_TX_PRESET_MASK 0x000000F0#define PCI_PL_16GT_LE_CTRL_USP_TX_PRESET_SHIFT 4 +/* Data Object Exchange */ +#define PCI_DOE_CAP 0x04/* DOE Capabilities Register */ +#define PCI_DOE_CAP_INT 0x00000001/* Interrupt Support */ +#define PCI_DOE_CAP_IRQ 0x00000ffe/* Interrupt Message Number */ +#define PCI_DOE_CTRL 0x08/* DOE Control Register */ +#define PCI_DOE_CTRL_ABORT 0x00000001/* DOE Abort */ +#define PCI_DOE_CTRL_INT_EN 0x00000002/* DOE Interrupt Enable */ +#define PCI_DOE_CTRL_GO 0x80000000/* DOE Go */ +#define PCI_DOE_STATUS 0x0c/* DOE Status Register */ +#define PCI_DOE_STATUS_BUSY 0x00000001/* DOE Busy */ +#define PCI_DOE_STATUS_INT_STATUS 0x00000002/* DOE Interrupt Status */ +#define PCI_DOE_STATUS_ERROR 0x00000004/* DOE Error */ +#define PCI_DOE_STATUS_DATA_OBJECT_READY 0x80000000/* Data Object Ready */ +#define PCI_DOE_WRITE 0x10/* DOE Write Data Mailbox Register */ +#define PCI_DOE_READ 0x14/* DOE Read Data Mailbox Register */ + +/* DOE Data Object - note not actually registers */ +#define PCI_DOE_DATA_OBJECT_HEADER_1_VID 0x0000ffff +#define PCI_DOE_DATA_OBJECT_HEADER_1_TYPE 0x00ff0000 +#define PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH 0x0003ffff + +#define PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX 0x000000ff +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID 0x0000ffff +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL 0x00ff0000 +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX 0xff000000 +#endif /* LINUX_PCI_REGS_H */ Signature · 1 line
2.35.1
Re: [PATCH V8 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
Quoted 6 lines · Bjorn Helgaas
Quoted 3 lines · On Thu, Apr 14, 2022 at 01:32:30PM -0700, [email protected] wrote:
From: Jonathan Cameron <[email protected]>
Introduced in a PCI v6.0[1], DOE provides a config space based mailbox
Introduced in PCIe r6.0, sec 6.30, DOE ...
Fixed. Sorry I missed the fact that PCI uses 'r'.
Quoted 7 lines
Quoted 7 lines
with standard protocol discovery. Each mailbox is accessed through a DOE Extended Capability.
Each DOE mailbox must support the DOE discovery protocol in addition to any number of additional protocols.
Quoted 7 lines
Quoted 6 lines
Define core PCI functionality to manage a single PCI DOE mailbox at a defined config space offset. Functionality includes creating, supported protocol queries, submit tasks to, and destroying the new state objects.
If interrupts are desired, interrupts vectors should be allocated prior to asking for irq's when creating a mailbox object.
IRQs
Fixed.
Quoted 5 lines
Quoted 2 lines
The link is only useful for PCI-SIG members, and only as long as the SIG maintains this structure. I think "PCIe r6.0" is sufficient.
Removed. thanks.
Quoted 7 lines
Quoted 5 lines
Cc Christoph Hellwig <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>Co-developed-by Ira Weiny <[email protected]>Signed-off-by Ira Weiny <[email protected]>Acked-by Bjorn Helgaas <[email protected]>
thanks!
Quoted 3 lines
Minor comments below.
[snip]
Quoted 24 lines
Quoted 24 lines
--- drivers/pci/Kconfig | 3 + drivers/pci/Makefile | 1 + drivers/pci/pci-doe.c | 607 ++++++++++++++++++++++++++++++++++ include/linux/pci-doe.h | 119 +++++++ include/uapi/linux/pci_regs.h | 29 +- 5 files changed, 758 insertions(+), 1 deletion(-) create mode 100644 drivers/pci/pci-doe.c create mode 100644 include/linux/pci-doe.hdrivers/pci/Kconfig +3
-0@@ -121,6 +121,9 @@ config XEN_PCIDEV_FRONTEND config PCI_ATS bool +config PCI_DOE + bool + config PCI_ECAM bool
Quoted 11 lines
drivers/pci/Makefile obj-$(CONFIG_PCI_ECAM) += ecam.o · line 34
Quoted 9 lines
drivers/pci/Makefile +1
-0@@ -31,6 +31,7 @@ obj-$(CONFIG_PCI_ECAM) += ecam.o obj-$(CONFIG_PCI_P2PDMA) += p2pdma.o obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o obj-$(CONFIG_VGA_ARB) += vgaarb.o +obj-$(CONFIG_PCI_DOE) += pci-doe.oIs there value in the "pci-" prefix?
Not really.
Quoted 3 lines
There are a few other files with
the prefix, but I can't remember why. Most things are of the form "doe.c".
Because of the mixed bag I was not sure which was preferred. I chose poorly. I'll remove the prefix.
Quoted 15 lines
drivers/pci/pci-doe.c line 4
Quoted 13 lines
drivers/pci/Makefile +0
-0# Endpoint library must be initialized before its users obj-$(CONFIG_PCI_ENDPOINT) += endpoint/drivers/pci/pci-doe.c new file +4
-0@@ -0,0 +1,607 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Data Object Exchange +* https://members.pcisig.com/wg/PCI-SIG/document/16609 I think "PCIe r6.0, sec 6.30" is more generally useful.
Done.
Quoted 18 lines
Quoted 18 lines
drivers/pci/pci-doe.c new file +17
-0+* Copyright (C) 2021 Huawei +* Jonathan Cameron <[email protected]> +* +* Copyright (C) 2022 Intel Corporation +* Ira Weiny <[email protected]> +*/ + +#include <linux/bitfield.h> +#include <linux/delay.h> +#include <linux/jiffies.h> +#include <linux/mutex.h> +#include <linux/pci.h> +#include <linux/pci-doe.h> +#include <linux/workqueue.h> + +#define PCI_DOE_PROTOCOL_DISCOVERY 0 +
Quoted 8 lines
drivers/pci/pci-doe.c line 26
Quoted 4 lines
drivers/pci/pci-doe.c new file +4
-0+#define PCI_DOE_BUSY_MAX_RETRIES 16 +#define PCI_DOE_POLL_INTERVAL (HZ / 128) + +/* Timeout of 1 second from 6.30.2 Operation, PCI Spec v6.0 */ Pedantic: the PCI specs use "r6.0", not "v6.0". Reverse for ACPI. Of course. Even worse, PCI uses "Revision" for the major, "Version" for the minor.
Thanks for letting me know.
Quoted 15 lines
drivers/pci/pci-doe.c line 38
Quoted 13 lines
drivers/pci/pci-doe.c new file +12
-0+#define PCI_DOE_TIMEOUT HZ + +static irqreturn_t pci_doe_irq_handler (int irq,void *data) +{ +struct pci_doe_mb *doe_mb = data; +struct pci_dev *pdev = doe_mb->pdev; +int offset = doe_mb->cap_offset; +u32 val; + +pci_read_config_dword (pdev, offset +PCI_DOE_STATUS , &val); + +/* Leave the error case to be handled outside IRQ */ s/irq/IRQ/ for similar comment and log message uses below.
Done.
Quoted 31 lines
Quoted 31 lines
drivers/pci/pci-doe.c new file +30
-0+if (FIELD_GET (PCI_DOE_STATUS_ERROR , val)) { +mod_delayed_work (system_wq, &doe_mb->statemachine,0 ); +return IRQ_HANDLED ; + } + +if (FIELD_GET (PCI_DOE_STATUS_INT_STATUS , val)) { +pci_write_config_dword (pdev, offset +PCI_DOE_STATUS , +PCI_DOE_STATUS_INT_STATUS ); +mod_delayed_work (system_wq, &doe_mb->statemachine,0 ); +return IRQ_HANDLED ; + } + +return IRQ_NONE ; +} + +/* +* Only called when safe to directly access the DOE from +* doe_statemachine_work(). Outside access is not protected. Users who +* perform such access are left with the pieces. +*/ +static void pci_doe_abort_start (struct pci_doe_mb *doe_mb) +{ +struct pci_dev *pdev = doe_mb->pdev; +int offset = doe_mb->cap_offset; +u32 val; + + val =PCI_DOE_CTRL_ABORT ; +if (doe_mb->irq >=0 ) + val |=PCI_DOE_CTRL_INT_EN ; +pci_write_config_dword (pdev, offset +PCI_DOE_CTRL , val);
Quoted 8 lines
drivers/pci/pci-doe.c line 74
Quoted 6 lines
drivers/pci/pci-doe.c new file +6
-0+ + doe_mb->timeout_jiffies = jiffies +HZ ; +schedule_delayed_work (&doe_mb->statemachine,HZ ); +} + +static int pci_doe_send_req (struct pci_doe_mb *doe_mb,struct pci_doe_task *task)Wrap to fit in 80 columns, like the rest of
drivers/pci/*
Done.
Quoted 60 lines
Quoted 46 lines
drivers/pci/pci-doe.c new file +45
-0+{ +struct pci_dev *pdev = doe_mb->pdev; +int offset = doe_mb->cap_offset; +u32 val; +int i; + +/* +* Check the DOE busy bit is not set. If it is set, this could indicate +* someone other than Linux (e.g. firmware) is using the mailbox. Note +* it is expected that firmware and OS will negotiate access rights via +* an, as yet to be defined method. +*/ +pci_read_config_dword (pdev, offset +PCI_DOE_STATUS , &val); +if (FIELD_GET (PCI_DOE_STATUS_BUSY , val)) +return -EBUSY ; + +if (FIELD_GET (PCI_DOE_STATUS_ERROR , val)) +return -EIO ; + +/* Write DOE Header */ + val =FIELD_PREP (PCI_DOE_DATA_OBJECT_HEADER_1_VID , task->prot.vid) | +FIELD_PREP (PCI_DOE_DATA_OBJECT_HEADER_1_TYPE , task->prot.type); +pci_write_config_dword (pdev, offset +PCI_DOE_WRITE , val); +/* Length is 2 DW of header + length of payload in DW */ +pci_write_config_dword (pdev, offset +PCI_DOE_WRITE , +FIELD_PREP (PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH , +2 + task->request_pl_sz / +sizeof (u32))); +for (i =0 ; i < task->request_pl_sz /sizeof (u32); i++) +pci_write_config_dword (pdev, offset +PCI_DOE_WRITE , + task->request_pl[i]); + + val =PCI_DOE_CTRL_GO ; +if (doe_mb->irq >=0 ) + val |=PCI_DOE_CTRL_INT_EN ; + +pci_write_config_dword (pdev, offset +PCI_DOE_CTRL , val); +/* Request is sent - now wait for poll or IRQ */ +return 0 ; +} + +static int pci_doe_recv_resp (struct pci_doe_mb *doe_mb,struct pci_doe_task *task) +{ +struct pci_dev *pdev = doe_mb->pdev; +int offset = doe_mb->cap_offset;drivers/pci/pci-doe.c line 129
Quoted 10 lines
drivers/pci/pci-doe.c new file +10
-0+size_t length; +u32 val; +int i; + +/* Read the first dword to get the protocol */ +pci_read_config_dword (pdev, offset +PCI_DOE_READ , &val); +if ((FIELD_GET (PCI_DOE_DATA_OBJECT_HEADER_1_VID , val) != task->prot.vid) || + (FIELD_GET (PCI_DOE_DATA_OBJECT_HEADER_1_TYPE , val) != task->prot.type)) { + pci_err(pdev, + "Expected [VID, Protocol] = [%#x, %#x], got [%#x, %#x]\n",Needs a "DOE" or similar hint for where to look when you see this error.
Quoted 3 lines
"%04x" is the typical way we print a PCI vendor ID. I guess a leading "0x" isn't a disaster, but I do think it should be 4 hex digits so it doesn't look like a length or something.
I'll match it up. Using '%04x' for vendor ID and '%02x' for type.
Quoted 3 lines
It looks like you anticipate multiple DOE capabilities. Maybe messages should include the capability offset to be specific?
Great idea, I've added 'DOE [%x]' as a prefix to all messages.
Quoted 2 lines
I see you print with %u in
pci_doe_create_mb(). I'm pretty sure "lspci -vv" prints them in hex, and it's probably useful to match.
Yes matching is good. lspci does print in hex and without the 0x.
Quoted 70 lines
Quoted 70 lines
drivers/pci/pci-doe.c new file +69
-0+ task->prot.vid, task->prot.type, +FIELD_GET (PCI_DOE_DATA_OBJECT_HEADER_1_VID , val), + FIELD_GET(PCI_DOE_DATA_OBJECT_HEADER_1_TYPE, val)); +return -EIO ; + } + +pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); +/* Read the second dword to get the length */ +pci_read_config_dword (pdev, offset +PCI_DOE_READ , &val); +pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); + + length =FIELD_GET (PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH , val); +if (length >SZ_1M || length <2 ) +return -EIO ; + +/* First 2 dwords have already been read */ + length -=2 ; +/* Read the rest of the response payload */ +for (i =0 ; i <min (length, task->response_pl_sz /sizeof (u32)); i++) { +pci_read_config_dword (pdev, offset +PCI_DOE_READ , + &task->response_pl[i]); +pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); + } + +/* Flush excess length */ +for (; i < length; i++) { +pci_read_config_dword (pdev, offset +PCI_DOE_READ , &val); +pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); + } +/* Final error check to pick up on any since Data Object Ready */ +pci_read_config_dword (pdev, offset +PCI_DOE_STATUS , &val); +if (FIELD_GET (PCI_DOE_STATUS_ERROR , val)) +return -EIO ; + +return min (length, task->response_pl_sz /sizeof (u32)) *sizeof (u32); +} + +static void signal_task_complete (struct pci_doe_task *task,int rv) +{ + task->rv = rv; + task->complete (task); +} + +static void retire_cur_task (struct pci_doe_mb *doe_mb) +{ +mutex_lock (&doe_mb->task_lock); + doe_mb->cur_task =NULL ; +mutex_unlock (&doe_mb->task_lock); +wake_up_interruptible (&doe_mb->wq); +} + +static void doe_statemachine_work (struct work_struct *work) +{ +struct delayed_work *w =to_delayed_work (work); + struct pci_doe_mb *doe_mb = container_of(w, struct pci_doe_mb, + statemachine); +struct pci_dev *pdev = doe_mb->pdev; +int offset = doe_mb->cap_offset; +struct pci_doe_task *task; +u32 val; +int rc; + +mutex_lock (&doe_mb->task_lock); + task = doe_mb->cur_task; +mutex_unlock (&doe_mb->task_lock); + +if (test_and_clear_bit (PCI_DOE_FLAG_ABORT , &doe_mb->flags)) { +/* +* Currently only used during init - care needed if
Quoted 8 lines
drivers/pci/pci-doe.c line 203
Quoted 5 lines
drivers/pci/pci-doe.c new file +5
-0+* pci_doe_abort() is generally exposed as it would impact +* queries in flight. +*/ +if (task) +pr_err ("Aborting with active task!\n" );This should be a
dev_err()and probably include "DOE" or some kind of hint about what this applies to.
I think you mean pci_err()?
I've updated all the pci_*() messages with 'DOE @ [offset]:' prefix.
Quoted 14 lines
drivers/pci/pci-doe.c line 214
Quoted 12 lines
drivers/pci/pci-doe.c new file +11
-0+ doe_mb->state =DOE_WAIT_ABORT ; +pci_doe_abort_start (doe_mb); +return ; + } + +switch (doe_mb->state) { +case DOE_IDLE : +if (task ==NULL ) +return ; + + rc =pci_doe_send_req (doe_mb, task);Add blank line before block comment.
done
Quoted 160 lines
Quoted 160 lines
drivers/pci/pci-doe.c new file +159
-0+/* +* The specification does not provide any guidance on how long +* some other entity could keep the DOE busy, so try for 1 +* second then fail. Busy handling is best effort only, because +* there is no way of avoiding racing against another user of +* the DOE. +*/ +if (rc == -EBUSY ) { + doe_mb->busy_retries++; +if (doe_mb->busy_retries ==PCI_DOE_BUSY_MAX_RETRIES ) { +/* Long enough, fail this request */ +pci_warn (pdev, +"DOE busy for too long (> 1 sec)\n" ); + doe_mb->busy_retries =0 ; + goto err_busy; + } +schedule_delayed_work (w,HZ /PCI_DOE_BUSY_MAX_RETRIES ); +return ; + } +if (rc) + goto err_abort; + doe_mb->busy_retries =0 ; + + doe_mb->state =DOE_WAIT_RESP ; + doe_mb->timeout_jiffies = jiffies +HZ ; +/* Now poll or wait for IRQ with timeout */ +if (doe_mb->irq >=0 ) +schedule_delayed_work (w,PCI_DOE_TIMEOUT ); +else +schedule_delayed_work (w,PCI_DOE_POLL_INTERVAL ); +return ; + +case DOE_WAIT_RESP : +/* Not possible to get here with NULL task */ +pci_read_config_dword (pdev, offset +PCI_DOE_STATUS , &val); +if (FIELD_GET (PCI_DOE_STATUS_ERROR , val)) { + rc = -EIO ; + goto err_abort; + } + +if (!FIELD_GET (PCI_DOE_STATUS_DATA_OBJECT_READY , val)) { +/* If not yet at timeout reschedule otherwise abort */ +if (time_after (jiffies, doe_mb->timeout_jiffies)) { + rc = -ETIMEDOUT ; + goto err_abort; + } +schedule_delayed_work (w,PCI_DOE_POLL_INTERVAL ); +return ; + } + + rc =pci_doe_recv_resp (doe_mb, task); +if (rc <0 ) + goto err_abort; + + doe_mb->state =DOE_IDLE ; + +retire_cur_task (doe_mb); +/* Set the return value to the length of received payload */ +signal_task_complete (task, rc); + +return ; + +case DOE_WAIT_ABORT : +case DOE_WAIT_ABORT_ON_ERR : +pci_read_config_dword (pdev, offset +PCI_DOE_STATUS , &val); + +if (!FIELD_GET (PCI_DOE_STATUS_ERROR , val) && + !FIELD_GET (PCI_DOE_STATUS_BUSY , val)) { +/* Back to normal state - carry on */ +retire_cur_task (doe_mb); + +/* +* For deliberately triggered abort, someone is +* waiting. +*/ +if (doe_mb->state ==DOE_WAIT_ABORT ) { +if (task) +signal_task_complete (task, -EFAULT ); +complete (&doe_mb->abort_c); + } + + doe_mb->state =DOE_IDLE ; +return ; + } +if (time_after (jiffies, doe_mb->timeout_jiffies)) { +/* Task has timed out and is dead - abort */ +pci_err (pdev,"DOE ABORT timed out\n" ); +set_bit (PCI_DOE_FLAG_DEAD , &doe_mb->flags); +retire_cur_task (doe_mb); + +if (doe_mb->state ==DOE_WAIT_ABORT ) { +if (task) +signal_task_complete (task, -EFAULT ); +complete (&doe_mb->abort_c); + } + } +return ; + } + +err_abort: + doe_mb->state =DOE_WAIT_ABORT_ON_ERR ; +pci_doe_abort_start (doe_mb); +err_busy: +signal_task_complete (task, rc); +if (doe_mb->state ==DOE_IDLE ) +retire_cur_task (doe_mb); +} + +static void pci_doe_task_complete (struct pci_doe_task *task) +{ +complete (task->private); +} + +static int pci_doe_discovery (struct pci_doe_mb *doe_mb,u8 *index,u16 *vid, +u8 *protocol) +{ +u32 request_pl =FIELD_PREP (PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX , + *index); +u32 response_pl; +DECLARE_COMPLETION_ONSTACK (c); +struct pci_doe_task task = { + .prot.vid =PCI_VENDOR_ID_PCI_SIG , + .prot.type =PCI_DOE_PROTOCOL_DISCOVERY , + .request_pl = &request_pl, + .request_pl_sz =sizeof (request_pl), + .response_pl = &response_pl, + .response_pl_sz =sizeof (response_pl), + .complete = pci_doe_task_complete, + .private = &c, + }; +int ret; + + ret =pci_doe_submit_task (doe_mb, &task); +if (ret <0 ) +return ret; + +wait_for_completion (&c); + +if (task.rv !=sizeof (response_pl)) +return -EIO ; + + *vid =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID , response_pl); + *protocol =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL , + response_pl); + *index =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX , + response_pl); + +return 0 ; +} + +static int pci_doe_cache_protocols (struct pci_doe_mb *doe_mb) +{ +u8 index =0 ; +int num_prots; +int rc; + +/* Discovery protocol must always be supported and must report itself */ + num_prots =1 ; +
Quoted 8 lines
drivers/pci/pci-doe.c line 379
Quoted 6 lines
drivers/pci/pci-doe.c new file +6
-0+ doe_mb->prots =kcalloc (num_prots,sizeof (*doe_mb->prots),GFP_KERNEL ); +if (!doe_mb->prots) +return -ENOMEM ; + +/* +* NOTE: doe_mb_prots is freed by pci_doe_free_mb automatically on "
pci_doe_free_mb()" to match other function name references.
oops... done.
Quoted 106 lines
Quoted 106 lines
drivers/pci/pci-doe.c new file +105
-0+* error if pci_doe_cache_protocols() fails past this point. +*/ +do { +struct pci_doe_protocol *prot; + + prot = &doe_mb->prots[num_prots -1 ]; + rc =pci_doe_discovery (doe_mb, &index, &prot->vid, &prot->type); +if (rc) +return rc; + +if (index) { +struct pci_doe_protocol *prot_new; + + num_prots++; + prot_new =krealloc (doe_mb->prots, +sizeof (*doe_mb->prots) * num_prots, +GFP_KERNEL ); +if (!prot_new) +return -ENOMEM ; + + doe_mb->prots = prot_new; + } + }while (index); + + doe_mb->num_prots = num_prots; +return 0 ; +} + +static int pci_doe_abort (struct pci_doe_mb *doe_mb) +{ +reinit_completion (&doe_mb->abort_c); +set_bit (PCI_DOE_FLAG_ABORT , &doe_mb->flags); +schedule_delayed_work (&doe_mb->statemachine,0 ); +wait_for_completion (&doe_mb->abort_c); + +if (test_bit (PCI_DOE_FLAG_DEAD , &doe_mb->flags)) +return -EIO ; + +return 0 ; +} + +static int pci_doe_request_irq (struct pci_doe_mb *doe_mb) +{ +struct pci_dev *pdev = doe_mb->pdev; +int offset = doe_mb->cap_offset; +int doe_irq, rc; +u32 val; + +pci_read_config_dword (pdev, offset +PCI_DOE_CAP , &val); + +if (!FIELD_GET (PCI_DOE_CAP_INT , val)) +return -EOPNOTSUPP ; + + doe_irq =FIELD_GET (PCI_DOE_CAP_IRQ , val); + rc =pci_request_irq (pdev, doe_irq, pci_doe_irq_handler, +NULL , doe_mb, +"DOE[%d:%s]" , doe_irq,pci_name (pdev)); +if (rc) +return rc; + + doe_mb->irq = doe_irq; +pci_write_config_dword (pdev, offset +PCI_DOE_CTRL , +PCI_DOE_CTRL_INT_EN ); +return 0 ; +} + +static void pci_doe_free_mb (struct pci_doe_mb *doe_mb) +{ +if (doe_mb->irq >=0 ) +pci_free_irq (doe_mb->pdev, doe_mb->irq, doe_mb); +kfree (doe_mb->prots); +kfree (doe_mb); +} + +/** +* pci_doe_create_mb() - Create a DOE mailbox object +* +* @pdev: PCI device to create the DOE mailbox for +* @cap_offset: Offset of the DOE mailbox +* @use_irq: Should the state machine use an irq +* +* Create a single mailbox object to manage the mailbox protocol at the +* cap_offset specified. +* +* Caller should allocate PCI irq vectors before setting use_irq. +* +* RETURNS: created mailbox object on success +* ERR_PTR(-errno) on failure +*/ +struct pci_doe_mb *pci_doe_create_mb (struct pci_dev *pdev,u16 cap_offset, +bool use_irq) +{ +struct pci_doe_mb *doe_mb; +int rc; + + doe_mb =kzalloc (sizeof (*doe_mb),GFP_KERNEL ); +if (!doe_mb) +return ERR_PTR (-ENOMEM ); + + doe_mb->pdev = pdev; +init_completion (&doe_mb->abort_c); + doe_mb->irq =-1 ; + doe_mb->cap_offset = cap_offset; + +init_waitqueue_head (&doe_mb->wq);
Quoted 8 lines
drivers/pci/pci-doe.c line 492
Quoted 8 lines
drivers/pci/pci-doe.c new file +8
-0+mutex_init (&doe_mb->task_lock); +INIT_DELAYED_WORK (&doe_mb->statemachine, doe_statemachine_work); + doe_mb->state =DOE_IDLE ; + +if (use_irq) { + rc =pci_doe_request_irq (doe_mb); +if (rc) + pci_err(pdev, "DOE request irq failed for mailbox @ %u : %d\n",
This and below are changed to print:
"DOE [%x] ..." rather than print the offset at the end.
This makes these consistent with the other errors per your feedback.
It also made these messages more concise. :-D
Quoted 23 lines
Quoted 23 lines
drivers/pci/pci-doe.c new file +23
-0+ cap_offset, rc); + } + +/* Reset the mailbox by issuing an abort */ + rc =pci_doe_abort (doe_mb); +if (rc) { +pci_err (pdev,"DOE failed to reset the mailbox @ %u : %d\n" , + cap_offset, rc); +pci_doe_free_mb (doe_mb); +return ERR_PTR (rc); + } + + rc =pci_doe_cache_protocols (doe_mb); +if (rc) { +pci_err (pdev,"DOE failed to cache protocols for mailbox @ %u : %d\n" , + cap_offset, rc); +pci_doe_free_mb (doe_mb); +return ERR_PTR (rc); + } + +return doe_mb; +} +EXPORT_SYMBOL_GPL (pci_doe_create_mb);
Quoted 8 lines
drivers/pci/pci-doe.c line 522
Quoted 7 lines
drivers/pci/pci-doe.c new file +7
-0+ +/** +* pci_doe_supports_prot() - Return if the DOE instance supports the given +* protocol +* @doe_mb: DOE mailbox capability to query +* @vid: Protocol Vendor ID +* @type: protocol type Protocol
Done.
Quoted 4 lines
drivers/pci/pci-doe.c line 523
Quoted 2 lines
drivers/pci/pci-doe.c new file +2
-0+* +* RETURNS: True if the DOE device supports the protocol specified I think you typically use "DOE mailbox", not "DOE device".
Yep. That was left over from the Auxiliary device stuff. Fixed.
Quoted 88 lines
Quoted 88 lines
drivers/pci/pci-doe.c new file +83
-0+*/ +bool pci_doe_supports_prot (struct pci_doe_mb *doe_mb,u16 vid,u8 type) +{ +int i; + +/* The discovery protocol must always be supported */ +if (vid ==PCI_VENDOR_ID_PCI_SIG && type ==PCI_DOE_PROTOCOL_DISCOVERY ) +return true; + +for (i =0 ; i < doe_mb->num_prots; i++) +if ((doe_mb->prots[i].vid == vid) && + (doe_mb->prots[i].type == type)) +return true; + +return false; +} +EXPORT_SYMBOL_GPL (pci_doe_supports_prot); + +/** +* pci_doe_submit_task() - Submit a task to be processed by the state machine +* +* @doe_mb: DOE mailbox capability to submit to +* @task: task to be queued +* +* Submit a DOE task (request/response) to the DOE mailbox to be processed. +* Returns upon queueing the task object. If the queue is full this function +* will sleep until there is room in the queue. +* +* task->complete will be called when the state machine is done processing this +* task. +* +* Excess data will be discarded. +* +* RETURNS: 0 when task has been successful queued, -ERRNO on error +*/ +int pci_doe_submit_task (struct pci_doe_mb *doe_mb,struct pci_doe_task *task) +{ +if (!pci_doe_supports_prot (doe_mb, task->prot.vid, task->prot.type)) +return -EINVAL ; + +/* DOE requests must be a whole number of DW */ +if (task->request_pl_sz %sizeof (u32)) +return -EINVAL ; + +again: +mutex_lock (&doe_mb->task_lock); +if (doe_mb->cur_task) { +mutex_unlock (&doe_mb->task_lock); +wait_event_interruptible (doe_mb->wq, doe_mb->cur_task ==NULL ); + goto again; + } + +if (test_bit (PCI_DOE_FLAG_DEAD , &doe_mb->flags)) { +mutex_unlock (&doe_mb->task_lock); +return -EIO ; + } + doe_mb->cur_task = task; +mutex_unlock (&doe_mb->task_lock); +schedule_delayed_work (&doe_mb->statemachine,0 ); + +return 0 ; +} +EXPORT_SYMBOL_GPL (pci_doe_submit_task); + +/** +* pci_doe_destroy_mb() - Destroy a DOE mailbox object created with +* pci_doe_create_mb() +* +* @doe_mb: DOE mailbox capability structure to destroy +* +* The mailbox becomes invalid and should not be used after this call. +*/ +void pci_doe_destroy_mb (struct pci_doe_mb *doe_mb) +{ +/* abort any work in progress */ +pci_doe_abort (doe_mb); + +/* halt the state machine */ +cancel_delayed_work_sync (&doe_mb->statemachine); + +pci_doe_free_mb (doe_mb); +} +EXPORT_SYMBOL_GPL (pci_doe_destroy_mb);include/linux/pci-doe.h new file +0
-1--- /dev/null
Quoted 8 lines
include/linux/pci-doe.h line 4
Quoted 6 lines
+++
b/include/linux/pci-doe.hinclude/linux/pci-doe.h new file +4
-0@@ -0,0 +1,119 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Data Object Exchange +* https://members.pcisig.com/wg/PCI-SIG/document/16609 Ditto.
Done.
Thanks for the in depth review,
Ira
Quoted 164 lines
Quoted 164 lines
include/linux/pci-doe.h new file +115
-0+* +* Copyright (C) 2021 Huawei +* Jonathan Cameron <[email protected]> +* +* Copyright (C) 2022 Intel Corporation +* Ira Weiny <[email protected]> +*/ + +#ifndef LINUX_PCI_DOE_H +#define LINUX_PCI_DOE_H + +#include <linux/completion.h> + +enum pci_doe_state { +DOE_IDLE , +DOE_WAIT_RESP , +DOE_WAIT_ABORT , +DOE_WAIT_ABORT_ON_ERR , +}; + +#define PCI_DOE_FLAG_ABORT 0 +#define PCI_DOE_FLAG_DEAD 1 + +struct pci_doe_protocol { +u16 vid; +u8 type; +}; + +/** +* struct pci_doe_task - represents a single query/response +* +* @prot: DOE Protocol +* @request_pl: The request payload +* @request_pl_sz: Size of the request payload +* @response_pl: The response payload +* @response_pl_sz: Size of the response payload +* @rv: Return value. Length of received response or error +* @complete: Called when task is complete +* @private: Private data for the consumer +*/ +struct pci_doe_task { +struct pci_doe_protocol prot; +u32 *request_pl; +size_t request_pl_sz; +u32 *response_pl; +size_t response_pl_sz; +int rv; +void (*complete)(struct pci_doe_task *task); +void *private; +}; + +/** +* struct pci_doe_mb - State for a single DOE mailbox +* +* This state is used to manage a single DOE mailbox capability. All fields +* should be considered opaque to the consumers and the structure passed into +* the helpers below after being created by devm_pci_doe_create() +* +* @pdev: PCI device this belongs to mailbox belongs to +* @abort_c: Completion used for initial abort handling +* @irq: Interrupt used for signaling DOE ready or abort +* @prots: Array of protocols supported on this DOE +* @num_prots: Size of prots array +* @cap_offset: Capability offset +* @wq: Wait queue to wait on if a query is in progress +* @cur_task: Current task the state machine is working on +* @task_lock: Protect cur_task +* @statemachine: Work item for the DOE state machine +* @state: Current state of this DOE +* @timeout_jiffies: 1 second after GO set +* @busy_retries: Count of retry attempts +* @flags: Bit array of PCI_DOE_FLAG_* flags +* +* Note: prots can't be allocated with struct size because the number of +* protocols is not known until after this structure is in use. However, the +* single discovery protocol is always required to query for the number of +* protocols. +*/ +struct pci_doe_mb { +struct pci_dev *pdev; +struct completion abort_c; +int irq; +struct pci_doe_protocol *prots; +int num_prots; +u16 cap_offset; + +wait_queue_head_t wq; +struct pci_doe_task *cur_task; +struct mutex task_lock; +struct delayed_work statemachine; +enum pci_doe_state state; +unsigned long timeout_jiffies; +unsigned int busy_retries; +unsigned long flags; +}; + +/** +* pci_doe_for_each_off - Iterate each DOE capability +* @pdev: struct pci_dev to iterate +* @off: u16 of config space offset of each mailbox capability found +*/ +#define pci_doe_for_each_off (pdev, off) \ + for (off = pci_find_next_ext_capability(pdev, off, \ + PCI_EXT_CAP_ID_DOE); \ + off > 0; \ + off = pci_find_next_ext_capability(pdev, off, \ + PCI_EXT_CAP_ID_DOE)) + +struct pci_doe_mb *pci_doe_create_mb (struct pci_dev *pdev,u16 cap_offset, +bool use_irq); +void pci_doe_destroy_mb (struct pci_doe_mb *doe_mb); +bool pci_doe_supports_prot (struct pci_doe_mb *doe_mb,u16 vid,u8 type); +int pci_doe_submit_task (struct pci_doe_mb *doe_mb,struct pci_doe_task *task); + +#endif include/uapi/linux/pci_regs.h +28
-1@@ -736,7 +736,8 @@#define PCI_EXT_CAP_ID_DVSEC 0x23/* Designated Vendor-Specific */ #define PCI_EXT_CAP_ID_DLF 0x25/* Data Link Feature */ #define PCI_EXT_CAP_ID_PL_16GT 0x26/* Physical Layer 16.0 GT/s */ -#define PCI_EXT_CAP_ID_MAX PCI_EXT_CAP_ID_PL_16GT +#define PCI_EXT_CAP_ID_DOE 0x2E/* Data Object Exchange */ +#define PCI_EXT_CAP_ID_MAX PCI_EXT_CAP_ID_DOE#define PCI_EXT_CAP_DSN_SIZEOF 12#define PCI_EXT_CAP_MCAST_ENDPOINT_SIZEOF 40@@ -1102,4 +1103,30 @@#define PCI_PL_16GT_LE_CTRL_USP_TX_PRESET_MASK 0x000000F0#define PCI_PL_16GT_LE_CTRL_USP_TX_PRESET_SHIFT 4 +/* Data Object Exchange */ +#define PCI_DOE_CAP 0x04/* DOE Capabilities Register */ +#define PCI_DOE_CAP_INT 0x00000001/* Interrupt Support */ +#define PCI_DOE_CAP_IRQ 0x00000ffe/* Interrupt Message Number */ +#define PCI_DOE_CTRL 0x08/* DOE Control Register */ +#define PCI_DOE_CTRL_ABORT 0x00000001/* DOE Abort */ +#define PCI_DOE_CTRL_INT_EN 0x00000002/* DOE Interrupt Enable */ +#define PCI_DOE_CTRL_GO 0x80000000/* DOE Go */ +#define PCI_DOE_STATUS 0x0c/* DOE Status Register */ +#define PCI_DOE_STATUS_BUSY 0x00000001/* DOE Busy */ +#define PCI_DOE_STATUS_INT_STATUS 0x00000002/* DOE Interrupt Status */ +#define PCI_DOE_STATUS_ERROR 0x00000004/* DOE Error */ +#define PCI_DOE_STATUS_DATA_OBJECT_READY 0x80000000/* Data Object Ready */ +#define PCI_DOE_WRITE 0x10/* DOE Write Data Mailbox Register */ +#define PCI_DOE_READ 0x14/* DOE Read Data Mailbox Register */ + +/* DOE Data Object - note not actually registers */ +#define PCI_DOE_DATA_OBJECT_HEADER_1_VID 0x0000ffff +#define PCI_DOE_DATA_OBJECT_HEADER_1_TYPE 0x00ff0000 +#define PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH 0x0003ffff + +#define PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX 0x000000ff +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID 0x0000ffff +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL 0x00ff0000 +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX 0xff000000 +#endif /* LINUX_PCI_REGS_H */ Signature · 1 line
2.35.1
Re: [PATCH V8 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
In reply to [email protected]Quoted 1 line · On Thu, Apr 14, 2022 at 01:32:30PM -0700, [email protected] wrote:
+static int
pci_doe_recv_resp(struct pci_doe_mb *doe_mb, struct pci_doe_task *task)
[...]
drivers/pci/pci-doe.c line 144
Quoted 9 lines
drivers/pci/pci-doe.c new file +9
-0+pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); +/* Read the second dword to get the length */ +pci_read_config_dword (pdev, offset +PCI_DOE_READ , &val); +pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); + + length =FIELD_GET (PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH , val); +if (length >SZ_1M || length <2 ) +return -EIO ; +
This API requires consumers to know the size of the response in advance. That's not always the case, as exemplified by SPDM VERSION responses. Jonathan uses a kludge in his SPDM patch which submits a first request with a fixed size of 2 versions and, if that turns out to be too small, submits a second request.
It would be nice if consumers are allowed to set request_pl to NULL. Then a payload can be allocated here in pci_doe_recv_resp() with the size retrieved above.
A flag may be necessary to indicate that the response is heap-allocated and needs to be freed upon destruction of the pci_doe_task.
drivers/pci/pci-doe.c line 152
Quoted 8 lines
drivers/pci/pci-doe.c new file +8
-0+/* First 2 dwords have already been read */ + length -=2 ; +/* Read the rest of the response payload */ +for (i =0 ; i <min (length, task->response_pl_sz /sizeof (u32)); i++) { +pci_read_config_dword (pdev, offset +PCI_DOE_READ , + &task->response_pl[i]); +pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); + }
You need to check the Data Object Ready bit. The device may clear the bit prematurely (e.g. as a result of a concurrent FLR or Conventional Reset). You'll continue reading zero dwords from the mailbox and pretend success to the caller even though the response is truncated.
If you're concerned about performance when checking the bit on every loop iteration, checking it only on the last but one iteration should be sufficient to detect truncation.
drivers/pci/pci-doe.c line 360
Quoted 5 lines
drivers/pci/pci-doe.c new file +5
-0+ *vid =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID , response_pl); + *protocol =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL , + response_pl); + *index =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX , + response_pl);
The fact that you need line breaks here is an indication that the macros are too long.
include/uapi/linux/pci_regs.h line 1130
Quoted 9 lines
include/uapi/linux/pci_regs.h +9
-0+/* DOE Data Object - note not actually registers */ +#define PCI_DOE_DATA_OBJECT_HEADER_1_VID 0x0000ffff +#define PCI_DOE_DATA_OBJECT_HEADER_1_TYPE 0x00ff0000 +#define PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH 0x0003ffff + +#define PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX 0x000000ff +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID 0x0000ffff +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL 0x00ff0000 +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX 0xff000000
I'd get rid of "DATA_OBJECT_" everywhere, it's redundant with the "Data Object" in "DOE".
Quoted 1 line
+#define
PCI_DOE_STATUS_INT_STATUS0x00000002/* DOE Interrupt Status */
Another redundancy, I would get rid of the second "_STATUS".
Quoted 1 line
+#define
PCI_DOE_STATUS_DATA_OBJECT_READY0x80000000/* Data Object Ready */
I would shorten to PCI_DOE_STATUS_READY.
Quoted 6 lines
Simplify submitting work to the mailbox
Replacepci_doe_exchange_sync()withpci_doe_submit_task()Consumers of the mailbox are now responsible for setting up callbacks within a task object and submitting them to the mailbox to be processed.
I honestly think that's a mistake. All consumers both in the CDAT as well as in the SPDM series just want to wait for completion of the task. They have no need for an arbitrary callback and shouldn't be burdended with providing one. It just unnecessarily complicates the API.
So only providing pci_doe_exchange_sync() and doing away with pci_doe_submit_task() would seem like a more appropriate approach.
Quoted 6 lines
include/linux/pci-doe.h new file +6
-0+/** +* pci_doe_for_each_off - Iterate each DOE capability +* @pdev: struct pci_dev to iterate +* @off: u16 of config space offset of each mailbox capability found +*/ +#define pci_doe_for_each_off (pdev, off) \
include/linux/pci-doe.h line 116
Quoted 10 lines
include/linux/pci-doe.h new file +10
-0+for (off =pci_find_next_ext_capability (pdev, off, \ +PCI_EXT_CAP_ID_DOE ); \ + off >0 ; \ + off =pci_find_next_ext_capability (pdev, off, \ +PCI_EXT_CAP_ID_DOE )) + +struct pci_doe_mb *pci_doe_create_mb(struct pci_dev *pdev, u16 cap_offset, +bool use_irq); +void pci_doe_destroy_mb (struct pci_doe_mb *doe_mb); +bool pci_doe_supports_prot (struct pci_doe_mb *doe_mb,u16 vid,u8 type);
Drivers should not be concerned with the intricacies of DOE capabilities and mailboxes.
Moreover, the above API doesn't allow different drivers to access the same DOE mailbox concurrently, e.g. if that mailbox supports multiple protocols. There's no locking to serialize access to the mailbox by the drivers.
This should be moved to the PCI core instead: In pci_init_capabilities(), add a new call pci_doe_init() which enumerates all DOE capabilities. Add a list_head to struct pci_dev and add each DOE instance found to that list. Destroy the list elements in pci_destroy_dev(). No locking needed for the list_head, you only ever modify the list on device enumeration and destruction.
Then provide a pci_doe_find_mailbox() library function which drivers call to retrieve the pci_doe_mb for a given pci_dev/vid/type tuple. That avoids the need to traverse the list time and again.
Quoted 2 lines
+/**
+ * structpci_doe_mb- State for a single DOE mailbox
We generally use the same terms as the spec to make it easier for readers to connect the language in the spec to the implementation.
The spec uniformly refers to "DOE instance". I guess "mailbox" is slightly more concise, so keep that, but please at least mention the term "instance" in the struct's kernel-doc.
This implementation uses the term "task" for one request/response. That term is not mentioned in the spec at all. The spec refers to "exchange" and "transfer" on several occasions, so I would have chosen either one of those instead of the somewhat unfortunate "task".
Quoted 3 lines
+ * This state is used to manage a single DOE mailbox capability. All fields
+ * should be considered opaque to the consumers and the structure passed into
+ * the helpers below after being created bydevm_pci_doe_create()
If the struct is considered opaque, why is it exposed in a public header file? Just use a forward declaration in the header so that consumers can pass around pointers to the struct, and hide the declaration proper in doe.c.
Quoted 1 line
+ * @pdev: PCI device this belongs to mailbox belongs to
^^^^^^^^^^
Typo.
Quoted 2 lines
+ * @prots: Array of protocols supported on this DOE
+ * @num_prots: Size of prots array
Use @prots instead of prots everywhere in the kernel-doc.
drivers/pci/pci-doe.c line 381
Quoted 4 lines
drivers/pci/pci-doe.c new file +4
-0+/* +* NOTE: doe_mb_prots is freed by pci_doe_free_mb automatically on +* error if pci_doe_cache_protocols() fails past this point. +*/
s/doe_mb_prots/doe_mb->prots/
s/pci_doe_free_mb/pci_doe_free_mb()/
drivers/pci/pci-doe.c line 567
Quoted 3 lines
drivers/pci/pci-doe.c new file +3
-0+/* DOE requests must be a whole number of DW */ +if (task->request_pl_sz %sizeof (u32)) +return -EINVAL ;
It would be nice if this restriction could be lifted. SPDM uses requests which are not padded to dword-length. It can run over other transports which may not impose such restrictions. The SPDM layer should not need to worry about quirks of the transport layer.
Quoted 14 lines
drivers/pci/pci-doe.c new file +14
-0+static irqreturn_t pci_doe_irq_handler (int irq,void *data) +{ +struct pci_doe_mb *doe_mb = data; +struct pci_dev *pdev = doe_mb->pdev; +int offset = doe_mb->cap_offset; +u32 val; + +pci_read_config_dword (pdev, offset +PCI_DOE_STATUS , &val); + +/* Leave the error case to be handled outside IRQ */ +if (FIELD_GET (PCI_DOE_STATUS_ERROR , val)) { +mod_delayed_work (system_wq, &doe_mb->statemachine,0 ); +return IRQ_HANDLED ; + }
drivers/pci/pci-doe.c line 52
Quoted 10 lines
drivers/pci/pci-doe.c new file +10
-0+ +if (FIELD_GET (PCI_DOE_STATUS_INT_STATUS , val)) { +pci_write_config_dword (pdev, offset +PCI_DOE_STATUS , +PCI_DOE_STATUS_INT_STATUS ); +mod_delayed_work (system_wq, &doe_mb->statemachine,0 ); +return IRQ_HANDLED ; + } + +return IRQ_NONE ; +}
PCIe 6.0, table 7-316 says that an interrupt is also raised when "the DOE Busy bit has been Cleared", yet such an interrupt is not handled here. It is incorrectly treated as a spurious interrupt by returning IRQ_NONE. The right thing to do is probably to wake the state machine in case it's polling for the Busy flag to clear.
include/linux/pci-doe.h line 26
Quoted 9 lines
include/linux/pci-doe.h new file +9
-0+enum pci_doe_state { +DOE_IDLE , +DOE_WAIT_RESP , +DOE_WAIT_ABORT , +DOE_WAIT_ABORT_ON_ERR , +}; + +#define PCI_DOE_FLAG_ABORT 0 +#define PCI_DOE_FLAG_DEAD 1
That's all internal and should live in doe.c, not the header file.
Thanks,
Lukas
Re: [PATCH V8 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
Quoted 19 lines · On Mon, 30 May 2022 21:06:57 +0200 Lukas Wunner <[email protected]> wrote:
Quoted 1 line · On Thu, Apr 14, 2022 at 01:32:30PM -0700, [email protected] wrote:
+static int
pci_doe_recv_resp(struct pci_doe_mb *doe_mb, struct pci_doe_task *task)[...]
drivers/pci/pci-doe.c line 144
Quoted 9 lines
drivers/pci/pci-doe.c new file +9
-0+pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); +/* Read the second dword to get the length */ +pci_read_config_dword (pdev, offset +PCI_DOE_READ , &val); +pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); + + length =FIELD_GET (PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH , val); +if (length >SZ_1M || length <2 ) +return -EIO ; +This API requires consumers to know the size of the response in advance. That's not always the case, as exemplified by SPDM VERSION responses. Jonathan uses a kludge in his SPDM patch which submits a first request with a fixed size of 2 versions and, if that turns out to be too small, submits a second request.
Quoted 6 lines
It would be nice if consumers are allowed to set
request_plto NULL. Then a payload can be allocated here inpci_doe_recv_resp()with the size retrieved above.A flag may be necessary to indicate that the response is heap-allocated and needs to be freed upon destruction of the
pci_doe_task.
If possible I'd make that the callers problem. It should know it provided NULL and expected a response.
I'd suggest making this a 'future' feature just to keep this initial version simple. Won't be hard to add later.
Quoted 16 lines
drivers/pci/pci-doe.c line 152
Quoted 10 lines
drivers/pci/pci-doe.c new file +8
-0+/* First 2 dwords have already been read */ + length -=2 ; +/* Read the rest of the response payload */ +for (i =0 ; i <min (length, task->response_pl_sz /sizeof (u32)); i++) { +pci_read_config_dword (pdev, offset +PCI_DOE_READ , + &task->response_pl[i]); +pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); + }You need to check the Data Object Ready bit. The device may clear the bit prematurely (e.g. as a result of a concurrent FLR or Conventional Reset). You'll continue reading zero dwords from the mailbox and pretend success to the caller even though the response is truncated.
Quoted 3 lines
If you're concerned about performance when checking the bit on every loop iteration, checking it only on the last but one iteration should be sufficient to detect truncation.
Good catch - I hate corner cases. Thankfully this one is trivial to check for.
Quoted 12 lines
drivers/pci/pci-doe.c line 360
Quoted 7 lines
drivers/pci/pci-doe.c new file +5
-0+ *vid =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID , response_pl); + *protocol =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL , + response_pl); + *index =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX , + response_pl);The fact that you need line breaks here is an indication that the macros are too long.
Quoted 12 lines
include/uapi/linux/pci_regs.h line 1130
Quoted 9 lines
include/uapi/linux/pci_regs.h +9
-0+/* DOE Data Object - note not actually registers */ +#define PCI_DOE_DATA_OBJECT_HEADER_1_VID 0x0000ffff +#define PCI_DOE_DATA_OBJECT_HEADER_1_TYPE 0x00ff0000 +#define PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH 0x0003ffff + +#define PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX 0x000000ff +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID 0x0000ffff +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL 0x00ff0000 +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX 0xff000000I'd get rid of "
DATA_OBJECT_" everywhere, it's redundant with the "Data Object" in "DOE".
We need something to make it clear these aren't DVSEC headers for example, but definitely could be shorter.
PCI_DOE_OBJ_...
perhaps?
Quoted 5 lines
Quoted 3 lines
+#define
PCI_DOE_STATUS_INT_STATUS0x00000002/* DOE Interrupt Status */Another redundancy, I would get rid of the second "
_STATUS".
Hmm. I'll leave this one to Ira's discretion but I'm not keen on cropping too much of naming given loss of alignment with the spec.
Quoted 5 lines
Quoted 3 lines
+#define
PCI_DOE_STATUS_DATA_OBJECT_READY0x80000000/* Data Object Ready */I would shorten to
PCI_DOE_STATUS_READY.
Seems reasonable though always some burden in moving away from full spec names.
Quoted 9 lines
Quoted 8 lines
Simplify submitting work to the mailbox
Replacepci_doe_exchange_sync()withpci_doe_submit_task()Consumers of the mailbox are now responsible for setting up callbacks within a task object and submitting them to the mailbox to be processed.
Quoted 8 lines
I honestly think that's a mistake. All consumers both in the CDAT as well as in the SPDM series just want to wait for completion of the task. They have no need for an arbitrary callback and shouldn't be burdended with providing one. It just unnecessarily complicates the API.
So only providing
pci_doe_exchange_sync()and doing away withpci_doe_submit_task()would seem like a more appropriate approach.
We've gone around the houses with this. At this stage I don't care strongly either way and it's all in kernel code so we can refine it later once we have lots of examples.
Quoted 34 lines
Quoted 8 lines
include/linux/pci-doe.h new file +6
-0+/** +* pci_doe_for_each_off - Iterate each DOE capability +* @pdev: struct pci_dev to iterate +* @off: u16 of config space offset of each mailbox capability found +*/ +#define pci_doe_for_each_off (pdev, off) \include/linux/pci-doe.h line 116
Quoted 10 lines
include/linux/pci-doe.h new file +10
-0+for (off =pci_find_next_ext_capability (pdev, off, \ +PCI_EXT_CAP_ID_DOE ); \ + off >0 ; \ + off =pci_find_next_ext_capability (pdev, off, \ +PCI_EXT_CAP_ID_DOE )) + +struct pci_doe_mb *pci_doe_create_mb(struct pci_dev *pdev, u16 cap_offset, +bool use_irq); +void pci_doe_destroy_mb (struct pci_doe_mb *doe_mb); +bool pci_doe_supports_prot (struct pci_doe_mb *doe_mb,u16 vid,u8 type);Drivers should not be concerned with the intricacies of DOE capabilities and mailboxes.
Moreover, the above API doesn't allow different drivers to access the same DOE mailbox concurrently, e.g. if that mailbox supports multiple protocols. There's no locking to serialize access to the mailbox by the drivers.
This should be moved to the PCI core instead: In
pci_init_capabilities(), add a new callpci_doe_init()which enumerates all DOE capabilities. Add alist_headto structpci_devand add each DOE instance found to that list. Destroy the list elements inpci_destroy_dev(). No locking needed for thelist_head, you only ever modify the list on device enumeration and destruction.
Quoted 3 lines
Then provide a
pci_doe_find_mailbox()library function which drivers call to retrieve thepci_doe_mbfor a given pci_dev/vid/type tuple. That avoids the need to traverse the list time and again.
I've lost track a bit as this thread has been running a long time, but I think we are moving back to something that looks more like this (and the much earlier versions of the set which did more or less what you describe - though they had their own issues resolved in the meantime)
There is an exciting corner around interrupts though that complicates things. Currently I think I'm right in saying the pci core never sets up interrupts, that is always a job for the drivers.
My first thought is to do something similar to the hack I did for the switch ports, and use polled mode to query support protocols. Then later call from driver that will attempt to enable interrupts if desired for a given DOE instance.
Quoted 47 lines
Quoted 4 lines
+/**
+ * structpci_doe_mb- State for a single DOE mailboxWe generally use the same terms as the spec to make it easier for readers to connect the language in the spec to the implementation.
The spec uniformly refers to "DOE instance". I guess "mailbox" is slightly more concise, so keep that, but please at least mention the term "instance" in the struct's kernel-doc.
This implementation uses the term "task" for one request/response. That term is not mentioned in the spec at all. The spec refers to "exchange" and "transfer" on several occasions, so I would have chosen either one of those instead of the somewhat unfortunate "task".
Quoted 3 lines
+ * This state is used to manage a single DOE mailbox capability. All fields
+ * should be considered opaque to the consumers and the structure passed into
+ * the helpers below after being created bydevm_pci_doe_create()If the struct is considered opaque, why is it exposed in a public header file? Just use a forward declaration in the header so that consumers can pass around pointers to the struct, and hide the declaration proper in
doe.c.Quoted 1 line
+ * @pdev: PCI device this belongs to mailbox belongs to
^^^^^^^^^^Typo.
Quoted 2 lines
+ * @prots: Array of protocols supported on this DOE
+ * @num_prots: Size of prots arrayUse @prots instead of prots everywhere in the kernel-doc.
drivers/pci/pci-doe.c line 381
Quoted 4 lines
drivers/pci/pci-doe.c new file +4
-0+/* +* NOTE: doe_mb_prots is freed by pci_doe_free_mb automatically on +* error if pci_doe_cache_protocols() fails past this point. +*/ s/doe_mb_prots/doe_mb->prots/
s/pci_doe_free_mb/pci_doe_free_mb()/
Quoted 8 lines
drivers/pci/pci-doe.c line 567
Quoted 3 lines
drivers/pci/pci-doe.c new file +3
-0+/* DOE requests must be a whole number of DW */ +if (task->request_pl_sz %sizeof (u32)) +return -EINVAL ;It would be nice if this restriction could be lifted. SPDM uses requests which are not padded to dword-length. It can run over other transports which may not impose such restrictions. The SPDM layer should not need to worry about quirks of the transport layer.
This is a pain. DOE absolutely requires 32 bit padding and
reads need to be 32 bit. We can obviously do something nasty
with dealing with the tail via a bounce buffer though.
I'd pencil that in as a future feature though rather than worry about it before we have any support at all in place.
Quoted 25 lines
Quoted 25 lines
drivers/pci/pci-doe.c new file +23
-0+static irqreturn_t pci_doe_irq_handler (int irq,void *data) +{ +struct pci_doe_mb *doe_mb = data; +struct pci_dev *pdev = doe_mb->pdev; +int offset = doe_mb->cap_offset; +u32 val; + +pci_read_config_dword (pdev, offset +PCI_DOE_STATUS , &val); + +/* Leave the error case to be handled outside IRQ */ +if (FIELD_GET (PCI_DOE_STATUS_ERROR , val)) { +mod_delayed_work (system_wq, &doe_mb->statemachine,0 ); +return IRQ_HANDLED ; + } + +if (FIELD_GET (PCI_DOE_STATUS_INT_STATUS , val)) { +pci_write_config_dword (pdev, offset +PCI_DOE_STATUS , +PCI_DOE_STATUS_INT_STATUS ); +mod_delayed_work (system_wq, &doe_mb->statemachine,0 ); +return IRQ_HANDLED ; + } + +return IRQ_NONE ;
Quoted 8 lines
Quoted 1 line
+}
PCIe 6.0, table 7-316 says that an interrupt is also raised when "the DOE Busy bit has been Cleared", yet such an interrupt is not handled here. It is incorrectly treated as a spurious interrupt by returning
IRQ_NONE. The right thing to do is probably to wake the state machine in case it's polling for the Busy flag to clear.
Ah. I remember testing this via a lot of hacking on the QEMU code to inject the various races that can occur (it was really ugly to do).
Guess we lost the handling at some point. I think your fix is the right one.
Quoted 14 lines
include/linux/pci-doe.h line 26
Quoted 11 lines
include/linux/pci-doe.h new file +9
-0+enum pci_doe_state { +DOE_IDLE , +DOE_WAIT_RESP , +DOE_WAIT_ABORT , +DOE_WAIT_ABORT_ON_ERR , +}; + +#define PCI_DOE_FLAG_ABORT 0 +#define PCI_DOE_FLAG_DEAD 1That's all internal and should live in
doe.c, not the header file.
Quoted 4 lines
Thanks,
Lukas
Thanks for the review and thanks again to Ira for taking this forwards.
Jonathan
Re: [PATCH V8 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
Quoted 26 lines · Jonathan Cameron
Quoted 23 lines · On Mon, 30 May 2022 21:06:57 +0200 Lukas Wunner <[email protected]> wrote:
Quoted 1 line · On Thu, Apr 14, 2022 at 01:32:30PM -0700, [email protected] wrote:
+static int
pci_doe_recv_resp(struct pci_doe_mb *doe_mb, struct pci_doe_task *task)[...]
drivers/pci/pci-doe.c line 144
Quoted 9 lines
drivers/pci/pci-doe.c new file +9
-0+pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); +/* Read the second dword to get the length */ +pci_read_config_dword (pdev, offset +PCI_DOE_READ , &val); +pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); + + length =FIELD_GET (PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH , val); +if (length >SZ_1M || length <2 ) +return -EIO ; +This API requires consumers to know the size of the response in advance. That's not always the case, as exemplified by SPDM VERSION responses. Jonathan uses a kludge in his SPDM patch which submits a first request with a fixed size of 2 versions and, if that turns out to be too small, submits a second request.
It would be nice if consumers are allowed to set
request_plto NULL. Then a payload can be allocated here inpci_doe_recv_resp()with the size retrieved above.
Quoted 8 lines
Quoted 2 lines
A flag may be necessary to indicate that the response is heap-allocated and needs to be freed upon destruction of the
pci_doe_task.If possible I'd make that the callers problem. It should know it provided NULL and expected a response.
I'd suggest making this a 'future' feature just to keep this initial version simple. Won't be hard to add later.
Agreed.
Quoted 17 lines
Quoted 17 lines
drivers/pci/pci-doe.c line 152
Quoted 11 lines
drivers/pci/pci-doe.c new file +8
-0+/* First 2 dwords have already been read */ + length -=2 ; +/* Read the rest of the response payload */ +for (i =0 ; i <min (length, task->response_pl_sz /sizeof (u32)); i++) { +pci_read_config_dword (pdev, offset +PCI_DOE_READ , + &task->response_pl[i]); +pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); + }You need to check the Data Object Ready bit. The device may clear the bit prematurely (e.g. as a result of a concurrent FLR or Conventional Reset). You'll continue reading zero dwords from the mailbox and pretend success to the caller even though the response is truncated.
Quoted 6 lines
Quoted 3 lines
If you're concerned about performance when checking the bit on every loop iteration, checking it only on the last but one iteration should be sufficient to detect truncation.
Good catch - I hate corner cases. Thankfully this one is trivial to check for.
Ok looking at the spec: Strictly speaking this needs to happen multiple times both in doe_statemachine_work() and inside pci_doe_recv_resp(); not just in this loop. :-(
This is because, the check in doe_statemachine_work() only covers the 1st dword read IIUC. Therefore, we should put this into the statemachine properly unless it is agreed to busy wait for the Data Object Ready bit once the first one is seen?
I'm not sure I really like that because I'm not sure how hardware is going to behave. Will it potentially delay mid response payload?
I think complete correctness requires pci_doe_recv_resp() to be split up such that the state machine could be scheduled on any dword read... :-( And I suspect that anything else is a hack. That is going to take a bit of rework. But I think it may be the best thing to do.
Before I embark on this rework, tell me I'm not crazy?
Quoted 26 lines
Quoted 13 lines
drivers/pci/pci-doe.c line 360
Quoted 8 lines
drivers/pci/pci-doe.c new file +5
-0+ *vid =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID , response_pl); + *protocol =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL , + response_pl); + *index =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX , + response_pl);The fact that you need line breaks here is an indication that the macros are too long.
Quoted 12 lines
include/uapi/linux/pci_regs.h line 1130
Quoted 9 lines
include/uapi/linux/pci_regs.h +9
-0+/* DOE Data Object - note not actually registers */ +#define PCI_DOE_DATA_OBJECT_HEADER_1_VID 0x0000ffff +#define PCI_DOE_DATA_OBJECT_HEADER_1_TYPE 0x00ff0000 +#define PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH 0x0003ffff + +#define PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX 0x000000ff +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID 0x0000ffff +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL 0x00ff0000 +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX 0xff000000I'd get rid of "
DATA_OBJECT_" everywhere, it's redundant with the "Data Object" in "DOE".
Quoted 6 lines
We need something to make it clear these aren't DVSEC headers for example, but definitely could be shorter.
PCI_DOE_OBJ_...perhaps?
FWIW I'm inclined to leave them for now.
Quoted 9 lines
Quoted 6 lines
Quoted 4 lines
+#define
PCI_DOE_STATUS_INT_STATUS0x00000002/* DOE Interrupt Status */Another redundancy, I would get rid of the second "
_STATUS".Hmm. I'll leave this one to Ira's discretion but I'm not keen on cropping too much of naming given loss of alignment with the spec.
Again I'm inclined to leave it.
Quoted 9 lines
Quoted 6 lines
Quoted 4 lines
+#define
PCI_DOE_STATUS_DATA_OBJECT_READY0x80000000/* Data Object Ready */I would shorten to
PCI_DOE_STATUS_READY.Seems reasonable though always some burden in moving away from full spec names.
I think this is fine.
Quoted 16 lines
Quoted 16 lines
Quoted 9 lines
Simplify submitting work to the mailbox
Replacepci_doe_exchange_sync()withpci_doe_submit_task()Consumers of the mailbox are now responsible for setting up callbacks within a task object and submitting them to the mailbox to be processed.I honestly think that's a mistake. All consumers both in the CDAT as well as in the SPDM series just want to wait for completion of the task. They have no need for an arbitrary callback and shouldn't be burdended with providing one. It just unnecessarily complicates the API.
Quoted 6 lines
Quoted 2 lines
So only providing
pci_doe_exchange_sync()and doing away withpci_doe_submit_task()would seem like a more appropriate approach.We've gone around the houses with this. At this stage I don't care strongly either way and it's all in kernel code so we can refine it later once we have lots of examples.
Agreed.
Quoted 44 lines
Quoted 35 lines
Quoted 9 lines
include/linux/pci-doe.h new file +6
-0+/** +* pci_doe_for_each_off - Iterate each DOE capability +* @pdev: struct pci_dev to iterate +* @off: u16 of config space offset of each mailbox capability found +*/ +#define pci_doe_for_each_off (pdev, off) \include/linux/pci-doe.h line 116
Quoted 10 lines
include/linux/pci-doe.h new file +10
-0+for (off =pci_find_next_ext_capability (pdev, off, \ +PCI_EXT_CAP_ID_DOE ); \ + off >0 ; \ + off =pci_find_next_ext_capability (pdev, off, \ +PCI_EXT_CAP_ID_DOE )) + +struct pci_doe_mb *pci_doe_create_mb(struct pci_dev *pdev, u16 cap_offset, +bool use_irq); +void pci_doe_destroy_mb (struct pci_doe_mb *doe_mb); +bool pci_doe_supports_prot (struct pci_doe_mb *doe_mb,u16 vid,u8 type);Drivers should not be concerned with the intricacies of DOE capabilities and mailboxes.
Moreover, the above API doesn't allow different drivers to access the same DOE mailbox concurrently, e.g. if that mailbox supports multiple protocols. There's no locking to serialize access to the mailbox by the drivers.
This should be moved to the PCI core instead: In
pci_init_capabilities(), add a new callpci_doe_init()which enumerates all DOE capabilities. Add alist_headto structpci_devand add each DOE instance found to that list. Destroy the list elements inpci_destroy_dev(). No locking needed for thelist_head, you only ever modify the list on device enumeration and destruction.Quoted 3 lines
Then provide a
pci_doe_find_mailbox()library function which drivers call to retrieve thepci_doe_mbfor a given pci_dev/vid/type tuple. That avoids the need to traverse the list time and again.I've lost track a bit as this thread has been running a long time, but I think we are moving back to something that looks more like this (and the much earlier versions of the set which did more or less what you describe - though they had their own issues resolved in the meantime)
Quoted 9 lines
There is an exciting corner around interrupts though that complicates things. Currently I think I'm right in saying the pci core never sets up interrupts, that is always a job for the drivers.
My first thought is to do something similar to the hack I did for the switch ports, and use polled mode to query support protocols. Then later call from driver that will attempt to enable interrupts if desired for a given DOE instance.
V9 is already getting respun but lets look there for the move toward this. I don't think the CXL code should get any of the DOE mailbox code directly. But I'm unclear how to tie it together with the PCI side ATM.
For this series CDAT is only useful for CXL and as the only user I think having the CXL PCI code instantiate the mailboxes for now is fine. But having a more general home for that is needed I think for other protocols and users.
Quoted 57 lines
Quoted 48 lines
Quoted 5 lines
+/**
+ * structpci_doe_mb- State for a single DOE mailboxWe generally use the same terms as the spec to make it easier for readers to connect the language in the spec to the implementation.
The spec uniformly refers to "DOE instance". I guess "mailbox" is slightly more concise, so keep that, but please at least mention the term "instance" in the struct's kernel-doc.
This implementation uses the term "task" for one request/response. That term is not mentioned in the spec at all. The spec refers to "exchange" and "transfer" on several occasions, so I would have chosen either one of those instead of the somewhat unfortunate "task".
Quoted 3 lines
+ * This state is used to manage a single DOE mailbox capability. All fields
+ * should be considered opaque to the consumers and the structure passed into
+ * the helpers below after being created bydevm_pci_doe_create()If the struct is considered opaque, why is it exposed in a public header file? Just use a forward declaration in the header so that consumers can pass around pointers to the struct, and hide the declaration proper in
doe.c.Quoted 1 line
+ * @pdev: PCI device this belongs to mailbox belongs to
^^^^^^^^^^Typo.
Quoted 2 lines
+ * @prots: Array of protocols supported on this DOE
+ * @num_prots: Size of prots arrayUse @prots instead of prots everywhere in the kernel-doc.
drivers/pci/pci-doe.c line 381
Quoted 4 lines
drivers/pci/pci-doe.c new file +4
-0+/* +* NOTE: doe_mb_prots is freed by pci_doe_free_mb automatically on +* error if pci_doe_cache_protocols() fails past this point. +*/ s/doe_mb_prots/doe_mb->prots/
s/pci_doe_free_mb/pci_doe_free_mb()/Quoted 8 lines
drivers/pci/pci-doe.c line 567
Quoted 3 lines
drivers/pci/pci-doe.c new file +3
-0+/* DOE requests must be a whole number of DW */ +if (task->request_pl_sz %sizeof (u32)) +return -EINVAL ;It would be nice if this restriction could be lifted. SPDM uses requests which are not padded to dword-length. It can run over other transports which may not impose such restrictions. The SPDM layer should not need to worry about quirks of the transport layer.
Quoted 6 lines
This is a pain. DOE absolutely requires 32 bit padding and
reads need to be 32 bit. We can obviously do something nasty
with dealing with the tail via a bounce buffer though.I'd pencil that in as a future feature though rather than worry about it before we have any support at all in place.
I think any missmatch between something like SPDM and DOE will need to be handled by SPDM to DOE code. Not the DOE layer.
Quoted 35 lines
Quoted 26 lines
Quoted 26 lines
drivers/pci/pci-doe.c new file +23
-0+static irqreturn_t pci_doe_irq_handler (int irq,void *data) +{ +struct pci_doe_mb *doe_mb = data; +struct pci_dev *pdev = doe_mb->pdev; +int offset = doe_mb->cap_offset; +u32 val; + +pci_read_config_dword (pdev, offset +PCI_DOE_STATUS , &val); + +/* Leave the error case to be handled outside IRQ */ +if (FIELD_GET (PCI_DOE_STATUS_ERROR , val)) { +mod_delayed_work (system_wq, &doe_mb->statemachine,0 ); +return IRQ_HANDLED ; + } + +if (FIELD_GET (PCI_DOE_STATUS_INT_STATUS , val)) { +pci_write_config_dword (pdev, offset +PCI_DOE_STATUS , +PCI_DOE_STATUS_INT_STATUS ); +mod_delayed_work (system_wq, &doe_mb->statemachine,0 ); +return IRQ_HANDLED ; + } + +return IRQ_NONE ;Quoted 8 lines
Quoted 1 line
+}
PCIe 6.0, table 7-316 says that an interrupt is also raised when "the DOE Busy bit has been Cleared", yet such an interrupt is not handled here. It is incorrectly treated as a spurious interrupt by returning
IRQ_NONE. The right thing to do is probably to wake the state machine in case it's polling for the Busy flag to clear.
Quoted 5 lines
Ah. I remember testing this via a lot of hacking on the QEMU code to inject the various races that can occur (it was really ugly to do).
Guess we lost the handling at some point. I think your fix is the right one.
Perhaps I am missing something but digging into this more. I disagree that the handler fails to handle this case. If I read the spec correctly DOE Interrupt Status must be set when an interrupt is generated. The handler wakes the state machine in that case. The state machine then checks for busy if there is work to be done.
Normally we would not even need to check for status error. But that is special cased because clearing that status is left to the state machine.
Quoted 15 lines
Quoted 15 lines
include/linux/pci-doe.h line 26
Quoted 12 lines
include/linux/pci-doe.h new file +9
-0+enum pci_doe_state { +DOE_IDLE , +DOE_WAIT_RESP , +DOE_WAIT_ABORT , +DOE_WAIT_ABORT_ON_ERR , +}; + +#define PCI_DOE_FLAG_ABORT 0 +#define PCI_DOE_FLAG_DEAD 1That's all internal and should live in
doe.c, not the header file.
Quoted 6 lines
Quoted 4 lines
Thanks,
Lukas
Thanks for the review and thanks again to Ira for taking this forwards.
Thanks!
Ira
Re: [PATCH V8 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
Quoted 24 lines · Ira Weiny
Quoted 16 lines · Jonathan Cameron
Quoted 15 lines · On Mon, 30 May 2022 21:06:57 +0200 Lukas Wunner <[email protected]> wrote:
drivers/pci/pci-doe.c line 152
Quoted 8 lines · On Thu, Apr 14, 2022 at 01:32:30PM -0700, [email protected] wrote:
drivers/pci/pci-doe.c new file +8
-0+/* First 2 dwords have already been read */ + length -=2 ; +/* Read the rest of the response payload */ +for (i =0 ; i <min (length, task->response_pl_sz /sizeof (u32)); i++) { +pci_read_config_dword (pdev, offset +PCI_DOE_READ , + &task->response_pl[i]); +pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); + }You need to check the Data Object Ready bit. The device may clear the bit prematurely (e.g. as a result of a concurrent FLR or Conventional Reset). You'll continue reading zero dwords from the mailbox and pretend success to the caller even though the response is truncated.
Quoted 6 lines
Quoted 3 lines
If you're concerned about performance when checking the bit on every loop iteration, checking it only on the last but one iteration should be sufficient to detect truncation.
Good catch - I hate corner cases. Thankfully this one is trivial to check for.
Quoted 6 lines
Ok looking at the spec: Strictly speaking this needs to happen multiple times both in
doe_statemachine_work()and insidepci_doe_recv_resp(); not just in this loop. :-(This is because, the check in
doe_statemachine_work()only covers the 1st dword read IIUC.
The spec says "this bit indicates the DOE instance has a *data object* available to be read by system firmware/software".
So, the entire object is available for reading, not just one dword.
You've already got checks in place for the first two dwords which cover reading an "all zeroes" response. No need to amend them.
You only need to re-check the Data Object Ready bit on the last-but-one dword in case the function was reset concurrently. Per sec. 6.30.2, "An FLR to a Function must result in the aborting of any DOE transfer in progress."
Quoted 35 lines
Quoted 35 lines
Quoted 23 lines
Quoted 23 lines
drivers/pci/pci-doe.c new file +23
-0+static irqreturn_t pci_doe_irq_handler (int irq,void *data) +{ +struct pci_doe_mb *doe_mb = data; +struct pci_dev *pdev = doe_mb->pdev; +int offset = doe_mb->cap_offset; +u32 val; + +pci_read_config_dword (pdev, offset +PCI_DOE_STATUS , &val); + +/* Leave the error case to be handled outside IRQ */ +if (FIELD_GET (PCI_DOE_STATUS_ERROR , val)) { +mod_delayed_work (system_wq, &doe_mb->statemachine,0 ); +return IRQ_HANDLED ; + } + +if (FIELD_GET (PCI_DOE_STATUS_INT_STATUS , val)) { +pci_write_config_dword (pdev, offset +PCI_DOE_STATUS , +PCI_DOE_STATUS_INT_STATUS ); +mod_delayed_work (system_wq, &doe_mb->statemachine,0 ); +return IRQ_HANDLED ; + } + +return IRQ_NONE ;Quoted 8 lines
Quoted 1 line
+}
PCIe 6.0, table 7-316 says that an interrupt is also raised when "the DOE Busy bit has been Cleared", yet such an interrupt is not handled here. It is incorrectly treated as a spurious interrupt by returning
IRQ_NONE. The right thing to do is probably to wake the state machine in case it's polling for the Busy flag to clear.Ah. I remember testing this via a lot of hacking on the QEMU code to inject the various races that can occur (it was really ugly to do).
Quoted 8 lines
Quoted 2 lines
Guess we lost the handling at some point. I think your fix is the right one.
Perhaps I am missing something but digging into this more. I disagree that the handler fails to handle this case. If I read the spec correctly DOE Interrupt Status must be set when an interrupt is generated. The handler wakes the state machine in that case. The state machine then checks for busy if there is work to be done.
Right, I was mistaken, sorry for the noise.
Quoted 2 lines
Normally we would not even need to check for status error. But that is special cased because clearing that status is left to the state machine.
That however looks wrong because the DOE Interrupt Status bit is never cleared after a DOE Error is signaled. The state machine performs an explicit abort upon an error by setting the DOE Abort bit, but that doesn't seem to clear DOE Interrupt Status:
Per section 6.30.2, "At any time, the system firmware/software is permitted to set the DOE Abort bit in the DOE Control Register, and the DOE instance must Clear the Data Object Ready bit, if not already Clear, and Clear the DOE Error bit, if already Set, in the DOE Status Register, within 1 second."
No mention of the DOE Interrupt Status bit, so we cannot assume that it's cleared by a DOE Abort and we must clear it explicitly.
Thanks,
Lukas
Re: [PATCH V8 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
Quoted 29 lines · On Wed, 1 Jun 2022 09:18:08 +0200 Lukas Wunner <[email protected]> wrote:
Quoted 28 lines · Ira Weiny
Quoted 16 lines · Jonathan Cameron
Quoted 15 lines · On Mon, 30 May 2022 21:06:57 +0200 Lukas Wunner <[email protected]> wrote:
drivers/pci/pci-doe.c line 152
Quoted 8 lines · On Thu, Apr 14, 2022 at 01:32:30PM -0700, [email protected] wrote:
drivers/pci/pci-doe.c new file +8
-0+/* First 2 dwords have already been read */ + length -=2 ; +/* Read the rest of the response payload */ +for (i =0 ; i <min (length, task->response_pl_sz /sizeof (u32)); i++) { +pci_read_config_dword (pdev, offset +PCI_DOE_READ , + &task->response_pl[i]); +pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); + }You need to check the Data Object Ready bit. The device may clear the bit prematurely (e.g. as a result of a concurrent FLR or Conventional Reset). You'll continue reading zero dwords from the mailbox and pretend success to the caller even though the response is truncated.
Quoted 6 lines
Quoted 3 lines
If you're concerned about performance when checking the bit on every loop iteration, checking it only on the last but one iteration should be sufficient to detect truncation.
Good catch - I hate corner cases. Thankfully this one is trivial to check for.
Ok looking at the spec: Strictly speaking this needs to happen multiple times both in
doe_statemachine_work()and insidepci_doe_recv_resp(); not just in this loop. :-(
Quoted 7 lines
Quoted 2 lines
This is because, the check in
doe_statemachine_work()only covers the 1st dword read IIUC.The spec says "this bit indicates the DOE instance has a *data object* available to be read by system
firmware/software".So, the entire object is available for reading, not just one dword.
Agreed
Quoted 8 lines
You've already got checks in place for the first two dwords which cover reading an "all zeroes" response. No need to amend them.
You only need to re-check the Data Object Ready bit on the last-but-one dword in case the function was reset concurrently. Per sec. 6.30.2, "An FLR to a Function must result in the aborting of any DOE transfer in progress."
Ouch, isn't that racy as you can only check it slightly before reading the last dword and a reset could occur in between?
Quoted 40 lines
Quoted 40 lines
Quoted 39 lines
Quoted 25 lines
Quoted 25 lines
drivers/pci/pci-doe.c new file +23
-0+static irqreturn_t pci_doe_irq_handler (int irq,void *data) +{ +struct pci_doe_mb *doe_mb = data; +struct pci_dev *pdev = doe_mb->pdev; +int offset = doe_mb->cap_offset; +u32 val; + +pci_read_config_dword (pdev, offset +PCI_DOE_STATUS , &val); + +/* Leave the error case to be handled outside IRQ */ +if (FIELD_GET (PCI_DOE_STATUS_ERROR , val)) { +mod_delayed_work (system_wq, &doe_mb->statemachine,0 ); +return IRQ_HANDLED ; + } + +if (FIELD_GET (PCI_DOE_STATUS_INT_STATUS , val)) { +pci_write_config_dword (pdev, offset +PCI_DOE_STATUS , +PCI_DOE_STATUS_INT_STATUS ); +mod_delayed_work (system_wq, &doe_mb->statemachine,0 ); +return IRQ_HANDLED ; + } + +return IRQ_NONE ;Quoted 8 lines
Quoted 1 line
+}
PCIe 6.0, table 7-316 says that an interrupt is also raised when "the DOE Busy bit has been Cleared", yet such an interrupt is not handled here. It is incorrectly treated as a spurious interrupt by returning
IRQ_NONE. The right thing to do is probably to wake the state machine in case it's polling for the Busy flag to clear.Ah. I remember testing this via a lot of hacking on the QEMU code to inject the various races that can occur (it was really ugly to do).
Guess we lost the handling at some point. I think your fix is the right one.
Quoted 7 lines
Quoted 5 lines
Perhaps I am missing something but digging into this more. I disagree that the handler fails to handle this case. If I read the spec correctly DOE Interrupt Status must be set when an interrupt is generated. The handler wakes the state machine in that case. The state machine then checks for busy if there is work to be done.
Right, I was mistaken, sorry for the noise.
Ah. Makes sense - managed to confuse me too ;)
I really don't like the absence of a status bit for the DOE busy bit has cleared interrupt source, but glad we did handle it.
Quoted 10 lines
Quoted 4 lines
Normally we would not even need to check for status error. But that is special cased because clearing that status is left to the state machine.
That however looks wrong because the DOE Interrupt Status bit is never cleared after a DOE Error is signaled. The state machine performs an explicit abort upon an error by setting the DOE Abort bit, but that doesn't seem to clear DOE Interrupt Status:
Quoted 8 lines
Per section 6.30.2, "At any time, the system
firmware/softwareis permitted to set the DOE Abort bit in the DOE Control Register, and the DOE instance must Clear the Data Object Ready bit, if not already Clear, and Clear the DOE Error bit, if already Set, in the DOE Status Register, within 1 second."No mention of the DOE Interrupt Status bit, so we cannot assume that it's cleared by a DOE Abort and we must clear it explicitly.
Gah.
Jonathan
Quoted 5 lines
Thanks,
Lukas
Re: [PATCH V8 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
In reply to Lukas WunnerQuoted 29 lines · Lukas Wunner
Quoted 28 lines · Ira Weiny
Quoted 16 lines · Jonathan Cameron
Quoted 15 lines · On Mon, 30 May 2022 21:06:57 +0200 Lukas Wunner <[email protected]> wrote:
drivers/pci/pci-doe.c line 152
Quoted 8 lines · On Thu, Apr 14, 2022 at 01:32:30PM -0700, [email protected] wrote:
drivers/pci/pci-doe.c new file +8
-0+/* First 2 dwords have already been read */ + length -=2 ; +/* Read the rest of the response payload */ +for (i =0 ; i <min (length, task->response_pl_sz /sizeof (u32)); i++) { +pci_read_config_dword (pdev, offset +PCI_DOE_READ , + &task->response_pl[i]); +pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); + }You need to check the Data Object Ready bit. The device may clear the bit prematurely (e.g. as a result of a concurrent FLR or Conventional Reset). You'll continue reading zero dwords from the mailbox and pretend success to the caller even though the response is truncated.
Quoted 6 lines
Quoted 3 lines
If you're concerned about performance when checking the bit on every loop iteration, checking it only on the last but one iteration should be sufficient to detect truncation.
Good catch - I hate corner cases. Thankfully this one is trivial to check for.
Ok looking at the spec: Strictly speaking this needs to happen multiple times both in
doe_statemachine_work()and insidepci_doe_recv_resp(); not just in this loop. :-(
Quoted 5 lines
Quoted 2 lines
This is because, the check in
doe_statemachine_work()only covers the 1st dword read IIUC.The spec says "this bit indicates the DOE instance has a *data object* available to be read by system
firmware/software".
Ok yea. I got confused by step 6 in sec 6.30.2.
Quoted 2 lines
So, the entire object is available for reading, not just one dword.
Yes cool!
Quoted 8 lines
You've already got checks in place for the first two dwords which cover reading an "all zeroes" response. No need to amend them.
You only need to re-check the Data Object Ready bit on the last-but-one dword in case the function was reset concurrently. Per sec. 6.30.2, "An FLR to a Function must result in the aborting of any DOE transfer in progress."
I think I disagree. Even if we do that and an FLR comes before the last read the last read could be 0's.
I think the interpretation of the data needs to happen above this and if an FLR happens during this read we are going to have other issues.
But I can add the check if you feel strongly about it.
Quoted 40 lines
Quoted 40 lines
Quoted 39 lines
Quoted 25 lines
Quoted 25 lines
drivers/pci/pci-doe.c new file +23
-0+static irqreturn_t pci_doe_irq_handler (int irq,void *data) +{ +struct pci_doe_mb *doe_mb = data; +struct pci_dev *pdev = doe_mb->pdev; +int offset = doe_mb->cap_offset; +u32 val; + +pci_read_config_dword (pdev, offset +PCI_DOE_STATUS , &val); + +/* Leave the error case to be handled outside IRQ */ +if (FIELD_GET (PCI_DOE_STATUS_ERROR , val)) { +mod_delayed_work (system_wq, &doe_mb->statemachine,0 ); +return IRQ_HANDLED ; + } + +if (FIELD_GET (PCI_DOE_STATUS_INT_STATUS , val)) { +pci_write_config_dword (pdev, offset +PCI_DOE_STATUS , +PCI_DOE_STATUS_INT_STATUS ); +mod_delayed_work (system_wq, &doe_mb->statemachine,0 ); +return IRQ_HANDLED ; + } + +return IRQ_NONE ;Quoted 8 lines
Quoted 1 line
+}
PCIe 6.0, table 7-316 says that an interrupt is also raised when "the DOE Busy bit has been Cleared", yet such an interrupt is not handled here. It is incorrectly treated as a spurious interrupt by returning
IRQ_NONE. The right thing to do is probably to wake the state machine in case it's polling for the Busy flag to clear.Ah. I remember testing this via a lot of hacking on the QEMU code to inject the various races that can occur (it was really ugly to do).
Guess we lost the handling at some point. I think your fix is the right one.
Quoted 7 lines
Quoted 5 lines
Perhaps I am missing something but digging into this more. I disagree that the handler fails to handle this case. If I read the spec correctly DOE Interrupt Status must be set when an interrupt is generated. The handler wakes the state machine in that case. The state machine then checks for busy if there is work to be done.
Right, I was mistaken, sorry for the noise.
NP I'm not always following this either.
Quoted 10 lines
Quoted 4 lines
Normally we would not even need to check for status error. But that is special cased because clearing that status is left to the state machine.
That however looks wrong because the DOE Interrupt Status bit is never cleared after a DOE Error is signaled. The state machine performs an explicit abort upon an error by setting the DOE Abort bit, but that doesn't seem to clear DOE Interrupt Status:
Quoted 5 lines
Per section 6.30.2, "At any time, the system
firmware/softwareis permitted to set the DOE Abort bit in the DOE Control Register, and the DOE instance must Clear the Data Object Ready bit, if not already Clear, and Clear the DOE Error bit, if already Set, in the DOE Status Register, within 1 second."
I thought that meant the hardware (the DOE instance) must clear those bits within 1 second?
Quoted 3 lines
No mention of the DOE Interrupt Status bit, so we cannot assume that it's cleared by a DOE Abort and we must clear it explicitly.
Oh... yea. Jonathan? We discussed this before and I was convinced it worked but I think Lukas is correct here.
Should we drop the special case in pci_doe_irq_handler() and just clear the status always? Or should we wait and clear it is pci_doe_abort_start?
Ira
Quoted 4 lines
Thanks,
Lukas
Re: [PATCH V8 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
Quoted 8 lines · Ira Weiny
Quoted 4 lines · Lukas Wunner
You only need to re-check the Data Object Ready bit on the last-but-one dword in case the function was reset concurrently. Per sec. 6.30.2, "An FLR to a Function must result in the aborting of any DOE transfer in progress."
I think I disagree. Even if we do that and an FLR comes before the last read the last read could be 0's.
PCIe r6.0, Table 7-316 says:
"If there is no additional data object ready for transfer, the
DOE instance must clear this bit after the entire data object has been transferred, as indicated by software writing to the DOE Read Data Mailbox Register after reading the final DW of the data object."
Remember that you *read* a dword from the mailbox and then acknowledge reception to the mailbox by *writing* a dword to the mailbox.
So you check that the Data Object Ready bit is set before acknowledging the final dword with a register write. That's race-free.
(I realize me talking about the "last-but-one dword" above was quite unclear, sorry about that.)
Thanks,
Lukas
Re: [PATCH V8 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
Quoted 17 lines · Lukas Wunner
Quoted 8 lines · Ira Weiny
Quoted 4 lines · Lukas Wunner
You only need to re-check the Data Object Ready bit on the last-but-one dword in case the function was reset concurrently. Per sec. 6.30.2, "An FLR to a Function must result in the aborting of any DOE transfer in progress."
I think I disagree. Even if we do that and an FLR comes before the last read the last read could be 0's.
PCIe r6.0, Table 7-316 says:
"If there is no additional data object ready for transfer, the
DOE instance must clear this bit after the entire data object has been transferred, as indicated by software writing to the DOE Read Data Mailbox Register after reading the final DW of the data object."
Quoted 5 lines
Remember that you *read* a dword from the mailbox and then acknowledge reception to the mailbox by *writing* a dword to the mailbox.
So you check that the Data Object Ready bit is set before acknowledging the final dword with a register write. That's race-free.
Ok.
Quoted 4 lines
(I realize me talking about the "last-but-one dword" above was quite unclear, sorry about that.)
Ah yes. Ok, I'll put in a check before the final write.
Ira
Re: [PATCH V8 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
In reply to Ira WeinyQuoted 130 lines · On Wed, 1 Jun 2022 10:16:15 -0700 Ira Weiny <[email protected]> wrote:
Quoted 29 lines · Lukas Wunner
Quoted 28 lines · Ira Weiny
Quoted 16 lines · Jonathan Cameron
Quoted 15 lines · On Mon, 30 May 2022 21:06:57 +0200 Lukas Wunner <[email protected]> wrote:
drivers/pci/pci-doe.c line 152
Quoted 8 lines · On Thu, Apr 14, 2022 at 01:32:30PM -0700, [email protected] wrote:
drivers/pci/pci-doe.c new file +8
-0+/* First 2 dwords have already been read */ + length -=2 ; +/* Read the rest of the response payload */ +for (i =0 ; i <min (length, task->response_pl_sz /sizeof (u32)); i++) { +pci_read_config_dword (pdev, offset +PCI_DOE_READ , + &task->response_pl[i]); +pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); + }You need to check the Data Object Ready bit. The device may clear the bit prematurely (e.g. as a result of a concurrent FLR or Conventional Reset). You'll continue reading zero dwords from the mailbox and pretend success to the caller even though the response is truncated.
Quoted 6 lines
Quoted 3 lines
If you're concerned about performance when checking the bit on every loop iteration, checking it only on the last but one iteration should be sufficient to detect truncation.
Good catch - I hate corner cases. Thankfully this one is trivial to check for.
Ok looking at the spec: Strictly speaking this needs to happen multiple times both in
doe_statemachine_work()and insidepci_doe_recv_resp(); not just in this loop. :-(Quoted 5 lines
Quoted 2 lines
This is because, the check in
doe_statemachine_work()only covers the 1st dword read IIUC.The spec says "this bit indicates the DOE instance has a *data object* available to be read by system
firmware/software".Ok yea. I got confused by step 6 in sec 6.30.2.
Quoted 2 lines
So, the entire object is available for reading, not just one dword.
Yes cool!
Quoted 8 lines
You've already got checks in place for the first two dwords which cover reading an "all zeroes" response. No need to amend them.
You only need to re-check the Data Object Ready bit on the last-but-one dword in case the function was reset concurrently. Per sec. 6.30.2, "An FLR to a Function must result in the aborting of any DOE transfer in progress."
I think I disagree. Even if we do that and an FLR comes before the last read the last read could be 0's.
I think the interpretation of the data needs to happen above this and if an FLR happens during this read we are going to have other issues.
But I can add the check if you feel strongly about it.
Quoted 40 lines
Quoted 40 lines
Quoted 39 lines
Quoted 25 lines
Quoted 25 lines
drivers/pci/pci-doe.c new file +23
-0+static irqreturn_t pci_doe_irq_handler (int irq,void *data) +{ +struct pci_doe_mb *doe_mb = data; +struct pci_dev *pdev = doe_mb->pdev; +int offset = doe_mb->cap_offset; +u32 val; + +pci_read_config_dword (pdev, offset +PCI_DOE_STATUS , &val); + +/* Leave the error case to be handled outside IRQ */ +if (FIELD_GET (PCI_DOE_STATUS_ERROR , val)) { +mod_delayed_work (system_wq, &doe_mb->statemachine,0 ); +return IRQ_HANDLED ; + } + +if (FIELD_GET (PCI_DOE_STATUS_INT_STATUS , val)) { +pci_write_config_dword (pdev, offset +PCI_DOE_STATUS , +PCI_DOE_STATUS_INT_STATUS ); +mod_delayed_work (system_wq, &doe_mb->statemachine,0 ); +return IRQ_HANDLED ; + } + +return IRQ_NONE ;Quoted 8 lines
Quoted 1 line
+}
PCIe 6.0, table 7-316 says that an interrupt is also raised when "the DOE Busy bit has been Cleared", yet such an interrupt is not handled here. It is incorrectly treated as a spurious interrupt by returning
IRQ_NONE. The right thing to do is probably to wake the state machine in case it's polling for the Busy flag to clear.Ah. I remember testing this via a lot of hacking on the QEMU code to inject the various races that can occur (it was really ugly to do).
Guess we lost the handling at some point. I think your fix is the right one.
Quoted 7 lines
Quoted 5 lines
Perhaps I am missing something but digging into this more. I disagree that the handler fails to handle this case. If I read the spec correctly DOE Interrupt Status must be set when an interrupt is generated. The handler wakes the state machine in that case. The state machine then checks for busy if there is work to be done.
Right, I was mistaken, sorry for the noise.
NP I'm not always following this either.
Quoted 10 lines
Quoted 4 lines
Normally we would not even need to check for status error. But that is special cased because clearing that status is left to the state machine.
That however looks wrong because the DOE Interrupt Status bit is never cleared after a DOE Error is signaled. The state machine performs an explicit abort upon an error by setting the DOE Abort bit, but that doesn't seem to clear DOE Interrupt Status:
Quoted 5 lines
Per section 6.30.2, "At any time, the system
firmware/softwareis permitted to set the DOE Abort bit in the DOE Control Register, and the DOE instance must Clear the Data Object Ready bit, if not already Clear, and Clear the DOE Error bit, if already Set, in the DOE Status Register, within 1 second."I thought that meant the hardware (the DOE instance) must clear those bits within 1 second?
Quoted 1 line
Quoted 5 lines
Quoted 2 lines
No mention of the DOE Interrupt Status bit, so we cannot assume that it's cleared by a DOE Abort and we must clear it explicitly.
Oh... yea. Jonathan? We discussed this before and I was convinced it worked but I think Lukas is correct here.
Hmm. I thought we were good as well, but Lukas is correct in saying the interrupt status bit isn't cleared (which is 'novel' give the associated bit to tell you what the interrupt means will be cleared).
I'm not sure I want to think around the race conditions that result...
Quoted 3 lines
Should we drop the special case in
pci_doe_irq_handler()and just clear the status always? Or should we wait and clear it ispci_doe_abort_start?
I don't think it matters. pci_doe_irq_handler() seems a little cleaner.
I've not figured out completely if there are races however...
It is set when no already set and we get transitions of any of the following:
- DOE error bit set (this can't happen until abort so no race here)
- Data Object Ready bit is set: Can this happen with the DOE error set? I don't immediately see language saying it can't. However, I don't think it can for any of the challenge response protocols yet defined (and there are other problems if anyone wants to implement unsolicited messages)
- DOE busy bit has cleared - can definitely happen after an abort (which is fine as nothing to do anyway, so we'll handle a pointless interrupt). Could it in theory happen when error is set? I think not but only because of the statement "Clear this bit when it is able to receive a new data object."
So I think we are fine doing it preabort, but wouldn't put it past a hardware designer to find some path through that which results in a bonus interrupt and potentially us resetting twice.
If we clear it at the end of abort instead, what happens? Definitely no interrupts until we clear it. As we are doing query response protocols only, no new data until state machine moves on, so fine there.
So what about just doing it unconditionally..
+ case DOE_WAIT_ABORT:
+ case DOE_WAIT_ABORT_ON_ERR:
+ pci_read_config_dword(pdev, offset + PCI_DOE_STATUS, &val);
+
+ if (!FIELD_GET(PCI_DOE_STATUS_ERROR, val) &&
+ !FIELD_GET(PCI_DOE_STATUS_BUSY, val)) {
here...
+ /* Back to normal state - carry on */
+ retire_cur_task(doe_mb);
This feels a little bit more 'standard' as we are allowing new interrupts only after everything is back to a nice state.
Quoted 7 lines
Ira
Quoted 4 lines
Thanks,
Lukas
Re: [PATCH V8 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
Quoted 89 lines · Jonathan Cameron
Quoted 76 lines · On Wed, 1 Jun 2022 10:16:15 -0700 Ira Weiny <[email protected]> wrote:
Quoted 45 lines · Lukas Wunner
Quoted 44 lines · Ira Weiny
Quoted 42 lines · Jonathan Cameron
Quoted 27 lines · On Mon, 30 May 2022 21:06:57 +0200 Lukas Wunner <[email protected]> wrote:
Quoted 23 lines · On Thu, Apr 14, 2022 at 01:32:30PM -0700, [email protected] wrote:
(quoted diff) +23
-0+static irqreturn_t pci_doe_irq_handler(int irq, void *data) +{ + struct pci_doe_mb *doe_mb = data; + struct pci_dev *pdev = doe_mb->pdev; + int offset = doe_mb->cap_offset; + u32 val; + + pci_read_config_dword(pdev, offset + PCI_DOE_STATUS, &val); + + /* Leave the error case to be handled outside IRQ */ + if (FIELD_GET(PCI_DOE_STATUS_ERROR, val)) { + mod_delayed_work(system_wq, &doe_mb->statemachine, 0); + return IRQ_HANDLED; + } + + if (FIELD_GET(PCI_DOE_STATUS_INT_STATUS, val)) { + pci_write_config_dword(pdev, offset + PCI_DOE_STATUS, + PCI_DOE_STATUS_INT_STATUS); + mod_delayed_work(system_wq, &doe_mb->statemachine, 0); + return IRQ_HANDLED; + } + + return IRQ_NONE;Quoted 8 lines
Quoted 1 line
+}
PCIe 6.0, table 7-316 says that an interrupt is also raised when "the DOE Busy bit has been Cleared", yet such an interrupt is not handled here. It is incorrectly treated as a spurious interrupt by returning
IRQ_NONE. The right thing to do is probably to wake the state machine in case it's polling for the Busy flag to clear.Ah. I remember testing this via a lot of hacking on the QEMU code to inject the various races that can occur (it was really ugly to do).
Guess we lost the handling at some point. I think your fix is the right one.
Quoted 7 lines
Quoted 5 lines
Perhaps I am missing something but digging into this more. I disagree that the handler fails to handle this case. If I read the spec correctly DOE Interrupt Status must be set when an interrupt is generated. The handler wakes the state machine in that case. The state machine then checks for busy if there is work to be done.
Right, I was mistaken, sorry for the noise.
NP I'm not always following this either.
Quoted 10 lines
Quoted 4 lines
Normally we would not even need to check for status error. But that is special cased because clearing that status is left to the state machine.
That however looks wrong because the DOE Interrupt Status bit is never cleared after a DOE Error is signaled. The state machine performs an explicit abort upon an error by setting the DOE Abort bit, but that doesn't seem to clear DOE Interrupt Status:
Quoted 5 lines
Per section 6.30.2, "At any time, the system
firmware/softwareis permitted to set the DOE Abort bit in the DOE Control Register, and the DOE instance must Clear the Data Object Ready bit, if not already Clear, and Clear the DOE Error bit, if already Set, in the DOE Status Register, within 1 second."I thought that meant the hardware (the DOE instance) must clear those bits within 1 second?
Quoted 1 line
Quoted 5 lines
Quoted 2 lines
No mention of the DOE Interrupt Status bit, so we cannot assume that it's cleared by a DOE Abort and we must clear it explicitly.
Oh... yea. Jonathan? We discussed this before and I was convinced it worked but I think Lukas is correct here.
Hmm. I thought we were good as well, but Lukas is correct in saying the interrupt status bit isn't cleared (which is 'novel' give the associated bit to tell you what the interrupt means will be cleared).
Quoted 7 lines
I'm not sure I want to think around the race conditions that result...
Quoted 3 lines
Should we drop the special case in
pci_doe_irq_handler()and just clear the status always? Or should we wait and clear it ispci_doe_abort_start?I don't think it matters.
pci_doe_irq_handler()seems a little cleaner.
I agree and that is what V10 does.
Quoted 2 lines
I've not figured out completely if there are races however...
This is why I reworked the handling of cur_task in those error cases.
Quoted 9 lines
It is set when no already set and we get transitions of any of the following:
- DOE error bit set (this can't happen until abort so no race here)- Data Object Ready bit is set: Can this happen with the DOE error set? I don't immediately see language saying it can't. However, I don't think it can for any of the challenge response protocols yet defined (and there are other problems if anyone wants to implement unsolicited messages)
Quoted 7 lines
- DOE busy bit has cleared - can definitely happen after an abort (which is fine as nothing to do anyway, so we'll handle a pointless interrupt). Could it in theory happen when error is set? I think not but only because of the statement "Clear this bit when it is able to receive a new data object."
So I think we are fine doing it preabort,
That is what I though for V10 especially after reworking the cur_task locking. An extra interrupt would either start processing the next task or return with nothing to do.
Quoted 22 lines
but wouldn't put it past a hardware
designer to find some path through that which results in a bonus interrupt and potentially us resetting twice.If we clear it at the end of abort instead, what happens? Definitely no interrupts until we clear it. As we are doing query response protocols only, no new data until state machine moves on, so fine there.
So what about just doing it unconditionally..
(quoted diff) +6
-0+ case DOE_WAIT_ABORT: + case DOE_WAIT_ABORT_ON_ERR: + pci_read_config_dword(pdev, offset + PCI_DOE_STATUS, &val); + + if (!FIELD_GET(PCI_DOE_STATUS_ERROR, val) && + !FIELD_GET(PCI_DOE_STATUS_BUSY, val)) {here...(quoted diff) +2
-0+ /* Back to normal state - carry on */ + retire_cur_task(doe_mb);
Quoted 2 lines
This feels a little bit more 'standard' as we are allowing new interrupts only after everything is back to a nice state.
As I reworked the cur_task locking I really thought about locking cur_task throughout doe_statemachine_work(). It seems a lot safer for a lot of reasons. Doing so would make the extra work item no big deal.
So I looked at this again because you got me worried. If mod_delayed_work() can cause doe_statemachine_work() while another thread is in the middle of processing the interrupt there is a chance that signal_task_complete() is called a second time on a given task pointer.
However, I _don't_ _think_ that can happen. Because I don't think mod_delayed_work() can cause the work item to run while it is already running.
So unless I misunderstand how mod_delayed_work() works we are guaranteed that the extra interrupt will see the correct mailbox state and do the right thing.
Ira
Re: [PATCH V8 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
Quoted 155 lines · On Mon, 6 Jun 2022 12:56:05 -0700 Ira Weiny <[email protected]> wrote:
Quoted 89 lines · Jonathan Cameron
Quoted 76 lines · On Wed, 1 Jun 2022 10:16:15 -0700 Ira Weiny <[email protected]> wrote:
Quoted 45 lines · Lukas Wunner
Quoted 44 lines · Ira Weiny
Quoted 42 lines · Jonathan Cameron
Quoted 27 lines · On Mon, 30 May 2022 21:06:57 +0200 Lukas Wunner <[email protected]> wrote:
Quoted 23 lines · On Thu, Apr 14, 2022 at 01:32:30PM -0700, [email protected] wrote:
(quoted diff) +23
-0+static irqreturn_t pci_doe_irq_handler(int irq, void *data) +{ + struct pci_doe_mb *doe_mb = data; + struct pci_dev *pdev = doe_mb->pdev; + int offset = doe_mb->cap_offset; + u32 val; + + pci_read_config_dword(pdev, offset + PCI_DOE_STATUS, &val); + + /* Leave the error case to be handled outside IRQ */ + if (FIELD_GET(PCI_DOE_STATUS_ERROR, val)) { + mod_delayed_work(system_wq, &doe_mb->statemachine, 0); + return IRQ_HANDLED; + } + + if (FIELD_GET(PCI_DOE_STATUS_INT_STATUS, val)) { + pci_write_config_dword(pdev, offset + PCI_DOE_STATUS, + PCI_DOE_STATUS_INT_STATUS); + mod_delayed_work(system_wq, &doe_mb->statemachine, 0); + return IRQ_HANDLED; + } + + return IRQ_NONE;Quoted 8 lines
Quoted 1 line
+}
PCIe 6.0, table 7-316 says that an interrupt is also raised when "the DOE Busy bit has been Cleared", yet such an interrupt is not handled here. It is incorrectly treated as a spurious interrupt by returning
IRQ_NONE. The right thing to do is probably to wake the state machine in case it's polling for the Busy flag to clear.Ah. I remember testing this via a lot of hacking on the QEMU code to inject the various races that can occur (it was really ugly to do).
Guess we lost the handling at some point. I think your fix is the right one.
Quoted 7 lines
Quoted 5 lines
Perhaps I am missing something but digging into this more. I disagree that the handler fails to handle this case. If I read the spec correctly DOE Interrupt Status must be set when an interrupt is generated. The handler wakes the state machine in that case. The state machine then checks for busy if there is work to be done.
Right, I was mistaken, sorry for the noise.
NP I'm not always following this either.
Quoted 10 lines
Quoted 4 lines
Normally we would not even need to check for status error. But that is special cased because clearing that status is left to the state machine.
That however looks wrong because the DOE Interrupt Status bit is never cleared after a DOE Error is signaled. The state machine performs an explicit abort upon an error by setting the DOE Abort bit, but that doesn't seem to clear DOE Interrupt Status:
Quoted 5 lines
Per section 6.30.2, "At any time, the system
firmware/softwareis permitted to set the DOE Abort bit in the DOE Control Register, and the DOE instance must Clear the Data Object Ready bit, if not already Clear, and Clear the DOE Error bit, if already Set, in the DOE Status Register, within 1 second."I thought that meant the hardware (the DOE instance) must clear those bits within 1 second?
Quoted 1 line
Quoted 5 lines
Quoted 2 lines
No mention of the DOE Interrupt Status bit, so we cannot assume that it's cleared by a DOE Abort and we must clear it explicitly.
Oh... yea. Jonathan? We discussed this before and I was convinced it worked but I think Lukas is correct here.
Hmm. I thought we were good as well, but Lukas is correct in saying the interrupt status bit isn't cleared (which is 'novel' give the associated bit to tell you what the interrupt means will be cleared).
Quoted 7 lines
I'm not sure I want to think around the race conditions that result...
Quoted 3 lines
Should we drop the special case in
pci_doe_irq_handler()and just clear the status always? Or should we wait and clear it ispci_doe_abort_start?I don't think it matters.
pci_doe_irq_handler()seems a little cleaner.I agree and that is what V10 does.
Quoted 2 lines
I've not figured out completely if there are races however...
This is why I reworked the handling of
cur_taskin those error cases.Quoted 9 lines
It is set when no already set and we get transitions of any of the following:
- DOE error bit set (this can't happen until abort so no race here)- Data Object Ready bit is set: Can this happen with the DOE error set? I don't immediately see language saying it can't. However, I don't think it can for any of the challenge response protocols yet defined (and there are other problems if anyone wants to implement unsolicited messages)
Quoted 7 lines
- DOE busy bit has cleared - can definitely happen after an abort (which is fine as nothing to do anyway, so we'll handle a pointless interrupt). Could it in theory happen when error is set? I think not but only because of the statement "Clear this bit when it is able to receive a new data object."
So I think we are fine doing it preabort,
That is what I though for V10 especially after reworking the
cur_tasklocking. An extra interrupt would either start processing the next task or return with nothing to do.Quoted 22 lines
but wouldn't put it past a hardware
designer to find some path through that which results in a bonus interrupt and potentially us resetting twice.If we clear it at the end of abort instead, what happens? Definitely no interrupts until we clear it. As we are doing query response protocols only, no new data until state machine moves on, so fine there.
So what about just doing it unconditionally..
(quoted diff) +6
-0+ case DOE_WAIT_ABORT: + case DOE_WAIT_ABORT_ON_ERR: + pci_read_config_dword(pdev, offset + PCI_DOE_STATUS, &val); + + if (!FIELD_GET(PCI_DOE_STATUS_ERROR, val) && + !FIELD_GET(PCI_DOE_STATUS_BUSY, val)) {here...(quoted diff) +2
-0+ /* Back to normal state - carry on */ + retire_cur_task(doe_mb);Quoted 2 lines
This feels a little bit more 'standard' as we are allowing new interrupts only after everything is back to a nice state.
As I reworked the
cur_tasklocking I really thought about lockingcur_taskthroughoutdoe_statemachine_work(). It seems a lot safer for a lot of reasons. Doing so would make the extra work item no big deal.
Quoted 7 lines
So I looked at this again because you got me worried. If
mod_delayed_work()can causedoe_statemachine_work()while another thread is in the middle of processing the interrupt there is a chance thatsignal_task_complete()is called a second time on a given task pointer.However, I _don't_ _think_ that can happen. Because I don't think
mod_delayed_work()can cause the work item to run while it is already running.
You are correct. I remember looking into that exact question for a different project a while ago.
Quoted 3 lines
So unless I misunderstand how
mod_delayed_work()works we are guaranteed that the extra interrupt will see the correct mailbox state and do the right thing.
Agreed. Far as I can tell we are fine. More eyes always good though if anyone else wants to take a look!
Jonathan
p.s. I liked the original heavy weight queuing the whole thing on a mutex as it was a lot easier to reason about :) Was ugly though!
Quoted 2 lines
Ira
Re: [PATCH V8 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
In reply to Lukas WunnerQuoted 19 lines · Lukas Wunner
Quoted 1 line · On Thu, Apr 14, 2022 at 01:32:30PM -0700, [email protected] wrote:
+static int
pci_doe_recv_resp(struct pci_doe_mb *doe_mb, struct pci_doe_task *task)[...]
drivers/pci/pci-doe.c line 144
Quoted 9 lines
drivers/pci/pci-doe.c new file +9
-0+pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); +/* Read the second dword to get the length */ +pci_read_config_dword (pdev, offset +PCI_DOE_READ , &val); +pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); + + length =FIELD_GET (PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH , val); +if (length >SZ_1M || length <2 ) +return -EIO ; +This API requires consumers to know the size of the response in advance. That's not always the case, as exemplified by SPDM VERSION responses. Jonathan uses a kludge in his SPDM patch which submits a first request with a fixed size of 2 versions and, if that turns out to be too small, submits a second request.
Quoted 6 lines
It would be nice if consumers are allowed to set
request_plto NULL. Then a payload can be allocated here inpci_doe_recv_resp()with the size retrieved above.A flag may be necessary to indicate that the response is heap-allocated and needs to be freed upon destruction of the
pci_doe_task.
I'm not comfortable with PCI allocating memory. Especially optionally allocating memory. And I'm not sure this really saves the extra queries. The PCI layer will have to query first to determine response length.
If the community does want PCI to allocate memory then I think the interface should be to always allocate it.
Quoted 15 lines
drivers/pci/pci-doe.c line 152
Quoted 10 lines
drivers/pci/pci-doe.c new file +8
-0+/* First 2 dwords have already been read */ + length -=2 ; +/* Read the rest of the response payload */ +for (i =0 ; i <min (length, task->response_pl_sz /sizeof (u32)); i++) { +pci_read_config_dword (pdev, offset +PCI_DOE_READ , + &task->response_pl[i]); +pci_write_config_dword (pdev, offset +PCI_DOE_READ ,0 ); + }You need to check the Data Object Ready bit. The device may clear the bit prematurely (e.g. as a result of a concurrent FLR or Conventional Reset). You'll continue reading zero dwords from the mailbox and pretend success to the caller even though the response is truncated.
If an FLR happens then truncation does not seem like a problem.
Quoted 4 lines
If you're concerned about performance when checking the bit on every loop iteration, checking it only on the last but one iteration should be sufficient to detect truncation.
I'll review. I don't think this is a fast path.
Quoted 12 lines
drivers/pci/pci-doe.c line 360
Quoted 7 lines
drivers/pci/pci-doe.c new file +5
-0+ *vid =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID , response_pl); + *protocol =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL , + response_pl); + *index =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX , + response_pl);The fact that you need line breaks here is an indication that the macros are too long.
Quoted 12 lines
include/uapi/linux/pci_regs.h line 1130
Quoted 9 lines
include/uapi/linux/pci_regs.h +9
-0+/* DOE Data Object - note not actually registers */ +#define PCI_DOE_DATA_OBJECT_HEADER_1_VID 0x0000ffff +#define PCI_DOE_DATA_OBJECT_HEADER_1_TYPE 0x00ff0000 +#define PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH 0x0003ffff + +#define PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX 0x000000ff +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID 0x0000ffff +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL 0x00ff0000 +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX 0xff000000I'd get rid of "
DATA_OBJECT_" everywhere, it's redundant with the "Data Object" in "DOE".
I'm ok with renaming. Jonathan chose the names and no one has complained yet.
Quoted 19 lines
Quoted 3 lines
+#define
PCI_DOE_STATUS_INT_STATUS0x00000002/* DOE Interrupt Status */Another redundancy, I would get rid of the second "
_STATUS".Quoted 1 line
+#define
PCI_DOE_STATUS_DATA_OBJECT_READY0x80000000/* Data Object Ready */I would shorten to
PCI_DOE_STATUS_READY.Quoted 6 lines
Simplify submitting work to the mailbox
Replacepci_doe_exchange_sync()withpci_doe_submit_task()Consumers of the mailbox are now responsible for setting up callbacks within a task object and submitting them to the mailbox to be processed.
Quoted 8 lines
I honestly think that's a mistake. All consumers both in the CDAT as well as in the SPDM series just want to wait for completion of the task. They have no need for an arbitrary callback and shouldn't be burdended with providing one. It just unnecessarily complicates the API.
So only providing
pci_doe_exchange_sync()and doing away withpci_doe_submit_task()would seem like a more appropriate approach.
This was discussed a couple of times and it was decided to keep the synchronicity out of the library functions and allow users to decide how to handle it.
Quoted 13 lines
Quoted 13 lines
include/linux/pci-doe.h new file +11
-0+/** +* pci_doe_for_each_off - Iterate each DOE capability +* @pdev: struct pci_dev to iterate +* @off: u16 of config space offset of each mailbox capability found +*/ +#define pci_doe_for_each_off (pdev, off) \ + for (off = pci_find_next_ext_capability(pdev, off, \ + PCI_EXT_CAP_ID_DOE); \ + off > 0; \ + off = pci_find_next_ext_capability(pdev, off, \ + PCI_EXT_CAP_ID_DOE))
Quoted 8 lines
include/linux/pci-doe.h line 116
Quoted 5 lines
include/linux/pci-doe.h new file +5
-0+ +struct pci_doe_mb *pci_doe_create_mb (struct pci_dev *pdev,u16 cap_offset, +bool use_irq); +void pci_doe_destroy_mb (struct pci_doe_mb *doe_mb); +bool pci_doe_supports_prot (struct pci_doe_mb *doe_mb,u16 vid,u8 type);Drivers should not be concerned with the intricacies of DOE capabilities and mailboxes.
I think it depends on which driver one is considering.
Quoted 5 lines
Moreover, the above API doesn't allow different drivers to access the same DOE mailbox concurrently, e.g. if that mailbox supports multiple protocols. There's no locking to serialize access to the mailbox by the drivers.
Correct it is up to the higher level code to do this.
Quoted 11 lines
This should be moved to the PCI core instead: In
pci_init_capabilities(), add a new callpci_doe_init()which enumerates all DOE capabilities. Add alist_headto structpci_devand add each DOE instance found to that list. Destroy the list elements inpci_destroy_dev(). No locking needed for thelist_head, you only ever modify the list on device enumeration and destruction.Then provide a
pci_doe_find_mailbox()library function which drivers call to retrieve thepci_doe_mbfor a given pci_dev/vid/type tuple. That avoids the need to traverse the list time and again.
All that could be done above these calls. I've abandoned the aux bus stuff after discussions with Dan. So perhaps burring this away from the CXL drivers is a good idea. But I still think this can serve as a base within the PCIe code.
Quoted 8 lines
Quoted 4 lines
+/**
+ * structpci_doe_mb- State for a single DOE mailboxWe generally use the same terms as the spec to make it easier for readers to connect the language in the spec to the implementation.
Quoted 8 lines
The spec uniformly refers to "DOE instance". I guess "mailbox" is slightly more concise, so keep that, but please at least mention the term "instance" in the struct's kernel-doc.
This implementation uses the term "task" for one request/response. That term is not mentioned in the spec at all. The spec refers to "exchange" and "transfer" on several occasions, so I would have chosen either one of those instead of the somewhat unfortunate "task".
Again this was discussed and we settled on task. I'm not married to the term and s/task/exchange/ is fine with me. But IFRC Dan was not happy with exchange.
Quoted 10 lines
Quoted 5 lines
+ * This state is used to manage a single DOE mailbox capability. All fields
+ * should be considered opaque to the consumers and the structure passed into
+ * the helpers below after being created bydevm_pci_doe_create()If the struct is considered opaque, why is it exposed in a public header file? Just use a forward declaration in the header so that consumers can pass around pointers to the struct, and hide the declaration proper in
doe.c.
I could do that. It just did not seem important enough to make it that strict.
Quoted 5 lines
Quoted 3 lines
+ * @pdev: PCI device this belongs to mailbox belongs to
^^^^^^^^^^Typo.
oops... yea slipped by in v9 as well.
Quoted 6 lines
Quoted 4 lines
+ * @prots: Array of protocols supported on this DOE
+ * @num_prots: Size of prots arrayUse @prots instead of prots everywhere in the kernel-doc.
Ok.
Quoted 9 lines
drivers/pci/pci-doe.c line 381
Quoted 6 lines
drivers/pci/pci-doe.c new file +4
-0+/* +* NOTE: doe_mb_prots is freed by pci_doe_free_mb automatically on +* error if pci_doe_cache_protocols() fails past this point. +*/ s/doe_mb_prots/doe_mb->prots/
s/pci_doe_free_mb/pci_doe_free_mb()/
This note has changed.
Quoted 10 lines
drivers/pci/pci-doe.c line 567
Quoted 5 lines
drivers/pci/pci-doe.c new file +3
-0+/* DOE requests must be a whole number of DW */ +if (task->request_pl_sz %sizeof (u32)) +return -EINVAL ;It would be nice if this restriction could be lifted. SPDM uses requests which are not padded to dword-length. It can run over other transports which may not impose such restrictions. The SPDM layer should not need to worry about quirks of the transport layer.
Are you suggesting that this layer PAD the request? I hear your concern but users of this layer will need to understand this in the request payload allocated anyway.
Quoted 25 lines
Quoted 25 lines
drivers/pci/pci-doe.c new file +23
-0+static irqreturn_t pci_doe_irq_handler (int irq,void *data) +{ +struct pci_doe_mb *doe_mb = data; +struct pci_dev *pdev = doe_mb->pdev; +int offset = doe_mb->cap_offset; +u32 val; + +pci_read_config_dword (pdev, offset +PCI_DOE_STATUS , &val); + +/* Leave the error case to be handled outside IRQ */ +if (FIELD_GET (PCI_DOE_STATUS_ERROR , val)) { +mod_delayed_work (system_wq, &doe_mb->statemachine,0 ); +return IRQ_HANDLED ; + } + +if (FIELD_GET (PCI_DOE_STATUS_INT_STATUS , val)) { +pci_write_config_dword (pdev, offset +PCI_DOE_STATUS , +PCI_DOE_STATUS_INT_STATUS ); +mod_delayed_work (system_wq, &doe_mb->statemachine,0 ); +return IRQ_HANDLED ; + } + +return IRQ_NONE ;
Quoted 8 lines
Quoted 1 line
+}
PCIe 6.0, table 7-316 says that an interrupt is also raised when "the DOE Busy bit has been Cleared", yet such an interrupt is not handled here. It is incorrectly treated as a spurious interrupt by returning
IRQ_NONE. The right thing to do is probably to wake the state machine in case it's polling for the Busy flag to clear.
I thought Jonathan and I had work through how this was correct. I'll have to review those threads.
Quoted 13 lines
include/linux/pci-doe.h line 26
Quoted 11 lines
include/linux/pci-doe.h new file +9
-0+enum pci_doe_state { +DOE_IDLE , +DOE_WAIT_RESP , +DOE_WAIT_ABORT , +DOE_WAIT_ABORT_ON_ERR , +}; + +#define PCI_DOE_FLAG_ABORT 0 +#define PCI_DOE_FLAG_DEAD 1That's all internal and should live in
doe.c, not the header file.
Sure if struct pci_doe_mb is moved.
Lets see how V9 looks from other perspectives. I've incorporated some of this feedback for V10.
Ira
Quoted 3 lines
Thanks,
Lukas
PATCH v8 4/10 cxl/pci: Create auxiliary devices for each DOE mailbox
In reply to [email protected]From: Ira Weiny <[email protected]>
CXL kernel drivers optionally need to access DOE mailbox capabilities. Access to mailboxes for things such as CDAT, SPDM, and IDE are needed by the kernel while other access is designed towards user space usage. An example of this is for CXL Compliance Testing (see CXL 2.0 14.16.4 Compliance Mode DOE) which offers a mechanism to set different test modes for a device.
There is no anticipated need for the kernel to share an individual mailbox with user space. Thus developing an interface to marshal access between the kernel and user space for a single mailbox is unnecessary overhead. However, having the kernel relinquish some mailboxes to be controlled by user space is a reasonable compromise to share access to the device.
The auxiliary bus provides an elegant solution for this. Each DOE capability is given its own auxiliary device. This device is controlled by a kernel driver by default which restricts access to the mailbox. Unbinding the driver from a single auxiliary device (DOE mailbox capability) frees the mailbox for user space access. This architecture also allows a clear picture on which mailboxes are kernel controlled vs not.
Iterate each DOE mailbox capability and create auxiliary bus devices. Follow on patches will define a driver for the newly created devices.
sysfs shows the devices.
$ ls -l /sys/bus/auxiliary/devices/ total 0 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.0 -> ../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.0 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.1 -> ../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.1 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.2 -> ../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.2 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.3 -> ../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.3 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.4 -> ../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.4 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.5 -> ../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.5 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.6 -> ../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.6 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.7 -> ../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.7
---
Changes from V7:
Minor code clean ups
Rebased on cxl-pending
Changes from V6:
Move all the auxiliary device stuff to the CXL layer
Changes from V5:
Split the CXL specific stuff off from the PCI DOE create auxiliary device code.
--- drivers/cxl/Kconfig | 1 + drivers/cxl/cxlpci.h | 21 +++++++ drivers/cxl/pci.c | 127 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 149 insertions(+)
drivers/cxl/Kconfig +1 -0
@@ -16,6 +16,7 @@ if CXL_BUS config CXL_PCI tristate "PCI manageability" default CXL_BUS + select AUXILIARY_BUS help The CXL specification defines a "CXL memory device" sub-class in the PCI "memory controller" base class of devices. Device's identified by
drivers/cxl/cxlpci.h +21 -0
@@ -2,6 +2,7 @@/* Copyright(c) 2020 Intel Corporation. All rights reserved. */ #ifndef __CXL_PCI_H__#define __CXL_PCI_H__ +#include <linux/auxiliary_bus.h> #include <linux/pci.h> #include "cxl.h"
@@ -72,4 +73,24 @@ static inline resource_size_t cxl_regmap_to_base(struct pci_dev *pdev, }int devm_cxl_port_enumerate_dports (struct cxl_port *port); + +/** +* struct cxl_doe_dev - CXL DOE auxiliary bus device +* +* @adev: Auxiliary bus device +* @pdev: PCI device this belongs to +* @cap_offset: Capability offset +* @use_irq: Set if IRQs are to be used with this mailbox +* +* This represents a single DOE mailbox device. CXL devices should create this +* device and register it on the Auxiliary bus for the CXL DOE driver to drive. +*/ +struct cxl_doe_dev { +struct auxiliary_device adev; +struct pci_dev *pdev; +int cap_offset; +bool use_irq; +}; +#define DOE_DEV_NAME "doe" +#endif /* __CXL_PCI_H__ */
drivers/cxl/pci.c +127 -0
145 lines not on this page · raw message
Signature · 1 line
2.35.1
Re: [PATCH V8 04/10] cxl/pci: Create auxiliary devices for each DOE mailbox
Quoted 40 lines · On Thu, 14 Apr 2022 13:32:31 -0700 [email protected] wrote:
From: Ira Weiny <[email protected]>
CXL kernel drivers optionally need to access DOE mailbox capabilities. Access to mailboxes for things such as CDAT, SPDM, and IDE are needed by the kernel while other access is designed towards user space usage. An example of this is for CXL Compliance Testing (see CXL 2.0 14.16.4 Compliance Mode DOE) which offers a mechanism to set different test modes for a device.
There is no anticipated need for the kernel to share an individual mailbox with user space. Thus developing an interface to marshal access between the kernel and user space for a single mailbox is unnecessary overhead. However, having the kernel relinquish some mailboxes to be controlled by user space is a reasonable compromise to share access to the device.
The auxiliary bus provides an elegant solution for this. Each DOE capability is given its own auxiliary device. This device is controlled by a kernel driver by default which restricts access to the mailbox. Unbinding the driver from a single auxiliary device (DOE mailbox capability) frees the mailbox for user space access. This architecture also allows a clear picture on which mailboxes are kernel controlled vs not.
Iterate each DOE mailbox capability and create auxiliary bus devices. Follow on patches will define a driver for the newly created devices.
sysfs shows the devices.
$ ls -l /sys/bus/auxiliary/devices/ total 0 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.0 -> ../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.0 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.1 -> ../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.1 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.2 -> ../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.2 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.3 -> ../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.3 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.4 -> ../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.4 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.5 -> ../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.5 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.6 -> ../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.6 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.7 -> ../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.7
Quoted 1 line
Signed-off-by Ira Weiny <[email protected]>
I'm not 100% happy with effectively having one solution for CXL and probably a different one for DOEs on switch ports (which I just hacked into a port service driver to convince myself there was at least one plausible way of doing that) but if this effectively separates the two discussions then I guess I can live with it for now ;)
Once this is merged we can start the discussion about how to handle switch ports with DOEs both for CDAT and SPDM.
I'll send out an RFC that is so hideous it will get people to suggestion how to do it better! Currently it starts and stops the mailbox 3 times in the registration path and I think it's more luck than judgement that is landing me with the right MSI.
Anyhow, this looks good to me.
Quoted 219 lines
---
Changes from V7:
Minor code clean ups
Rebased on cxl-pendingChanges from V6:
Move all the auxiliary device stuff to the CXL layerChanges from V5:
Split the CXL specific stuff off from the PCI DOE create auxiliary device code.--- drivers/cxl/Kconfig | 1 + drivers/cxl/cxlpci.h | 21 +++++++ drivers/cxl/pci.c | 127 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 149 insertions(+)drivers/cxl/Kconfig +1
-0@@ -16,6 +16,7 @@ if CXL_BUS config CXL_PCI tristate "PCI manageability" default CXL_BUS + select AUXILIARY_BUS help The CXL specification defines a "CXL memory device" sub-class in the PCI "memory controller" base class of devices. Device's identified bydrivers/cxl/cxlpci.h +21
-0@@ -2,6 +2,7 @@/* Copyright(c) 2020 Intel Corporation. All rights reserved. */ #ifndef __CXL_PCI_H__#define __CXL_PCI_H__ +#include <linux/auxiliary_bus.h> #include <linux/pci.h> #include "cxl.h" @@ -72,4 +73,24 @@ static inline resource_size_t cxl_regmap_to_base(struct pci_dev *pdev, }int devm_cxl_port_enumerate_dports (struct cxl_port *port); + +/** +* struct cxl_doe_dev - CXL DOE auxiliary bus device +* +* @adev: Auxiliary bus device +* @pdev: PCI device this belongs to +* @cap_offset: Capability offset +* @use_irq: Set if IRQs are to be used with this mailbox +* +* This represents a single DOE mailbox device. CXL devices should create this +* device and register it on the Auxiliary bus for the CXL DOE driver to drive. +*/ +struct cxl_doe_dev { +struct auxiliary_device adev; +struct pci_dev *pdev; +int cap_offset; +bool use_irq; +}; +#define DOE_DEV_NAME "doe" +#endif /* __CXL_PCI_H__ */ drivers/cxl/pci.c +127
-0@@ -8,6 +8,7 @@#include <linux/mutex.h> #include <linux/list.h> #include <linux/pci.h> +#include <linux/pci-doe.h> #include <linux/io.h> #include "cxlmem.h" #include "cxlpci.h" @@ -564,6 +565,128 @@ static void cxl_dvsec_ranges(struct cxl_dev_state *cxlds) info->ranges =__cxl_dvsec_ranges (cxlds, info); } +static void cxl_pci_free_irq_vectors (void *data) +{ +pci_free_irq_vectors (data); +} + +static DEFINE_IDA (pci_doe_adev_ida); + +static void cxl_pci_doe_dev_release (struct device *dev) +{ +struct auxiliary_device *adev =container_of (dev, + struct auxiliary_device, + dev); + struct cxl_doe_dev *doe_dev = container_of(adev, struct cxl_doe_dev, + adev); + +ida_free (&pci_doe_adev_ida, adev->id); +kfree (doe_dev); +} + +static void cxl_pci_doe_destroy_device (void *ad) +{ +auxiliary_device_delete (ad); +auxiliary_device_uninit (ad); +} + +/** +* cxl_pci_create_doe_devices - Create auxiliary bus DOE devices for all DOE +* mailboxes found +* +* @pci_dev: The PCI device to scan for DOE mailboxes +* +* There is no coresponding destroy of these devices. This function associates +* the DOE auxiliary devices created with the pci_dev passed in. That +* association is device managed (devm_*) such that the DOE auxiliary device +* lifetime is always less than or equal to the lifetime of the pci_dev. +* +* RETURNS: 0 on success -ERRNO on failure. +*/ +static int cxl_pci_create_doe_devices (struct pci_dev *pdev) +{ +struct device *dev = &pdev->dev; +bool use_irq = true; +int irqs =0 ; +u16 off =0 ; +int rc; + +pci_doe_for_each_off (pdev, off) + irqs++; +pci_info (pdev,"Found %d DOE mailbox's\n" , irqs); + +/* +* Allocate enough vectors for the DOE's +*/ + rc =pci_alloc_irq_vectors (pdev, irqs, irqs,PCI_IRQ_MSI | +PCI_IRQ_MSIX ); +if (rc != irqs) { +pci_err (pdev, +"Not enough interrupts for all the DOEs; use polling\n" ); + use_irq = false; +/* Some got allocated; clean them up */ +if (rc >0 ) +cxl_pci_free_irq_vectors (pdev); + }else { +/* +* Enabling bus mastering is require for MSI/MSIx. It could be +* done later within the DOE initialization, but as it +* potentially has other impacts keep it here when setting up +* the IRQ's. +*/ +pci_set_master (pdev); + rc =devm_add_action_or_reset (dev, + cxl_pci_free_irq_vectors, + pdev); +if (rc) +return rc; + } + +pci_doe_for_each_off (pdev, off) { +struct auxiliary_device *adev; +struct cxl_doe_dev *new_dev; +int id; + + new_dev =kzalloc (sizeof (*new_dev),GFP_KERNEL ); +if (!new_dev) +return -ENOMEM ; + + new_dev->pdev = pdev; + new_dev->cap_offset = off; + new_dev->use_irq = use_irq; + +/* Set up struct auxiliary_device */ + adev = &new_dev->adev; + id =ida_alloc (&pci_doe_adev_ida,GFP_KERNEL ); +if (id <0 ) { +kfree (new_dev); +return -ENOMEM ; + } + + adev->id = id; + adev->name =DOE_DEV_NAME ; + adev->dev.release = cxl_pci_doe_dev_release; + adev->dev.parent = dev; + +if (auxiliary_device_init (adev)) { +cxl_pci_doe_dev_release (&adev->dev); +return -EIO ; + } + +if (auxiliary_device_add (adev)) { +auxiliary_device_uninit (adev); +return -EIO ; + } + + rc =devm_add_action_or_reset (dev, cxl_pci_doe_destroy_device, + adev); +if (rc) +return rc; + } + +return 0 ; +} +static int cxl_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct cxl_register_map map;@@ -630,6 +753,10 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)if (rc)return rc; + rc =cxl_pci_create_doe_devices (pdev); +if (rc) +return rc; +cxl_dvsec_ranges (cxlds); cxlmd =devm_cxl_add_memdev (cxlds);
Re: [PATCH V8 04/10] cxl/pci: Create auxiliary devices for each DOE mailbox
Quoted 43 lines · Jonathan Cameron
Quoted 40 lines · On Thu, 14 Apr 2022 13:32:31 -0700 [email protected] wrote:
From: Ira Weiny <[email protected]>
CXL kernel drivers optionally need to access DOE mailbox capabilities. Access to mailboxes for things such as CDAT, SPDM, and IDE are needed by the kernel while other access is designed towards user space usage. An example of this is for CXL Compliance Testing (see CXL 2.0 14.16.4 Compliance Mode DOE) which offers a mechanism to set different test modes for a device.
There is no anticipated need for the kernel to share an individual mailbox with user space. Thus developing an interface to marshal access between the kernel and user space for a single mailbox is unnecessary overhead. However, having the kernel relinquish some mailboxes to be controlled by user space is a reasonable compromise to share access to the device.
The auxiliary bus provides an elegant solution for this. Each DOE capability is given its own auxiliary device. This device is controlled by a kernel driver by default which restricts access to the mailbox. Unbinding the driver from a single auxiliary device (DOE mailbox capability) frees the mailbox for user space access. This architecture also allows a clear picture on which mailboxes are kernel controlled vs not.
Iterate each DOE mailbox capability and create auxiliary bus devices. Follow on patches will define a driver for the newly created devices.
sysfs shows the devices.
$ ls -l /sys/bus/auxiliary/devices/ total 0 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.0 -> ../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.0 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.1 -> ../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.1 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.2 -> ../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.2 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.3 -> ../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.3 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.4 -> ../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.4 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.5 -> ../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.5 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.6 -> ../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.6 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.7 -> ../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.7
Quoted 8 lines
Quoted 1 line
Signed-off-by Ira Weiny <[email protected]>I'm not 100% happy with effectively having one solution for CXL and probably a different one for DOEs on switch ports (which I just hacked into a port service driver to convince myself there was at least one plausible way of doing that) but if this effectively separates the two discussions then I guess I can live with it for now ;)
I took some time this morning to mull this over and talk to Dan...
:-(
Truthfully the aux driver does very little except provide a way for admins to trigger the driver to stop/start accessing the Mailbox.
I suppose a simple sysfs interface could be done to do the same?
I'll let Dan weigh in here.
Quoted 3 lines
Once this is merged we can start the discussion about how to handle switch ports with DOEs both for CDAT and SPDM.
I'm ok with that too. However, I was thinking that this was not a user ABI. But it really is. If user space starts writing script to unbind drivers and then we drop the aux driver support it will break them...
Quoted 3 lines
I'll send out an RFC that is so hideous it will get people to suggestion how to do it better!
I think I'd like to see that.
Quoted 8 lines
Currently it starts and
stops the mailbox 3 times in the registration path and I think it's more luck than judgement that is landing me with the right MSI.Anyhow, this looks good to me.
Reviewed-by Jonathan Cameron <[email protected]>
Thanks!
The good news is that the main support for the algorithm is now just part of the pci core as library functions. I think this discussion is a pretty light lift to move the calls to those around...
Ira
Quoted 222 lines
Quoted 221 lines
---
Changes from V7:
Minor code clean ups
Rebased on cxl-pendingChanges from V6:
Move all the auxiliary device stuff to the CXL layerChanges from V5:
Split the CXL specific stuff off from the PCI DOE create auxiliary device code.--- drivers/cxl/Kconfig | 1 + drivers/cxl/cxlpci.h | 21 +++++++ drivers/cxl/pci.c | 127 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 149 insertions(+)drivers/cxl/Kconfig +1
-0@@ -16,6 +16,7 @@ if CXL_BUS config CXL_PCI tristate "PCI manageability" default CXL_BUS + select AUXILIARY_BUS help The CXL specification defines a "CXL memory device" sub-class in the PCI "memory controller" base class of devices. Device's identified bydrivers/cxl/cxlpci.h +21
-0@@ -2,6 +2,7 @@/* Copyright(c) 2020 Intel Corporation. All rights reserved. */ #ifndef __CXL_PCI_H__#define __CXL_PCI_H__ +#include <linux/auxiliary_bus.h> #include <linux/pci.h> #include "cxl.h" @@ -72,4 +73,24 @@ static inline resource_size_t cxl_regmap_to_base(struct pci_dev *pdev, }int devm_cxl_port_enumerate_dports (struct cxl_port *port); + +/** +* struct cxl_doe_dev - CXL DOE auxiliary bus device +* +* @adev: Auxiliary bus device +* @pdev: PCI device this belongs to +* @cap_offset: Capability offset +* @use_irq: Set if IRQs are to be used with this mailbox +* +* This represents a single DOE mailbox device. CXL devices should create this +* device and register it on the Auxiliary bus for the CXL DOE driver to drive. +*/ +struct cxl_doe_dev { +struct auxiliary_device adev; +struct pci_dev *pdev; +int cap_offset; +bool use_irq; +}; +#define DOE_DEV_NAME "doe" +#endif /* __CXL_PCI_H__ */ drivers/cxl/pci.c +127
-0@@ -8,6 +8,7 @@#include <linux/mutex.h> #include <linux/list.h> #include <linux/pci.h> +#include <linux/pci-doe.h> #include <linux/io.h> #include "cxlmem.h" #include "cxlpci.h" @@ -564,6 +565,128 @@ static void cxl_dvsec_ranges(struct cxl_dev_state *cxlds) info->ranges =__cxl_dvsec_ranges (cxlds, info); } +static void cxl_pci_free_irq_vectors (void *data) +{ +pci_free_irq_vectors (data); +} + +static DEFINE_IDA (pci_doe_adev_ida); + +static void cxl_pci_doe_dev_release (struct device *dev) +{ +struct auxiliary_device *adev =container_of (dev, + struct auxiliary_device, + dev); + struct cxl_doe_dev *doe_dev = container_of(adev, struct cxl_doe_dev, + adev); + +ida_free (&pci_doe_adev_ida, adev->id); +kfree (doe_dev); +} + +static void cxl_pci_doe_destroy_device (void *ad) +{ +auxiliary_device_delete (ad); +auxiliary_device_uninit (ad); +} + +/** +* cxl_pci_create_doe_devices - Create auxiliary bus DOE devices for all DOE +* mailboxes found +* +* @pci_dev: The PCI device to scan for DOE mailboxes +* +* There is no coresponding destroy of these devices. This function associates +* the DOE auxiliary devices created with the pci_dev passed in. That +* association is device managed (devm_*) such that the DOE auxiliary device +* lifetime is always less than or equal to the lifetime of the pci_dev. +* +* RETURNS: 0 on success -ERRNO on failure. +*/ +static int cxl_pci_create_doe_devices (struct pci_dev *pdev) +{ +struct device *dev = &pdev->dev; +bool use_irq = true; +int irqs =0 ; +u16 off =0 ; +int rc; + +pci_doe_for_each_off (pdev, off) + irqs++; +pci_info (pdev,"Found %d DOE mailbox's\n" , irqs); + +/* +* Allocate enough vectors for the DOE's +*/ + rc =pci_alloc_irq_vectors (pdev, irqs, irqs,PCI_IRQ_MSI | +PCI_IRQ_MSIX ); +if (rc != irqs) { +pci_err (pdev, +"Not enough interrupts for all the DOEs; use polling\n" ); + use_irq = false; +/* Some got allocated; clean them up */ +if (rc >0 ) +cxl_pci_free_irq_vectors (pdev); + }else { +/* +* Enabling bus mastering is require for MSI/MSIx. It could be +* done later within the DOE initialization, but as it +* potentially has other impacts keep it here when setting up +* the IRQ's. +*/ +pci_set_master (pdev); + rc =devm_add_action_or_reset (dev, + cxl_pci_free_irq_vectors, + pdev); +if (rc) +return rc; + } + +pci_doe_for_each_off (pdev, off) { +struct auxiliary_device *adev; +struct cxl_doe_dev *new_dev; +int id; + + new_dev =kzalloc (sizeof (*new_dev),GFP_KERNEL ); +if (!new_dev) +return -ENOMEM ; + + new_dev->pdev = pdev; + new_dev->cap_offset = off; + new_dev->use_irq = use_irq; + +/* Set up struct auxiliary_device */ + adev = &new_dev->adev; + id =ida_alloc (&pci_doe_adev_ida,GFP_KERNEL ); +if (id <0 ) { +kfree (new_dev); +return -ENOMEM ; + } + + adev->id = id; + adev->name =DOE_DEV_NAME ; + adev->dev.release = cxl_pci_doe_dev_release; + adev->dev.parent = dev; + +if (auxiliary_device_init (adev)) { +cxl_pci_doe_dev_release (&adev->dev); +return -EIO ; + } + +if (auxiliary_device_add (adev)) { +auxiliary_device_uninit (adev); +return -EIO ; + } + + rc =devm_add_action_or_reset (dev, cxl_pci_doe_destroy_device, + adev); +if (rc) +return rc; + } + +return 0 ; +} +static int cxl_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct cxl_register_map map;@@ -630,6 +753,10 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)if (rc)return rc; + rc =cxl_pci_create_doe_devices (pdev); +if (rc) +return rc; +cxl_dvsec_ranges (cxlds); cxlmd =devm_cxl_add_memdev (cxlds);
Re: [PATCH V8 04/10] cxl/pci: Create auxiliary devices for each DOE mailbox
Quoted 55 lines · On Thu, 28 Apr 2022 14:09:38 -0700 [email protected] wrote:
Quoted 43 lines · Jonathan Cameron
Quoted 40 lines · On Thu, 14 Apr 2022 13:32:31 -0700 [email protected] wrote:
From: Ira Weiny <[email protected]>
CXL kernel drivers optionally need to access DOE mailbox capabilities. Access to mailboxes for things such as CDAT, SPDM, and IDE are needed by the kernel while other access is designed towards user space usage. An example of this is for CXL Compliance Testing (see CXL 2.0 14.16.4 Compliance Mode DOE) which offers a mechanism to set different test modes for a device.
There is no anticipated need for the kernel to share an individual mailbox with user space. Thus developing an interface to marshal access between the kernel and user space for a single mailbox is unnecessary overhead. However, having the kernel relinquish some mailboxes to be controlled by user space is a reasonable compromise to share access to the device.
The auxiliary bus provides an elegant solution for this. Each DOE capability is given its own auxiliary device. This device is controlled by a kernel driver by default which restricts access to the mailbox. Unbinding the driver from a single auxiliary device (DOE mailbox capability) frees the mailbox for user space access. This architecture also allows a clear picture on which mailboxes are kernel controlled vs not.
Iterate each DOE mailbox capability and create auxiliary bus devices. Follow on patches will define a driver for the newly created devices.
sysfs shows the devices.
$ ls -l /sys/bus/auxiliary/devices/ total 0 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.0 -> ../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.0 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.1 -> ../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.1 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.2 -> ../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.2 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.3 -> ../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.3 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.4 -> ../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.4 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.5 -> ../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.5 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.6 -> ../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.6 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.7 -> ../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.7Quoted 8 lines
Quoted 1 line
Signed-off-by Ira Weiny <[email protected]>I'm not 100% happy with effectively having one solution for CXL and probably a different one for DOEs on switch ports (which I just hacked into a port service driver to convince myself there was at least one plausible way of doing that) but if this effectively separates the two discussions then I guess I can live with it for now ;)
I took some time this morning to mull this over and talk to Dan...
Quoted 8 lines
:-(
Truthfully the aux driver does very little except provide a way for admins to trigger the driver to stop/start accessing the Mailbox.
I suppose a simple sysfs interface could be done to do the same?
I'll let Dan weigh in here.
I wonder if best short term option is to not provide a means of removing it at all (separate from the PCI driver that is). Then we can take our time to decide on the interface if we ever get much demand for one.
Quoted 10 lines
Quoted 4 lines
Once this is merged we can start the discussion about how to handle switch ports with DOEs both for CDAT and SPDM.
I'm ok with that too. However, I was thinking that this was not a user ABI. But it really is. If user space starts writing script to unbind drivers and then we drop the aux driver support it will break them...
Quoted 1 line
Quoted 4 lines
Quoted 2 lines
I'll send out an RFC that is so hideous it will get people to suggestion how to do it better!
I think I'd like to see that.
Fair enough. It may muddy the waters a bit :( I'll send an RFC next week. I've not looked at how the CXL region code etc would actually get to the latency / bandwidth info from the driver yet it just goes as far as reading a CDAT length. I also want to actually hook up some decent switch CDAT emulation in the QEMU code (right now it's giving the same default table as for a type 3 device).
I just hope we don't bikeshed around the RFC in a fashion that slows this series moving forwards.
Quoted 8 lines
Quoted 8 lines
Currently it starts and
stops the mailbox 3 times in the registration path and I think it's more luck than judgement that is landing me with the right MSI.Anyhow, this looks good to me.
Quoted 7 lines
Quoted 1 line
Reviewed-by Jonathan Cameron <[email protected]>Thanks!
The good news is that the main support for the algorithm is now just part of the pci core as library functions. I think this discussion is a pretty light lift to move the calls to those around...
Absolutely - one nasty bit of code that seems to be almost agreed on - definite progress!
Jonathan
Quoted 225 lines
Ira
Quoted 222 lines
Quoted 221 lines
---
Changes from V7:
Minor code clean ups
Rebased on cxl-pendingChanges from V6:
Move all the auxiliary device stuff to the CXL layerChanges from V5:
Split the CXL specific stuff off from the PCI DOE create auxiliary device code.--- drivers/cxl/Kconfig | 1 + drivers/cxl/cxlpci.h | 21 +++++++ drivers/cxl/pci.c | 127 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 149 insertions(+)drivers/cxl/Kconfig +1
-0@@ -16,6 +16,7 @@ if CXL_BUS config CXL_PCI tristate "PCI manageability" default CXL_BUS + select AUXILIARY_BUS help The CXL specification defines a "CXL memory device" sub-class in the PCI "memory controller" base class of devices. Device's identified bydrivers/cxl/cxlpci.h +21
-0@@ -2,6 +2,7 @@/* Copyright(c) 2020 Intel Corporation. All rights reserved. */ #ifndef __CXL_PCI_H__#define __CXL_PCI_H__ +#include <linux/auxiliary_bus.h> #include <linux/pci.h> #include "cxl.h" @@ -72,4 +73,24 @@ static inline resource_size_t cxl_regmap_to_base(struct pci_dev *pdev, }int devm_cxl_port_enumerate_dports (struct cxl_port *port); + +/** +* struct cxl_doe_dev - CXL DOE auxiliary bus device +* +* @adev: Auxiliary bus device +* @pdev: PCI device this belongs to +* @cap_offset: Capability offset +* @use_irq: Set if IRQs are to be used with this mailbox +* +* This represents a single DOE mailbox device. CXL devices should create this +* device and register it on the Auxiliary bus for the CXL DOE driver to drive. +*/ +struct cxl_doe_dev { +struct auxiliary_device adev; +struct pci_dev *pdev; +int cap_offset; +bool use_irq; +}; +#define DOE_DEV_NAME "doe" +#endif /* __CXL_PCI_H__ */ drivers/cxl/pci.c +127
-0@@ -8,6 +8,7 @@#include <linux/mutex.h> #include <linux/list.h> #include <linux/pci.h> +#include <linux/pci-doe.h> #include <linux/io.h> #include "cxlmem.h" #include "cxlpci.h" @@ -564,6 +565,128 @@ static void cxl_dvsec_ranges(struct cxl_dev_state *cxlds) info->ranges =__cxl_dvsec_ranges (cxlds, info); } +static void cxl_pci_free_irq_vectors (void *data) +{ +pci_free_irq_vectors (data); +} + +static DEFINE_IDA (pci_doe_adev_ida); + +static void cxl_pci_doe_dev_release (struct device *dev) +{ +struct auxiliary_device *adev =container_of (dev, + struct auxiliary_device, + dev); + struct cxl_doe_dev *doe_dev = container_of(adev, struct cxl_doe_dev, + adev); + +ida_free (&pci_doe_adev_ida, adev->id); +kfree (doe_dev); +} + +static void cxl_pci_doe_destroy_device (void *ad) +{ +auxiliary_device_delete (ad); +auxiliary_device_uninit (ad); +} + +/** +* cxl_pci_create_doe_devices - Create auxiliary bus DOE devices for all DOE +* mailboxes found +* +* @pci_dev: The PCI device to scan for DOE mailboxes +* +* There is no coresponding destroy of these devices. This function associates +* the DOE auxiliary devices created with the pci_dev passed in. That +* association is device managed (devm_*) such that the DOE auxiliary device +* lifetime is always less than or equal to the lifetime of the pci_dev. +* +* RETURNS: 0 on success -ERRNO on failure. +*/ +static int cxl_pci_create_doe_devices (struct pci_dev *pdev) +{ +struct device *dev = &pdev->dev; +bool use_irq = true; +int irqs =0 ; +u16 off =0 ; +int rc; + +pci_doe_for_each_off (pdev, off) + irqs++; +pci_info (pdev,"Found %d DOE mailbox's\n" , irqs); + +/* +* Allocate enough vectors for the DOE's +*/ + rc =pci_alloc_irq_vectors (pdev, irqs, irqs,PCI_IRQ_MSI | +PCI_IRQ_MSIX ); +if (rc != irqs) { +pci_err (pdev, +"Not enough interrupts for all the DOEs; use polling\n" ); + use_irq = false; +/* Some got allocated; clean them up */ +if (rc >0 ) +cxl_pci_free_irq_vectors (pdev); + }else { +/* +* Enabling bus mastering is require for MSI/MSIx. It could be +* done later within the DOE initialization, but as it +* potentially has other impacts keep it here when setting up +* the IRQ's. +*/ +pci_set_master (pdev); + rc =devm_add_action_or_reset (dev, + cxl_pci_free_irq_vectors, + pdev); +if (rc) +return rc; + } + +pci_doe_for_each_off (pdev, off) { +struct auxiliary_device *adev; +struct cxl_doe_dev *new_dev; +int id; + + new_dev =kzalloc (sizeof (*new_dev),GFP_KERNEL ); +if (!new_dev) +return -ENOMEM ; + + new_dev->pdev = pdev; + new_dev->cap_offset = off; + new_dev->use_irq = use_irq; + +/* Set up struct auxiliary_device */ + adev = &new_dev->adev; + id =ida_alloc (&pci_doe_adev_ida,GFP_KERNEL ); +if (id <0 ) { +kfree (new_dev); +return -ENOMEM ; + } + + adev->id = id; + adev->name =DOE_DEV_NAME ; + adev->dev.release = cxl_pci_doe_dev_release; + adev->dev.parent = dev; + +if (auxiliary_device_init (adev)) { +cxl_pci_doe_dev_release (&adev->dev); +return -EIO ; + } + +if (auxiliary_device_add (adev)) { +auxiliary_device_uninit (adev); +return -EIO ; + } + + rc =devm_add_action_or_reset (dev, cxl_pci_doe_destroy_device, + adev); +if (rc) +return rc; + } + +return 0 ; +} +static int cxl_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct cxl_register_map map;@@ -630,6 +753,10 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)if (rc)return rc; + rc =cxl_pci_create_doe_devices (pdev); +if (rc) +return rc; +cxl_dvsec_ranges (cxlds); cxlmd =devm_cxl_add_memdev (cxlds);
Re: [PATCH V8 04/10] cxl/pci: Create auxiliary devices for each DOE mailbox
Quoted 95 lines · Jonathan Cameron
Quoted 55 lines · On Thu, 28 Apr 2022 14:09:38 -0700 [email protected] wrote:
Quoted 43 lines · Jonathan Cameron
Quoted 40 lines · On Thu, 14 Apr 2022 13:32:31 -0700 [email protected] wrote:
From: Ira Weiny <[email protected]>
CXL kernel drivers optionally need to access DOE mailbox capabilities. Access to mailboxes for things such as CDAT, SPDM, and IDE are needed by the kernel while other access is designed towards user space usage. An example of this is for CXL Compliance Testing (see CXL 2.0 14.16.4 Compliance Mode DOE) which offers a mechanism to set different test modes for a device.
There is no anticipated need for the kernel to share an individual mailbox with user space. Thus developing an interface to marshal access between the kernel and user space for a single mailbox is unnecessary overhead. However, having the kernel relinquish some mailboxes to be controlled by user space is a reasonable compromise to share access to the device.
The auxiliary bus provides an elegant solution for this. Each DOE capability is given its own auxiliary device. This device is controlled by a kernel driver by default which restricts access to the mailbox. Unbinding the driver from a single auxiliary device (DOE mailbox capability) frees the mailbox for user space access. This architecture also allows a clear picture on which mailboxes are kernel controlled vs not.
Iterate each DOE mailbox capability and create auxiliary bus devices. Follow on patches will define a driver for the newly created devices.
sysfs shows the devices.
$ ls -l /sys/bus/auxiliary/devices/ total 0 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.0 -> ../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.0 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.1 -> ../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.1 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.2 -> ../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.2 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.3 -> ../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.3 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.4 -> ../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.4 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.5 -> ../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.5 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.6 -> ../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.6 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.7 -> ../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.7Quoted 8 lines
Quoted 1 line
Signed-off-by Ira Weiny <[email protected]>I'm not 100% happy with effectively having one solution for CXL and probably a different one for DOEs on switch ports (which I just hacked into a port service driver to convince myself there was at least one plausible way of doing that) but if this effectively separates the two discussions then I guess I can live with it for now ;)
I took some time this morning to mull this over and talk to Dan...
Quoted 8 lines
:-(
Truthfully the aux driver does very little except provide a way for admins to trigger the driver to stop/start accessing the Mailbox.
I suppose a simple sysfs interface could be done to do the same?
I'll let Dan weigh in here.
I wonder if best short term option is to not provide a means of removing it at all (separate from the PCI driver that is). Then we can take our time to decide on the interface if we ever get much demand for one.
Quoted 10 lines
Quoted 4 lines
Once this is merged we can start the discussion about how to handle switch ports with DOEs both for CDAT and SPDM.
I'm ok with that too. However, I was thinking that this was not a user ABI. But it really is. If user space starts writing script to unbind drivers and then we drop the aux driver support it will break them...
Quoted 1 line
Quoted 4 lines
Quoted 2 lines
I'll send out an RFC that is so hideous it will get people to suggestion how to do it better!
I think I'd like to see that.
Fair enough. It may muddy the waters a bit :( I'll send an RFC next week. I've not looked at how the CXL region code etc would actually get to the latency / bandwidth info from the driver yet it just goes as far as reading a CDAT length. I also want to actually hook up some decent switch CDAT emulation in the QEMU code (right now it's giving the same default table as for a type 3 device).
Quoted 2 lines
I just hope we don't bikeshed around the RFC in a fashion that slows this series moving forwards.
I think we have time in the sense that the worst that happens is that tooling picks the wrong CFMWS to dynamically create a region and the performance ends up being sub-optimal. That's tolerable to work around in userspace in the near term. I want to get some wider confidence in the DOE ABI with respect to the known protocols and what to do about the vendor-specific protocols that may conflict and will be driven from userspace issued config-cycles. That likely means that no DOE ABI is the best ABI to start which means not moving forward with aux-devices so scripts do not become attached to something that is not fully committed to being carried forward.
I still want to refresh the request_config_region() support for at least having the kernel warn on userspace conflicting configuration writes to config areas claimed by a driver.
Re: [PATCH V8 04/10] cxl/pci: Create auxiliary devices for each DOE mailbox
Quoted 100 lines · On Fri, 29 Apr 2022 10:01:09 -0700 Dan Williams <[email protected]>…
Quoted 95 lines · Jonathan Cameron
Quoted 55 lines · On Thu, 28 Apr 2022 14:09:38 -0700 [email protected] wrote:
Quoted 43 lines · Jonathan Cameron
Quoted 40 lines · On Thu, 14 Apr 2022 13:32:31 -0700 [email protected] wrote:
From: Ira Weiny <[email protected]>
CXL kernel drivers optionally need to access DOE mailbox capabilities. Access to mailboxes for things such as CDAT, SPDM, and IDE are needed by the kernel while other access is designed towards user space usage. An example of this is for CXL Compliance Testing (see CXL 2.0 14.16.4 Compliance Mode DOE) which offers a mechanism to set different test modes for a device.
There is no anticipated need for the kernel to share an individual mailbox with user space. Thus developing an interface to marshal access between the kernel and user space for a single mailbox is unnecessary overhead. However, having the kernel relinquish some mailboxes to be controlled by user space is a reasonable compromise to share access to the device.
The auxiliary bus provides an elegant solution for this. Each DOE capability is given its own auxiliary device. This device is controlled by a kernel driver by default which restricts access to the mailbox. Unbinding the driver from a single auxiliary device (DOE mailbox capability) frees the mailbox for user space access. This architecture also allows a clear picture on which mailboxes are kernel controlled vs not.
Iterate each DOE mailbox capability and create auxiliary bus devices. Follow on patches will define a driver for the newly created devices.
sysfs shows the devices.
$ ls -l /sys/bus/auxiliary/devices/ total 0 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.0 -> ../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.0 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.1 -> ../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.1 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.2 -> ../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.2 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.3 -> ../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.3 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.4 -> ../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.4 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.5 -> ../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.5 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.6 -> ../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.6 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.7 -> ../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.7Quoted 8 lines
Quoted 1 line
Signed-off-by Ira Weiny <[email protected]>I'm not 100% happy with effectively having one solution for CXL and probably a different one for DOEs on switch ports (which I just hacked into a port service driver to convince myself there was at least one plausible way of doing that) but if this effectively separates the two discussions then I guess I can live with it for now ;)
I took some time this morning to mull this over and talk to Dan...
Quoted 8 lines
:-(
Truthfully the aux driver does very little except provide a way for admins to trigger the driver to stop/start accessing the Mailbox.
I suppose a simple sysfs interface could be done to do the same?
I'll let Dan weigh in here.
I wonder if best short term option is to not provide a means of removing it at all (separate from the PCI driver that is). Then we can take our time to decide on the interface if we ever get much demand for one.
Quoted 10 lines
Quoted 4 lines
Once this is merged we can start the discussion about how to handle switch ports with DOEs both for CDAT and SPDM.
I'm ok with that too. However, I was thinking that this was not a user ABI. But it really is. If user space starts writing script to unbind drivers and then we drop the aux driver support it will break them...
Quoted 1 line
Quoted 4 lines
Quoted 2 lines
I'll send out an RFC that is so hideous it will get people to suggestion how to do it better!
I think I'd like to see that.
Fair enough. It may muddy the waters a bit :( I'll send an RFC next week. I've not looked at how the CXL region code etc would actually get to the latency / bandwidth info from the driver yet it just goes as far as reading a CDAT length. I also want to actually hook up some decent switch CDAT emulation in the QEMU code (right now it's giving the same default table as for a type 3 device).
Quoted 2 lines
I just hope we don't bikeshed around the RFC in a fashion that slows this series moving forwards.
Quoted 7 lines
I think we have time in the sense that the worst that happens is that tooling picks the wrong CFMWS to dynamically create a region and the performance ends up being sub-optimal. That's tolerable to work around in userspace in the near term. I want to get some wider confidence in the DOE ABI with respect to the known protocols and what to do about the vendor-specific protocols that may conflict and will be driven from userspace issued config-cycles.
Hi Dan,
Ok, though I would like to try to push the conversation forwards beyond where we got to last year. IIRC the general conclusion was that all protocols sharing a DOE instance (and more generally because they all share discovery) must be mediated by the kernel and that we would not be supporting a generic access interface (there was one in a much earlier version of this patch set). Whilst it's far from the only thing that needs resolving, this DOE question is also a blocker on getting anywhere with CMA/SPDM. Unbinding a driver as the means to stop the kernel accessing a DOE is reliant on the host driver not deciding to do any more protocol discovery - we can probably rely on that but it's not pretty.
Quoted 4 lines
That likely means that no DOE ABI
is the best ABI to start which means not moving forward with aux-devices so scripts do not become attached to something that is not fully committed to being carried forward.
This isn't really DOE ABI we are currently discussing, it's a CXL subsystem ABI. If we decided to only expose the DOE as an internal implementation detail (calls made directly from appropriate existing CXL driver) then there wouldn't be an ABI question. We would be limiting DOE access for other protocols but personally I don't see that as a problem
in the short to medium term.
Things may be more 'interesting' for the PCIe port services driver though (see RFC just sent out)
https://lore.kernel.org/linux-cxl/[email protected]/T/#t
Perhaps if we can resolve what that should look like, the CXL EP side of things will be much easier to figure out?
Quoted 4 lines
I still want to refresh the
request_config_region()support for at least having the kernel warn on userspace conflicting configuration writes to config areas claimed by a driver.
Great, that seems like a sensible step to do in parallel.
Jonathan
Re: [PATCH V8 04/10] cxl/pci: Create auxiliary devices for each DOE mailbox
In reply to [email protected]Quoted 40 lines · On Thu, 14 Apr 2022 13:32:31 -0700 [email protected] wrote:
From: Ira Weiny <[email protected]>
CXL kernel drivers optionally need to access DOE mailbox capabilities. Access to mailboxes for things such as CDAT, SPDM, and IDE are needed by the kernel while other access is designed towards user space usage. An example of this is for CXL Compliance Testing (see CXL 2.0 14.16.4 Compliance Mode DOE) which offers a mechanism to set different test modes for a device.
There is no anticipated need for the kernel to share an individual mailbox with user space. Thus developing an interface to marshal access between the kernel and user space for a single mailbox is unnecessary overhead. However, having the kernel relinquish some mailboxes to be controlled by user space is a reasonable compromise to share access to the device.
The auxiliary bus provides an elegant solution for this. Each DOE capability is given its own auxiliary device. This device is controlled by a kernel driver by default which restricts access to the mailbox. Unbinding the driver from a single auxiliary device (DOE mailbox capability) frees the mailbox for user space access. This architecture also allows a clear picture on which mailboxes are kernel controlled vs not.
Iterate each DOE mailbox capability and create auxiliary bus devices. Follow on patches will define a driver for the newly created devices.
sysfs shows the devices.
$ ls -l /sys/bus/auxiliary/devices/ total 0 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.0 -> ../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.0 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.1 -> ../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.1 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.2 -> ../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.2 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.3 -> ../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.3 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.4 -> ../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.4 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.5 -> ../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.5 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.6 -> ../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.6 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.7 -> ../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.7
Quoted 1 line
Signed-off-by Ira Weiny <[email protected]>
oops. I just replied to v7. The point still stands though. Repeated briefly below.
Quoted 121 lines
---
Changes from V7:
Minor code clean ups
Rebased on cxl-pendingChanges from V6:
Move all the auxiliary device stuff to the CXL layerChanges from V5:
Split the CXL specific stuff off from the PCI DOE create auxiliary device code.--- drivers/cxl/Kconfig | 1 + drivers/cxl/cxlpci.h | 21 +++++++ drivers/cxl/pci.c | 127 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 149 insertions(+)drivers/cxl/Kconfig +1
-0@@ -16,6 +16,7 @@ if CXL_BUS config CXL_PCI tristate "PCI manageability" default CXL_BUS + select AUXILIARY_BUS help The CXL specification defines a "CXL memory device" sub-class in the PCI "memory controller" base class of devices. Device's identified bydrivers/cxl/cxlpci.h +21
-0@@ -2,6 +2,7 @@/* Copyright(c) 2020 Intel Corporation. All rights reserved. */ #ifndef __CXL_PCI_H__#define __CXL_PCI_H__ +#include <linux/auxiliary_bus.h> #include <linux/pci.h> #include "cxl.h" @@ -72,4 +73,24 @@ static inline resource_size_t cxl_regmap_to_base(struct pci_dev *pdev, }int devm_cxl_port_enumerate_dports (struct cxl_port *port); + +/** +* struct cxl_doe_dev - CXL DOE auxiliary bus device +* +* @adev: Auxiliary bus device +* @pdev: PCI device this belongs to +* @cap_offset: Capability offset +* @use_irq: Set if IRQs are to be used with this mailbox +* +* This represents a single DOE mailbox device. CXL devices should create this +* device and register it on the Auxiliary bus for the CXL DOE driver to drive. +*/ +struct cxl_doe_dev { +struct auxiliary_device adev; +struct pci_dev *pdev; +int cap_offset; +bool use_irq; +}; +#define DOE_DEV_NAME "doe" +#endif /* __CXL_PCI_H__ */ drivers/cxl/pci.c +39
-0@@ -8,6 +8,7 @@#include <linux/mutex.h> #include <linux/list.h> #include <linux/pci.h> +#include <linux/pci-doe.h> #include <linux/io.h> #include "cxlmem.h" #include "cxlpci.h" @@ -564,6 +565,128 @@ static void cxl_dvsec_ranges(struct cxl_dev_state *cxlds) info->ranges =__cxl_dvsec_ranges (cxlds, info); } +static void cxl_pci_free_irq_vectors (void *data) +{ +pci_free_irq_vectors (data); +} + +static DEFINE_IDA (pci_doe_adev_ida); + +static void cxl_pci_doe_dev_release (struct device *dev) +{ +struct auxiliary_device *adev =container_of (dev, + struct auxiliary_device, + dev); + struct cxl_doe_dev *doe_dev = container_of(adev, struct cxl_doe_dev, + adev); + +ida_free (&pci_doe_adev_ida, adev->id); +kfree (doe_dev); +} + +static void cxl_pci_doe_destroy_device (void *ad) +{ +auxiliary_device_delete (ad); +auxiliary_device_uninit (ad); +} + +/** +* cxl_pci_create_doe_devices - Create auxiliary bus DOE devices for all DOE +* mailboxes found +* +* @pci_dev: The PCI device to scan for DOE mailboxes +* +* There is no coresponding destroy of these devices. This function associates +* the DOE auxiliary devices created with the pci_dev passed in. That +* association is device managed (devm_*) such that the DOE auxiliary device +* lifetime is always less than or equal to the lifetime of the pci_dev. +* +* RETURNS: 0 on success -ERRNO on failure. +*/
drivers/cxl/pci.c static void cxl_dvsec_ranges(struct cxl_dev_state *cxlds) · line 615
Quoted 10 lines
drivers/cxl/pci.c +10
-0+static int cxl_pci_create_doe_devices (struct pci_dev *pdev) +{ +struct device *dev = &pdev->dev; +bool use_irq = true; +int irqs =0 ; +u16 off =0 ; +int rc; + +pci_doe_for_each_off (pdev, off) + irqs++;
I believe this is insufficient because there may be other irqs in use on the device. In a similar fashion to that done in pcie/portdrv_core.c I think we need to instead find the maximum msi/msix vector number by reading the config space. Then we request one more vector than that max value to ensure the vector we need has been requested.
Jonathan
Quoted 88 lines
drivers/cxl/pci.c +78
-0+pci_info (pdev,"Found %d DOE mailbox's\n" , irqs); + +/* +* Allocate enough vectors for the DOE's +*/ + rc =pci_alloc_irq_vectors (pdev, irqs, irqs,PCI_IRQ_MSI | +PCI_IRQ_MSIX ); +if (rc != irqs) { +pci_err (pdev, +"Not enough interrupts for all the DOEs; use polling\n" ); + use_irq = false; +/* Some got allocated; clean them up */ +if (rc >0 ) +cxl_pci_free_irq_vectors (pdev); + }else { +/* +* Enabling bus mastering is require for MSI/MSIx. It could be +* done later within the DOE initialization, but as it +* potentially has other impacts keep it here when setting up +* the IRQ's. +*/ +pci_set_master (pdev); + rc =devm_add_action_or_reset (dev, + cxl_pci_free_irq_vectors, + pdev); +if (rc) +return rc; + } + +pci_doe_for_each_off (pdev, off) { +struct auxiliary_device *adev; +struct cxl_doe_dev *new_dev; +int id; + + new_dev =kzalloc (sizeof (*new_dev),GFP_KERNEL ); +if (!new_dev) +return -ENOMEM ; + + new_dev->pdev = pdev; + new_dev->cap_offset = off; + new_dev->use_irq = use_irq; + +/* Set up struct auxiliary_device */ + adev = &new_dev->adev; + id =ida_alloc (&pci_doe_adev_ida,GFP_KERNEL ); +if (id <0 ) { +kfree (new_dev); +return -ENOMEM ; + } + + adev->id = id; + adev->name =DOE_DEV_NAME ; + adev->dev.release = cxl_pci_doe_dev_release; + adev->dev.parent = dev; + +if (auxiliary_device_init (adev)) { +cxl_pci_doe_dev_release (&adev->dev); +return -EIO ; + } + +if (auxiliary_device_add (adev)) { +auxiliary_device_uninit (adev); +return -EIO ; + } + + rc =devm_add_action_or_reset (dev, cxl_pci_doe_destroy_device, + adev); +if (rc) +return rc; + } + +return 0 ; +} +static int cxl_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct cxl_register_map map;@@ -630,6 +753,10 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)if (rc)return rc; + rc =cxl_pci_create_doe_devices (pdev); +if (rc) +return rc; +cxl_dvsec_ranges (cxlds); cxlmd =devm_cxl_add_memdev (cxlds);
Re: [PATCH V8 04/10] cxl/pci: Create auxiliary devices for each DOE mailbox
Quoted 5 lines · Jonathan Cameron
Quoted 2 lines · On Thu, 14 Apr 2022 13:32:31 -0700 [email protected] wrote:
From: Ira Weiny <[email protected]>
[snip]
Quoted 18 lines
Quoted 18 lines
drivers/cxl/pci.c +18
-0+ +/** +* cxl_pci_create_doe_devices - Create auxiliary bus DOE devices for all DOE +* mailboxes found +* +* @pci_dev: The PCI device to scan for DOE mailboxes +* +* There is no coresponding destroy of these devices. This function associates +* the DOE auxiliary devices created with the pci_dev passed in. That +* association is device managed (devm_*) such that the DOE auxiliary device +* lifetime is always less than or equal to the lifetime of the pci_dev. +* +* RETURNS: 0 on success -ERRNO on failure. +*/ +static int cxl_pci_create_doe_devices (struct pci_dev *pdev) +{ +struct device *dev = &pdev->dev; +bool use_irq = true;
Quoted 8 lines
drivers/cxl/pci.c static void cxl_dvsec_ranges(struct cxl_dev_state *cxlds) · line 615
Quoted 6 lines
drivers/cxl/pci.c +6
-0+int irqs =0 ; +u16 off =0 ; +int rc; + +pci_doe_for_each_off (pdev, off) + irqs++;I believe this is insufficient because there may be other irqs in use on the device.
I did not think that was true for any current CXL device. From what I could tell all CXL devices would be covered by this simple calculation. I left it to the reader to determine if a new CXL device came along which needed other irq's to lift this somewhere to cover those allocations. I probably should have made some comment. Sorry.
Quoted 3 lines
In a similar fashion to that done in
pcie/portdrv_core.cI think we need to instead find the maximum msi/msix vector number by reading the config space.
I was not aware I could do that...
Quoted 2 lines
Then we request one more vector
than that max value to ensure the vector we need has been requested.
Yea at some point I figured this would be lifted out of here as part of a larger 'allocate all the vectors for the device' function.
But for now this is the only place that needs irqs so I punted. I can lift this into something like
cxl_pci_alloc_irq_vectors(...) and then pass use_irq here.
But to move this series forward I would propose that cxl_pci_alloc_irq_vectors() do what I'm doing here for now.
Ira
Quoted 92 lines
Jonathan
Quoted 88 lines
drivers/cxl/pci.c +78
-0+pci_info (pdev,"Found %d DOE mailbox's\n" , irqs); + +/* +* Allocate enough vectors for the DOE's +*/ + rc =pci_alloc_irq_vectors (pdev, irqs, irqs,PCI_IRQ_MSI | +PCI_IRQ_MSIX ); +if (rc != irqs) { +pci_err (pdev, +"Not enough interrupts for all the DOEs; use polling\n" ); + use_irq = false; +/* Some got allocated; clean them up */ +if (rc >0 ) +cxl_pci_free_irq_vectors (pdev); + }else { +/* +* Enabling bus mastering is require for MSI/MSIx. It could be +* done later within the DOE initialization, but as it +* potentially has other impacts keep it here when setting up +* the IRQ's. +*/ +pci_set_master (pdev); + rc =devm_add_action_or_reset (dev, + cxl_pci_free_irq_vectors, + pdev); +if (rc) +return rc; + } + +pci_doe_for_each_off (pdev, off) { +struct auxiliary_device *adev; +struct cxl_doe_dev *new_dev; +int id; + + new_dev =kzalloc (sizeof (*new_dev),GFP_KERNEL ); +if (!new_dev) +return -ENOMEM ; + + new_dev->pdev = pdev; + new_dev->cap_offset = off; + new_dev->use_irq = use_irq; + +/* Set up struct auxiliary_device */ + adev = &new_dev->adev; + id =ida_alloc (&pci_doe_adev_ida,GFP_KERNEL ); +if (id <0 ) { +kfree (new_dev); +return -ENOMEM ; + } + + adev->id = id; + adev->name =DOE_DEV_NAME ; + adev->dev.release = cxl_pci_doe_dev_release; + adev->dev.parent = dev; + +if (auxiliary_device_init (adev)) { +cxl_pci_doe_dev_release (&adev->dev); +return -EIO ; + } + +if (auxiliary_device_add (adev)) { +auxiliary_device_uninit (adev); +return -EIO ; + } + + rc =devm_add_action_or_reset (dev, cxl_pci_doe_destroy_device, + adev); +if (rc) +return rc; + } + +return 0 ; +} +static int cxl_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct cxl_register_map map;@@ -630,6 +753,10 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)if (rc)return rc; + rc =cxl_pci_create_doe_devices (pdev); +if (rc) +return rc; +cxl_dvsec_ranges (cxlds); cxlmd =devm_cxl_add_memdev (cxlds);
Re: [PATCH V8 04/10] cxl/pci: Create auxiliary devices for each DOE mailbox
Quoted 54 lines · On Fri, 29 Apr 2022 10:20:54 -0700 Ira Weiny <[email protected]> wrote:
Quoted 5 lines · Jonathan Cameron
Quoted 2 lines · On Thu, 14 Apr 2022 13:32:31 -0700 [email protected] wrote:
From: Ira Weiny <[email protected]>
[snip]
Quoted 18 lines
Quoted 18 lines
drivers/cxl/pci.c +18
-0+ +/** +* cxl_pci_create_doe_devices - Create auxiliary bus DOE devices for all DOE +* mailboxes found +* +* @pci_dev: The PCI device to scan for DOE mailboxes +* +* There is no coresponding destroy of these devices. This function associates +* the DOE auxiliary devices created with the pci_dev passed in. That +* association is device managed (devm_*) such that the DOE auxiliary device +* lifetime is always less than or equal to the lifetime of the pci_dev. +* +* RETURNS: 0 on success -ERRNO on failure. +*/ +static int cxl_pci_create_doe_devices (struct pci_dev *pdev) +{ +struct device *dev = &pdev->dev; +bool use_irq = true;Quoted 8 lines
drivers/cxl/pci.c static void cxl_dvsec_ranges(struct cxl_dev_state *cxlds) · line 615
Quoted 6 lines
drivers/cxl/pci.c +6
-0+int irqs =0 ; +u16 off =0 ; +int rc; + +pci_doe_for_each_off (pdev, off) + irqs++;I believe this is insufficient because there may be other irqs in use on the device.
I did not think that was true for any current CXL device. From what I could tell all CXL devices would be covered by this simple calculation. I left it to the reader to determine if a new CXL device came along which needed other irq's to lift this somewhere to cover those allocations. I probably should have made some comment. Sorry.
Quoted 3 lines
In a similar fashion to that done in
pcie/portdrv_core.cI think we need to instead find the maximum msi/msix vector number by reading the config space.I was not aware I could do that...
Quoted 2 lines
Then we request one more vector
than that max value to ensure the vector we need has been requested.Yea at some point I figured this would be lifted out of here as part of a larger 'allocate all the vectors for the device' function.
Quoted 7 lines
But for now this is the only place that needs irqs so I punted. I can lift this into something like
cxl_pci_alloc_irq_vectors(...)and then passuse_irqhere.But to move this series forward I would propose that
cxl_pci_alloc_irq_vectors()do what I'm doing here for now.
Handling this right is pretty simple code e.g. equivalent of
https://elixir.bootlin.com/linux/latest/source/drivers/pci/pcie/portdrv_core.c#L62
So my inclination would be to fix it now rather than leaving chance of some odd failures later.
Jonathan
Quoted 95 lines
Ira
Quoted 92 lines
Jonathan
Quoted 88 lines
drivers/cxl/pci.c +78
-0+pci_info (pdev,"Found %d DOE mailbox's\n" , irqs); + +/* +* Allocate enough vectors for the DOE's +*/ + rc =pci_alloc_irq_vectors (pdev, irqs, irqs,PCI_IRQ_MSI | +PCI_IRQ_MSIX ); +if (rc != irqs) { +pci_err (pdev, +"Not enough interrupts for all the DOEs; use polling\n" ); + use_irq = false; +/* Some got allocated; clean them up */ +if (rc >0 ) +cxl_pci_free_irq_vectors (pdev); + }else { +/* +* Enabling bus mastering is require for MSI/MSIx. It could be +* done later within the DOE initialization, but as it +* potentially has other impacts keep it here when setting up +* the IRQ's. +*/ +pci_set_master (pdev); + rc =devm_add_action_or_reset (dev, + cxl_pci_free_irq_vectors, + pdev); +if (rc) +return rc; + } + +pci_doe_for_each_off (pdev, off) { +struct auxiliary_device *adev; +struct cxl_doe_dev *new_dev; +int id; + + new_dev =kzalloc (sizeof (*new_dev),GFP_KERNEL ); +if (!new_dev) +return -ENOMEM ; + + new_dev->pdev = pdev; + new_dev->cap_offset = off; + new_dev->use_irq = use_irq; + +/* Set up struct auxiliary_device */ + adev = &new_dev->adev; + id =ida_alloc (&pci_doe_adev_ida,GFP_KERNEL ); +if (id <0 ) { +kfree (new_dev); +return -ENOMEM ; + } + + adev->id = id; + adev->name =DOE_DEV_NAME ; + adev->dev.release = cxl_pci_doe_dev_release; + adev->dev.parent = dev; + +if (auxiliary_device_init (adev)) { +cxl_pci_doe_dev_release (&adev->dev); +return -EIO ; + } + +if (auxiliary_device_add (adev)) { +auxiliary_device_uninit (adev); +return -EIO ; + } + + rc =devm_add_action_or_reset (dev, cxl_pci_doe_destroy_device, + adev); +if (rc) +return rc; + } + +return 0 ; +} +static int cxl_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct cxl_register_map map;@@ -630,6 +753,10 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)if (rc)return rc; + rc =cxl_pci_create_doe_devices (pdev); +if (rc) +return rc; +cxl_dvsec_ranges (cxlds); cxlmd =devm_cxl_add_memdev (cxlds);
PATCH v8 5/10 cxl/pci: Create DOE auxiliary driver
In reply to [email protected]From: Ira Weiny <[email protected]>
CXL kernel drivers optionally need to access DOE mailbox capabilities. Access to mailboxes for things such as CDAT, SPDM, and IDE are needed by the kernel while other access is designed towards user space usage. An example of this is for CXL Compliance Testing (see CXL 2.0 14.16.4 Compliance Mode DOE) which offers a mechanism to set different test modes for a device.
There is no anticipated need for the kernel to share an individual mailbox with user space. Thus developing an interface to marshal access between the kernel and user space for a single mailbox is unnecessary overhead. However, having the kernel relinquish some mailboxes to be controlled by user space is a reasonable compromise to share access to the device.
The auxiliary bus provides an elegant solution for this. Each DOE capability is given its own auxiliary device. This device is controlled by a kernel driver by default which restricts access to the mailbox. Unbinding the driver from a single auxiliary device (DOE mailbox capability) frees the mailbox for user space access. This architecture also allows a clear picture on which mailboxes are kernel controlled vs not.
Create a driver for the DOE auxiliary devices. The driver uses the PCI DOE core to manage the mailbox.
User space must be prevented from unbinding the driver state when the DOE auxiliary driver is being accessed by the kernel. Add a read write lock to the DOE auxiliary device to protect the driver data portion.
Finally, flag the driver module to be preloaded by device creation to ensure the driver is attached when iterating the DOE capabilities.
User space access can be obtained by unbinding the driver from that device. For example:
$ ls -l /sys/bus/auxiliary/drivers total 0 drwxr-xr-x 2 root root 0 Mar 24 10:45 cxl_doe.cxl_doe_drv
$ ls -l /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci* lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.0 -> ../../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.0 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.1 -> ../../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.1 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.2 -> ../../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.2 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.3 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.3 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.3 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.4 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.5 -> ../../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.5 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.6 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.6 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.7 -> ../../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.7
$ echo "cxl_pci.doe.4" > /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/unbind
$ ls -l /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci* lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.0 -> ../../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.0 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.1 -> ../../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.1 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.2 -> ../../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.2 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.3 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.3 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.5 -> ../../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.5 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.6 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.6 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.7 -> ../../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.7
---
Changes from V7:
Now need to select PCI_DOE
Change MODULE_LICENSE to 'GPL' instead of old 'GPL v2'
Changes from V6:
The CXL layer now contains the driver for these auxiliary devices.
Changes from V5:
Split the CXL specific stuff off from the PCI DOE create auxiliary device code.
--- drivers/cxl/Kconfig | 13 +++++ drivers/cxl/Makefile | 2 + drivers/cxl/cxlpci.h | 13 +++++ drivers/cxl/doe.c | 90 +++++++++++++++++++++++++++++++++++ drivers/cxl/pci.c | 20 ++++++++ include/uapi/linux/pci_regs.h | 1 + 6 files changed, 139 insertions(+) create mode 100644 drivers/cxl/doe.c
drivers/cxl/Kconfig +13 -0
@@ -103,4 +103,17 @@ config CXL_SUSPEND def_bool y depends on SUSPEND && CXL_MEM +config CXL_PCI_DOE + tristate "CXL PCI Data Object Exchange (DOE) support" + depends on CXL_PCI + default CXL_BUS + select PCI_DOE + help + Driver for DOE auxiliary devices. + + The DOE capabilities provides a simple mailbox in PCI config space that + is used for a number of different protocols useful to CXL. The CXL PCI + subsystem creates auxiliary devices for each DOE mailbox capability + found. This driver is required for the kernel to use these devices. + endif
drivers/cxl/Makefile +2 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 obj-y += core/ obj-$(CONFIG_CXL_PCI) += cxl_pci.o +obj-$(CONFIG_CXL_PCI_DOE) += cxl_doe.o obj-$(CONFIG_CXL_MEM) += cxl_mem.o obj-$(CONFIG_CXL_ACPI) += cxl_acpi.o obj-$(CONFIG_CXL_PMEM) += cxl_pmem.o
@@ -8,6 +9,7 @@ obj-$(CONFIG_CXL_PORT) += cxl_port.o cxl_mem-y := mem.o cxl_pci-y := pci.o +cxl_doe-y := doe.o cxl_acpi-y := acpi.o cxl_pmem-y := pmem.o cxl_port-y := port.o
drivers/cxl/cxlpci.h +13 -0
@@ -79,6 +79,7 @@ int devm_cxl_port_enumerate_dports(struct cxl_port *port);* * @adev: Auxiliary bus device * @pdev: PCI device this belongs to +* @driver_access: Lock the driver during access * @cap_offset: Capability offset * @use_irq: Set if IRQs are to be used with this mailbox *
@@ -88,9 +89,21 @@ int devm_cxl_port_enumerate_dports(struct cxl_port *port);struct cxl_doe_dev {struct auxiliary_device adev;struct pci_dev *pdev; +struct rw_semaphore driver_access;int cap_offset;bool use_irq; };#define DOE_DEV_NAME "doe" +/** +* struct cxl_doe_drv_state - state of the DOE Aux driver +* +* @doe_dev: The Auxiliary DOE device +* @doe_mb: PCI DOE mailbox state +*/ +struct cxl_doe_drv_state { +struct cxl_doe_dev *doe_dev; +struct pci_doe_mb *doe_mb; +}; +#endif /* __CXL_PCI_H__ */
drivers/cxl/doe.c new file +90 -0
90 lines not on this page · raw message
drivers/cxl/pci.c +20 -0
@@ -590,6 +590,17 @@ static void cxl_pci_doe_destroy_device(void *ad)auxiliary_device_uninit (ad); } +static struct cxl_doe_drv_state *cxl_pci_doe_get_drv (struct cxl_doe_dev *doe_dev) +{ +down_read (&doe_dev->driver_access); +return auxiliary_get_drvdata (&doe_dev->adev); +} + +static void cxl_pci_doe_put_drv (struct cxl_doe_dev *doe_dev) +{ +up_read (&doe_dev->driver_access); +} +/** * cxl_pci_create_doe_devices - Create auxiliary bus DOE devices for all DOE * mailboxes found
@@ -652,6 +663,7 @@ static int cxl_pci_create_doe_devices(struct pci_dev *pdev)return -ENOMEM ; new_dev->pdev = pdev; +init_rwsem (&new_dev->driver_access); new_dev->cap_offset = off; new_dev->use_irq = use_irq;
@@ -682,6 +694,13 @@ static int cxl_pci_create_doe_devices(struct pci_dev *pdev) adev);if (rc)return rc; + +if (device_attach (&adev->dev) !=1 ) { +dev_err (&adev->dev, +"Failed to attach a driver to DOE device %d\n" , + adev->id); +return -ENODEV ; + } }return 0 ;
@@ -785,6 +804,7 @@ static struct pci_driver cxl_pci_driver = { }, }; +MODULE_SOFTDEP ("pre: cxl_doe" );MODULE_LICENSE ("GPL v2" );module_pci_driver (cxl_pci_driver);MODULE_IMPORT_NS (CXL );
include/uapi/linux/pci_regs.h +1 -0
@@ -1118,6 +1118,7 @@#define PCI_DOE_STATUS_DATA_OBJECT_READY 0x80000000/* Data Object Ready */ #define PCI_DOE_WRITE 0x10/* DOE Write Data Mailbox Register */ #define PCI_DOE_READ 0x14/* DOE Read Data Mailbox Register */ +#define PCI_DOE_CAP_SIZE (0x14 + 4)/* Size of this register block */ /* DOE Data Object - note not actually registers */ #define PCI_DOE_DATA_OBJECT_HEADER_1_VID 0x0000ffff
Signature · 1 line
2.35.1
Re: [PATCH V8 05/10] cxl/pci: Create DOE auxiliary driver
Quoted 62 lines · On Thu, 14 Apr 2022 13:32:32 -0700 [email protected] wrote:
From: Ira Weiny <[email protected]>
CXL kernel drivers optionally need to access DOE mailbox capabilities. Access to mailboxes for things such as CDAT, SPDM, and IDE are needed by the kernel while other access is designed towards user space usage. An example of this is for CXL Compliance Testing (see CXL 2.0 14.16.4 Compliance Mode DOE) which offers a mechanism to set different test modes for a device.
There is no anticipated need for the kernel to share an individual mailbox with user space. Thus developing an interface to marshal access between the kernel and user space for a single mailbox is unnecessary overhead. However, having the kernel relinquish some mailboxes to be controlled by user space is a reasonable compromise to share access to the device.
The auxiliary bus provides an elegant solution for this. Each DOE capability is given its own auxiliary device. This device is controlled by a kernel driver by default which restricts access to the mailbox. Unbinding the driver from a single auxiliary device (DOE mailbox capability) frees the mailbox for user space access. This architecture also allows a clear picture on which mailboxes are kernel controlled vs not.
Create a driver for the DOE auxiliary devices. The driver uses the PCI DOE core to manage the mailbox.
User space must be prevented from unbinding the driver state when the DOE auxiliary driver is being accessed by the kernel. Add a read write lock to the DOE auxiliary device to protect the driver data portion.
Finally, flag the driver module to be preloaded by device creation to ensure the driver is attached when iterating the DOE capabilities.
User space access can be obtained by unbinding the driver from that device. For example:
$ ls -l /sys/bus/auxiliary/drivers total 0 drwxr-xr-x 2 root root 0 Mar 24 10:45 cxl_doe.cxl_doe_drv$ ls -l /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci* lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.0 -> ../../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.0 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.1 -> ../../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.1 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.2 -> ../../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.2 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.3 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.3 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.3 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.4 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.5 -> ../../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.5 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.6 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.6 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.7 -> ../../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.7$ echo "cxl_pci.doe.4" > /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/unbind$ ls -l /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci* lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.0 -> ../../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.0 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.1 -> ../../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.1 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.2 -> ../../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.2 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.3 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.3 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.5 -> ../../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.5 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.6 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.6 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.7 -> ../../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.7
Quoted 1 line
Signed-off-by Ira Weiny <[email protected]>
Hi Ira,
A few minor comments inline.
With those cleaned up
Quoted 28 lines
---
Changes from V7:
Now need to selectPCI_DOE
ChangeMODULE_LICENSEto 'GPL' instead of old 'GPL v2'Changes from V6:
The CXL layer now contains the driver for these auxiliary devices.Changes from V5:
Split the CXL specific stuff off from the PCI DOE create auxiliary device code.--- drivers/cxl/Kconfig | 13 +++++ drivers/cxl/Makefile | 2 + drivers/cxl/cxlpci.h | 13 +++++ drivers/cxl/doe.c | 90 +++++++++++++++++++++++++++++++++++ drivers/cxl/pci.c | 20 ++++++++ include/uapi/linux/pci_regs.h | 1 + 6 files changed, 139 insertions(+) create mode 100644 drivers/cxl/doe.cdrivers/cxl/Kconfig +0
-0
drivers/cxl/Kconfig config CXL_SUSPEND · line 108
Quoted 6 lines
drivers/cxl/Kconfig +3
-0@@ -103,4 +103,17 @@ config CXL_SUSPEND def_bool y depends on SUSPEND && CXL_MEM +config CXL_PCI_DOE + tristate "CXL PCI Data Object Exchange (DOE) support" + depends on CXL_PCI
Should be leading tabs not spaces.
Quoted 47 lines
drivers/cxl/Kconfig +10
-0+ default CXL_BUS + select PCI_DOE + help + Driver for DOE auxiliary devices. + + The DOE capabilities provides a simple mailbox in PCI config space that + is used for a number of different protocols useful to CXL. The CXL PCI + subsystem creates auxiliary devices for each DOE mailbox capability + found. This driver is required for the kernel to use these devices. + endifdrivers/cxl/Makefile +2
-0@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 obj-y += core/ obj-$(CONFIG_CXL_PCI) += cxl_pci.o +obj-$(CONFIG_CXL_PCI_DOE) += cxl_doe.o obj-$(CONFIG_CXL_MEM) += cxl_mem.o obj-$(CONFIG_CXL_ACPI) += cxl_acpi.o obj-$(CONFIG_CXL_PMEM) += cxl_pmem.o@@ -8,6 +9,7 @@ obj-$(CONFIG_CXL_PORT) += cxl_port.o cxl_mem-y := mem.o cxl_pci-y := pci.o +cxl_doe-y := doe.o cxl_acpi-y := acpi.o cxl_pmem-y := pmem.o cxl_port-y := port.odrivers/cxl/cxlpci.h +1
-0@@ -79,6 +79,7 @@ int devm_cxl_port_enumerate_dports(struct cxl_port *port);* * @adev: Auxiliary bus device * @pdev: PCI device this belongs to +* @driver_access: Lock the driver during access * @cap_offset: Capability offset * @use_irq: Set if IRQs are to be used with this mailbox * @@ -88,9 +89,21 @@ int devm_cxl_port_enumerate_dports(struct cxl_port *port);struct cxl_doe_dev {struct auxiliary_device adev;struct pci_dev *pdev;
drivers/cxl/cxlpci.h int devm_cxl_port_enumerate_dports(struct cxl_port *port); · line 101
Quoted 10 lines
drivers/cxl/cxlpci.h +5
-0+struct rw_semaphore driver_access;int cap_offset;bool use_irq; };#define DOE_DEV_NAME "doe" +/** +* struct cxl_doe_drv_state - state of the DOE Aux driver +* +* @doe_dev: The Auxiliary DOE device
As far as I can tell no one actually uses the doe_dev from here for anything so do we need it at all?
Quoted 14 lines
drivers/cxl/cxlpci.h +7
-0+* @doe_mb: PCI DOE mailbox state +*/ +struct cxl_doe_drv_state { +struct cxl_doe_dev *doe_dev; +struct pci_doe_mb *doe_mb; +}; +#endif /* __CXL_PCI_H__ */ drivers/cxl/doe.c new file +0
-0
drivers/cxl/doe.c line 5
Quoted 5 lines
drivers/cxl/doe.c new file +5
-0@@ -0,0 +1,90 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright(c) 2022 Intel Corporation. All rights reserved. */ + +#include <linux/pci.h> +#include <linux/pci-doe.h>
Rather sparse include list given what is going on in here. We shouldn't rely too heavily on what comes indirectly except where it's really standard headers.
Probably mod_devicetable.h and some headers for auxiliary devices and rwsem.h at least?
Quoted 17 lines
drivers/cxl/doe.c new file +17
-0+ +#include "cxlpci.h" + +static void doe_destroy_mb (void *ds) +{ +struct cxl_doe_drv_state *doe_ds = ds; + +pci_doe_destroy_mb (doe_ds->doe_mb); +} + +static int cxl_pci_doe_probe (struct auxiliary_device *aux_dev, +const struct auxiliary_device_id *id) +{ + struct cxl_doe_dev *doe_dev = container_of(aux_dev, struct cxl_doe_dev, + adev); +struct device *dev = &aux_dev->dev; +struct cxl_doe_drv_state *doe_ds;
drivers/cxl/doe.c line 32
Quoted 10 lines
drivers/cxl/doe.c new file +10
-0+struct pci_doe_mb *doe_mb; + + doe_ds =devm_kzalloc (dev,sizeof (*doe_ds),GFP_KERNEL ); +if (!doe_ds) +return -ENOMEM ; + + doe_mb =pci_doe_create_mb (doe_dev->pdev, doe_dev->cap_offset, + doe_dev->use_irq); +if (IS_ERR (doe_mb)) { +dev_err (dev,"Failed to create the DOE mailbox state machine\n" );
You could use dev_err_probe() here to tidy this up a little bit.
Quoted 11 lines
drivers/cxl/doe.c new file +10
-0+return PTR_ERR (doe_mb); + } + + doe_ds->doe_mb = doe_mb; +devm_add_action_or_reset (dev, doe_destroy_mb, doe_ds); + +down_write (&doe_dev->driver_access); +auxiliary_set_drvdata (aux_dev, doe_ds); +up_write (&doe_dev->driver_access); +
drivers/cxl/doe.c line 52
Quoted 10 lines
drivers/cxl/doe.c new file +10
-0+return 0 ; +} + +static void cxl_pci_doe_remove (struct auxiliary_device *aux_dev) +{ + struct cxl_doe_dev *doe_dev = container_of(aux_dev, struct cxl_doe_dev, + adev); + +down_write (&doe_dev->driver_access); +auxiliary_set_drvdata (aux_dev,NULL );
This confused me for a bit. I 'think' you are doing this to be able to use it as a flag for whether the driver is still bound. If so, a comment would be useful.
Quoted 69 lines
drivers/cxl/doe.c new file +38
-0+up_write (&doe_dev->driver_access); +} + +static const struct auxiliary_device_id cxl_pci_doe_auxiliary_id_table[] = { + {.name ="cxl_pci." DOE_DEV_NAME , }, + {}, +}; + +MODULE_DEVICE_TABLE (auxiliary, cxl_pci_doe_auxiliary_id_table); + +struct auxiliary_driver cxl_pci_doe_auxiliary_drv = { + .name ="cxl_doe_drv" , + .id_table = cxl_pci_doe_auxiliary_id_table, + .probe = cxl_pci_doe_probe, + .remove = cxl_pci_doe_remove, +}; + +static int __init cxl_pci_doe_init_module (void ) +{ +int ret; + + ret =auxiliary_driver_register (&cxl_pci_doe_auxiliary_drv); +if (ret) { +pr_err ("Failed cxl_pci_doe auxiliary_driver_register() ret=%d\n" , + ret); + } + +return ret; +} + +static void __exit cxl_pci_doe_exit_module(void) +{ +auxiliary_driver_unregister (&cxl_pci_doe_auxiliary_drv); +} + +module_init (cxl_pci_doe_init_module); +module_exit (cxl_pci_doe_exit_module); +MODULE_LICENSE ("GPL" );drivers/cxl/pci.c +12
-0@@ -590,6 +590,17 @@ static void cxl_pci_doe_destroy_device(void *ad)auxiliary_device_uninit (ad); } +static struct cxl_doe_drv_state *cxl_pci_doe_get_drv (struct cxl_doe_dev *doe_dev) +{ +down_read (&doe_dev->driver_access); +return auxiliary_get_drvdata (&doe_dev->adev); +} + +static void cxl_pci_doe_put_drv (struct cxl_doe_dev *doe_dev) +{ +up_read (&doe_dev->driver_access); +} +/** * cxl_pci_create_doe_devices - Create auxiliary bus DOE devices for all DOE * mailboxes found @@ -652,6 +663,7 @@ static int cxl_pci_create_doe_devices(struct pci_dev *pdev)return -ENOMEM ; new_dev->pdev = pdev; +init_rwsem (&new_dev->driver_access); new_dev->cap_offset = off; new_dev->use_irq = use_irq;
drivers/cxl/pci.c static int cxl_pci_create_doe_devices(struct pci_dev *pdev) · line 703
Quoted 10 lines
drivers/cxl/pci.c +7
-0@@ -682,6 +694,13 @@ static int cxl_pci_create_doe_devices(struct pci_dev *pdev) adev);if (rc)return rc; + +if (device_attach (&adev->dev) !=1 ) { +dev_err (&adev->dev, +"Failed to attach a driver to DOE device %d\n" , + adev->id); +return -ENODEV ; + }
Can you add a comment on why this has to be the case at this point. Why can't the driver come along later?
Quoted 6 lines
drivers/cxl/pci.c +0
-0}return 0 ;@@ -785,6 +804,7 @@ static struct pci_driver cxl_pci_driver = { }, };
...
Re: [PATCH V8 05/10] cxl/pci: Create DOE auxiliary driver
Quoted 65 lines · Jonathan Cameron
Quoted 62 lines · On Thu, 14 Apr 2022 13:32:32 -0700 [email protected] wrote:
From: Ira Weiny <[email protected]>
CXL kernel drivers optionally need to access DOE mailbox capabilities. Access to mailboxes for things such as CDAT, SPDM, and IDE are needed by the kernel while other access is designed towards user space usage. An example of this is for CXL Compliance Testing (see CXL 2.0 14.16.4 Compliance Mode DOE) which offers a mechanism to set different test modes for a device.
There is no anticipated need for the kernel to share an individual mailbox with user space. Thus developing an interface to marshal access between the kernel and user space for a single mailbox is unnecessary overhead. However, having the kernel relinquish some mailboxes to be controlled by user space is a reasonable compromise to share access to the device.
The auxiliary bus provides an elegant solution for this. Each DOE capability is given its own auxiliary device. This device is controlled by a kernel driver by default which restricts access to the mailbox. Unbinding the driver from a single auxiliary device (DOE mailbox capability) frees the mailbox for user space access. This architecture also allows a clear picture on which mailboxes are kernel controlled vs not.
Create a driver for the DOE auxiliary devices. The driver uses the PCI DOE core to manage the mailbox.
User space must be prevented from unbinding the driver state when the DOE auxiliary driver is being accessed by the kernel. Add a read write lock to the DOE auxiliary device to protect the driver data portion.
Finally, flag the driver module to be preloaded by device creation to ensure the driver is attached when iterating the DOE capabilities.
User space access can be obtained by unbinding the driver from that device. For example:
$ ls -l /sys/bus/auxiliary/drivers total 0 drwxr-xr-x 2 root root 0 Mar 24 10:45 cxl_doe.cxl_doe_drv$ ls -l /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci* lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.0 -> ../../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.0 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.1 -> ../../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.1 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.2 -> ../../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.2 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.3 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.3 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.3 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.4 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.5 -> ../../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.5 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.6 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.6 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.7 -> ../../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.7$ echo "cxl_pci.doe.4" > /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/unbind$ ls -l /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci* lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.0 -> ../../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.0 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.1 -> ../../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.1 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.2 -> ../../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.2 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.3 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.3 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.5 -> ../../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.5 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.6 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.6 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.7 -> ../../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.7
Quoted 6 lines
Quoted 1 line
Signed-off-by Ira Weiny <[email protected]>Hi Ira,
A few minor comments inline.
With those cleaned up
Thanks!
Quoted 34 lines
Reviewed-by Jonathan Cameron <[email protected]>Quoted 31 lines
---
Changes from V7:
Now need to selectPCI_DOE
ChangeMODULE_LICENSEto 'GPL' instead of old 'GPL v2'Changes from V6:
The CXL layer now contains the driver for these auxiliary devices.Changes from V5:
Split the CXL specific stuff off from the PCI DOE create auxiliary device code.--- drivers/cxl/Kconfig | 13 +++++ drivers/cxl/Makefile | 2 + drivers/cxl/cxlpci.h | 13 +++++ drivers/cxl/doe.c | 90 +++++++++++++++++++++++++++++++++++ drivers/cxl/pci.c | 20 ++++++++ include/uapi/linux/pci_regs.h | 1 + 6 files changed, 139 insertions(+) create mode 100644 drivers/cxl/doe.cdrivers/cxl/Kconfig +0
-0@@ -103,4 +103,17 @@ config CXL_SUSPEND def_bool y depends on SUSPEND && CXL_MEM
Quoted 5 lines
drivers/cxl/Kconfig config CXL_SUSPEND · line 108
Quoted 3 lines
drivers/cxl/Kconfig +3
-0+config CXL_PCI_DOE + tristate "CXL PCI Data Object Exchange (DOE) support" + depends on CXL_PCIShould be leading tabs not spaces.
Opps must have been a bad copy/paste. Sorry.
Quoted 54 lines
Quoted 54 lines
drivers/cxl/Kconfig +10
-0+ default CXL_BUS + select PCI_DOE + help + Driver for DOE auxiliary devices. + + The DOE capabilities provides a simple mailbox in PCI config space that + is used for a number of different protocols useful to CXL. The CXL PCI + subsystem creates auxiliary devices for each DOE mailbox capability + found. This driver is required for the kernel to use these devices. + endifdrivers/cxl/Makefile +2
-0@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 obj-y += core/ obj-$(CONFIG_CXL_PCI) += cxl_pci.o +obj-$(CONFIG_CXL_PCI_DOE) += cxl_doe.o obj-$(CONFIG_CXL_MEM) += cxl_mem.o obj-$(CONFIG_CXL_ACPI) += cxl_acpi.o obj-$(CONFIG_CXL_PMEM) += cxl_pmem.o@@ -8,6 +9,7 @@ obj-$(CONFIG_CXL_PORT) += cxl_port.o cxl_mem-y := mem.o cxl_pci-y := pci.o +cxl_doe-y := doe.o cxl_acpi-y := acpi.o cxl_pmem-y := pmem.o cxl_port-y := port.odrivers/cxl/cxlpci.h +2
-0@@ -79,6 +79,7 @@ int devm_cxl_port_enumerate_dports(struct cxl_port *port);* * @adev: Auxiliary bus device * @pdev: PCI device this belongs to +* @driver_access: Lock the driver during access * @cap_offset: Capability offset * @use_irq: Set if IRQs are to be used with this mailbox * @@ -88,9 +89,21 @@ int devm_cxl_port_enumerate_dports(struct cxl_port *port);struct cxl_doe_dev {struct auxiliary_device adev;struct pci_dev *pdev; +struct rw_semaphore driver_access;int cap_offset;bool use_irq; };#define DOE_DEV_NAME "doe"
Quoted 7 lines
drivers/cxl/cxlpci.h int devm_cxl_port_enumerate_dports(struct cxl_port *port); · line 101
Quoted 4 lines
drivers/cxl/cxlpci.h +4
-0+/** +* struct cxl_doe_drv_state - state of the DOE Aux driver +* +* @doe_dev: The Auxiliary DOE device As far as I can tell no one actually uses the
doe_devfrom here for anything so do we need it at all?
Oh wow! Great catch. Worse yet I never even set it. :-(
It must have been left over cruft from development which I missed in final review. I think the logic was that the device goes along with the driver state...
Yes I will remove it.
But that unfortunately begs the question does cxl_doe_drv_state even need to exist?
I don't like returning the pci_doe_mb directly but having a struct contain a struct is worse IMO.
So cxl_pci_doe_get_drv() and cxl_pci_doe_put_drv() are going to be get_mb/put_mb respectively.
Can I make that change with your review by?
Quoted 25 lines
Quoted 15 lines
drivers/cxl/cxlpci.h +7
-0+* @doe_mb: PCI DOE mailbox state +*/ +struct cxl_doe_drv_state { +struct cxl_doe_dev *doe_dev; +struct pci_doe_mb *doe_mb; +}; +#endif /* __CXL_PCI_H__ */ drivers/cxl/doe.c new file +0
-0drivers/cxl/doe.c line 5
Quoted 5 lines
drivers/cxl/doe.c new file +5
-0@@ -0,0 +1,90 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright(c) 2022 Intel Corporation. All rights reserved. */ + +#include <linux/pci.h> +#include <linux/pci-doe.h> Rather sparse include list given what is going on in here. We shouldn't rely too heavily on what comes indirectly except where it's really standard headers.
Quoted 2 lines
Probably
mod_devicetable.hand some headers for auxiliary devices andrwsem.hat least?
Yea I'll add to this list.
Quoted 22 lines
Quoted 22 lines
drivers/cxl/doe.c new file +21
-0+ +#include "cxlpci.h" + +static void doe_destroy_mb (void *ds) +{ +struct cxl_doe_drv_state *doe_ds = ds; + +pci_doe_destroy_mb (doe_ds->doe_mb); +} + +static int cxl_pci_doe_probe (struct auxiliary_device *aux_dev, +const struct auxiliary_device_id *id) +{ + struct cxl_doe_dev *doe_dev = container_of(aux_dev, struct cxl_doe_dev, + adev); +struct device *dev = &aux_dev->dev; +struct cxl_doe_drv_state *doe_ds; +struct pci_doe_mb *doe_mb; + + doe_ds =devm_kzalloc (dev,sizeof (*doe_ds),GFP_KERNEL ); +if (!doe_ds)
Quoted 8 lines
drivers/cxl/doe.c line 32
Quoted 6 lines
drivers/cxl/doe.c new file +6
-0+return -ENOMEM ; + + doe_mb =pci_doe_create_mb (doe_dev->pdev, doe_dev->cap_offset, + doe_dev->use_irq); +if (IS_ERR (doe_mb)) { +dev_err (dev,"Failed to create the DOE mailbox state machine\n" );You could use
dev_err_probe()here to tidy this up a little bit.
Sure!
Quoted 18 lines
Quoted 18 lines
drivers/cxl/doe.c new file +16
-0+return PTR_ERR (doe_mb); + } + + doe_ds->doe_mb = doe_mb; +devm_add_action_or_reset (dev, doe_destroy_mb, doe_ds); + +down_write (&doe_dev->driver_access); +auxiliary_set_drvdata (aux_dev, doe_ds); +up_write (&doe_dev->driver_access); + +return 0 ; +} + +static void cxl_pci_doe_remove (struct auxiliary_device *aux_dev) +{ + struct cxl_doe_dev *doe_dev = container_of(aux_dev, struct cxl_doe_dev,
Quoted 8 lines
drivers/cxl/doe.c line 52
Quoted 4 lines
drivers/cxl/doe.c new file +4
-0+ adev); + +down_write (&doe_dev->driver_access); +auxiliary_set_drvdata (aux_dev,NULL );This confused me for a bit. I 'think' you are doing this to be able to use it as a flag for whether the driver is still bound. If so, a comment would be useful.
Yes.
I'll add this from the commit message:
User space must be prevented from unbinding the driver state when the DOE auxiliary driver is being accessed by the kernel.
Quoted 69 lines
Quoted 69 lines
drivers/cxl/doe.c new file +38
-0+up_write (&doe_dev->driver_access); +} + +static const struct auxiliary_device_id cxl_pci_doe_auxiliary_id_table[] = { + {.name ="cxl_pci." DOE_DEV_NAME , }, + {}, +}; + +MODULE_DEVICE_TABLE (auxiliary, cxl_pci_doe_auxiliary_id_table); + +struct auxiliary_driver cxl_pci_doe_auxiliary_drv = { + .name ="cxl_doe_drv" , + .id_table = cxl_pci_doe_auxiliary_id_table, + .probe = cxl_pci_doe_probe, + .remove = cxl_pci_doe_remove, +}; + +static int __init cxl_pci_doe_init_module (void ) +{ +int ret; + + ret =auxiliary_driver_register (&cxl_pci_doe_auxiliary_drv); +if (ret) { +pr_err ("Failed cxl_pci_doe auxiliary_driver_register() ret=%d\n" , + ret); + } + +return ret; +} + +static void __exit cxl_pci_doe_exit_module(void) +{ +auxiliary_driver_unregister (&cxl_pci_doe_auxiliary_drv); +} + +module_init (cxl_pci_doe_init_module); +module_exit (cxl_pci_doe_exit_module); +MODULE_LICENSE ("GPL" );drivers/cxl/pci.c +12
-0@@ -590,6 +590,17 @@ static void cxl_pci_doe_destroy_device(void *ad)auxiliary_device_uninit (ad); } +static struct cxl_doe_drv_state *cxl_pci_doe_get_drv (struct cxl_doe_dev *doe_dev) +{ +down_read (&doe_dev->driver_access); +return auxiliary_get_drvdata (&doe_dev->adev); +} + +static void cxl_pci_doe_put_drv (struct cxl_doe_dev *doe_dev) +{ +up_read (&doe_dev->driver_access); +} +/** * cxl_pci_create_doe_devices - Create auxiliary bus DOE devices for all DOE * mailboxes found @@ -652,6 +663,7 @@ static int cxl_pci_create_doe_devices(struct pci_dev *pdev)return -ENOMEM ; new_dev->pdev = pdev; +init_rwsem (&new_dev->driver_access); new_dev->cap_offset = off; new_dev->use_irq = use_irq;
Quoted 14 lines
drivers/cxl/pci.c static int cxl_pci_create_doe_devices(struct pci_dev *pdev) · line 703
Quoted 11 lines
drivers/cxl/pci.c +7
-0@@ -682,6 +694,13 @@ static int cxl_pci_create_doe_devices(struct pci_dev *pdev) adev);if (rc)return rc; + +if (device_attach (&adev->dev) !=1 ) { +dev_err (&adev->dev, +"Failed to attach a driver to DOE device %d\n" , + adev->id); +return -ENODEV ; + }Can you add a comment on why this has to be the case at this point. Why can't the driver come along later?
Yes I will.
I've not really liked this aspect of the auxiliary device arch. But I've not convinced myself that it will work ok to leave this till later.
Putting the CDAT retry on a timer might be a better option but it would also mean searching for the proper DOE would need to be delayed as well...
For now I'll put in a comment.
Thanks for the review!
Ira
Quoted 10 lines
Quoted 7 lines
drivers/cxl/pci.c +0
-0}return 0 ;@@ -785,6 +804,7 @@ static struct pci_driver cxl_pci_driver = { }, };...
Re: [PATCH V8 05/10] cxl/pci: Create DOE auxiliary driver
Quoted 101 lines · On Thu, 28 Apr 2022 07:48:00 -0700 [email protected] wrote:
Quoted 65 lines · Jonathan Cameron
Quoted 62 lines · On Thu, 14 Apr 2022 13:32:32 -0700 [email protected] wrote:
From: Ira Weiny <[email protected]>
CXL kernel drivers optionally need to access DOE mailbox capabilities. Access to mailboxes for things such as CDAT, SPDM, and IDE are needed by the kernel while other access is designed towards user space usage. An example of this is for CXL Compliance Testing (see CXL 2.0 14.16.4 Compliance Mode DOE) which offers a mechanism to set different test modes for a device.
There is no anticipated need for the kernel to share an individual mailbox with user space. Thus developing an interface to marshal access between the kernel and user space for a single mailbox is unnecessary overhead. However, having the kernel relinquish some mailboxes to be controlled by user space is a reasonable compromise to share access to the device.
The auxiliary bus provides an elegant solution for this. Each DOE capability is given its own auxiliary device. This device is controlled by a kernel driver by default which restricts access to the mailbox. Unbinding the driver from a single auxiliary device (DOE mailbox capability) frees the mailbox for user space access. This architecture also allows a clear picture on which mailboxes are kernel controlled vs not.
Create a driver for the DOE auxiliary devices. The driver uses the PCI DOE core to manage the mailbox.
User space must be prevented from unbinding the driver state when the DOE auxiliary driver is being accessed by the kernel. Add a read write lock to the DOE auxiliary device to protect the driver data portion.
Finally, flag the driver module to be preloaded by device creation to ensure the driver is attached when iterating the DOE capabilities.
User space access can be obtained by unbinding the driver from that device. For example:
$ ls -l /sys/bus/auxiliary/drivers total 0 drwxr-xr-x 2 root root 0 Mar 24 10:45 cxl_doe.cxl_doe_drv$ ls -l /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci* lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.0 -> ../../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.0 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.1 -> ../../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.1 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.2 -> ../../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.2 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.3 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.3 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.3 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.4 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.5 -> ../../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.5 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.6 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.6 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.7 -> ../../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.7$ echo "cxl_pci.doe.4" > /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/unbind$ ls -l /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci* lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.0 -> ../../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.0 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.1 -> ../../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.1 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.2 -> ../../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.2 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.3 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.3 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.5 -> ../../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.5 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.6 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.6 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.7 -> ../../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.7Quoted 6 lines
Quoted 1 line
Signed-off-by Ira Weiny <[email protected]>Hi Ira,
A few minor comments inline.
With those cleaned upThanks!
Quoted 26 lines
Reviewed-by Jonathan Cameron <[email protected]>Quoted 23 lines
---
Changes from V7:
Now need to selectPCI_DOE
ChangeMODULE_LICENSEto 'GPL' instead of old 'GPL v2'Changes from V6:
The CXL layer now contains the driver for these auxiliary devices.Changes from V5:
Split the CXL specific stuff off from the PCI DOE create auxiliary device code.--- drivers/cxl/Kconfig | 13 +++++ drivers/cxl/Makefile | 2 + drivers/cxl/cxlpci.h | 13 +++++ drivers/cxl/doe.c | 90 +++++++++++++++++++++++++++++++++++ drivers/cxl/pci.c | 20 ++++++++ include/uapi/linux/pci_regs.h | 1 + 6 files changed, 139 insertions(+) create mode 100644 drivers/cxl/doe.c
...
Quoted 41 lines
Quoted 22 lines
Quoted 22 lines
drivers/cxl/cxlpci.h +2
-0@@ -79,6 +79,7 @@ int devm_cxl_port_enumerate_dports(struct cxl_port *port);* * @adev: Auxiliary bus device * @pdev: PCI device this belongs to +* @driver_access: Lock the driver during access * @cap_offset: Capability offset * @use_irq: Set if IRQs are to be used with this mailbox * @@ -88,9 +89,21 @@ int devm_cxl_port_enumerate_dports(struct cxl_port *port);struct cxl_doe_dev {struct auxiliary_device adev;struct pci_dev *pdev; +struct rw_semaphore driver_access;int cap_offset;bool use_irq; };#define DOE_DEV_NAME "doe"Quoted 7 lines
drivers/cxl/cxlpci.h int devm_cxl_port_enumerate_dports(struct cxl_port *port); · line 101
Quoted 4 lines
drivers/cxl/cxlpci.h +4
-0+/** +* struct cxl_doe_drv_state - state of the DOE Aux driver +* +* @doe_dev: The Auxiliary DOE device As far as I can tell no one actually uses the
doe_devfrom here for anything so do we need it at all?Oh wow! Great catch. Worse yet I never even set it. :-(
It must have been left over cruft from development which I missed in final review. I think the logic was that the device goes along with the driver state...
Yes I will remove it.
But that unfortunately begs the question does
cxl_doe_drv_stateeven need to exist?
Quoted 7 lines
I don't like returning the
pci_doe_mbdirectly but having a struct contain a struct is worse IMO.So
cxl_pci_doe_get_drv()andcxl_pci_doe_put_drv()are going to be get_mb/put_mb respectively.Can I make that change with your review by?
Yes, that's fine.
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
drivers/cxl/cxlpci.h +7
-0+* @doe_mb: PCI DOE mailbox state +*/ +struct cxl_doe_drv_state { +struct cxl_doe_dev *doe_dev; +struct pci_doe_mb *doe_mb; +}; +#endif /* __CXL_PCI_H__ */ drivers/cxl/doe.c new file +0
-0
...
Quoted 27 lines
Quoted 18 lines
Quoted 18 lines
drivers/cxl/doe.c new file +16
-0+return PTR_ERR (doe_mb); + } + + doe_ds->doe_mb = doe_mb; +devm_add_action_or_reset (dev, doe_destroy_mb, doe_ds); + +down_write (&doe_dev->driver_access); +auxiliary_set_drvdata (aux_dev, doe_ds); +up_write (&doe_dev->driver_access); + +return 0 ; +} + +static void cxl_pci_doe_remove (struct auxiliary_device *aux_dev) +{ + struct cxl_doe_dev *doe_dev = container_of(aux_dev, struct cxl_doe_dev,Quoted 8 lines
drivers/cxl/doe.c line 52
Quoted 4 lines
drivers/cxl/doe.c new file +4
-0+ adev); + +down_write (&doe_dev->driver_access); +auxiliary_set_drvdata (aux_dev,NULL );This confused me for a bit. I 'think' you are doing this to be able to use it as a flag for whether the driver is still bound. If so, a comment would be useful.
Quoted 6 lines
Yes.
I'll add this from the commit message:
User space must be prevented from unbinding the driver state when the DOE auxiliary driver is being accessed by the kernel.
Maybe a comment here as well as setting drvdata to NULL is rather rare as I'm fairly sure the driver core does it for you these days (but too late for this particular use).
Quoted 85 lines
Quoted 70 lines
Quoted 70 lines
drivers/cxl/doe.c new file +38
-0+up_write (&doe_dev->driver_access); +} + +static const struct auxiliary_device_id cxl_pci_doe_auxiliary_id_table[] = { + {.name ="cxl_pci." DOE_DEV_NAME , }, + {}, +}; + +MODULE_DEVICE_TABLE (auxiliary, cxl_pci_doe_auxiliary_id_table); + +struct auxiliary_driver cxl_pci_doe_auxiliary_drv = { + .name ="cxl_doe_drv" , + .id_table = cxl_pci_doe_auxiliary_id_table, + .probe = cxl_pci_doe_probe, + .remove = cxl_pci_doe_remove, +}; + +static int __init cxl_pci_doe_init_module (void ) +{ +int ret; + + ret =auxiliary_driver_register (&cxl_pci_doe_auxiliary_drv); +if (ret) { +pr_err ("Failed cxl_pci_doe auxiliary_driver_register() ret=%d\n" , + ret); + } + +return ret; +} + +static void __exit cxl_pci_doe_exit_module(void) +{ +auxiliary_driver_unregister (&cxl_pci_doe_auxiliary_drv); +} + +module_init (cxl_pci_doe_init_module); +module_exit (cxl_pci_doe_exit_module); +MODULE_LICENSE ("GPL" );drivers/cxl/pci.c +12
-0@@ -590,6 +590,17 @@ static void cxl_pci_doe_destroy_device(void *ad)auxiliary_device_uninit (ad); } +static struct cxl_doe_drv_state *cxl_pci_doe_get_drv (struct cxl_doe_dev *doe_dev) +{ +down_read (&doe_dev->driver_access); +return auxiliary_get_drvdata (&doe_dev->adev); +} + +static void cxl_pci_doe_put_drv (struct cxl_doe_dev *doe_dev) +{ +up_read (&doe_dev->driver_access); +} +/** * cxl_pci_create_doe_devices - Create auxiliary bus DOE devices for all DOE * mailboxes found @@ -652,6 +663,7 @@ static int cxl_pci_create_doe_devices(struct pci_dev *pdev)return -ENOMEM ; new_dev->pdev = pdev; +init_rwsem (&new_dev->driver_access); new_dev->cap_offset = off; new_dev->use_irq = use_irq;Quoted 14 lines
drivers/cxl/pci.c static int cxl_pci_create_doe_devices(struct pci_dev *pdev) · line 703
Quoted 11 lines
drivers/cxl/pci.c +7
-0@@ -682,6 +694,13 @@ static int cxl_pci_create_doe_devices(struct pci_dev *pdev) adev);if (rc)return rc; + +if (device_attach (&adev->dev) !=1 ) { +dev_err (&adev->dev, +"Failed to attach a driver to DOE device %d\n" , + adev->id); +return -ENODEV ; + }Can you add a comment on why this has to be the case at this point. Why can't the driver come along later?
Quoted 7 lines
Yes I will.
I've not really liked this aspect of the auxiliary device arch. But I've not convinced myself that it will work ok to leave this till later.
Putting the CDAT retry on a timer might be a better option but it would also mean searching for the proper DOE would need to be delayed as well...
Ultimately we may not need to know CDAT info at the time of driver load, but only on either a userspace read, or setup of a region etc. I guess in majority of cases that will all be automated though (based on LSA contents etc).
Quoted 2 lines
For now I'll put in a comment.
Great,
Quoted 2 lines
Thanks for the review!
You are welcome.
Thanks for driving this forwards.
Jonathan
Quoted 12 lines
Ira
Quoted 10 lines
Quoted 7 lines
drivers/cxl/pci.c +0
-0}return 0 ;@@ -785,6 +804,7 @@ static struct pci_driver cxl_pci_driver = { }, };...
PATCH v8 6/10 cxl/pci: Find the DOE mailbox which supports CDAT
In reply to [email protected]From: Ira Weiny <[email protected]>
Each CXL device may have multiple DOE mailbox capabilities and each mailbox may support multiple protocols.
Search the DOE auxiliary devices for one which supports the CDAT protocol. Cache that device to be used for future queries.
---
Changes from V7
Minor code clean ups
Changes from V6
Adjust for aux devices being a CXL only concept Update commit msg.
Ensure devices iterated by auxiliary_find_device() are checked
to be DOE devices prior to checking for the CDAT protocol
From Ben
Ensure reference from auxiliary_find_device() is dropped
--- drivers/cxl/cxl.h | 2 ++ drivers/cxl/cxlmem.h | 2 ++ drivers/cxl/pci.c | 76 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 79 insertions(+), 1 deletion(-)
drivers/cxl/cxl.h +2 -0
@@ -90,6 +90,8 @@ static inline int cxl_hdm_decoder_count(u32 cap_hdr)#define CXLDEV_MBOX_BG_CMD_STATUS_OFFSET 0x18#define CXLDEV_MBOX_PAYLOAD_OFFSET 0x20 +#define CXL_DOE_PROTOCOL_TABLE_ACCESS 2 +/* * Using struct_group() allows for per register-block-type helper routines, * without requiring block-type agnostic code to include the prefix.
drivers/cxl/cxlmem.h +2 -0
@@ -168,6 +168,7 @@ struct cxl_endpoint_dvsec_info {* Currently only memory devices are represented. * * @dev: The device associated with this CXL state +* @cdat_doe: Auxiliary DOE device capabile of reading CDAT * @regs: Parsed register blocks * @cxl_dvsec: Offset to the PCIe device DVSEC * @payload_size: Size of space for payload
@@ -200,6 +201,7 @@ struct cxl_endpoint_dvsec_info {struct cxl_dev_state {struct device *dev; +struct cxl_doe_dev *cdat_doe;struct cxl_regs regs;int cxl_dvsec;
drivers/cxl/pci.c +75 -1
88 lines not on this page · raw message
Signature · 1 line
2.35.1
Re: [PATCH V8 06/10] cxl/pci: Find the DOE mailbox which supports CDAT
Quoted 9 lines · On Thu, 14 Apr 2022 13:32:33 -0700 [email protected] wrote:
From: Ira Weiny <[email protected]>
Each CXL device may have multiple DOE mailbox capabilities and each mailbox may support multiple protocols.
Search the DOE auxiliary devices for one which supports the CDAT protocol. Cache that device to be used for future queries.
Signed-off-by Ira Weiny <[email protected]>
One question inline. With that addressed (or convincing argument why not) the rest looks good.
Quoted 58 lines
---
Changes from V7
Minor code clean upsChanges from V6
Adjust for aux devices being a CXL only concept Update commit msg.
Ensure devices iterated byauxiliary_find_device()are checked
to be DOE devices prior to checking for the CDAT protocol
From Ben
Ensure reference fromauxiliary_find_device()is dropped--- drivers/cxl/cxl.h | 2 ++ drivers/cxl/cxlmem.h | 2 ++ drivers/cxl/pci.c | 76 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 79 insertions(+), 1 deletion(-)drivers/cxl/cxl.h +2
-0@@ -90,6 +90,8 @@ static inline int cxl_hdm_decoder_count(u32 cap_hdr)#define CXLDEV_MBOX_BG_CMD_STATUS_OFFSET 0x18#define CXLDEV_MBOX_PAYLOAD_OFFSET 0x20 +#define CXL_DOE_PROTOCOL_TABLE_ACCESS 2 +/* * Using struct_group() allows for per register-block-type helper routines, * without requiring block-type agnostic code to include the prefix. drivers/cxl/cxlmem.h +2
-0@@ -168,6 +168,7 @@ struct cxl_endpoint_dvsec_info {* Currently only memory devices are represented. * * @dev: The device associated with this CXL state +* @cdat_doe: Auxiliary DOE device capabile of reading CDAT * @regs: Parsed register blocks * @cxl_dvsec: Offset to the PCIe device DVSEC * @payload_size: Size of space for payload @@ -200,6 +201,7 @@ struct cxl_endpoint_dvsec_info {struct cxl_dev_state {struct device *dev; +struct cxl_doe_dev *cdat_doe;struct cxl_regs regs;int cxl_dvsec;drivers/cxl/pci.c +0
-0@@ -706,6 +706,80 @@ static int cxl_pci_create_doe_devices(struct pci_dev *pdev)return 0 ;
drivers/cxl/pci.c static int cxl_pci_create_doe_devices(struct pci_dev *pdev) · line 716
Quoted 10 lines
drivers/cxl/pci.c +8
-0} +static bool cxl_doe_dev_supports_prot (struct cxl_doe_dev *doe_dev,u16 vid,u16 pid) +{ +struct cxl_doe_drv_state *doe_ds; +bool ret; + + doe_ds =cxl_pci_doe_get_drv (doe_dev); +if (!doe_ds) { +cxl_pci_doe_put_drv (doe_dev);
That means the get_drv has a rather unexpected side effect. Could you move the NULL check into the function so that we don't retain a reference if it fails?
Quoted 78 lines
drivers/cxl/pci.c +67
-1+return false; + } + ret =pci_doe_supports_prot (doe_ds->doe_mb, vid, pid); +cxl_pci_doe_put_drv (doe_dev); +return ret; +} + +static int cxl_match_cdat_doe_device (struct device *dev,const void *data) +{ +const struct cxl_dev_state *cxlds = data; +struct auxiliary_device *adev =to_auxiliary_dev (dev); +struct cxl_doe_dev *doe_dev; + +/* Ensure this is a DOE device */ +if (strcmp (DOE_DEV_NAME , adev->name)) +return 0 ; + +/* Determine if this auxiliary device belongs to the cxlds */ +if (cxlds->dev != dev->parent) +return 0 ; + + doe_dev = container_of(adev, struct cxl_doe_dev, adev); + +/* If it is one of ours check for the CDAT protocol */ +if (!cxl_doe_dev_supports_prot (doe_dev,PCI_DVSEC_VENDOR_ID_CXL , +CXL_DOE_PROTOCOL_TABLE_ACCESS )) +return 0 ; + +return 1 ; +} + +static void drop_cdat_doe_ref (void *data) +{ +struct cxl_doe_dev *cdat_doe = data; + +put_device (&cdat_doe->adev.dev); +} + +static int cxl_setup_doe_devices (struct cxl_dev_state *cxlds) +{ +struct device *dev = cxlds->dev; +struct pci_dev *pdev =to_pci_dev (dev); +struct auxiliary_device *adev; +int rc; + + rc =cxl_pci_create_doe_devices (pdev); +if (rc) +return rc; + + adev =auxiliary_find_device (NULL , cxlds, &cxl_match_cdat_doe_device); + +if (adev) { +struct cxl_doe_dev *doe_dev =container_of (adev, + struct cxl_doe_dev, + adev); + +/* auxiliary_find_device() takes the reference */ + rc =devm_add_action_or_reset (dev, drop_cdat_doe_ref, doe_dev); +if (rc) +return rc; + cxlds->cdat_doe = doe_dev; + } + +return 0 ; +} +static int cxl_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct cxl_register_map map;@@ -772,7 +846,7 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)if (rc)return rc; - rc =cxl_pci_create_doe_devices (pdev); + rc =cxl_setup_doe_devices (cxlds);if (rc)return rc;
Re: [PATCH V8 06/10] cxl/pci: Find the DOE mailbox which supports CDAT
Quoted 11 lines · Jonathan Cameron
Quoted 8 lines · On Thu, 14 Apr 2022 13:32:33 -0700 [email protected] wrote:
From: Ira Weiny <[email protected]>
Each CXL device may have multiple DOE mailbox capabilities and each mailbox may support multiple protocols.
Search the DOE auxiliary devices for one which supports the CDAT protocol. Cache that device to be used for future queries.
Quoted 6 lines
Quoted 1 line
Signed-off-by Ira Weiny <[email protected]>One question inline. With that addressed (or convincing argument why not) the rest looks good.
Reviewed-by Jonathan Cameron <[email protected]>
Thanks!
Quoted 61 lines
Quoted 61 lines
---
Changes from V7
Minor code clean upsChanges from V6
Adjust for aux devices being a CXL only concept Update commit msg.
Ensure devices iterated byauxiliary_find_device()are checked
to be DOE devices prior to checking for the CDAT protocol
From Ben
Ensure reference fromauxiliary_find_device()is dropped--- drivers/cxl/cxl.h | 2 ++ drivers/cxl/cxlmem.h | 2 ++ drivers/cxl/pci.c | 76 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 79 insertions(+), 1 deletion(-)drivers/cxl/cxl.h +2
-0@@ -90,6 +90,8 @@ static inline int cxl_hdm_decoder_count(u32 cap_hdr)#define CXLDEV_MBOX_BG_CMD_STATUS_OFFSET 0x18#define CXLDEV_MBOX_PAYLOAD_OFFSET 0x20 +#define CXL_DOE_PROTOCOL_TABLE_ACCESS 2 +/* * Using struct_group() allows for per register-block-type helper routines, * without requiring block-type agnostic code to include the prefix. drivers/cxl/cxlmem.h +2
-0@@ -168,6 +168,7 @@ struct cxl_endpoint_dvsec_info {* Currently only memory devices are represented. * * @dev: The device associated with this CXL state +* @cdat_doe: Auxiliary DOE device capabile of reading CDAT * @regs: Parsed register blocks * @cxl_dvsec: Offset to the PCIe device DVSEC * @payload_size: Size of space for payload @@ -200,6 +201,7 @@ struct cxl_endpoint_dvsec_info {struct cxl_dev_state {struct device *dev; +struct cxl_doe_dev *cdat_doe;struct cxl_regs regs;int cxl_dvsec;drivers/cxl/pci.c +0
-0@@ -706,6 +706,80 @@ static int cxl_pci_create_doe_devices(struct pci_dev *pdev)return 0 ; }
Quoted 12 lines
drivers/cxl/pci.c static int cxl_pci_create_doe_devices(struct pci_dev *pdev) · line 716
Quoted 8 lines
drivers/cxl/pci.c +8
-0+static bool cxl_doe_dev_supports_prot (struct cxl_doe_dev *doe_dev,u16 vid,u16 pid) +{ +struct cxl_doe_drv_state *doe_ds; +bool ret; + + doe_ds =cxl_pci_doe_get_drv (doe_dev); +if (!doe_ds) { +cxl_pci_doe_put_drv (doe_dev);That means the
get_drvhas a rather unexpected side effect. Could you move the NULL check into the function so that we don't retain a reference if it fails?
Indeed. I struggled a bit with this because get_* is usually taking a reference on the subject of the get but in this case we are really getting a reference on the device not the driver...
I originally open coded this and the functions were 'get_device'...
:-/
I think this also may have been why the device was originally part of the driver state.
I think this is the better way to code these access functions:
static struct cxl_doe_drv_state *cxl_pci_doe_get_drv(struct cxl_doe_dev *doe_dev)
{
struct cxl_doe_drv_state *cxl_ds;
down_read(&doe_dev->driver_access);
cxl_ds = auxiliary_get_drvdata(&doe_dev->adev);
if (!cxl_ds)
up_read(&doe_dev->driver_access);
return cxl_ds;
} static void cxl_pci_doe_put_drv(struct cxl_doe_drv_state *cxl_ds)
{
if (!cxl_ds)
return;
up_read(&cxl_ds->doe_dev->driver_access);
} Ira
Quoted 80 lines
Quoted 79 lines
drivers/cxl/pci.c +67
-1+return false; + } + ret =pci_doe_supports_prot (doe_ds->doe_mb, vid, pid); +cxl_pci_doe_put_drv (doe_dev); +return ret; +} + +static int cxl_match_cdat_doe_device (struct device *dev,const void *data) +{ +const struct cxl_dev_state *cxlds = data; +struct auxiliary_device *adev =to_auxiliary_dev (dev); +struct cxl_doe_dev *doe_dev; + +/* Ensure this is a DOE device */ +if (strcmp (DOE_DEV_NAME , adev->name)) +return 0 ; + +/* Determine if this auxiliary device belongs to the cxlds */ +if (cxlds->dev != dev->parent) +return 0 ; + + doe_dev = container_of(adev, struct cxl_doe_dev, adev); + +/* If it is one of ours check for the CDAT protocol */ +if (!cxl_doe_dev_supports_prot (doe_dev,PCI_DVSEC_VENDOR_ID_CXL , +CXL_DOE_PROTOCOL_TABLE_ACCESS )) +return 0 ; + +return 1 ; +} + +static void drop_cdat_doe_ref (void *data) +{ +struct cxl_doe_dev *cdat_doe = data; + +put_device (&cdat_doe->adev.dev); +} + +static int cxl_setup_doe_devices (struct cxl_dev_state *cxlds) +{ +struct device *dev = cxlds->dev; +struct pci_dev *pdev =to_pci_dev (dev); +struct auxiliary_device *adev; +int rc; + + rc =cxl_pci_create_doe_devices (pdev); +if (rc) +return rc; + + adev =auxiliary_find_device (NULL , cxlds, &cxl_match_cdat_doe_device); + +if (adev) { +struct cxl_doe_dev *doe_dev =container_of (adev, + struct cxl_doe_dev, + adev); + +/* auxiliary_find_device() takes the reference */ + rc =devm_add_action_or_reset (dev, drop_cdat_doe_ref, doe_dev); +if (rc) +return rc; + cxlds->cdat_doe = doe_dev; + } + +return 0 ; +} +static int cxl_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct cxl_register_map map;@@ -772,7 +846,7 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)if (rc)return rc; - rc =cxl_pci_create_doe_devices (pdev); + rc =cxl_setup_doe_devices (cxlds);if (rc)return rc;
PATCH v8 7/10 cxl/mem: Read CDAT table
In reply to [email protected]From: Jonathan Cameron <[email protected]>
The OS will need CDAT data from CXL devices to properly set up interleave sets. Currently this is supported by a through a DOE mailbox which supports CDAT. But any cxl_mem object can provide this data later if need be, for example for testing.
Cache the CDAT data for later parsing. Provide a sysfs binary attribute to allow dumping of the CDAT.
Binary dumping is modeled on /sys/firmware/ACPI/tables/
The ability to dump this table will be very useful for emulation of real devices once they become available as QEMU CXL type 3 device emulation will be able to load this file in.
This does not support table updates at runtime. It will always provide whatever was there when first cached. Handling of table updates can be implemented later.
Finally create a complete list of DOE defines within cdat.h for code wishing to decode the CDAT table.
---
Changes from V6:
Fix issue with devm use
Move cached cdat data to cxl_dev_state
Use new pci_doe_submit_task()
Ensure the aux driver is locked while processing tasks Rebased on cxl-pending
Changes from V5:
Add proper guards around cdat.h
Split out finding the CDAT DOE mailbox
Use cxl_cdat to group CDAT data together
Adjust to use auxiliary_find_device() to find the DOE device
which supplies the CDAT protocol.
Rebased to latest
Remove dev_dbg(length)
Remove unneeded DOE Table access defines
Move CXL_DOE_PROTOCOL_TABLE_ACCESS define into this patch where
it is used
Changes from V4:
Split this into it's own patch
Rearchitect this such that the memdev driver calls into the DOE driver via the cxl_mem state object. This allows CDAT data to come from any type of cxl_mem object not just PCI DOE. Rebase on new struct cxl_dev_state
--- drivers/cxl/cdat.h | 97 ++++++++++++++++++++++++ drivers/cxl/core/memdev.c | 38 ++++++++++ drivers/cxl/cxlmem.h | 26 +++++++ drivers/cxl/cxlpci.h | 1 + drivers/cxl/pci.c | 153 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 315 insertions(+) create mode 100644 drivers/cxl/cdat.h
drivers/cxl/cdat.h new file +97 -0
@@ -0,0 +1,97 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __CXL_CDAT_H__ +#define __CXL_CDAT_H__ + +/* +* Coherent Device Attribute table (CDAT) +* +* Specification available from UEFI.org +* +* Whilst CDAT is defined as a single table, the access via DOE maiboxes is +* done one entry at a time, where the first entry is the header. +*/ + +#define CXL_DOE_TABLE_ACCESS_REQ_CODE 0x000000ff +#define CXL_DOE_TABLE_ACCESS_REQ_CODE_READ 0 +#define CXL_DOE_TABLE_ACCESS_TABLE_TYPE 0x0000ff00 +#define CXL_DOE_TABLE_ACCESS_TABLE_TYPE_CDATA 0 +#define CXL_DOE_TABLE_ACCESS_ENTRY_HANDLE 0xffff0000 + +/* +* CDAT entries are little endian and are read from PCI config space which +* is also little endian. +* As such, on a big endian system these will have been reversed. +* This prevents us from making easy use of packed structures. +* Style form pci_regs.h +*/ + +#define CDAT_HEADER_LENGTH_DW 4 +#define CDAT_HEADER_LENGTH_BYTES (CDAT_HEADER_LENGTH_DW * sizeof(u32)) +#define CDAT_HEADER_DW0_LENGTH 0xffffffff +#define CDAT_HEADER_DW1_REVISION 0x000000ff +#define CDAT_HEADER_DW1_CHECKSUM 0x0000ff00 +/* CDAT_HEADER_DW2_RESERVED */ +#define CDAT_HEADER_DW3_SEQUENCE 0xffffffff + +/* All structures have a common first DW */ +#define CDAT_STRUCTURE_DW0_TYPE 0x000000ff +#define CDAT_STRUCTURE_DW0_TYPE_DSMAS 0 +#define CDAT_STRUCTURE_DW0_TYPE_DSLBIS 1 +#define CDAT_STRUCTURE_DW0_TYPE_DSMSCIS 2 +#define CDAT_STRUCTURE_DW0_TYPE_DSIS 3 +#define CDAT_STRUCTURE_DW0_TYPE_DSEMTS 4 +#define CDAT_STRUCTURE_DW0_TYPE_SSLBIS 5 + +#define CDAT_STRUCTURE_DW0_LENGTH 0xffff0000 + +/* Device Scoped Memory Affinity Structure */ +#define CDAT_DSMAS_DW1_DSMAD_HANDLE 0x000000ff +#define CDAT_DSMAS_DW1_FLAGS 0x0000ff00 +#define CDAT_DSMAS_DPA_OFFSET (entry) ((u64)((entry)[3]) << 32 | (entry)[2]) +#define CDAT_DSMAS_DPA_LEN (entry) ((u64)((entry)[5]) << 32 | (entry)[4]) +#define CDAT_DSMAS_NON_VOLATILE (flags) ((flags & 0x04) >> 2) + +/* Device Scoped Latency and Bandwidth Information Structure */ +#define CDAT_DSLBIS_DW1_HANDLE 0x000000ff +#define CDAT_DSLBIS_DW1_FLAGS 0x0000ff00 +#define CDAT_DSLBIS_DW1_DATA_TYPE 0x00ff0000 +#define CDAT_DSLBIS_BASE_UNIT (entry) ((u64)((entry)[3]) << 32 | (entry)[2]) +#define CDAT_DSLBIS_DW4_ENTRY_0 0x0000ffff +#define CDAT_DSLBIS_DW4_ENTRY_1 0xffff0000 +#define CDAT_DSLBIS_DW5_ENTRY_2 0x0000ffff + +/* Device Scoped Memory Side Cache Information Structure */ +#define CDAT_DSMSCIS_DW1_HANDLE 0x000000ff +#define CDAT_DSMSCIS_MEMORY_SIDE_CACHE_SIZE (entry) \ + ((u64)((entry)[3]) << 32 | (entry)[2]) +#define CDAT_DSMSCIS_DW4_MEMORY_SIDE_CACHE_ATTRS 0xffffffff + +/* Device Scoped Initiator Structure */ +#define CDAT_DSIS_DW1_FLAGS 0x000000ff +#define CDAT_DSIS_DW1_HANDLE 0x0000ff00 + +/* Device Scoped EFI Memory Type Structure */ +#define CDAT_DSEMTS_DW1_HANDLE 0x000000ff +#define CDAT_DSEMTS_DW1_EFI_MEMORY_TYPE_ATTR 0x0000ff00 +#define CDAT_DSEMTS_DPA_OFFSET (entry) ((u64)((entry)[3]) << 32 | (entry)[2]) +#define CDAT_DSEMTS_DPA_LENGTH (entry) ((u64)((entry)[5]) << 32 | (entry)[4]) + +/* Switch Scoped Latency and Bandwidth Information Structure */ +#define CDAT_SSLBIS_DW1_DATA_TYPE 0x000000ff +#define CDAT_SSLBIS_BASE_UNIT (entry) ((u64)((entry)[3]) << 32 | (entry)[2]) +#define CDAT_SSLBIS_ENTRY_PORT_X (entry, i) ((entry)[4 + (i) * 2] & 0x0000ffff) +#define CDAT_SSLBIS_ENTRY_PORT_Y (entry, i) (((entry)[4 + (i) * 2] & 0xffff0000) >> 16) +#define CDAT_SSLBIS_ENTRY_LAT_OR_BW (entry, i) ((entry)[4 + (i) * 2 + 1] & 0x0000ffff) + +/** +* struct cxl_cdat - CXL CDAT data +* +* @table: cache of CDAT table +* @length: length of cached CDAT table +*/ +struct cxl_cdat { +void *table; +size_t length; +}; + +#endif /* !__CXL_CDAT_H__ */
drivers/cxl/core/memdev.c +38 -0
@@ -86,6 +86,37 @@ static ssize_t pmem_size_show(struct device *dev, struct device_attribute *attr,return sysfs_emit (buf,"%#llx\n" , len); } +static ssize_t CDAT_read (struct file *filp,struct kobject *kobj, +struct bin_attribute *bin_attr,char *buf, +loff_t offset,size_t count) +{ +struct device *dev =kobj_to_dev (kobj); +struct cxl_memdev *cxlmd =to_cxl_memdev (dev); +struct cxl_dev_state *cxlds = cxlmd->cxlds; + +if (!cxlds->cdat.table) +return 0 ; + +return memory_read_from_buffer (buf, count, &offset, + cxlds->cdat.table, + cxlds->cdat.length); +} + +static BIN_ATTR_RO(CDAT, 0); + +static umode_t cxl_memdev_bin_attr_is_visible (struct kobject *kobj, +struct bin_attribute *attr,int i) +{ +struct device *dev =kobj_to_dev (kobj); +struct cxl_memdev *cxlmd =to_cxl_memdev (dev); +struct cxl_dev_state *cxlds = cxlmd->cxlds; + +if ((attr == &bin_attr_CDAT) && cxlds->cdat.table) +return 0400 ; + +return 0 ; +} +static struct device_attribute dev_attr_pmem_size =__ATTR (size,0444 , pmem_size_show,NULL );
@@ -115,6 +146,11 @@ static struct attribute *cxl_memdev_attributes[] = { NULL, }; +static struct bin_attribute *cxl_memdev_bin_attributes[] = { + &bin_attr_CDAT, +NULL , +}; +static struct attribute *cxl_memdev_pmem_attributes[] = { &dev_attr_pmem_size.attr,NULL ,
@@ -136,6 +172,8 @@ static umode_t cxl_memdev_visible(struct kobject *kobj, struct attribute *a,static struct attribute_group cxl_memdev_attribute_group = { .attrs = cxl_memdev_attributes, .is_visible = cxl_memdev_visible, + .bin_attrs = cxl_memdev_bin_attributes, + .is_bin_visible = cxl_memdev_bin_attr_is_visible, };static struct attribute_group cxl_memdev_ram_attribute_group = {
drivers/cxl/cxlmem.h +26 -0
@@ -5,6 +5,7 @@#include <uapi/linux/cxl_mem.h> #include <linux/cdev.h> #include "cxl.h" +#include "cdat.h" /* CXL 2.0 8.2.8.5.1.1 Memory Device Status Register */ #define CXLMDEV_STATUS_OFFSET 0x0
@@ -169,6 +170,7 @@ struct cxl_endpoint_dvsec_info {* * @dev: The device associated with this CXL state * @cdat_doe: Auxiliary DOE device capabile of reading CDAT +* @cdat: Cached CDAT data * @regs: Parsed register blocks * @cxl_dvsec: Offset to the PCIe device DVSEC * @payload_size: Size of space for payload
@@ -194,6 +196,10 @@ struct cxl_endpoint_dvsec_info {* @serial: PCIe Device Serial Number * @mbox_send: @dev specific transport for transmitting mailbox commands * @wait_media_ready: @dev specific method to await media ready +* @cdat_get_length: @dev specific function for reading the CDAT table length +* returns -errno if CDAT not supported on this device +* @cdat_read_table: @dev specific function for reading the table +* returns -errno if CDAT not supported on this device * * See section 8.2.9.5.2 Capacity Configuration and Label Storage for * details on capacity parameters.
@@ -202,6 +208,7 @@ struct cxl_dev_state {struct device *dev;struct cxl_doe_dev *cdat_doe; +struct cxl_cdat cdat;struct cxl_regs regs;int cxl_dvsec;
@@ -230,6 +237,9 @@ struct cxl_dev_state {int (*mbox_send)(struct cxl_dev_state *cxlds,struct cxl_mbox_cmd *cmd);int (*wait_media_ready)(struct cxl_dev_state *cxlds); +int (*cdat_get_length)(struct cxl_dev_state *cxlds,size_t *length); +int (*cdat_read_table)(struct cxl_dev_state *cxlds, +struct cxl_cdat *cdat); };enum cxl_opcode {
@@ -374,4 +384,20 @@ struct cxl_hdm {unsigned int interleave_mask; struct cxl_port *port; }; + +static inline int cxl_mem_cdat_get_length (struct cxl_dev_state *cxlds,size_t *length) +{ +if (cxlds->cdat_get_length) +return cxlds->cdat_get_length (cxlds, length); +return -EOPNOTSUPP ; +} + +static inline int cxl_mem_cdat_read_table (struct cxl_dev_state *cxlds, +struct cxl_cdat *cdat) +{ +if (cxlds->cdat_read_table) +return cxlds->cdat_read_table (cxlds, cdat); +return -EOPNOTSUPP ; +} +#endif /* __CXL_MEM_H__ */
drivers/cxl/cxlpci.h +1 -0
@@ -4,6 +4,7 @@#define __CXL_PCI_H__#include <linux/auxiliary_bus.h> #include <linux/pci.h> +#include <linux/pci-doe.h> #include "cxl.h" #define CXL_MEMORY_PROGIF 0x10
drivers/cxl/pci.c +153 -0
171 lines not on this page · raw message
Signature · 1 line
2.35.1
Re: [PATCH V8 07/10] cxl/mem: Read CDAT table
Quoted 20 lines · On Thu, 14 Apr 2022 13:32:34 -0700 [email protected] wrote:
From: Jonathan Cameron <[email protected]>
The OS will need CDAT data from CXL devices to properly set up interleave sets. Currently this is supported by a through a DOE mailbox which supports CDAT. But any
cxl_memobject can provide this data later if need be, for example for testing.Cache the CDAT data for later parsing. Provide a sysfs binary attribute to allow dumping of the CDAT.
Binary dumping is modeled on
/sys/firmware/ACPI/tables/The ability to dump this table will be very useful for emulation of real devices once they become available as QEMU CXL type 3 device emulation will be able to load this file in.
This does not support table updates at runtime. It will always provide whatever was there when first cached. Handling of table updates can be implemented later.
Quoted 7 lines
Finally create a complete list of DOE defines within
cdat.hfor code wishing to decode the CDAT table.Signed-off-by Jonathan Cameron <[email protected]>Co-developed-by Ira Weiny <[email protected]>Signed-off-by Ira Weiny <[email protected]>
I'd have left the introduction of callbacks until they were actually needed, but meh. That's minor.
On trivial below.
...
drivers/cxl/pci.c static int cxl_setup_doe_devices(struct cxl_dev_state *cxlds) · line 918
Quoted 13 lines
drivers/cxl/pci.c +13
-0+ +static int read_cdat_data (struct cxl_dev_state *cxlds) +{ +struct device *dev = cxlds->dev; +size_t cdat_length; +int ret; + +if (cxl_mem_cdat_get_length (cxlds, &cdat_length)) +return 0 ; + + cxlds->cdat.table =devm_kzalloc (dev, cdat_length,GFP_KERNEL ); +if (!cxlds->cdat.table) +return -ENOMEM ;
Trivial but blank line here.
Quoted 9 lines
drivers/cxl/pci.c +9
-0+ cxlds->cdat.length = cdat_length; + ret =cxl_mem_cdat_read_table (cxlds, &cxlds->cdat); +if (ret) { +devm_kfree (dev, cxlds->cdat.table); + cxlds->cdat.table =NULL ; + cxlds->cdat.length =0 ; + } +return ret; +}
PATCH v8 8/10 cxl/cdat: Introduce cxl_cdat_valid()
In reply to [email protected]From: Ira Weiny <[email protected]>
The CDAT data is protected by a checksum and should be the proper length.
Introduce cxl_cdat_valid() to validate the data. While at it check and store the sequence number.
---
Changes from V6
Change name to cxl_cdat_valid() as this validates all the CDAT
data not just the header
Add error and debug prints
Changes from V5
New patch, split out
Update cdat_hdr_valid()
Remove revision and cs field parsing
There is no point in these
Add seq check and debug print.
--- drivers/cxl/cdat.h | 2 ++ drivers/cxl/pci.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+)
drivers/cxl/cdat.h +2 -0
@@ -88,10 +88,12 @@* * @table: cache of CDAT table * @length: length of cached CDAT table +* @seq: Last read Sequence number of the CDAT table */ struct cxl_cdat {void *table;size_t length; +u32 seq; };#endif /* !__CXL_CDAT_H__ */
drivers/cxl/pci.c +36 -0
@@ -781,6 +781,40 @@ static int cxl_setup_doe_devices(struct cxl_dev_state *cxlds)return 0 ; } +static bool cxl_cdat_valid (struct device *dev,struct cxl_cdat *cdat) +{ +u32 *table = cdat->table; +u8 *data8 = cdat->table; +u32 length, seq; +u8 check; +int i; + + length =FIELD_GET (CDAT_HEADER_DW0_LENGTH , table[0 ]); +if ((length <CDAT_HEADER_LENGTH_BYTES ) || (length > cdat->length)) { +dev_err (dev,"Invalid length %u (%lu-%lu)\n" , length, +CDAT_HEADER_LENGTH_BYTES , cdat->length); +return false; + } + +for (check =0 , i =0 ; i < length; i++) + check += data8[i]; + +dev_dbg (dev,"CDAT length %u CS %u\n" , length, check); +if (check !=0 ) { +dev_err (dev,"Invalid checksum %u\n" , check); +return false; + } + + seq =FIELD_GET (CDAT_HEADER_DW3_SEQUENCE , table[3 ]); +/* Store the sequence for now. */ +if (cdat->seq != seq) { +dev_info (dev,"CDAT seq change %x -> %x\n" , cdat->seq, seq); + cdat->seq = seq; + } + +return true; +} +#define CDAT_DOE_REQ (entry_handle) \ (FIELD_PREP(CXL_DOE_TABLE_ACCESS_REQ_CODE, \ CXL_DOE_TABLE_ACCESS_REQ_CODE_READ) | \
@@ -892,6 +926,8 @@ static int cxl_cdat_read_table(struct cxl_dev_state *cxlds, release_driver:cxl_pci_doe_put_drv (doe_dev); +if (!rc && !cxl_cdat_valid (cxlds->dev, cdat)) +return -EIO ;return rc; }
Signature · 1 line
2.35.1
Re: [PATCH V8 08/10] cxl/cdat: Introduce cxl_cdat_valid()
Quoted 10 lines · On Thu, 14 Apr 2022 13:32:35 -0700 [email protected] wrote:
From: Ira Weiny <[email protected]>
The CDAT data is protected by a checksum and should be the proper length.
Introduce
cxl_cdat_valid()to validate the data. While at it check and store the sequence number.Signed-off-by Ira Weiny <[email protected]>
Quoted 88 lines
---
Changes from V6
Change name tocxl_cdat_valid()as this validates all the CDAT
data not just the header
Add error and debug printsChanges from V5
New patch, split out
Updatecdat_hdr_valid()
Remove revision and cs field parsing
There is no point in these
Add seq check and debug print.--- drivers/cxl/cdat.h | 2 ++ drivers/cxl/pci.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+)drivers/cxl/cdat.h +2
-0@@ -88,10 +88,12 @@* * @table: cache of CDAT table * @length: length of cached CDAT table +* @seq: Last read Sequence number of the CDAT table */ struct cxl_cdat {void *table;size_t length; +u32 seq; };#endif /* !__CXL_CDAT_H__ */ drivers/cxl/pci.c +36
-0@@ -781,6 +781,40 @@ static int cxl_setup_doe_devices(struct cxl_dev_state *cxlds)return 0 ; } +static bool cxl_cdat_valid (struct device *dev,struct cxl_cdat *cdat) +{ +u32 *table = cdat->table; +u8 *data8 = cdat->table; +u32 length, seq; +u8 check; +int i; + + length =FIELD_GET (CDAT_HEADER_DW0_LENGTH , table[0 ]); +if ((length <CDAT_HEADER_LENGTH_BYTES ) || (length > cdat->length)) { +dev_err (dev,"Invalid length %u (%lu-%lu)\n" , length, +CDAT_HEADER_LENGTH_BYTES , cdat->length); +return false; + } + +for (check =0 , i =0 ; i < length; i++) + check += data8[i]; + +dev_dbg (dev,"CDAT length %u CS %u\n" , length, check); +if (check !=0 ) { +dev_err (dev,"Invalid checksum %u\n" , check); +return false; + } + + seq =FIELD_GET (CDAT_HEADER_DW3_SEQUENCE , table[3 ]); +/* Store the sequence for now. */ +if (cdat->seq != seq) { +dev_info (dev,"CDAT seq change %x -> %x\n" , cdat->seq, seq); + cdat->seq = seq; + } + +return true; +} +#define CDAT_DOE_REQ (entry_handle) \ (FIELD_PREP(CXL_DOE_TABLE_ACCESS_REQ_CODE, \ CXL_DOE_TABLE_ACCESS_REQ_CODE_READ) | \@@ -892,6 +926,8 @@ static int cxl_cdat_read_table(struct cxl_dev_state *cxlds, release_driver:cxl_pci_doe_put_drv (doe_dev); +if (!rc && !cxl_cdat_valid (cxlds->dev, cdat)) +return -EIO ;return rc; }
PATCH v8 9/10 cxl/mem: Retry reading CDAT on failure
In reply to [email protected]From: Ira Weiny <[email protected]>
The CDAT read may fail for a number of reasons but mainly it is possible to get different parts of a valid state. The checksum in the CDAT table protects against this.
Now that the cdat data is validated issue a retries if the CDAT read fails. For now 5 retries are implemented.
---
Changes from V6
Move to pci.c
Fix retries count
Change to 5 retries
Changes from V5:
New patch -- easy to push off or drop.
--- drivers/cxl/pci.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
drivers/cxl/pci.c +17 -4
@@ -940,7 +940,7 @@ static void cxl_initialize_cdat_callbacks(struct cxl_dev_state *cxlds) cxlds->cdat_read_table = cxl_cdat_read_table; } -static int read_cdat_data (struct cxl_dev_state *cxlds) +static int __read_cdat_data (struct cxl_dev_state *cxlds) {struct device *dev = cxlds->dev;size_t cdat_length;
@@ -962,6 +962,21 @@ static int read_cdat_data(struct cxl_dev_state *cxlds)return ret; } +static void read_cdat_data (struct cxl_dev_state *cxlds) +{ +int retries =5 ; +int rc; + +while (retries--) { + rc =__read_cdat_data (cxlds); +if (!rc) +break ; +dev_err (cxlds->dev, +"CDAT data read error rc=%d (retries %d)\n" , + rc, retries); + } +} +static int cxl_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct cxl_register_map map;
@@ -1035,9 +1050,7 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)cxl_initialize_cdat_callbacks (cxlds);/* Cache the data early to ensure is_visible() works */ - rc =read_cdat_data (cxlds); -if (rc) -dev_err (&pdev->dev,"CDAT data read error (%d)\n" , rc); +read_cdat_data (cxlds);cxl_dvsec_ranges (cxlds);
Signature · 1 line
2.35.1
Re: [PATCH V8 09/10] cxl/mem: Retry reading CDAT on failure
Quoted 7 lines · On Thu, 14 Apr 2022 13:32:36 -0700 [email protected] wrote:
From: Ira Weiny <[email protected]>
The CDAT read may fail for a number of reasons but mainly it is possible to get different parts of a valid state. The checksum in the CDAT table protects against this.
Now that the cdat data is validated issue a retries if the CDAT read
validated, retry if the CDAT read fails.
Quoted 3 lines
fails. For now 5 retries are implemented.
Signed-off-by Ira Weiny <[email protected]>
Quoted 59 lines
---
Changes from V6
Move topci.c
Fix retries count
Change to 5 retriesChanges from V5:
New patch -- easy to push off or drop.--- drivers/cxl/pci.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)drivers/cxl/pci.c +17
-4@@ -940,7 +940,7 @@ static void cxl_initialize_cdat_callbacks(struct cxl_dev_state *cxlds) cxlds->cdat_read_table = cxl_cdat_read_table; } -static int read_cdat_data (struct cxl_dev_state *cxlds) +static int __read_cdat_data (struct cxl_dev_state *cxlds) {struct device *dev = cxlds->dev;size_t cdat_length;@@ -962,6 +962,21 @@ static int read_cdat_data(struct cxl_dev_state *cxlds)return ret; } +static void read_cdat_data (struct cxl_dev_state *cxlds) +{ +int retries =5 ; +int rc; + +while (retries--) { + rc =__read_cdat_data (cxlds); +if (!rc) +break ; +dev_err (cxlds->dev, +"CDAT data read error rc=%d (retries %d)\n" , + rc, retries); + } +} +static int cxl_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct cxl_register_map map;@@ -1035,9 +1050,7 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)cxl_initialize_cdat_callbacks (cxlds);/* Cache the data early to ensure is_visible() works */ - rc =read_cdat_data (cxlds); -if (rc) -dev_err (&pdev->dev,"CDAT data read error (%d)\n" , rc); +read_cdat_data (cxlds);cxl_dvsec_ranges (cxlds);
PATCH v8 10/10 cxl/port: Parse out DSMAS data from CDAT table
In reply to [email protected]From: Ira Weiny <[email protected]>
CXL Ports with memory devices attached need the information from the Device Scoped Memory Affinity Structure (DSMAS). This information is contained within the CDAT table buffer which is previously read and cached in the device state.
If CDAT data is available, parse and cache DSMAS data from the table. Store this data in unmarshaled struct dsmas data structures for ease of use.
---
Changes from V7
Rebased on cxl-pending
Changes from V6
Move to port.c
It is not an error if no DSMAS data is found
Changes from V5
Fix up sparse warnings
Split out cdat_hdr_valid()
Update cdat_hdr_valid()
Remove revision and cs field parsing
There is no point in these
Add seq check and debug print.
From Jonathan
Add spaces around '+' and '/' use devm_krealloc() for dmas_ary
--- drivers/cxl/cdat.h | 17 ++++++++++++ drivers/cxl/cxl.h | 6 +++++ drivers/cxl/port.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+)
drivers/cxl/cdat.h +17 -0
@@ -83,6 +83,23 @@#define CDAT_SSLBIS_ENTRY_PORT_Y (entry, i) (((entry)[4 + (i) * 2] & 0xffff0000) >> 16)#define CDAT_SSLBIS_ENTRY_LAT_OR_BW (entry, i) ((entry)[4 + (i) * 2 + 1] & 0x0000ffff) +/** +* struct cxl_dsmas - host unmarshaled version of DSMAS data +* +* As defined in the Coherent Device Attribute Table (CDAT) specification this +* represents a single DSMAS entry in that table. +* +* @dpa_base: The lowest Device Physical Address associated with this DSMAD +* @length: Length in bytes of this DSMAD +* @non_volatile: If set, the memory region represents Non-Volatile memory +*/ +struct cxl_dsmas { +u64 dpa_base; +u64 length; +/* Flags */ +u8 non_volatile:1 ; +}; +/** * struct cxl_cdat - CXL CDAT data *
drivers/cxl/cxl.h +6 -0
@@ -9,6 +9,8 @@#include <linux/bitops.h> #include <linux/io.h> +#include "cdat.h" +/** * DOC: cxl objects *
@@ -269,6 +271,8 @@ struct cxl_nvdimm {* @component_reg_phys: component register capability base address (optional) * @dead: last ep has been removed, force port re-creation * @depth: How deep this port is relative to the root. depth 0 is the root. +* @dsmas_ary: Array of DSMAS entries as parsed from the CDAT table +* @nr_dsmas: Number of entries in dsmas_ary */ struct cxl_port {struct device dev;
@@ -280,6 +284,8 @@ struct cxl_port {resource_size_t component_reg_phys;bool dead;unsigned int depth; +struct cxl_dsmas *dsmas_ary; +int nr_dsmas; };/**
drivers/cxl/port.c +65 -0
77 lines not on this page · raw message
Signature · 1 line
2.35.1
Re: [PATCH V8 10/10] cxl/port: Parse out DSMAS data from CDAT table
Quoted 7 lines · On Thu, 14 Apr 2022 13:32:37 -0700 [email protected] wrote:
From: Ira Weiny <[email protected]>
CXL Ports with memory devices attached need the information from the Device Scoped Memory Affinity Structure (DSMAS). This information is contained within the CDAT table buffer which is previously read and cached in the device state.
Quoted 5 lines
If CDAT data is available, parse and cache DSMAS data from the table. Store this data in unmarshaled struct dsmas data structures for ease of use.
Signed-off-by Ira Weiny <[email protected]>
You could hold off on this patch and having it in the series that uses the data.
Patch itself looks fine - it's just a bit random to parse one particular record and do nothing with it beyond some debug prints :)
Quoted 156 lines
---
Changes from V7
Rebased on cxl-pendingChanges from V6
Move toport.c
It is not an error if no DSMAS data is foundChanges from V5
Fix up sparse warnings
Split outcdat_hdr_valid()
Updatecdat_hdr_valid()
Remove revision and cs field parsing
There is no point in these
Add seq check and debug print.
From Jonathan
Add spaces around '+' and '/' usedevm_krealloc()fordmas_ary--- drivers/cxl/cdat.h | 17 ++++++++++++ drivers/cxl/cxl.h | 6 +++++ drivers/cxl/port.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+)drivers/cxl/cdat.h +17
-0@@ -83,6 +83,23 @@#define CDAT_SSLBIS_ENTRY_PORT_Y (entry, i) (((entry)[4 + (i) * 2] & 0xffff0000) >> 16)#define CDAT_SSLBIS_ENTRY_LAT_OR_BW (entry, i) ((entry)[4 + (i) * 2 + 1] & 0x0000ffff) +/** +* struct cxl_dsmas - host unmarshaled version of DSMAS data +* +* As defined in the Coherent Device Attribute Table (CDAT) specification this +* represents a single DSMAS entry in that table. +* +* @dpa_base: The lowest Device Physical Address associated with this DSMAD +* @length: Length in bytes of this DSMAD +* @non_volatile: If set, the memory region represents Non-Volatile memory +*/ +struct cxl_dsmas { +u64 dpa_base; +u64 length; +/* Flags */ +u8 non_volatile:1 ; +}; +/** * struct cxl_cdat - CXL CDAT data * drivers/cxl/cxl.h +6
-0@@ -9,6 +9,8 @@#include <linux/bitops.h> #include <linux/io.h> +#include "cdat.h" +/** * DOC: cxl objects * @@ -269,6 +271,8 @@ struct cxl_nvdimm {* @component_reg_phys: component register capability base address (optional) * @dead: last ep has been removed, force port re-creation * @depth: How deep this port is relative to the root. depth 0 is the root. +* @dsmas_ary: Array of DSMAS entries as parsed from the CDAT table +* @nr_dsmas: Number of entries in dsmas_ary */ struct cxl_port {struct device dev;@@ -280,6 +284,8 @@ struct cxl_port {resource_size_t component_reg_phys;bool dead;unsigned int depth; +struct cxl_dsmas *dsmas_ary; +int nr_dsmas; };/** drivers/cxl/port.c +64
-0@@ -30,6 +30,70 @@ static void schedule_detach(void *cxlmd)schedule_cxl_memdev_detach (cxlmd); } +static void parse_dsmas (struct cxl_port *port,struct cxl_dev_state *cxlds) +{ +struct device *dev = &port->dev; +struct cxl_dsmas *dsmas_ary =NULL ; +u32 *data = cxlds->cdat.table; +int bytes_left = cxlds->cdat.length; +int nr_dsmas =0 ; + +if (!data) { +dev_info (dev,"No CDAT data available for DSMAS\n" ); +return ; + } + +/* Skip header */ + data +=CDAT_HEADER_LENGTH_DW ; + bytes_left -=CDAT_HEADER_LENGTH_BYTES ; + +while (bytes_left >0 ) { +u32 *cur_rec = data; +u8 type =FIELD_GET (CDAT_STRUCTURE_DW0_TYPE , cur_rec[0 ]); +u16 length =FIELD_GET (CDAT_STRUCTURE_DW0_LENGTH , cur_rec[0 ]); + +if (type ==CDAT_STRUCTURE_DW0_TYPE_DSMAS ) { +struct cxl_dsmas *new_ary; +u8 flags; + + new_ary =devm_krealloc (dev, dsmas_ary, +sizeof (*dsmas_ary) * (nr_dsmas +1 ), +GFP_KERNEL ); +if (!new_ary) { +dev_err (dev, +"Failed to allocate memory for DSMAS data (nr_dsmas %d)\n" , + nr_dsmas); +return ; + } + dsmas_ary = new_ary; + + flags =FIELD_GET (CDAT_DSMAS_DW1_FLAGS , cur_rec[1 ]); + + dsmas_ary[nr_dsmas].dpa_base =CDAT_DSMAS_DPA_OFFSET (cur_rec); + dsmas_ary[nr_dsmas].length =CDAT_DSMAS_DPA_LEN (cur_rec); + dsmas_ary[nr_dsmas].non_volatile =CDAT_DSMAS_NON_VOLATILE (flags); + +dev_dbg (dev,"DSMAS %d: %llx:%llx %s\n" , + nr_dsmas, + dsmas_ary[nr_dsmas].dpa_base, + dsmas_ary[nr_dsmas].dpa_base + + dsmas_ary[nr_dsmas].length, + (dsmas_ary[nr_dsmas].non_volatile ? +"Persistent" :"Volatile" ) + ); + + nr_dsmas++; + } + + data += (length /sizeof (u32)); + bytes_left -= length; + } + +dev_dbg (dev,"Found %d DSMAS entries\n" , nr_dsmas); + port->dsmas_ary = dsmas_ary; + port->nr_dsmas = nr_dsmas; +} +