CXL 2.0 Support
Subsystems (6)
v3 cover CXL 2.0 Support
# Changes since v2 [1]
* s/mbox_lock/mbox_mutex in kdocs (Ben)
* Remove stray comments about deleted flags (Ben)
* Remove flags from CXL_CMD (Ben)
* Rework cxl_mem_enumerate_cmds() to allow more than 2 commands (Ben, Jonathan)
* I misread the spec and this needed more robust handling.
* Remove validate_payload() as it no longer is useful (Ben)
* Remove check that CEL returned reasonable command list (Ben)
* It is easy enough to figure this out elsewhere.
* Enable sane set of commands regardless (Ben)
* Remove now useless cxl_enable_cmd() (Ben)
* Add payload dump debugging regardless of timeout (Dan)
* Extracted to separate RFC patch (Ben)
* Move PCI_DVSEC_HEADER1_LENGTH_MASK back to cxl.h (Jonathan, Bjorn)
* Drop duplicated PCI_EXT_CAP_ID_DVSEC (Jonathan)
* Use PCI_DEVICE_CLASS (Jonathan)
* Create wrapper for kernel mailbox usage (Jonathan)
* Helps with error conditions
* Various cosmetic changes (Jonathan)
* Remove references to removed MUTEX flag (Jonathan)
* Remove KERNEL flag since not used yet (Jonathan)
* Remove payload dumping for debug (Jonathan)
* Show example expansion from macro magic (Jonathan)
---
In addition to the mailing list, please feel free to use #cxl on oftc IRC for discussion.
---
# Summary
Introduce support for “type-3” memory devices defined in the Compute Express Link (CXL) 2.0 specification [2]. Specifically, these are the memory devices defined by section 8.2.8.5 of the CXL 2.0 spec. A reference implementation emulating these devices has been submitted to the QEMU mailing list [3] and is available on gitlab [4], but will move to a shared tree on kernel.org after initial acceptance. “Type-3” is a CXL device that acts as a memory expander for RAM or Persistent Memory. The device might be interleaved with other CXL devices in a given physical address range.
In addition to the core functionality of discovering the spec defined registers and resources, introduce a CXL device model that will be the foundation for translating CXL capabilities into existing Linux infrastructure for Persistent Memory and other memory devices. For now, this only includes support for the management command mailbox the surfacing of type-3 devices. These control devices fill the role of “DIMMs” / nmemX memory-devices in LIBNVDIMM terms.
## Userspace Interaction
Interaction with the driver and type-3 devices via the CXL drivers is introduced in this patch series and considered stable ABI. They include
* sysfs - Documentation/ABI/testing/sysfs-bus-cxl
* IOCTL - Documentation/driver-api/cxl/memory-devices.rst
* debugfs - Documentation/ABI/testing/debugfs-debug
Work is in process to add support for CXL interactions to the ndctl project [5]
### Development plans
One of the unique challenges that CXL imposes on the Linux driver model is that it requires the operating system to perform physical address space management interleaved across devices and bridges. Whereas LIBNVDIMM handles a list of established static persistent memory address ranges (for example from the ACPI NFIT), CXL introduces hotplug and the concept of allocating address space to instantiate persistent memory ranges. This is similar to PCI in the sense that the platform establishes the MMIO range for PCI BARs to be allocated, but it is significantly complicated by the fact that a given device can optionally be interleaved with other devices and can participate in several interleave-sets at once. LIBNVDIMM handled something like this with the aliasing between PMEM and BLOCK-WINDOW mode, but CXL adds flexibility to alias DEVICE MEMORY through up to 10 decoders per device.
All of the above needs to be enabled with respect to PCI hotplug events on Type-3 memory device which needs hooks to determine if a given device is contributing to a "System RAM" address range that is unable to be unplugged. In other words CXL ties PCI hotplug to Memory Hotplug and PCI hotplug needs to be able to negotiate with memory hotplug. In the medium term the implications of CXL hotplug vs ACPI SRAT/SLIT/HMAT need to be reconciled. One capability that seems to be needed is either the dynamic allocation of new memory nodes, or default initializing extra pgdat instances beyond what is enumerated in ACPI SRAT to accommodate hot-added CXL memory.
Patches welcome, questions welcome as the development effort on the post v5.12 capabilities proceeds.
## Running in QEMU
The incantation to get CXL support in QEMU [4] is considered unstable at this time. Future readers of this cover letter should verify if any changes are needed. For the novice QEMU user, the following can be copy/pasted into a working QEMU commandline. It is enough to make the simplest topology possible. The topology would consist of a single memory window, single type3 device, single root port, and single host bridge.
+-------------+
| CXL PXB |
| |
| +-------+ |<----------+
| |CXL RP | | |
+--+-------+--+ v
| +----------+
| | "window" |
| +----------+
v ^
+-------------+ |
| CXL Type 3 | |
| Device |<----------+
+-------------+// Memory backend for "window"
-object memory-backend-file,id=cxl-mem1,share,mem-path=cxl-type3,size=512M
// Memory backend for LSA
-object memory-backend-file,id=cxl-mem1-lsa,share,mem-path=cxl-mem1-lsa,size=1K
// Host Bridge
-device pxb-cxl id=cxl.0,bus=pcie.0,bus_nr=52,uid=0 len-window-base=1,window-base[0]=0x4c0000000 memdev[0]=cxl-mem1
// Single root port
-device cxl rp,id=rp0,bus=cxl.0,addr=0.0,chassis=0,slot=0,memdev=cxl-mem1
// Single type3 device
-device cxl-type3,bus=rp0,memdev=cxl-mem1,id=cxl-pmem0,size=256M -device cxl-type3,bus=rp1,memdev=cxl-mem1,id=cxl-pmem1,size=256M,lsa=cxl-mem1-lsa
---
[1]: https://lore.kernel.org/linux-cxl/[email protected]/
[2]: https://www.computeexpresslink.org/](https://www.computeexpresslink.org/)
[3]: https://lore.kernel.org/qemu-devel/[email protected]/
[4]: https://gitlab.com/bwidawsk/qemu/-/tree/cxl-2.0v4
[5]: https://github.com/pmem/ndctl/tree/cxl-2.0v2
Ben Widawsky (7):
cxl/mem: Find device capabilities
cxl/mem: Add basic IOCTL interface
cxl/mem: Add a "RAW" send command
cxl/mem: Enable commands via CEL
cxl/mem: Add set of informational commands
MAINTAINERS: Add maintainers of the CXL driver
cxl/mem: Add payload dumping for debug
Dan Williams (2):
cxl/mem: Introduce a driver for CXL-2.0-Type-3 endpoints cxl/mem: Register CXL memX devices
.clang-format | 1 + Documentation/ABI/testing/sysfs-bus-cxl | 26 + Documentation/driver-api/cxl/index.rst | 12 + .../driver-api/cxl/memory-devices.rst | 46 + Documentation/driver-api/index.rst | 1 + .../userspace-api/ioctl/ioctl-number.rst | 1 + MAINTAINERS | 11 + drivers/Kconfig | 1 + drivers/Makefile | 1 + drivers/cxl/Kconfig | 66 + drivers/cxl/Makefile | 7 + drivers/cxl/bus.c | 29 + drivers/cxl/cxl.h | 93 + drivers/cxl/mem.c | 1531 +++++++++++++++++ drivers/cxl/pci.h | 31 + include/linux/pci_ids.h | 1 + include/uapi/linux/cxl_mem.h | 170 ++ 17 files changed, 2028 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-bus-cxl create mode 100644 Documentation/driver-api/cxl/index.rst create mode 100644 Documentation/driver-api/cxl/memory-devices.rst create mode 100644 drivers/cxl/Kconfig create mode 100644 drivers/cxl/Makefile create mode 100644 drivers/cxl/bus.c create mode 100644 drivers/cxl/cxl.h create mode 100644 drivers/cxl/mem.c create mode 100644 drivers/cxl/pci.h create mode 100644 include/uapi/linux/cxl_mem.h
---
Signature · 4 lines
2.30.0 _______________________________________________ Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]
PATCH v3 1/9 cxl/mem: Introduce a driver for CXL-2.0-Type-3 endpoints
From: Dan Williams <[email protected]>
The CXL.mem protocol allows a device to act as a provider of "System RAM" and/or "Persistent Memory" that is fully coherent as if the memory was attached to the typical CPU memory controller.
With the CXL-2.0 specification a PCI endpoint can implement a "Type-3" device interface and give the operating system control over "Host Managed Device Memory". See section 2.3 Type 3 CXL Device.
The memory range exported by the device may optionally be described by the platform firmware memory map, or by infrastructure like LIBNVDIMM to provision persistent memory capacity from one, or more, CXL.mem devices.
A pre-requisite for Linux-managed memory-capacity provisioning is this cxl_mem driver that can speak the mailbox protocol defined in section 8.2.8.4 Mailbox Registers.
For now just land the initial driver boiler-plate and Documentation/ infrastructure.
--- Documentation/driver-api/cxl/index.rst | 12 ++++ .../driver-api/cxl/memory-devices.rst | 29 +++++++++ Documentation/driver-api/index.rst | 1 + drivers/Kconfig | 1 + drivers/Makefile | 1 + drivers/cxl/Kconfig | 35 +++++++++++ drivers/cxl/Makefile | 4 ++ drivers/cxl/mem.c | 62 +++++++++++++++++++ drivers/cxl/pci.h | 17 +++++ include/linux/pci_ids.h | 1 + 10 files changed, 163 insertions(+) create mode 100644 Documentation/driver-api/cxl/index.rst create mode 100644 Documentation/driver-api/cxl/memory-devices.rst create mode 100644 drivers/cxl/Kconfig create mode 100644 drivers/cxl/Makefile create mode 100644 drivers/cxl/mem.c create mode 100644 drivers/cxl/pci.h
Documentation/driver-api/cxl/index.rst new file +12 -0
@@ -0,0 +1,12 @@ +.. SPDX-License-Identifier: GPL-2.0 + +==================== +Compute Express Link +==================== + +.. toctree:: + :maxdepth: 1 + + memory-devices + +.. only:: subproject and html
Documentation/driver-api/cxl/memory-devices.rst new file +29 -0
@@ -0,0 +1,29 @@ +.. SPDX-License-Identifier: GPL-2.0 +.. include:: <isonum.txt> + +=================================== +Compute Express Link Memory Devices +=================================== + +A Compute Express Link Memory Device is a CXL component that implements the +CXL.mem protocol. It contains some amount of volatile memory, persistent memory, +or both. It is enumerated as a PCI device for configuration and passing +messages over an MMIO mailbox. Its contribution to the System Physical +Address space is handled via HDM (Host Managed Device Memory) decoders +that optionally define a device's contribution to an interleaved address +range across multiple devices underneath a host-bridge or interleaved +across host-bridges. + +Driver Infrastructure +===================== + +This section covers the driver infrastructure for a CXL memory device. + +CXL Memory Device +----------------- + +.. kernel-doc:: drivers/cxl/mem.c + :doc: cxl mem + +.. kernel-doc:: drivers/cxl/mem.c + :internal:
Documentation/driver-api/index.rst +1 -0
@@ -35,6 +35,7 @@ available subsections can be seen below. usb/index firewire pci/index + cxl/index spi i2c ipmb
drivers/Kconfig +1 -0
@@ -6,6 +6,7 @@ menu "Device Drivers" source "drivers/amba/Kconfig" source "drivers/eisa/Kconfig" source "drivers/pci/Kconfig" +source "drivers/cxl/Kconfig" source "drivers/pcmcia/Kconfig" source "drivers/rapidio/Kconfig"
drivers/Makefile +1 -0
@@ -73,6 +73,7 @@ obj-$(CONFIG_NVM) += lightnvm/ obj-y += base/ block/ misc/ mfd/ nfc/ obj-$(CONFIG_LIBNVDIMM) += nvdimm/ obj-$(CONFIG_DAX) += dax/ +obj-$(CONFIG_CXL_BUS) += cxl/ obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf/ obj-$(CONFIG_NUBUS) += nubus/ obj-y += macintosh/
drivers/cxl/Kconfig new file +35 -0
@@ -0,0 +1,35 @@ +# SPDX-License-Identifier: GPL-2.0-only +menuconfig CXL_BUS + tristate "CXL (Compute Express Link) Devices Support" + depends on PCI + help + CXL is a bus that is electrically compatible with PCI Express, but + layers three protocols on that signalling (CXL.io, CXL.cache, and + CXL.mem). The CXL.cache protocol allows devices to hold cachelines + locally, the CXL.mem protocol allows devices to be fully coherent + memory targets, the CXL.io protocol is equivalent to PCI Express. + Say 'y' to enable support for the configuration and management of + devices supporting these protocols. + +if CXL_BUS + +config CXL_MEM + tristate "CXL.mem: Memory Devices" + help + The CXL.mem protocol allows a device to act as a provider of + "System RAM" and/or "Persistent Memory" that is fully coherent + as if the memory was attached to the typical CPU memory + controller. + + Say 'y/m' to enable a driver (named "cxl_mem.ko" when built as + a module) that will attach to CXL.mem devices for + configuration, provisioning, and health monitoring. This + driver is required for dynamic provisioning of CXL.mem + attached memory which is a prerequisite for persistent memory + support. Typically volatile memory is mapped by platform + firmware and included in the platform memory map, but in some + cases the OS is responsible for mapping that memory. See + Chapter 2.3 Type 3 CXL Device in the CXL 2.0 specification. + + If unsure say 'm'. +endif
drivers/cxl/Makefile new file +4 -0
@@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_CXL_MEM) += cxl_mem.o + +cxl_mem-y := mem.o
drivers/cxl/mem.c new file +62 -0
62 lines not on this page · raw message
drivers/cxl/pci.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright(c) 2020 Intel Corporation. All rights reserved. */ +#ifndef __CXL_PCI_H__ +#define __CXL_PCI_H__ + +#define CXL_MEMORY_PROGIF 0x10 + +/* +* See section 8.1 Configuration Space Registers in the CXL 2.0 +* Specification +*/ +#define PCI_DVSEC_VENDOR_ID_CXL 0x1E98 +#define PCI_DVSEC_ID_CXL 0x0 + +#define PCI_DVSEC_ID_CXL_REGLOC_OFFSET 0x8 + +#endif /* __CXL_PCI_H__ */
include/linux/pci_ids.h +1 -0
@@ -51,6 +51,7 @@#define PCI_BASE_CLASS_MEMORY 0x05#define PCI_CLASS_MEMORY_RAM 0x0500#define PCI_CLASS_MEMORY_FLASH 0x0501 +#define PCI_CLASS_MEMORY_CXL 0x0502#define PCI_CLASS_MEMORY_OTHER 0x0580#define PCI_BASE_CLASS_BRIDGE 0x06
Signature · 4 lines
2.30.0 _______________________________________________ Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]
PATCH v3 2/9 cxl/mem: Find device capabilities
In reply to Ben WidawskyProvide enough functionality to utilize the mailbox of a memory device. The mailbox is used to interact with the firmware running on the memory device. The flow is proven with one implemented command, "identify". Because the class code has already told the driver this is a memory device and the identify command is mandatory.
CXL devices contain an array of capabilities that describe the interactions software can have with the device or firmware running on the device. A CXL compliant device must implement the device status and the mailbox capability. Additionally, a CXL compliant memory device must implement the memory device capability. Each of the capabilities can [will] provide an offset within the MMIO region for interacting with the CXL device.
The capabilities tell the driver how to find and map the register space for CXL Memory Devices. The registers are required to utilize the CXL spec defined mailbox interface. The spec outlines two mailboxes, primary and secondary. The secondary mailbox is earmarked for system firmware, and not handled in this driver.
Primary mailboxes are capable of generating an interrupt when submitting a background command. That implementation is saved for a later time.
--- drivers/cxl/cxl.h | 88 ++++++++ drivers/cxl/mem.c | 542 +++++++++++++++++++++++++++++++++++++++++++++- drivers/cxl/pci.h | 14 ++ 3 files changed, 642 insertions(+), 2 deletions(-) create mode 100644 drivers/cxl/cxl.h
drivers/cxl/cxl.h new file +88 -0
@@ -0,0 +1,88 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright(c) 2020 Intel Corporation. */ + +#ifndef __CXL_H__ +#define __CXL_H__ + +#include <linux/bitfield.h> +#include <linux/bitops.h> +#include <linux/io.h> + +/* CXL 2.0 8.2.8.1 Device Capabilities Array Register */ +#define CXLDEV_CAP_ARRAY_OFFSET 0x0 +#define CXLDEV_CAP_ARRAY_CAP_ID 0 +#define CXLDEV_CAP_ARRAY_ID_MASK GENMASK(15, 0) +#define CXLDEV_CAP_ARRAY_COUNT_MASK GENMASK(47, 32) +/* CXL 2.0 8.2.8.2.1 CXL Device Capabilities */ +#define CXLDEV_CAP_CAP_ID_DEVICE_STATUS 0x1 +#define CXLDEV_CAP_CAP_ID_PRIMARY_MAILBOX 0x2 +#define CXLDEV_CAP_CAP_ID_SECONDARY_MAILBOX 0x3 +#define CXLDEV_CAP_CAP_ID_MEMDEV 0x4000 + +/* CXL 2.0 8.2.8.4 Mailbox Registers */ +#define CXLDEV_MBOX_CAPS_OFFSET 0x00 +#define CXLDEV_MBOX_CAP_PAYLOAD_SIZE_MASK GENMASK(4, 0) +#define CXLDEV_MBOX_CTRL_OFFSET 0x04 +#define CXLDEV_MBOX_CTRL_DOORBELL BIT(0) +#define CXLDEV_MBOX_CMD_OFFSET 0x08 +#define CXLDEV_MBOX_CMD_COMMAND_OPCODE_MASK GENMASK(15, 0) +#define CXLDEV_MBOX_CMD_PAYLOAD_LENGTH_MASK GENMASK(36, 16) +#define CXLDEV_MBOX_STATUS_OFFSET 0x10 +#define CXLDEV_MBOX_STATUS_RET_CODE_MASK GENMASK(47, 32) +#define CXLDEV_MBOX_BG_CMD_STATUS_OFFSET 0x18 +#define CXLDEV_MBOX_PAYLOAD_OFFSET 0x20 + +/* CXL 2.0 8.2.8.5.1.1 Memory Device Status Register */ +#define CXLMDEV_STATUS_OFFSET 0x0 +#define CXLMDEV_DEV_FATAL BIT(0) +#define CXLMDEV_FW_HALT BIT(1) +#define CXLMDEV_STATUS_MEDIA_STATUS_MASK GENMASK(3, 2) +#define CXLMDEV_MS_NOT_READY 0 +#define CXLMDEV_MS_READY 1 +#define CXLMDEV_MS_ERROR 2 +#define CXLMDEV_MS_DISABLED 3 +#define CXLMDEV_READY (status) \ + (FIELD_GET(CXLMDEV_STATUS_MEDIA_STATUS_MASK, status) == \ + CXLMDEV_MS_READY) +#define CXLMDEV_MBOX_IF_READY BIT(4) +#define CXLMDEV_RESET_NEEDED_MASK GENMASK(7, 5) +#define CXLMDEV_RESET_NEEDED_NOT 0 +#define CXLMDEV_RESET_NEEDED_COLD 1 +#define CXLMDEV_RESET_NEEDED_WARM 2 +#define CXLMDEV_RESET_NEEDED_HOT 3 +#define CXLMDEV_RESET_NEEDED_CXL 4 +#define CXLMDEV_RESET_NEEDED (status) \ + (FIELD_GET(CXLMDEV_RESET_NEEDED_MASK, status) != \ + CXLMDEV_RESET_NEEDED_NOT) + +/** +* struct cxl_mem - A CXL memory device +* @pdev: The PCI device associated with this CXL device. +* @regs: IO mappings to the device's MMIO +* @status_regs: CXL 2.0 8.2.8.3 Device Status Registers +* @mbox_regs: CXL 2.0 8.2.8.4 Mailbox Registers +* @memdev_regs: CXL 2.0 8.2.8.5 Memory Device Registers +* @payload_size: Size of space for payload +* (CXL 2.0 8.2.8.4.3 Mailbox Capabilities Register) +* @mbox_mutex: Mutex to synchronize mailbox access. +* @firmware_version: Firmware version for the memory device. +* @pmem: Persistent memory capacity information. +* @ram: Volatile memory capacity information. +*/ +struct cxl_mem { +struct pci_dev *pdev; +void __iomem *regs; + +void __iomem *status_regs; +void __iomem *mbox_regs; +void __iomem *memdev_regs; + +size_t payload_size; +struct mutex mbox_mutex;/* Protects device mailbox and firmware */ +char firmware_version[0x10 ]; + +struct range pmem_range; +struct range ram_range; +}; + +#endif /* __CXL_H__ */
drivers/cxl/mem.c +540 -2
563 lines not on this page · raw message
drivers/cxl/pci.h +14 -0
@@ -9,9 +9,23 @@* See section 8.1 Configuration Space Registers in the CXL 2.0 * Specification */ +#define PCI_DVSEC_HEADER1_LENGTH_MASK GENMASK(31, 20)#define PCI_DVSEC_VENDOR_ID_CXL 0x1E98#define PCI_DVSEC_ID_CXL 0x0#define PCI_DVSEC_ID_CXL_REGLOC_OFFSET 0x8 +#define PCI_DVSEC_ID_CXL_REGLOC_BLOCK1_OFFSET 0xC + +/* BAR Indicator Register (BIR) */ +#define CXL_REGLOC_BIR_MASK GENMASK(2, 0) + +/* Register Block Identifier (RBI) */ +#define CXL_REGLOC_RBI_MASK GENMASK(15, 8) +#define CXL_REGLOC_RBI_EMPTY 0 +#define CXL_REGLOC_RBI_COMPONENT 1 +#define CXL_REGLOC_RBI_VIRT 2 +#define CXL_REGLOC_RBI_MEMDEV 3 + +#define CXL_REGLOC_ADDR_MASK GENMASK(31, 16)#endif /* __CXL_PCI_H__ */
Signature · 4 lines
2.30.0 _______________________________________________ Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]
PATCH v3 3/9 cxl/mem: Register CXL memX devices
In reply to Ben WidawskyFrom: Dan Williams <[email protected]>
Create the /sys/bus/cxl hierarchy to enumerate:
* Memory Devices (per-endpoint control devices)
* Memory Address Space Devices (platform address ranges with interleaving, performance, and persistence attributes)
* Memory Regions (active provisioned memory from an address space device that is in use as System RAM or delegated to libnvdimm as Persistent Memory regions).
For now, only the per-endpoint control devices are registered on the 'cxl' bus. However, going forward it will provide a mechanism to coordinate cross-device interleave.
--- Documentation/ABI/testing/sysfs-bus-cxl | 26 ++ .../driver-api/cxl/memory-devices.rst | 17 + drivers/cxl/Makefile | 3 + drivers/cxl/bus.c | 29 ++ drivers/cxl/cxl.h | 3 + drivers/cxl/mem.c | 301 +++++++++++++++++- 6 files changed, 377 insertions(+), 2 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-cxl create mode 100644 drivers/cxl/bus.c
Documentation/ABI/testing/sysfs-bus-cxl new file +26 -0
@@ -0,0 +1,26 @@ +What: /sys/bus/cxl/devices/memX/firmware_version +Date: December, 2020 +KernelVersion: v5.12 +Contact: [email protected] +Description: + (RO) "FW Revision" string as reported by the Identify + Memory Device Output Payload in the CXL-2.0 + specification. + +What: /sys/bus/cxl/devices/memX/ram/size +Date: December, 2020 +KernelVersion: v5.12 +Contact: [email protected] +Description: + (RO) "Volatile Only Capacity" as bytes. Represents the + identically named field in the Identify Memory Device Output + Payload in the CXL-2.0 specification. + +What: /sys/bus/cxl/devices/memX/pmem/size +Date: December, 2020 +KernelVersion: v5.12 +Contact: [email protected] +Description: + (RO) "Persistent Only Capacity" as bytes. Represents the + identically named field in the Identify Memory Device Output + Payload in the CXL-2.0 specification.
Documentation/driver-api/cxl/memory-devices.rst +17 -0
@@ -27,3 +27,20 @@ CXL Memory Device .. kernel-doc:: drivers/cxl/mem.c :internal: + +CXL Bus +------- +.. kernel-doc:: drivers/cxl/bus.c + :doc: cxl bus + +External Interfaces +=================== + +CXL IOCTL Interface +------------------- + +.. kernel-doc:: include/uapi/linux/cxl_mem.h + :doc: UAPI + +.. kernel-doc:: include/uapi/linux/cxl_mem.h + :internal:
drivers/cxl/Makefile +3 -0
@@ -1,4 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_CXL_BUS) += cxl_bus.o obj-$(CONFIG_CXL_MEM) += cxl_mem.o +ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=CXL +cxl_bus-y := bus.o cxl_mem-y := mem.o
drivers/cxl/bus.c new file +29 -0
@@ -0,0 +1,29 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright(c) 2020 Intel Corporation. All rights reserved. */ +#include <linux/device.h> +#include <linux/module.h> + +/** +* DOC: cxl bus +* +* The CXL bus provides namespace for control devices and a rendezvous +* point for cross-device interleave coordination. +*/ +struct bus_type cxl_bus_type = { + .name ="cxl" , +}; +EXPORT_SYMBOL_GPL (cxl_bus_type); + +static __init int cxl_bus_init (void ) +{ +return bus_register (&cxl_bus_type); +} + +static void cxl_bus_exit (void ) +{ +bus_unregister (&cxl_bus_type); +} + +module_init (cxl_bus_init); +module_exit (cxl_bus_exit); +MODULE_LICENSE ("GPL v2" );
drivers/cxl/cxl.h +3 -0
@@ -55,6 +55,7 @@ (FIELD_GET (CXLMDEV_RESET_NEEDED_MASK , status) != \ CXLMDEV_RESET_NEEDED_NOT) +struct cxl_memdev ;/** * struct cxl_mem - A CXL memory device * @pdev: The PCI device associated with this CXL device.
@@ -72,6 +73,7 @@struct cxl_mem {struct pci_dev *pdev;void __iomem *regs; +struct cxl_memdev *cxlmd;void __iomem *status_regs;void __iomem *mbox_regs;
@@ -85,4 +87,5 @@ struct cxl_mem { struct range ram_range; }; +extern struct bus_type cxl_bus_type;#endif /* __CXL_H__ */
drivers/cxl/mem.c +299 -2
340 lines not on this page · raw message
Signature · 4 lines
2.30.0 _______________________________________________ Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]
Re: [PATCH v3 3/9] cxl/mem: Register CXL memX devices
Quoted 13 lines · Ben Widawsky
From: Dan Williams <[email protected]>
Create the
/sys/bus/cxlhierarchy to enumerate:* Memory Devices (per-endpoint control devices)
* Memory Address Space Devices (platform address ranges with interleaving, performance, and persistence attributes)
* Memory Regions (active provisioned memory from an address space device that is in use as System RAM or delegated to libnvdimm as Persistent Memory regions).
Quoted 7 lines
For now, only the per-endpoint control devices are registered on the 'cxl' bus. However, going forward it will provide a mechanism to coordinate cross-device interleave.
Signed-off-by Dan Williams <[email protected]>Signed-off-by Ben Widawsky <[email protected]>Reviewed-by Jonathan Cameron <[email protected]> (v2)
arm:allmodconfig, i386:allyesconfig, mips:allmodconfig:
drivers/cxl/mem.c:335:2: error: implicit declaration of function 'writeq'; did you mean 'writel'? [-Werror=implicit-function-declaration]
335 | writeq(cmd_reg, cxlm->mbox_regs + CXLDEV_MBOX_CMD_OFFSET);
In file included from <command-line>:drivers/cxl/mem.c: In function '__cxl_mem_mbox_send_cmd':include/linux/compiler_types.h:320:38: error: call to '__compiletime_assert_266' declared with attribute error: FIELD_GET: mask is zero
and many similar errors.
Guenter
_______________________________________________
Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]
PATCH v3 4/9 cxl/mem: Add basic IOCTL interface
In reply to Ben WidawskyAdd a straightforward IOCTL that provides a mechanism for userspace to query the supported memory device commands. CXL commands as they appear to userspace are described as part of the UAPI kerneldoc. The command list returned via this IOCTL will contain the full set of commands that the driver supports, however, some of those commands may not be available for use by userspace.
Memory device commands first appear in the CXL 2.0 specification. They are submitted through a mailbox mechanism specified in the CXL 2.0 specification.
The send command allows userspace to issue mailbox commands directly to the hardware. The list of available commands to send are the output of the query command. The driver verifies basic properties of the command and possibly inspect the input (or output) payload to determine whether or not the command is allowed (or might taint the kernel).
--- .clang-format | 1 + .../userspace-api/ioctl/ioctl-number.rst | 1 + drivers/cxl/mem.c | 280 +++++++++++++++++- include/uapi/linux/cxl_mem.h | 154 ++++++++++ 4 files changed, 435 insertions(+), 1 deletion(-) create mode 100644 include/uapi/linux/cxl_mem.h
.clang-format +1 -0
@@ -109,6 +109,7 @@ ForEachMacros: - 'css_for_each_child' - 'css_for_each_descendant_post' - 'css_for_each_descendant_pre' + - 'cxl_for_each_cmd' - 'device_for_each_child_node' - 'dma_fence_chain_for_each' - 'do_for_each_ftrace_op'
Documentation/userspace-api/ioctl/ioctl-number.rst +1 -0
@@ -352,6 +352,7 @@ Code Seq# Include File Comments <mailto:[email protected]> 0xCC 00-0F drivers/misc/ibmvmc.h pseries VMC driver 0xCD 01 linux/reiserfs_fs.h +0xCE 01-02 uapi/linux/cxl_mem.h Compute Express Link Memory Devices 0xCF 02 fs/cifs/ioctl.c 0xDB 00-0F drivers/char/mwave/mwavepub.h 0xDD 00-3F ZFCP device driver see drivers/s390/scsi/
drivers/cxl/mem.c +279 -1
309 lines not on this page · raw message
include/uapi/linux/cxl_mem.h new file +154 -0
154 lines not on this page · raw message
Signature · 4 lines
2.30.0 _______________________________________________ Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]
PATCH v3 5/9 cxl/mem: Add a "RAW" send command
In reply to Ben WidawskyThe CXL memory device send interface will have a number of supported commands. The raw command is not such a command. Raw commands allow userspace to send a specified opcode to the underlying hardware and bypass all driver checks on the command. The primary use for this command is to [begrudgingly] allow undocumented vendor specific hardware commands.
While not the main motivation, it also allows prototyping new hardware commands without a driver patch and rebuild.
While this all sounds very powerful it comes with a couple of caveats:
1. Bug reports using raw commands will not get the same level of attention as bug reports using supported commands (via taint).
2. Supported commands will be rejected by the RAW command.
With this comes new debugfs knob to allow full access to your toes with your weapon of choice.
--- drivers/cxl/Kconfig | 18 ++++++ drivers/cxl/mem.c | 121 +++++++++++++++++++++++++++++++++++ include/uapi/linux/cxl_mem.h | 12 +++- 3 files changed, 150 insertions(+), 1 deletion(-)
drivers/cxl/Kconfig +18 -0
@@ -32,4 +32,22 @@ config CXL_MEM Chapter 2.3 Type 3 CXL Device in the CXL 2.0 specification. If unsure say 'm'. + +config CXL_MEM_RAW_COMMANDS + bool "RAW Command Interface for Memory Devices" + depends on CXL_MEM + help + Enable CXL RAW command interface. + + The CXL driver ioctl interface may assign a kernel ioctl command + number for each specification defined opcode. At any given point in + time the number of opcodes that the specification defines and a device + may implement may exceed the kernel's set of associated ioctl function + numbers. The mismatch is either by omission, specification is too new, + or by design. When prototyping new hardware, or developing / debugging + the driver it is useful to be able to submit any possible command to + the hardware, even commands that may crash the kernel due to their + potential impact to memory currently in use by the kernel. + + If developing CXL hardware or the driver say Y, otherwise say N. endif
drivers/cxl/mem.c +121 -0
193 lines not on this page · raw message
include/uapi/linux/cxl_mem.h +11 -1
@@ -22,6 +22,7 @@#define CXL_CMDS \ ___C(INVALID, "Invalid Command"), \ ___C(IDENTIFY, "Identify Command"), \ + ___C(RAW, "Raw device command"), \ ___C(MAX, "invalid / last command")#define ___C (a, b) CXL_MEM_COMMAND_ID_##a
@@ -115,6 +116,9 @@ struct cxl_mem_query_commands {* @id: The command to send to the memory device. This must be one of the * commands returned by the query command. * @flags: Flags for the command (input). +* @raw: Special fields for raw commands +* @raw.opcode: Opcode passed to hardware when using the RAW command. +* @raw.rsvd: Must be zero. * @rsvd: Must be zero. * @retval: Return value from the memory device (output). * @in.size: Size of the payload to provide to the device (input).
@@ -135,7 +139,13 @@ struct cxl_mem_query_commands {struct cxl_send_command {__u32 id;__u32 flags; -__u32 rsvd; +union { +struct { +__u16 opcode; +__u16 rsvd; + } raw; +__u32 rsvd; + };__u32 retval;struct {
Signature · 4 lines
2.30.0 _______________________________________________ Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]
PATCH v3 6/9 cxl/mem: Enable commands via CEL
In reply to Ben WidawskyCXL devices identified by the memory-device class code must implement the Device Command Interface (described in 8.2.9 of the CXL 2.0 spec). While the driver already maintains a list of commands it supports, there is still a need to be able to distinguish between commands that the driver knows about from commands that are optionally supported by the hardware.
The Command Effects Log (CEL) is specified in the CXL 2.0 specification. The CEL is one of two types of logs, the other being vendor specific. They are distinguished in hardware/spec via UUID. The CEL is useful for 2 things:
1. Determine which optional commands are supported by the CXL device.
2. Enumerate any vendor specific commands
The CEL is used by the driver to determine which commands are available in the hardware and therefore which commands userspace is allowed to execute. The set of enabled commands might be a subset of commands which are advertised in UAPI via CXL_MEM_SEND_COMMAND IOCTL.
With the CEL enabling comes a internal flag to indicate a base set of commands that are enabled regardless of CEL. Such commands are required for basic interaction with the hardware and thus can be useful in debug cases, for example if the CEL is corrupted.
The implementation leaves the statically defined table of commands and supplements it with a bitmap to determine commands that are enabled. This organization was chosen for the following reasons:
- Smaller memory footprint. Doesn't need a table per device.
- Reduce memory allocation complexity.
- Fixed command IDs to opcode mapping for all devices makes development and debugging easier.
- Certain helpers are easily achievable, like cxl_for_each_cmd().
--- drivers/cxl/cxl.h | 2 + drivers/cxl/mem.c | 224 ++++++++++++++++++++++++++++++++++- include/uapi/linux/cxl_mem.h | 1 + 3 files changed, 224 insertions(+), 3 deletions(-)
drivers/cxl/cxl.h +2 -0
@@ -67,6 +67,7 @@ struct cxl_memdev;* (CXL 2.0 8.2.8.4.3 Mailbox Capabilities Register) * @mbox_mutex: Mutex to synchronize mailbox access. * @firmware_version: Firmware version for the memory device. +* @enabled_commands: Hardware commands found enabled in CEL. * @pmem: Persistent memory capacity information. * @ram: Volatile memory capacity information. */
@@ -82,6 +83,7 @@ struct cxl_mem {size_t payload_size;struct mutex mbox_mutex;/* Protects device mailbox and firmware */ char firmware_version[0x10 ]; +unsigned long *enabled_cmds;struct range pmem_range;struct range ram_range;
drivers/cxl/mem.c +221 -3
286 lines not on this page · raw message
include/uapi/linux/cxl_mem.h +1 -0
@@ -23,6 +23,7 @@___C (INVALID ,"Invalid Command" ), \___C (IDENTIFY ,"Identify Command" ), \___C (RAW ,"Raw device command" ), \ +___C (GET_SUPPORTED_LOGS ,"Get Supported Logs" ), \ ___C(MAX, "invalid / last command")#define ___C (a, b) CXL_MEM_COMMAND_ID_##a
Signature · 4 lines
2.30.0 _______________________________________________ Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]
PATCH v4 6/9 cxl/mem: Enable commands via CEL
CXL devices identified by the memory-device class code must implement the Device Command Interface (described in 8.2.9 of the CXL 2.0 spec). While the driver already maintains a list of commands it supports, there is still a need to be able to distinguish between commands that the driver knows about from commands that are optionally supported by the hardware.
The Command Effects Log (CEL) is specified in the CXL 2.0 specification. The CEL is one of two types of logs, the other being vendor specific. They are distinguished in hardware/spec via UUID. The CEL is useful for 2 things:
1. Determine which optional commands are supported by the CXL device.
2. Enumerate any vendor specific commands
The CEL is used by the driver to determine which commands are available in the hardware and therefore which commands userspace is allowed to execute. The set of enabled commands might be a subset of commands which are advertised in UAPI via CXL_MEM_SEND_COMMAND IOCTL.
With the CEL enabling comes a internal flag to indicate a base set of commands that are enabled regardless of CEL. Such commands are required for basic interaction with the hardware and thus can be useful in debug cases, for example if the CEL is corrupted.
The implementation leaves the statically defined table of commands and supplements it with a bitmap to determine commands that are enabled. This organization was chosen for the following reasons:
- Smaller memory footprint. Doesn't need a table per device.
- Reduce memory allocation complexity.
- Fixed command IDs to opcode mapping for all devices makes development and debugging easier.
- Certain helpers are easily achievable, like cxl_for_each_cmd().
--- drivers/cxl/cxl.h | 2 + drivers/cxl/mem.c | 213 ++++++++++++++++++++++++++++++++++- include/uapi/linux/cxl_mem.h | 1 + 3 files changed, 213 insertions(+), 3 deletions(-)
drivers/cxl/cxl.h +2 -0
@@ -67,6 +67,7 @@ struct cxl_memdev;* (CXL 2.0 8.2.8.4.3 Mailbox Capabilities Register) * @mbox_mutex: Mutex to synchronize mailbox access. * @firmware_version: Firmware version for the memory device. +* @enabled_commands: Hardware commands found enabled in CEL. * @pmem: Persistent memory capacity information. * @ram: Volatile memory capacity information. */
@@ -82,6 +83,7 @@ struct cxl_mem {size_t payload_size;struct mutex mbox_mutex;/* Protects device mailbox and firmware */ char firmware_version[0x10 ]; +unsigned long *enabled_cmds;struct range pmem_range;struct range ram_range;
drivers/cxl/mem.c +210 -3
275 lines not on this page · raw message
include/uapi/linux/cxl_mem.h +1 -0
@@ -23,6 +23,7 @@___C (INVALID ,"Invalid Command" ), \___C (IDENTIFY ,"Identify Command" ), \___C (RAW ,"Raw device command" ), \ +___C (GET_SUPPORTED_LOGS ,"Get Supported Logs" ), \ ___C(MAX, "invalid / last command")#define ___C (a, b) CXL_MEM_COMMAND_ID_##a
Signature · 4 lines
2.30.1 _______________________________________________ Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]
Re: [PATCH v4 06/09] cxl/mem: Enable commands via CEL
Quoted 33 lines · Ben Widawsky
CXL devices identified by the memory-device class code must implement the Device Command Interface (described in 8.2.9 of the CXL 2.0 spec). While the driver already maintains a list of commands it supports, there is still a need to be able to distinguish between commands that the driver knows about from commands that are optionally supported by the hardware.
The Command Effects Log (CEL) is specified in the CXL 2.0 specification. The CEL is one of two types of logs, the other being vendor specific. They are distinguished in hardware/spec via UUID. The CEL is useful for 2 things:
1. Determine which optional commands are supported by the CXL device.
2. Enumerate any vendor specific commandsThe CEL is used by the driver to determine which commands are available in the hardware and therefore which commands userspace is allowed to execute. The set of enabled commands might be a subset of commands which are advertised in UAPI via
CXL_MEM_SEND_COMMANDIOCTL.With the CEL enabling comes a internal flag to indicate a base set of commands that are enabled regardless of CEL. Such commands are required for basic interaction with the hardware and thus can be useful in debug cases, for example if the CEL is corrupted.
The implementation leaves the statically defined table of commands and supplements it with a bitmap to determine commands that are enabled. This organization was chosen for the following reasons:
- Smaller memory footprint. Doesn't need a table per device.
- Reduce memory allocation complexity.
- Fixed command IDs to opcode mapping for all devices makes development and debugging easier.
- Certain helpers are easily achievable, likecxl_for_each_cmd().
Quoted 2 lines
Signed-off-by Ben Widawsky <[email protected]>Reviewed-by Dan Williams <[email protected]>
See below for explanation on why the v4...
Quoted 228 lines
--- drivers/cxl/cxl.h | 2 + drivers/cxl/mem.c | 213 ++++++++++++++++++++++++++++++++++- include/uapi/linux/cxl_mem.h | 1 + 3 files changed, 213 insertions(+), 3 deletions(-)drivers/cxl/cxl.h +2
-0@@ -67,6 +67,7 @@ struct cxl_memdev;* (CXL 2.0 8.2.8.4.3 Mailbox Capabilities Register) * @mbox_mutex: Mutex to synchronize mailbox access. * @firmware_version: Firmware version for the memory device. +* @enabled_commands: Hardware commands found enabled in CEL. * @pmem: Persistent memory capacity information. * @ram: Volatile memory capacity information. */ @@ -82,6 +83,7 @@ struct cxl_mem {size_t payload_size;struct mutex mbox_mutex;/* Protects device mailbox and firmware */ char firmware_version[0x10 ]; +unsigned long *enabled_cmds;struct range pmem_range;struct range ram_range;drivers/cxl/mem.c +134
-3@@ -45,6 +45,8 @@ enum opcode {CXL_MBOX_OP_INVALID =0x0000 ,CXL_MBOX_OP_RAW =CXL_MBOX_OP_INVALID ,CXL_MBOX_OP_ACTIVATE_FW =0x0202 , +CXL_MBOX_OP_GET_SUPPORTED_LOGS =0x0400 , +CXL_MBOX_OP_GET_LOG =0x0401 ,CXL_MBOX_OP_IDENTIFY =0x4000 ,CXL_MBOX_OP_SET_PARTITION_INFO =0x4101 , CXL_MBOX_OP_SET_LSA = 0x4103,@@ -103,10 +105,28 @@ static DEFINE_IDA(cxl_memdev_ida);static struct dentry *cxl_debugfs;static bool cxl_raw_allow_all; +enum { +CEL_UUID , +VENDOR_DEBUG_UUID , +}; + +/* See CXL 2.0 Table 170. Get Log Input Payload */ +static const uuid_t log_uuid[] = { + [CEL_UUID ] =UUID_INIT (0xda9c0b5 ,0xbf41 ,0x4b78 ,0x8f ,0x79 ,0x96 , +0xb1 ,0x62 ,0x3b ,0x3f ,0x17 ), + [VENDOR_DEBUG_UUID ] =UUID_INIT (0xe1819d9 ,0x11a9 ,0x400c ,0x81 ,0x1f , +0xd6 ,0x07 ,0x19 ,0x40 ,0x3d ,0x86 ), +}; +/** * struct cxl_mem_command - Driver representation of a memory device command * @info: Command information as it exists for the UAPI * @opcode: The actual bits used for the mailbox protocol +* @flags: Set of flags effecting driver behavior. +* +* * %CXL_CMD_FLAG_FORCE_ENABLE: In cases of error, commands with this flag +* will be enabled by the driver regardless of what hardware may have +* advertised. * * The cxl_mem_command is the driver's internal representation of commands that * are supported by the driver. Some of these commands may not be supported by @@ -118,9 +138,12 @@ static bool cxl_raw_allow_all;struct cxl_mem_command {struct cxl_command_info info;enum opcode opcode; +u32 flags; +#define CXL_CMD_FLAG_NONE 0 +#define CXL_CMD_FLAG_FORCE_ENABLE BIT(0) }; -#define CXL_CMD (_id, sin, sout) \ +#define CXL_CMD (_id, sin, sout, _flags) \ [CXL_MEM_COMMAND_ID_##_id] = { \ .info = { \ .id = CXL_MEM_COMMAND_ID_##_id, \@@ -128,6 +151,7 @@ struct cxl_mem_command { .size_out = sout, \ }, \ .opcode = CXL_MBOX_OP_##_id, \ + .flags = _flags, \ }/* @@ -137,10 +161,11 @@ struct cxl_mem_command {* 0, and the user passed in 1, it is an error. */ static struct cxl_mem_command mem_commands[] = { -CXL_CMD (IDENTIFY ,0 ,0x43 ), +CXL_CMD (IDENTIFY ,0 ,0x43 ,CXL_CMD_FLAG_FORCE_ENABLE ), #ifdef CONFIG_CXL_MEM_RAW_COMMANDS -CXL_CMD (RAW , ~0 , ~0 ), +CXL_CMD (RAW , ~0 , ~0 ,0 ), #endif +CXL_CMD (GET_SUPPORTED_LOGS ,0 , ~0 ,CXL_CMD_FLAG_FORCE_ENABLE ), };/* @@ -619,6 +644,10 @@ static int cxl_validate_cmd_from_user(struct cxl_mem *cxlm, c = &mem_commands[send_cmd->id]; info = &c->info; +/* Check that the command is enabled for hardware */ +if (!test_bit (info->id, cxlm->enabled_cmds)) +return -ENOTTY ; +/* Check the input buffer is the expected size */ if (info->size_in >=0 && info->size_in != send_cmd->in.size)return -ENOMEM ;@@ -915,6 +944,14 @@ static struct cxl_mem *cxl_mem_create(struct pci_dev *pdev, u32 reg_lo,mutex_init (&cxlm->mbox_mutex); cxlm->pdev = pdev; cxlm->regs = regs + offset; + cxlm->enabled_cmds = +devm_kmalloc_array (dev,BITS_TO_LONGS (cxl_cmd_count), +sizeof (unsigned long ), +GFP_KERNEL | __GFP_ZERO); +if (!cxlm->enabled_cmds) { +dev_err (dev,"No memory available for bitmap\n" ); +return NULL ; + }dev_dbg (dev,"Mapped CXL Memory Device resource\n" );return cxlm;@@ -1134,6 +1171,172 @@ static int cxl_mem_add_memdev(struct cxl_mem *cxlm)return rc; } +static int cxl_xfer_log (struct cxl_mem *cxlm,uuid_t *uuid,u32 size,u8 *out) +{ +u32 remaining = size; +u32 offset =0 ; + +while (remaining) { +u32 xfer_size =min_t (u32, remaining, cxlm->payload_size); +struct cxl_mbox_get_log { +uuid_t uuid; +__le32 offset; +__le32 length; + } __packed log = { + .uuid = *uuid, + .offset =cpu_to_le32 (offset), + .length =cpu_to_le32 (xfer_size) + }; +int rc; + + rc =cxl_mem_mbox_send_cmd (cxlm,CXL_MBOX_OP_GET_LOG , + (u8 *)&log,sizeof (log), out, + xfer_size); +if (rc <0 ) +return rc; + + out += xfer_size; + remaining -= xfer_size; + offset += xfer_size; + } + +return 0 ; +} + +static inline struct cxl_mem_command *cxl_mem_find_command (u16 opcode) +{ +struct cxl_mem_command *c; + +cxl_for_each_cmd (c) +if (c->opcode == opcode) +return c; + +return NULL ; +} + +/** +* cxl_walk_cel() - Walk through the Command Effects Log. +* @cxlm: Device. +* @size: Length of the Command Effects Log. +* @cel: CEL +* +* Iterate over each entry in the CEL and determine if the driver supports the +* command. If so, the command is enabled for the device and can be used later. +*/ +static void cxl_walk_cel (struct cxl_mem *cxlm,size_t size,u8 *cel) +{ +struct cel_entry { +__le16 opcode; +__le16 effect; + } __packed * cel_entry; +const int cel_entries = size /sizeof (*cel_entry); +int i; + + cel_entry = (struct cel_entry *)cel; + +for (i =0 ; i < cel_entries; i++) { +u16 opcode =le16_to_cpu (cel_entry[i].opcode); +struct cxl_mem_command *cmd =cxl_mem_find_command (opcode); + +if (!cmd) { +dev_dbg (&cxlm->pdev->dev, +"Opcode 0x%04x unsupported by driver" , opcode); +continue ; + } + +set_bit (cmd->info.id, cxlm->enabled_cmds); + } +} + +struct cxl_mbox_get_supported_logs { +__le16 entries; +u8 rsvd[6 ]; +struct gsl_entry { +uuid_t uuid; +__le32 size; + } __packed entry[]; +} __packed; + +static struct cxl_mbox_get_supported_logs *cxl_get_gsl (struct cxl_mem *cxlm) +{ +struct cxl_mbox_get_supported_logs *ret; +int rc; + + ret =kvmalloc (cxlm->payload_size,GFP_KERNEL ); +if (!ret) +return ERR_PTR (-ENOMEM );
drivers/cxl/mem.c static int cxl_mem_add_memdev(struct cxl_mem *cxlm) · line 1277
Quoted 10 lines
drivers/cxl/mem.c +10
-0+ + rc =cxl_mem_mbox_send_cmd (cxlm,CXL_MBOX_OP_GET_SUPPORTED_LOGS ,NULL , +0 , (u8 *)ret,sizeof (*ret)); +if (rc <0 ) { +kvfree (ret); +return ERR_PTR (rc); + } + +return ret; +}
In v3 the logic here got reworked and it attempted to get the actual size of the get_supported_logs payload. The way I wrote it, if there was even 1 supported log (CEL is required, so there would be), it would overrun the stack variable 'temp'. This was trying to be too miserly and this version simply allocates the full payload amount.
Userspace commands were already guarded against this issue both logically, and they never use stack variables.
You might be wondering, how do you know the max payload size is enough to hold all the supported logs? You do not. I'd call this a spec bug and I'll work that separately. Unlike other commands, there is no way to provide an offset into the output here. While unlikely this will happen in practice, the spec should address it.
Quoted 91 lines
drivers/cxl/mem.c +66
-0+ +/** +* cxl_mem_enumerate_cmds() - Enumerate commands for a device. +* @cxlm: The device. +* +* Returns 0 if enumerate completed successfully. +* +* CXL devices have optional support for certain commands. This function will +* determine the set of supported commands for the hardware and update the +* enabled_cmds bitmap in the @cxlm. +*/ +static int cxl_mem_enumerate_cmds (struct cxl_mem *cxlm) +{ +struct cxl_mbox_get_supported_logs *gsl; +struct device *dev = &cxlm->pdev->dev; +struct cxl_mem_command *cmd; +int i, rc; + + gsl =cxl_get_gsl (cxlm); +if (IS_ERR (gsl)) +return PTR_ERR (gsl); + + rc = -ENOENT ; +for (i =0 ; i <le16_to_cpu (gsl->entries); i++) { +u32 size =le32_to_cpu (gsl->entry[i].size); +uuid_t uuid = gsl->entry[i].uuid; +u8 *log; + +dev_dbg (dev,"Found LOG type %pU of size %d" , &uuid, size); + +if (!uuid_equal (&uuid, &log_uuid[CEL_UUID ])) +continue ; + + log =kvmalloc (size,GFP_KERNEL ); +if (!log) { + rc = -ENOMEM ; + goto out; + } + + rc =cxl_xfer_log (cxlm, &uuid, size, log); +if (rc) { +kvfree (log); + goto out; + } + +cxl_walk_cel (cxlm, size, log); +kvfree (log); + +/* In case CEL was bogus, enable some default commands. */ +cxl_for_each_cmd (cmd) +if (cmd->flags &CXL_CMD_FLAG_FORCE_ENABLE ) +set_bit (cmd->info.id, cxlm->enabled_cmds); + +/* Found the required CEL */ + rc =0 ; + } + +out: +kvfree (gsl); +return rc; +} +/** * cxl_mem_identify() - Send the IDENTIFY command to the device. * @cxlm: The device to identify. @@ -1233,6 +1436,10 @@ static int cxl_mem_probe(struct pci_dev *pdev, const struct pci_device_id *id)if (rc)return rc; + rc =cxl_mem_enumerate_cmds (cxlm); +if (rc) +return rc; + rc =cxl_mem_identify (cxlm);if (rc)return rc;include/uapi/linux/cxl_mem.h +1
-0@@ -23,6 +23,7 @@___C (INVALID ,"Invalid Command" ), \___C (IDENTIFY ,"Identify Command" ), \___C (RAW ,"Raw device command" ), \ +___C (GET_SUPPORTED_LOGS ,"Get Supported Logs" ), \ ___C(MAX, "invalid / last command")#define ___C (a, b) CXL_MEM_COMMAND_ID_##aSignature · 1 line
2.30.1
_______________________________________________
Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]
PATCH v3 7/9 cxl/mem: Add set of informational commands
In reply to Ben WidawskyAdd initial set of formal commands beyond basic identify and command enumeration.
--- drivers/cxl/mem.c | 9 +++++++++ include/uapi/linux/cxl_mem.h | 5 +++++ 2 files changed, 14 insertions(+)
drivers/cxl/mem.c +9 -0
@@ -44,12 +44,16 @@enum opcode {CXL_MBOX_OP_INVALID =0x0000 ,CXL_MBOX_OP_RAW =CXL_MBOX_OP_INVALID , +CXL_MBOX_OP_GET_FW_INFO =0x0200 ,CXL_MBOX_OP_ACTIVATE_FW =0x0202 ,CXL_MBOX_OP_GET_SUPPORTED_LOGS =0x0400 ,CXL_MBOX_OP_GET_LOG =0x0401 ,CXL_MBOX_OP_IDENTIFY =0x4000 , +CXL_MBOX_OP_GET_PARTITION_INFO =0x4100 ,CXL_MBOX_OP_SET_PARTITION_INFO =0x4101 , +CXL_MBOX_OP_GET_LSA =0x4102 ,CXL_MBOX_OP_SET_LSA =0x4103 , +CXL_MBOX_OP_GET_HEALTH_INFO =0x4200 ,CXL_MBOX_OP_SET_SHUTDOWN_STATE =0x4204 ,CXL_MBOX_OP_SCAN_MEDIA =0x4304 ,CXL_MBOX_OP_GET_SCAN_MEDIA =0x4305 ,
@@ -166,6 +170,11 @@ static struct cxl_mem_command mem_commands[] = {CXL_CMD (RAW , ~0 , ~0 ,0 ), #endifCXL_CMD (GET_SUPPORTED_LOGS ,0 , ~0 ,CXL_CMD_FLAG_FORCE_ENABLE ), +CXL_CMD (GET_FW_INFO ,0 ,0x50 ,0 ), +CXL_CMD (GET_PARTITION_INFO ,0 ,0x20 ,0 ), +CXL_CMD (GET_LSA ,0x8 , ~0 ,0 ), +CXL_CMD (GET_HEALTH_INFO ,0 ,0x12 ,0 ), + CXL_CMD(GET_LOG, 0x18, ~0, CXL_CMD_FLAG_FORCE_ENABLE), };/*
include/uapi/linux/cxl_mem.h +5 -0
@@ -24,6 +24,11 @@___C (IDENTIFY ,"Identify Command" ), \___C (RAW ,"Raw device command" ), \___C (GET_SUPPORTED_LOGS ,"Get Supported Logs" ), \ +___C (GET_FW_INFO ,"Get FW Info" ), \ +___C (GET_PARTITION_INFO ,"Get Partition Information" ), \ +___C (GET_LSA ,"Get Label Storage Area" ), \ +___C (GET_HEALTH_INFO ,"Get Health Info" ), \ +___C (GET_LOG ,"Get Log" ), \ ___C(MAX, "invalid / last command") #define ___C(a, b) CXL_MEM_COMMAND_ID_##a
Signature · 4 lines
2.30.0 _______________________________________________ Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]
PATCH v3 8/9 MAINTAINERS: Add maintainers of the CXL driver
In reply to Ben Widawsky--- MAINTAINERS | 11 +++++++++++ 1 file changed, 11 insertions(+)
MAINTAINERS +11 -0
@@ -4444,6 +4444,17 @@ M: Miguel Ojeda <[email protected]> S: Maintained F: include/linux/compiler_attributes.h +COMPUTE EXPRESS LINK (CXL) +M: Alison Schofield <[email protected]> +M: Vishal Verma <[email protected]> +M: Ira Weiny <[email protected]> +M: Ben Widawsky <[email protected]> +M: Dan Williams <[email protected]> +L: [email protected] +S: Maintained +F: drivers/cxl/ +F: include/uapi/linux/cxl_mem.h + CONEXANT ACCESSRUNNER USB DRIVER L: [email protected] S: Orphan
Signature · 4 lines
2.30.0 _______________________________________________ Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]
RFC PATCH v3 9/9 cxl/mem: Add payload dumping for debug
In reply to Ben WidawskyIt's often useful in debug scenarios to see what the hardware has dumped out. As it stands today, any device error will result in the payload not being copied out, so there is no way to triage commands which weren't expected to fail (and sometimes the payload may have that information).
The functionality is protected by normal kernel security mechanisms as well as a CONFIG option in the CXL driver.
This was extracted from the original version of the CXL enabling patch series.
--- drivers/cxl/Kconfig | 13 +++++++++++++ drivers/cxl/mem.c | 8 ++++++++ 2 files changed, 21 insertions(+)
drivers/cxl/Kconfig +13 -0
@@ -50,4 +50,17 @@ config CXL_MEM_RAW_COMMANDS potential impact to memory currently in use by the kernel. If developing CXL hardware or the driver say Y, otherwise say N. + +config CXL_MEM_INSECURE_DEBUG + bool "CXL.mem debugging" + depends on CXL_MEM + help + Enable debug of all CXL command payloads. + + Some CXL devices and controllers support encryption and other + security features. The payloads for the commands that enable + those features may contain sensitive clear-text security + material. Disable debug of those command payloads by default. + If you are a kernel developer actively working on CXL + security enabling say Y, otherwise say N. endif
drivers/cxl/mem.c +8 -0
@@ -341,6 +341,14 @@ static int __cxl_mem_mbox_send_cmd(struct cxl_mem *cxlm,/* #5 */ rc =cxl_mem_wait_for_doorbell (cxlm); + +if (!cxl_is_security_command (mbox_cmd->opcode) || +IS_ENABLED (CONFIG_CXL_MEM_INSECURE_DEBUG )) { +print_hex_dump_debug ("Payload " ,DUMP_PREFIX_OFFSET ,16 ,1 , + mbox_cmd->payload_in, mbox_cmd->size_in, + true); + } +if (rc == -ETIMEDOUT ) {cxl_mem_mbox_timeout (cxlm, mbox_cmd);return rc;
Signature · 4 lines
2.30.0 _______________________________________________ Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]