add new features for FPGA DFL drivers
Subsystems (4)
v3 cover add new features for FPGA DFL drivers
This patchset adds more features support for FPGA Device Feature List (DFL) drivers, including PR enhancement, virtualization support based on PCIe SRIOV, private features to Port, private features to FME, and enhancement to DFL framework. Please refer to details in below list.
This patchset is created on top of these patches from Alan. [PATCH 0/4] patches for FPGA - https://lkml.org/lkml/2019/5/9/1002
Main changes from v2:
- move thermal/power management private feature support to another patchset, including hwmon patches and related documentation update.
- update sysfs doc for kernel version and date.
- replace scnprintf to sprintf for sysfs interfaces.
- fix comments for performance reporting support. (patch #16)
Main changes from v1:
- split the clean up code in a separated patch (patch #2)
- add cpu_feature_enabled check for AVX512 code (patch #4)
- improve sysfs return values and also sysfs doc (patch #12 #17)
- create a hwmon for thermal management sysfs interfaces (patch #15)
- create a hwmon for power management sysfs interfaces (patch #16)
- update docmentation according to above changes (patch #5)
- improve sysfs doc for performance reporting support (patch #18)
Wu Hao (16):
fpga: dfl-fme-mgr: fix FME_PR_INTFC_ID register address.
fpga: dfl: fme: remove copy_to_user() in ioctl for PR
fpga: dfl: fme: align PR buffer size per PR datawidth
fpga: dfl: fme: support 512bit data width PR
Documentation: fpga: dfl: add descriptions for virtualization and new
interfaces.
fpga: dfl: fme: add DFL_FPGA_FME_PORT_RELEASE/ASSIGN ioctl support.
fpga: dfl: pci: enable SRIOV support.
fpga: dfl: afu: add AFU state related sysfs interfaces
fpga: dfl: afu: add userclock sysfs interfaces.
fpga: dfl: add id_table for dfl private feature driver
fpga: dfl: afu: export __port_enable/disable function.
fpga: dfl: afu: add error reporting support.
fpga: dfl: afu: add STP (SignalTap) support
fpga: dfl: fme: add capability sysfs interfaces
fpga: dfl: fme: add global error reporting support
fpga: dfl: fme: add performance reporting support
Documentation/ABI/testing/sysfs-platform-dfl-fme | 191 +++++ Documentation/ABI/testing/sysfs-platform-dfl-port | 104 +++ Documentation/fpga/dfl.txt | 105 +++ drivers/fpga/Makefile | 4 +- drivers/fpga/dfl-afu-error.c | 225 +++++ drivers/fpga/dfl-afu-main.c | 330 +++++++- drivers/fpga/dfl-afu.h | 7 + drivers/fpga/dfl-fme-error.c | 385 +++++++++ drivers/fpga/dfl-fme-main.c | 124 ++- drivers/fpga/dfl-fme-mgr.c | 117 ++- drivers/fpga/dfl-fme-perf.c | 962 ++++++++++++++++++++++ drivers/fpga/dfl-fme-pr.c | 65 +- drivers/fpga/dfl-fme.h | 9 +- drivers/fpga/dfl-pci.c | 40 + drivers/fpga/dfl.c | 170 +++- drivers/fpga/dfl.h | 56 +- include/uapi/linux/fpga-dfl.h | 32 + 17 files changed, 2846 insertions(+), 80 deletions(-) create mode 100644 drivers/fpga/dfl-afu-error.c create mode 100644 drivers/fpga/dfl-fme-error.c create mode 100644 drivers/fpga/dfl-fme-perf.c
Signature · 1 line
1.8.3.1
PATCH v3 1/16 fpga: dfl-fme-mgr: fix FME_PR_INTFC_ID register address.
FME_PR_INTFC_ID is used as compat_id for fpga manager and region, but high 64 bits and low 64 bits of the compat_id are swapped by mistake. This patch fixes this problem by fixing register address.
--- drivers/fpga/dfl-fme-mgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/fpga/dfl-fme-mgr.c +2 -2
@@ -30,8 +30,8 @@#define FME_PR_STS 0x10#define FME_PR_DATA 0x18#define FME_PR_ERR 0x20 -#define FME_PR_INTFC_ID_H 0xA8 -#define FME_PR_INTFC_ID_L 0xB0 +#define FME_PR_INTFC_ID_L 0xA8 +#define FME_PR_INTFC_ID_H 0xB0/* FME PR Control Register Bitfield */ #define FME_PR_CTRL_PR_RST BIT_ULL(0)/* Reset PR engine */
Signature · 1 line
1.8.3.1
PATCH v3 2/16 fpga: dfl: fme: remove copy_to_user() in ioctl for PR
In reply to Wu HaoThis patch removes copy_to_user() code in partial reconfiguration ioctl, as it's useless as user never needs to read the data structure after ioctl.
---
v2: clean up code split from patch 2 in v1 patchset.
v3: no change.
--- drivers/fpga/dfl-fme-pr.c | 3 --- 1 file changed, 3 deletions(-)
drivers/fpga/dfl-fme-pr.c +0 -3
@@ -159,9 +159,6 @@ static int fme_pr(struct platform_device *pdev, unsigned long arg)mutex_unlock (&pdata->lock); free_exit:vfree (buf); -if (copy_to_user ((void __user *)arg, &port_pr, minsz)) -return -EFAULT ; -return ret; }
Signature · 1 line
1.8.3.1
PATCH v3 3/16 fpga: dfl: fme: align PR buffer size per PR datawidth
In reply to Wu HaoCurrent driver checks if input bitstream file size is aligned or not per PR data width (default 32bits). It requires one additional step for end user when they generate the bitstream file, padding extra zeros to bitstream file to align its size per PR data width, but they don't have to as hardware will drop extra padding bytes automatically.
In order to simplify the user steps, this patch aligns PR buffer size per PR data width in driver, to allow user to pass unaligned size bitstream files to driver.
--- drivers/fpga/dfl-fme-pr.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/fpga/dfl-fme-pr.c +9 -5
@@ -74,6 +74,7 @@ static int fme_pr(struct platform_device *pdev, unsigned long arg)struct dfl_fme *fme;unsigned long minsz;void *buf =NULL ; +size_t length;int ret =0 ;u64 v;
@@ -85,9 +86,6 @@ static int fme_pr(struct platform_device *pdev, unsigned long arg)if (port_pr.argsz < minsz || port_pr.flags)return -EINVAL ; -if (!IS_ALIGNED (port_pr.buffer_size,4 )) -return -EINVAL ; -/* get fme header region */ fme_hdr =dfl_get_feature_ioaddr_by_id (&pdev->dev,FME_FEATURE_ID_HEADER );
@@ -103,7 +101,13 @@ static int fme_pr(struct platform_device *pdev, unsigned long arg) port_pr.buffer_size))return -EFAULT ; - buf =vmalloc (port_pr.buffer_size); +/* +* align PR buffer per PR bandwidth, as HW ignores the extra padding +* data automatically. +*/ + length =ALIGN (port_pr.buffer_size,4 ); + + buf =vmalloc (length);if (!buf)return -ENOMEM ;
@@ -140,7 +144,7 @@ static int fme_pr(struct platform_device *pdev, unsigned long arg)fpga_image_info_free (region->info); info->buf = buf; - info->count = port_pr.buffer_size; + info->count = length; info->region_id = port_pr.port_id; region->info = info;
Signature · 1 line
1.8.3.1
PATCH v3 4/16 fpga: dfl: fme: support 512bit data width PR
In reply to Wu HaoIn early partial reconfiguration private feature, it only supports 32bit data width when writing data to hardware for PR. 512bit data width PR support is an important optimization for some specific solutions (e.g. XEON with FPGA integrated), it allows driver to use AVX512 instruction to improve the performance of partial reconfiguration. e.g. programming one 100MB bitstream image via this 512bit data width PR hardware only takes ~300ms, but 32bit revision requires ~3s per test result.
Please note now this optimization is only done on revision 2 of this PR private feature which is only used in integrated solution that AVX512 is always supported. This revision 2 hardware doesn't support 32bit PR.
---
v2: check AVX512 support using cpu_feature_enabled()
fix other comments from Scott Wood <[email protected]>
v3: no change.
--- drivers/fpga/dfl-fme-main.c | 3 ++ drivers/fpga/dfl-fme-mgr.c | 113 +++++++++++++++++++++++++++++++++++++------- drivers/fpga/dfl-fme-pr.c | 43 +++++++++++------ drivers/fpga/dfl-fme.h | 2 + drivers/fpga/dfl.h | 5 ++ 5 files changed, 135 insertions(+), 31 deletions(-)
drivers/fpga/dfl-fme-main.c +3 -0
@@ -21,6 +21,8 @@#include "dfl.h" #include "dfl-fme.h" +#define DRV_VERSION "0.8" +static ssize_t ports_num_show (struct device *dev,struct device_attribute *attr,char *buf) {
@@ -277,3 +279,4 @@ static int fme_remove(struct platform_device *pdev)MODULE_AUTHOR ("Intel Corporation" );MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("platform:dfl-fme" ); +MODULE_VERSION (DRV_VERSION );
drivers/fpga/dfl-fme-mgr.c +97 -16
178 lines not on this page · raw message
drivers/fpga/dfl-fme-pr.c +28 -15
84 lines not on this page · raw message
drivers/fpga/dfl-fme.h +2 -0
@@ -21,12 +21,14 @@/** * struct dfl_fme - dfl fme private data * +* @pr_datawidth: data width for partial reconfiguration. * @mgr: FME's FPGA manager platform device. * @region_list: linked list of FME's FPGA regions. * @bridge_list: linked list of FME's FPGA bridges. * @pdata: fme platform device's pdata. */ struct dfl_fme { +int pr_datawidth;struct platform_device *mgr;struct list_head region_list;struct list_head bridge_list;
drivers/fpga/dfl.h +5 -0
@@ -331,6 +331,11 @@ static inline bool dfl_feature_is_port(void __iomem *base) (FIELD_GET (DFH_ID , v) ==DFH_ID_FIU_PORT ); } +static inline u8 dfl_feature_revision (void __iomem *base) +{ +return (u8 )FIELD_GET (DFH_REVISION ,readq (base +DFH )); +} +/** * struct dfl_fpga_enum_info - DFL FPGA enumeration information *
Signature · 1 line
1.8.3.1
PATCH v3 5/16 Documentation: fpga: dfl: add descriptions for virtualization and new interfaces.
In reply to Wu HaoThis patch adds virtualization support description for DFL based FPGA devices (based on PCIe SRIOV), and introductions to new interfaces added by new dfl private feature drivers.
---
v2: update description for thermal/power management user interfaces.
v3: remove thermal/power management feature description.
--- Documentation/fpga/dfl.txt | 105 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+)
Documentation/fpga/dfl.txt +105 -0
@@ -84,6 +84,8 @@ The following functions are exposed through ioctls: Get driver API version (DFL_FPGA_GET_API_VERSION) Check for extensions (DFL_FPGA_CHECK_EXTENSION) Program bitstream (DFL_FPGA_FME_PORT_PR) + Assign port to PF (DFL_FPGA_FME_PORT_ASSIGN) + Release port from PF (DFL_FPGA_FME_PORT_RELEASE) More functions are exposed through sysfs (/sys/class/fpga_region/regionX/dfl-fme.n/):
@@ -99,6 +101,14 @@ More functions are exposed through sysfs one FPGA device may have more than one port, this sysfs interface indicates how many ports the FPGA device has. + Global error reporting management (errors/) + error reporting sysfs interfaces allow user to read errors detected by the + hardware, and clear the logged errors. + + Performance counters (perf/) + performance counters sysfs interfaces allow user to use different counters + to get performance data. + FIU - PORT ==========
@@ -139,6 +149,10 @@ More functions are exposed through sysfs: Read Accelerator GUID (afu_id) afu_id indicates which PR bitstream is programmed to this AFU. + Error reporting (errors/) + error reporting sysfs interfaces allow user to read port/afu errors + detected by the hardware, and clear the logged errors. + DFL Framework Overview ======================
@@ -212,6 +226,97 @@ the compat_id exposed by the target FPGA region. This check is usually done by userspace before calling the reconfiguration IOCTL. +FPGA virtualization - PCIe SRIOV +================================ +This section describes the virtualization support on DFL based FPGA device to +enable accessing an accelerator from applications running in a virtual machine +(VM). This section only describes the PCIe based FPGA device with SRIOV support. + +Features supported by the particular FPGA device are exposed through Device +Feature Lists, as illustrated below: + + +-------------------------------+ +-------------+ + | PF | | VF | + +-------------------------------+ +-------------+ + ^ ^ ^ ^ + | | | | ++-----|------------|---------|--------------|-------+ +| | | | | | +| +-----+ +-------+ +-------+ +-------+ | +| | FME | | Port0 | | Port1 | | Port2 | | +| +-----+ +-------+ +-------+ +-------+ | +| ^ ^ ^ | +| | | | | +| +-------+ +------+ +-------+ | +| | AFU | | AFU | | AFU | | +| +-------+ +------+ +-------+ | +| | +| DFL based FPGA PCIe Device | ++---------------------------------------------------+ + +FME is always accessed through the physical function (PF). + +Ports (and related AFUs) are accessed via PF by default, but could be exposed +through virtual function (VF) devices via PCIe SRIOV. Each VF only contains +1 Port and 1 AFU for isolation. Users could assign individual VFs (accelerators) +created via PCIe SRIOV interface, to virtual machines. + +The driver organization in virtualization case is illustrated below: + + +-------++------++------+ | + | FME || FME || FME | | + | FPGA || FPGA || FPGA | | + |Manager||Bridge||Region| | + +-------++------++------+ | + +-----------------------+ +--------+ | +--------+ + | FME | | AFU | | | AFU | + | Module | | Module | | | Module | + +-----------------------+ +--------+ | +--------+ + +-----------------------+ | +-----------------------+ + | FPGA Container Device | | | FPGA Container Device | + | (FPGA Base Region) | | | (FPGA Base Region) | + +-----------------------+ | +-----------------------+ + +------------------+ | +------------------+ + | FPGA PCIE Module | | Virtual | FPGA PCIE Module | + +------------------+ Host | Machine +------------------+ + -------------------------------------- | ------------------------------ + +---------------+ | +---------------+ + | PCI PF Device | | | PCI VF Device | + +---------------+ | +---------------+ + +FPGA PCIe device driver is always loaded first once a FPGA PCIe PF or VF device +is detected. It: + + a) finish enumeration on both FPGA PCIe PF and VF device using common + interfaces from DFL framework. + b) supports SRIOV. + +The FME device driver plays a management role in this driver architecture, it +provides ioctls to release Port from PF and assign Port to PF. After release +a port from PF, then it's safe to expose this port through a VF via PCIe SRIOV +sysfs interface. + +To enable accessing an accelerator from applications running in a VM, the +respective AFU's port needs to be assigned to a VF using the following steps: + + a) The PF owns all AFU ports by default. Any port that needs to be + reassigned to a VF must first be released through the + DFL_FPGA_FME_PORT_RELEASE ioctl on the FME device. + + b) Once N ports are released from PF, then user can use command below + to enable SRIOV and VFs. Each VF owns only one Port with AFU. + + echo N > $PCI_DEVICE_PATH/sriov_numvfs + + c) Pass through the VFs to VMs + + d) The AFU under VF is accessible from applications in VM (using the + same driver inside the VF). + +Note that an FME can't be assigned to a VF, thus PR and other management +functions are only available via the PF. + + Device enumeration ================== This section introduces how applications enumerate the fpga device from
Signature · 1 line
1.8.3.1
PATCH v3 6/16 fpga: dfl: fme: add DFL_FPGA_FME_PORT_RELEASE/ASSIGN ioctl support.
In reply to Wu HaoIn order to support virtualization usage via PCIe SRIOV, this patch adds two ioctls under FPGA Management Engine (FME) to release and assign back the port device. In order to safely turn Port from PF into VF and enable PCIe SRIOV, it requires user to invoke this PORT_RELEASE ioctl to release port firstly to remove userspace interfaces, and then configure the PF/VF access register in FME. After disable SRIOV, it requires user to invoke this PORT_ASSIGN ioctl to attach the port back to PF.
Ioctl interfaces:
* DFL_FPGA_FME_PORT_RELEASE
Release platform device of given port, it deletes port platform device to remove related userspace interfaces on PF, then configures PF/VF access mode to VF.
* DFL_FPGA_FME_PORT_ASSIGN
Assign platform device of given port back to PF, it configures PF/VF access mode to PF, then adds port platform device back to re-enable related userspace interfaces on PF.
---
v3: code rebase.
--- drivers/fpga/dfl-fme-main.c | 54 +++++++++++++++++++++ drivers/fpga/dfl.c | 107 +++++++++++++++++++++++++++++++++++++----- drivers/fpga/dfl.h | 10 ++++ include/uapi/linux/fpga-dfl.h | 32 +++++++++++++ 4 files changed, 191 insertions(+), 12 deletions(-)
drivers/fpga/dfl-fme-main.c +54 -0
@@ -16,6 +16,7 @@#include <linux/kernel.h> #include <linux/module.h> +#include <linux/uaccess.h> #include <linux/fpga-dfl.h> #include "dfl.h"
@@ -105,9 +106,62 @@ static void fme_hdr_uinit(struct platform_device *pdev,sysfs_remove_files (&pdev->dev.kobj, fme_hdr_attrs); } +static long fme_hdr_ioctl_release_port (struct dfl_feature_platform_data *pdata, +void __user *arg) +{ +struct dfl_fpga_cdev *cdev = pdata->dfl_cdev; +struct dfl_fpga_fme_port_release release; +unsigned long minsz; + + minsz = offsetofend(struct dfl_fpga_fme_port_release, port_id); + +if (copy_from_user (&release, arg, minsz)) +return -EFAULT ; + +if (release.argsz < minsz || release.flags) +return -EINVAL ; + +return dfl_fpga_cdev_config_port (cdev, release.port_id, true); +} + +static long fme_hdr_ioctl_assign_port (struct dfl_feature_platform_data *pdata, +void __user *arg) +{ +struct dfl_fpga_cdev *cdev = pdata->dfl_cdev; +struct dfl_fpga_fme_port_assign assign; +unsigned long minsz; + + minsz = offsetofend(struct dfl_fpga_fme_port_assign, port_id); + +if (copy_from_user (&assign, arg, minsz)) +return -EFAULT ; + +if (assign.argsz < minsz || assign.flags) +return -EINVAL ; + +return dfl_fpga_cdev_config_port (cdev, assign.port_id, false); +} + +static long fme_hdr_ioctl (struct platform_device *pdev, +struct dfl_feature *feature, +unsigned int cmd,unsigned long arg) +{ +struct dfl_feature_platform_data *pdata =dev_get_platdata (&pdev->dev); + +switch (cmd) { +case DFL_FPGA_FME_PORT_RELEASE : +return fme_hdr_ioctl_release_port (pdata, (void __user *)arg); +case DFL_FPGA_FME_PORT_ASSIGN : +return fme_hdr_ioctl_assign_port (pdata, (void __user *)arg); + } + +return -ENODEV ; +} +static const struct dfl_feature_ops fme_hdr_ops = { .init = fme_hdr_init, .uinit = fme_hdr_uinit, + .ioctl = fme_hdr_ioctl, };static struct dfl_feature_driver fme_feature_drvs[] = {
drivers/fpga/dfl.c +95 -12
148 lines not on this page · raw message
drivers/fpga/dfl.h +10 -0
@@ -183,6 +183,8 @@ struct dfl_feature {#define DEV_STATUS_IN_USE 0 +#define FEATURE_DEV_ID_UNUSED (-1) +/** * struct dfl_feature_platform_data - platform data for feature devices *
@@ -191,6 +193,7 @@ struct dfl_feature {* @cdev: cdev of feature dev. * @dev: ptr to platform device linked with this platform data. * @dfl_cdev: ptr to container device. +* @id: id used for this feature device. * @disable_count: count for port disable. * @num: number for sub features. * @dev_status: dev status (e.g. DEV_STATUS_IN_USE).
@@ -203,6 +206,7 @@ struct dfl_feature_platform_data {struct cdev cdev;struct platform_device *dev;struct dfl_fpga_cdev *dfl_cdev; +int id;unsigned int disable_count;unsigned long dev_status;void *private;
@@ -378,6 +382,7 @@ int dfl_fpga_enum_info_add_dfl(struct dfl_fpga_enum_info *info,* @fme_dev: FME feature device under this container device. * @lock: mutex lock to protect the port device list. * @port_dev_list: list of all port feature devices under this container device. +* @released_port_num: released port number under this container device. */ struct dfl_fpga_cdev {struct device *parent;
@@ -385,6 +390,7 @@ struct dfl_fpga_cdev {struct device *fme_dev;struct mutex lock;struct list_head port_dev_list; +int released_port_num; }; struct dfl_fpga_cdev *
@@ -412,4 +418,8 @@ struct platform_device * return pdev; } + +int dfl_fpga_cdev_config_port (struct dfl_fpga_cdev *cdev, +u32 port_id,bool release); +#endif /* __FPGA_DFL_H */
include/uapi/linux/fpga-dfl.h +32 -0
@@ -176,4 +176,36 @@ struct dfl_fpga_fme_port_pr {#define DFL_FPGA_FME_PORT_PR _IO(DFL_FPGA_MAGIC, DFL_FME_BASE + 0) +/** +* DFL_FPGA_FME_PORT_RELEASE - _IOW(DFL_FPGA_MAGIC, DFL_FME_BASE + 1, +* struct dfl_fpga_fme_port_release) +* +* Driver releases the port per Port ID provided by caller. +* Return: 0 on success, -errno on failure. +*/ +struct dfl_fpga_fme_port_release { +/* Input */ +__u32 argsz;/* Structure length */ +__u32 flags;/* Zero for now */ +__u32 port_id; +}; + +#define DFL_FPGA_FME_PORT_RELEASE _IO(DFL_FPGA_MAGIC, DFL_FME_BASE + 1) + +/** +* DFL_FPGA_FME_PORT_ASSIGN - _IOW(DFL_FPGA_MAGIC, DFL_FME_BASE + 2, +* struct dfl_fpga_fme_port_assign) +* +* Driver assigns the port back per Port ID provided by caller. +* Return: 0 on success, -errno on failure. +*/ +struct dfl_fpga_fme_port_assign { +/* Input */ +__u32 argsz;/* Structure length */ +__u32 flags;/* Zero for now */ +__u32 port_id; +}; + +#define DFL_FPGA_FME_PORT_ASSIGN _IO(DFL_FPGA_MAGIC, DFL_FME_BASE + 2) +#endif /* _UAPI_LINUX_FPGA_DFL_H */
Signature · 1 line
1.8.3.1
PATCH v3 7/16 fpga: dfl: pci: enable SRIOV support.
In reply to Wu HaoThis patch enables the standard sriov support. It allows user to enable SRIOV (and VFs), then user could pass through accelerators (VFs) into virtual machine or use VFs directly in host.
--- drivers/fpga/dfl-pci.c | 40 ++++++++++++++++++++++++++++++++++++++++ drivers/fpga/dfl.c | 41 +++++++++++++++++++++++++++++++++++++++++ drivers/fpga/dfl.h | 1 + 3 files changed, 82 insertions(+)
drivers/fpga/dfl-pci.c +40 -0
@@ -223,8 +223,46 @@ int cci_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *pcidevid)return ret; } +static int cci_pci_sriov_configure (struct pci_dev *pcidev,int num_vfs) +{ +struct cci_drvdata *drvdata =pci_get_drvdata (pcidev); +struct dfl_fpga_cdev *cdev = drvdata->cdev; +int ret =0 ; + +mutex_lock (&cdev->lock); + +if (!num_vfs) { +/* +* disable SRIOV and then put released ports back to default +* PF access mode. +*/ +pci_disable_sriov (pcidev); + +__dfl_fpga_cdev_config_port_vf (cdev, false); + + }else if (cdev->released_port_num == num_vfs) { +/* +* only enable SRIOV if cdev has matched released ports, put +* released ports into VF access mode firstly. +*/ +__dfl_fpga_cdev_config_port_vf (cdev, true); + + ret =pci_enable_sriov (pcidev, num_vfs); +if (ret) +__dfl_fpga_cdev_config_port_vf (cdev, false); + }else { + ret = -EINVAL ; + } + +mutex_unlock (&cdev->lock); +return ret; +} +static void cci_pci_remove (struct pci_dev *pcidev) { +if (dev_is_pf (&pcidev->dev)) +cci_pci_sriov_configure (pcidev,0 ); +cci_remove_feature_devs (pcidev);pci_disable_pcie_error_reporting (pcidev); }
@@ -234,6 +272,7 @@ static void cci_pci_remove(struct pci_dev *pcidev) .id_table = cci_pcie_id_tbl, .probe = cci_pci_probe, .remove = cci_pci_remove, + .sriov_configure = cci_pci_sriov_configure, };module_pci_driver (cci_pci_driver);
@@ -241,3 +280,4 @@ static void cci_pci_remove(struct pci_dev *pcidev)MODULE_DESCRIPTION ("FPGA DFL PCIe Device Driver" );MODULE_AUTHOR ("Intel Corporation" );MODULE_LICENSE ("GPL v2" ); +MODULE_VERSION (DRV_VERSION );
drivers/fpga/dfl.c +41 -0
47 lines not on this page · raw message
drivers/fpga/dfl.h +1 -0
@@ -421,5 +421,6 @@ struct platform_device *int dfl_fpga_cdev_config_port (struct dfl_fpga_cdev *cdev,u32 port_id,bool release); +void __dfl_fpga_cdev_config_port_vf (struct dfl_fpga_cdev *cdev,bool is_vf);#endif /* __FPGA_DFL_H */
Signature · 1 line
1.8.3.1
PATCH v3 8/16 fpga: dfl: afu: add AFU state related sysfs interfaces
In reply to Wu HaoThis patch introduces more sysfs interfaces for Accelerated Function Unit (AFU). These interfaces allow users to read current AFU Power State (APx), read / clear AFU Power (APx) events which are sticky to identify transient APx state, and manage AFU's LTR (latency tolerance reporting).
---
v3: replace scnprintf with sprintf in sysfs interfaces.
update sysfs doc kernel version and date.
--- Documentation/ABI/testing/sysfs-platform-dfl-port | 30 +++++ drivers/fpga/dfl-afu-main.c | 140 ++++++++++++++++++++++ drivers/fpga/dfl.h | 11 ++ 3 files changed, 181 insertions(+)
Documentation/ABI/testing/sysfs-platform-dfl-port +30 -0
@@ -14,3 +14,33 @@ Description: Read-only. User can program different PR bitstreams to FPGA Accelerator Function Unit (AFU) for different functions. It returns uuid which could be used to identify which PR bitstream is programmed in this AFU. + +What: /sys/bus/platform/devices/dfl-port.0/power_state +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-only. It reports the APx (AFU Power) state, different APx + means different throttling level. When reading this file, it + returns "0" - Normal / "1" - AP1 / "2" - AP2 / "6" - AP6. + +What: /sys/bus/platform/devices/dfl-port.0/ap1_event +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-write. Read or set 1 to clear AP1 (AFU Power State 1) + event. It's used to indicate transient AP1 state. + +What: /sys/bus/platform/devices/dfl-port.0/ap2_event +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-write. Read or set 1 to clear AP2 (AFU Power State 2) + event. It's used to indicate transient AP2 state. + +What: /sys/bus/platform/devices/dfl-port.0/ltr +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-write. Read and set AFU latency tolerance reporting value. + Set ltr to 1 if the AFU can tolerate latency >= 40us or set it + to 0 if it is latency sensitive.
drivers/fpga/dfl-afu-main.c +140 -0
157 lines not on this page · raw message
drivers/fpga/dfl.h +11 -0
@@ -119,6 +119,7 @@#define PORT_HDR_NEXT_AFU NEXT_AFU#define PORT_HDR_CAP 0x30#define PORT_HDR_CTRL 0x38 +#define PORT_HDR_STS 0x40/* Port Capability Register Bitfield */ #define PORT_CAP_PORT_NUM GENMASK_ULL(1, 0)/* ID of this port */
@@ -130,6 +131,16 @@/* Latency tolerance reporting. '1' >= 40us, '0' < 40us.*/ #define PORT_CTRL_LATENCY BIT_ULL(2)#define PORT_CTRL_SFTRST_ACK BIT_ULL(4)/* HW ack for reset */ + +/* Port Status Register Bitfield */ +#define PORT_STS_AP2_EVT BIT_ULL(13)/* AP2 event detected */ +#define PORT_STS_AP1_EVT BIT_ULL(12)/* AP1 event detected */ +#define PORT_STS_PWR_STATE GENMASK_ULL(11, 8)/* AFU power states */ +#define PORT_STS_PWR_STATE_NORM 0 +#define PORT_STS_PWR_STATE_AP1 1/* 50% throttling */ +#define PORT_STS_PWR_STATE_AP2 2/* 90% throttling */ +#define PORT_STS_PWR_STATE_AP6 6/* 100% throttling */ +/** * struct dfl_fpga_port_ops - port ops *
Signature · 1 line
1.8.3.1
PATCH v3 9/16 fpga: dfl: afu: add userclock sysfs interfaces.
In reply to Wu HaoThis patch introduces userclock sysfs interfaces for AFU, user could use these interfaces for clock setting to AFU.
Please note that, this is only working for port header feature with revision 0, for later revisions, userclock setting is moved to a separated private feature, so one revision sysfs interface is exposed to userspace application for this purpose too.
---
v3: replace scnprintf with sprintf in sysfs interfaces.
update sysfs doc kernel version and date.
--- Documentation/ABI/testing/sysfs-platform-dfl-port | 35 +++++++ drivers/fpga/dfl-afu-main.c | 113 +++++++++++++++++++++- drivers/fpga/dfl.h | 4 + 3 files changed, 151 insertions(+), 1 deletion(-)
Documentation/ABI/testing/sysfs-platform-dfl-port +35 -0
@@ -44,3 +44,38 @@ Contact: Wu Hao <[email protected]> Description: Read-write. Read and set AFU latency tolerance reporting value. Set ltr to 1 if the AFU can tolerate latency >= 40us or set it to 0 if it is latency sensitive. + +What: /sys/bus/platform/devices/dfl-port.0/revision +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-only. Read this file to get the revision of port header + feature. + +What: /sys/bus/platform/devices/dfl-port.0/userclk_freqcmd +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Write-only. User writes command to this interface to set + userclock to AFU. + +What: /sys/bus/platform/devices/dfl-port.0/userclk_freqsts +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-only. Read this file to get the status of issued command + to userclck_freqcmd. + +What: /sys/bus/platform/devices/dfl-port.0/userclk_freqcntrcmd +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Write-only. User writes command to this interface to set + userclock counter. + +What: /sys/bus/platform/devices/dfl-port.0/userclk_freqcntrsts +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-only. Read this file to get the status of issued command + to userclck_freqcntrcmd.
drivers/fpga/dfl-afu-main.c +112 -1
144 lines not on this page · raw message
drivers/fpga/dfl.h +4 -0
@@ -120,6 +120,10 @@#define PORT_HDR_CAP 0x30#define PORT_HDR_CTRL 0x38#define PORT_HDR_STS 0x40 +#define PORT_HDR_USRCLK_CMD0 0x50 +#define PORT_HDR_USRCLK_CMD1 0x58 +#define PORT_HDR_USRCLK_STS0 0x60 +#define PORT_HDR_USRCLK_STS1 0x68/* Port Capability Register Bitfield */ #define PORT_CAP_PORT_NUM GENMASK_ULL(1, 0)/* ID of this port */
Signature · 1 line
1.8.3.1
PATCH v3 10/16 fpga: dfl: add id_table for dfl private feature driver
In reply to Wu HaoThis patch adds id_table for each dfl private feature driver, it allows to reuse same private feature driver to match and support multiple dfl private features.
--- drivers/fpga/dfl-afu-main.c | 14 ++++++++++++-- drivers/fpga/dfl-fme-main.c | 11 ++++++++--- drivers/fpga/dfl-fme-pr.c | 7 ++++++- drivers/fpga/dfl-fme.h | 3 ++- drivers/fpga/dfl.c | 21 +++++++++++++++++++-- drivers/fpga/dfl.h | 21 +++++++++++++++------ 6 files changed, 62 insertions(+), 15 deletions(-)
drivers/fpga/dfl-afu-main.c +12 -2
@@ -435,6 +435,11 @@ static void port_hdr_uinit(struct platform_device *pdev,return ret; } +static const struct dfl_feature_id port_hdr_id_table[] = { + {.id =PORT_FEATURE_ID_HEADER ,}, + {0 ,} +}; +static const struct dfl_feature_ops port_hdr_ops = { .init = port_hdr_init, .uinit = port_hdr_uinit,
@@ -495,6 +500,11 @@ static void port_afu_uinit(struct platform_device *pdev,sysfs_remove_files (&pdev->dev.kobj, port_afu_attrs); } +static const struct dfl_feature_id port_afu_id_table[] = { + {.id =PORT_FEATURE_ID_AFU ,}, + {0 ,} +}; +static const struct dfl_feature_ops port_afu_ops = { .init = port_afu_init, .uinit = port_afu_uinit,
@@ -502,11 +512,11 @@ static void port_afu_uinit(struct platform_device *pdev,static struct dfl_feature_driver port_feature_drvs[] = { { - .id =PORT_FEATURE_ID_HEADER , + .id_table = port_hdr_id_table, .ops = &port_hdr_ops, }, { - .id =PORT_FEATURE_ID_AFU , + .id_table = port_afu_id_table, .ops = &port_afu_ops, }, {
drivers/fpga/dfl-fme-main.c +8 -3
@@ -158,6 +158,11 @@ static long fme_hdr_ioctl(struct platform_device *pdev,return -ENODEV ; } +static const struct dfl_feature_id fme_hdr_id_table[] = { + {.id =FME_FEATURE_ID_HEADER ,}, + {0 ,} +}; +static const struct dfl_feature_ops fme_hdr_ops = { .init = fme_hdr_init, .uinit = fme_hdr_uinit,
@@ -166,12 +171,12 @@ static long fme_hdr_ioctl(struct platform_device *pdev,static struct dfl_feature_driver fme_feature_drvs[] = { { - .id =FME_FEATURE_ID_HEADER , + .id_table = fme_hdr_id_table, .ops = &fme_hdr_ops, }, { - .id =FME_FEATURE_ID_PR_MGMT , - .ops = &pr_mgmt_ops, + .id_table = fme_pr_mgmt_id_table, + .ops = &fme_pr_mgmt_ops, }, { .ops =NULL ,
drivers/fpga/dfl-fme-pr.c +6 -1
@@ -483,7 +483,12 @@ static long fme_pr_ioctl(struct platform_device *pdev,return ret; } -const struct dfl_feature_ops pr_mgmt_ops = { +const struct dfl_feature_id fme_pr_mgmt_id_table[] = { + {.id =FME_FEATURE_ID_PR_MGMT ,}, + {0 } +}; + +const struct dfl_feature_ops fme_pr_mgmt_ops = { .init = pr_mgmt_init, .uinit = pr_mgmt_uinit, .ioctl = fme_pr_ioctl,
drivers/fpga/dfl-fme.h +2 -1
@@ -35,6 +35,7 @@ struct dfl_fme { struct dfl_feature_platform_data *pdata; }; -extern const struct dfl_feature_ops pr_mgmt_ops; +extern const struct dfl_feature_ops fme_pr_mgmt_ops; +extern const struct dfl_feature_id fme_pr_mgmt_id_table[];#endif /* __DFL_FME_H */
drivers/fpga/dfl.c +19 -2
@@ -14,6 +14,8 @@#include "dfl.h" +#define DRV_VERSION "0.8" +static DEFINE_MUTEX (dfl_id_mutex);/*
@@ -281,6 +283,21 @@ static int dfl_feature_instance_init(struct platform_device *pdev,return ret; } +static bool dfl_feature_drv_match (struct dfl_feature *feature, +struct dfl_feature_driver *driver) +{ +const struct dfl_feature_id *ids = driver->id_table; + +if (ids) { +while (ids->id) { +if (ids->id == feature->id) +return true; + ids++; + } + } +return false; +} +/** * dfl_fpga_dev_feature_init - init for sub features of dfl feature device * @pdev: feature device.
@@ -301,8 +318,7 @@ int dfl_fpga_dev_feature_init(struct platform_device *pdev,while (drv->ops) {dfl_fpga_dev_for_each_feature (pdata, feature) { -/* match feature and drv using id */ -if (feature->id == drv->id) { +if (dfl_feature_drv_match (feature, drv)) { ret =dfl_feature_instance_init (pdev, pdata, feature, drv);if (ret)
@@ -1178,3 +1194,4 @@ static void __exit dfl_fpga_exit(void)MODULE_DESCRIPTION ("FPGA Device Feature List (DFL) Support" );MODULE_AUTHOR ("Intel Corporation" );MODULE_LICENSE ("GPL v2" ); +MODULE_VERSION (DRV_VERSION );
drivers/fpga/dfl.h +15 -6
@@ -30,8 +30,8 @@/* plus one for fme device */ #define MAX_DFL_FEATURE_DEV_NUM (MAX_DFL_FPGA_PORT_NUM + 1) -/* Reserved 0x0 for Header Group Register and 0xff for AFU */ -#define FEATURE_ID_FIU_HEADER 0x0 +/* Reserved 0xfe for Header Group Register and 0xff for AFU */ +#define FEATURE_ID_FIU_HEADER 0xfe#define FEATURE_ID_AFU 0xff#define FME_FEATURE_ID_HEADER FEATURE_ID_FIU_HEADER
@@ -169,13 +169,22 @@ struct dfl_fpga_port_ops {int dfl_fpga_check_port_id (struct platform_device *pdev,void *pport_id);/** -* struct dfl_feature_driver - sub feature's driver +* struct dfl_feature_id - dfl private feature id * -* @id: sub feature id. -* @ops: ops of this sub feature. +* @id: unique dfl private feature id. */ -struct dfl_feature_driver { +struct dfl_feature_id {u64 id; +}; + +/** +* struct dfl_feature_driver - dfl private feature driver +* +* @id_table: id_table for dfl private features supported by this driver. +* @ops: ops of this dfl private feature driver. +*/ +struct dfl_feature_driver { +const struct dfl_feature_id *id_table;const struct dfl_feature_ops *ops; };
Signature · 1 line
1.8.3.1
PATCH v3 11/16 fpga: dfl: afu: export __port_enable/disable function.
In reply to Wu HaoAs these two functions are used by other private features. e.g. in error reporting private feature, it requires to check port status and reset port for error clearing.
--- drivers/fpga/dfl-afu-main.c | 25 ++++++++++++++----------- drivers/fpga/dfl-afu.h | 3 +++ 2 files changed, 17 insertions(+), 11 deletions(-)
drivers/fpga/dfl-afu-main.c +14 -11
@@ -24,14 +24,16 @@#define DRV_VERSION "0.8"/** -* port_enable - enable a port +* __port_enable - enable a port * @pdev: port platform device. * * Enable Port by clear the port soft reset bit, which is set by default. * The AFU is unable to respond to any MMIO access while in reset. -* port_enable function should only be used after port_disable function. +* __port_enable function should only be used after __port_disable function. +* +* The caller needs to hold lock for protection. */ -static void port_enable (struct platform_device *pdev) +void __port_enable (struct platform_device *pdev) {struct dfl_feature_platform_data *pdata =dev_get_platdata (&pdev->dev);void __iomem *base;
@@ -54,13 +56,14 @@ static void port_enable(struct platform_device *pdev)#define RST_POLL_TIMEOUT 1000/* us */ /** -* port_disable - disable a port +* __port_disable - disable a port * @pdev: port platform device. * -* Disable Port by setting the port soft reset bit, it puts the port into -* reset. +* Disable Port by setting the port soft reset bit, it puts the port into reset. +* +* The caller needs to hold lock for protection. */ -static int port_disable (struct platform_device *pdev) +int __port_disable (struct platform_device *pdev) {struct dfl_feature_platform_data *pdata =dev_get_platdata (&pdev->dev);void __iomem *base;
@@ -106,9 +109,9 @@ static int __port_reset(struct platform_device *pdev) {int ret; - ret =port_disable (pdev); + ret =__port_disable (pdev);if (!ret) -port_enable (pdev); +__port_enable (pdev);return ret; }
@@ -805,9 +808,9 @@ static int port_enable_set(struct platform_device *pdev, bool enable)mutex_lock (&pdata->lock);if (enable) -port_enable (pdev); +__port_enable (pdev);else - ret =port_disable (pdev); + ret =__port_disable (pdev);mutex_unlock (&pdata->lock);return ret;
drivers/fpga/dfl-afu.h +3 -0
@@ -79,6 +79,9 @@ struct dfl_afu {struct dfl_feature_platform_data *pdata; }; +void __port_enable (struct platform_device *pdev); +int __port_disable (struct platform_device *pdev); +void afu_mmio_region_init (struct dfl_feature_platform_data *pdata);int afu_mmio_region_add (struct dfl_feature_platform_data *pdata,u32 region_index,u64 region_size,u64 phys,u32 flags);
Signature · 1 line
1.8.3.1
PATCH v3 12/16 fpga: dfl: afu: add error reporting support.
In reply to Wu HaoError reporting is one important private feature, it reports error detected on port and accelerated function unit (AFU). It introduces several sysfs interfaces to allow userspace to check and clear errors detected by hardware.
---
v2: add more error code description for error clear sysfs in doc.
return -EINVAL instead of -EBUSY when input error code doesn't match in error clear sysfs.
v3: replace scnprintf with sprintf in sysfs interfaces.
update sysfs doc kernel version and date.
--- Documentation/ABI/testing/sysfs-platform-dfl-port | 39 ++++ drivers/fpga/Makefile | 1 + drivers/fpga/dfl-afu-error.c | 225 ++++++++++++++++++++++ drivers/fpga/dfl-afu-main.c | 4 + drivers/fpga/dfl-afu.h | 4 + 5 files changed, 273 insertions(+) create mode 100644 drivers/fpga/dfl-afu-error.c
Documentation/ABI/testing/sysfs-platform-dfl-port +39 -0
@@ -79,3 +79,42 @@ KernelVersion: 5.3 Contact: Wu Hao <[email protected]> Description: Read-only. Read this file to get the status of issued command to userclck_freqcntrcmd. + +What: /sys/bus/platform/devices/dfl-port.0/errors/revision +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-only. Read this file to get the revision of this error + reporting private feature. + +What: /sys/bus/platform/devices/dfl-port.0/errors/errors +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-only. Read this file to get errors detected on port and + Accelerated Function Unit (AFU). + +What: /sys/bus/platform/devices/dfl-port.0/errors/first_error +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-only. Read this file to get the first error detected by + hardware. + +What: /sys/bus/platform/devices/dfl-port.0/errors/first_malformed_req +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-only. Read this file to get the first malformed request + captured by hardware. + +What: /sys/bus/platform/devices/dfl-port.0/errors/clear +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Write-only. Write error code to this file to clear errors. + Write fails with -EINVAL if input parsing fails or input error + code doesn't match. + Write fails with -EBUSY or -ETIMEDOUT if error can't be cleared + as hardware is in low power state (-EBUSY) or not responding + (-ETIMEDOUT).
drivers/fpga/Makefile +1 -0
@@ -41,6 +41,7 @@ obj-$(CONFIG_FPGA_DFL_AFU) += dfl-afu.o dfl-fme-objs := dfl-fme-main.o dfl-fme-pr.o dfl-afu-objs := dfl-afu-main.o dfl-afu-region.o dfl-afu-dma-region.o +dfl-afu-objs += dfl-afu-error.o # Drivers for FPGAs which implement DFL obj-$(CONFIG_FPGA_DFL_PCI) += dfl-pci.o
drivers/fpga/dfl-afu-error.c new file +225 -0
225 lines not on this page · raw message
drivers/fpga/dfl-afu-main.c +4 -0
@@ -523,6 +523,10 @@ static void port_afu_uinit(struct platform_device *pdev, .ops = &port_afu_ops, }, { + .id_table = port_err_id_table, + .ops = &port_err_ops, + }, + { .ops = NULL, } };
drivers/fpga/dfl-afu.h +4 -0
@@ -100,4 +100,8 @@ int afu_dma_map_region(struct dfl_feature_platform_data *pdata,struct dfl_afu_dma_region *afu_dma_region_find (struct dfl_feature_platform_data *pdata,u64 iova,u64 size); + +extern const struct dfl_feature_ops port_err_ops; +extern const struct dfl_feature_id port_err_id_table[]; +#endif /* __DFL_AFU_H */
Signature · 1 line
1.8.3.1
PATCH v3 13/16 fpga: dfl: afu: add STP (SignalTap) support
In reply to Wu HaoSTP (SignalTap) is one of the private features under the port for debugging. This patch adds private feature driver support for it to allow userspace applications to mmap related mmio region and provide STP service.
--- drivers/fpga/dfl-afu-main.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
drivers/fpga/dfl-afu-main.c +34 -0
@@ -513,6 +513,36 @@ static void port_afu_uinit(struct platform_device *pdev, .uinit = port_afu_uinit, }; +static int port_stp_init (struct platform_device *pdev, +struct dfl_feature *feature) +{ +struct resource *res = &pdev->resource[feature->resource_index]; + +dev_dbg (&pdev->dev,"PORT STP Init.\n" ); + +return afu_mmio_region_add (dev_get_platdata (&pdev->dev), +DFL_PORT_REGION_INDEX_STP , +resource_size (res), res->start, +DFL_PORT_REGION_MMAP |DFL_PORT_REGION_READ | +DFL_PORT_REGION_WRITE ); +} + +static void port_stp_uinit (struct platform_device *pdev, +struct dfl_feature *feature) +{ +dev_dbg (&pdev->dev,"PORT STP UInit.\n" ); +} + +static const struct dfl_feature_id port_stp_id_table[] = { + {.id =PORT_FEATURE_ID_STP ,}, + {0 ,} +}; + +static const struct dfl_feature_ops port_stp_ops = { + .init = port_stp_init, + .uinit = port_stp_uinit, +}; +static struct dfl_feature_driver port_feature_drvs[] = { { .id_table = port_hdr_id_table,
@@ -527,6 +557,10 @@ static void port_afu_uinit(struct platform_device *pdev, .ops = &port_err_ops, }, { + .id_table = port_stp_id_table, + .ops = &port_stp_ops, + }, + { .ops = NULL, } };
Signature · 1 line
1.8.3.1
PATCH v3 14/16 fpga: dfl: fme: add capability sysfs interfaces
In reply to Wu HaoThis patch adds 3 read-only sysfs interfaces for FPGA Management Engine (FME) block for capabilities including cache_size, fabric_version and socket_id.
---
v3: replace scnprintf with sprintf in sysfs interfaces.
update sysfs doc kernel version and date.
--- Documentation/ABI/testing/sysfs-platform-dfl-fme | 23 ++++++++++++ drivers/fpga/dfl-fme-main.c | 48 ++++++++++++++++++++++++ 2 files changed, 71 insertions(+)
Documentation/ABI/testing/sysfs-platform-dfl-fme +23 -0
@@ -21,3 +21,26 @@ Contact: Wu Hao <[email protected]> Description: Read-only. It returns Bitstream (static FPGA region) meta data, which includes the synthesis date, seed and other information of this static FPGA region. + +What: /sys/bus/platform/devices/dfl-fme.0/cache_size +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-only. It returns cache size of this FPGA device. + +What: /sys/bus/platform/devices/dfl-fme.0/fabric_version +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-only. It returns fabric version of this FPGA device. + Userspace applications need this information to select + best data channels per different fabric design. + +What: /sys/bus/platform/devices/dfl-fme.0/socket_id +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-only. It returns socket_id to indicate which socket + this FPGA belongs to, only valid for integrated solution. + User only needs this information, in case standard numa node + can't provide correct information.
drivers/fpga/dfl-fme-main.c +48 -0
58 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH v3 15/16 fpga: dfl: fme: add global error reporting support
In reply to Wu HaoThis patch adds support for global error reporting for FPGA Management Engine (FME), it introduces sysfs interfaces to report different error detected by the hardware, and allow user to clear errors or inject error for testing purpose.
---
v2: fix issues found in sysfs doc.
fix returned error code issues for writable sysfs interfaces. (use -EINVAL if input doesn't match error code) reorder the sysfs groups in code.
v3: code rebase.
replace scnprintf with sprintf in sysfs interfaces. update sysfs doc kernel version and date.
--- Documentation/ABI/testing/sysfs-platform-dfl-fme | 75 +++++ drivers/fpga/Makefile | 2 +- drivers/fpga/dfl-fme-error.c | 385 +++++++++++++++++++++++ drivers/fpga/dfl-fme-main.c | 4 + drivers/fpga/dfl-fme.h | 2 + drivers/fpga/dfl.h | 2 + 6 files changed, 469 insertions(+), 1 deletion(-) create mode 100644 drivers/fpga/dfl-fme-error.c
Documentation/ABI/testing/sysfs-platform-dfl-fme +75 -0
@@ -44,3 +44,78 @@ Description: Read-only. It returns socket_id to indicate which socket this FPGA belongs to, only valid for integrated solution. User only needs this information, in case standard numa node can't provide correct information. + +What: /sys/bus/platform/devices/dfl-fme.0/errors/revision +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-only. Read this file to get the revision of this global + error reporting private feature. + +What: /sys/bus/platform/devices/dfl-fme.0/errors/pcie0_errors +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Write. Read this file for errors detected on pcie0 link. + Write this file to clear errors logged in pcie0_errors. Write + fails with -EINVAL if input parsing fails or input error code + doesn't match. + +What: /sys/bus/platform/devices/dfl-fme.0/errors/pcie1_errors +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Write. Read this file for errors detected on pcie1 link. + Write this file to clear errors logged in pcie1_errors. Write + fails with -EINVAL if input parsing fails or input error code + doesn't match. + +What: /sys/bus/platform/devices/dfl-fme.0/errors/nonfatal_errors +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-only. It returns non-fatal errors detected. + +What: /sys/bus/platform/devices/dfl-fme.0/errors/catfatal_errors +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-only. It returns catastrophic and fatal errors detected. + +What: /sys/bus/platform/devices/dfl-fme.0/errors/inject_error +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Write. Read this file to check errors injected. Write this + file to inject errors for testing purpose. Write fails with + -EINVAL if input parsing fails or input inject error code isn't + supported. + +What: /sys/bus/platform/devices/dfl-fme.0/errors/fme-errors/errors +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-only. Read this file to get errors detected by hardware. + +What: /sys/bus/platform/devices/dfl-fme.0/errors/fme-errors/first_error +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-only. Read this file to get the first error detected by + hardware. + +What: /sys/bus/platform/devices/dfl-fme.0/errors/fme-errors/next_error +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-only. Read this file to get the second error detected by + hardware. + +What: /sys/bus/platform/devices/dfl-fme.0/errors/fme-errors/clear +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Write-only. Write error code to this file to clear all errors + logged in errors, first_error and next_error. Write fails with + -EINVAL if input parsing fails or input error code doesn't + match.
drivers/fpga/Makefile +1 -1
@@ -39,7 +39,7 @@ obj-$(CONFIG_FPGA_DFL_FME_BRIDGE) += dfl-fme-br.o obj-$(CONFIG_FPGA_DFL_FME_REGION) += dfl-fme-region.o obj-$(CONFIG_FPGA_DFL_AFU) += dfl-afu.o -dfl-fme-objs := dfl-fme-main.o dfl-fme-pr.o +dfl-fme-objs := dfl-fme-main.o dfl-fme-pr.o dfl-fme-error.o dfl-afu-objs := dfl-afu-main.o dfl-afu-region.o dfl-afu-dma-region.o dfl-afu-objs += dfl-afu-error.o
drivers/fpga/dfl-fme-error.c new file +385 -0
385 lines not on this page · raw message
drivers/fpga/dfl-fme-main.c +4 -0
@@ -227,6 +227,10 @@ static long fme_hdr_ioctl(struct platform_device *pdev, .ops = &fme_pr_mgmt_ops, }, { + .id_table = fme_global_err_id_table, + .ops = &fme_global_err_ops, + }, + { .ops = NULL, }, };
drivers/fpga/dfl-fme.h +2 -0
@@ -37,5 +37,7 @@ struct dfl_fme {extern const struct dfl_feature_ops fme_pr_mgmt_ops;extern const struct dfl_feature_id fme_pr_mgmt_id_table[]; +extern const struct dfl_feature_ops fme_global_err_ops; +extern const struct dfl_feature_id fme_global_err_id_table[];#endif /* __DFL_FME_H */
drivers/fpga/dfl.h +2 -0
@@ -197,12 +197,14 @@ struct dfl_feature_driver {* feature dev (platform device)'s reources. * @ioaddr: mapped mmio resource address. * @ops: ops of this sub feature. +* @priv: priv data of this feature. */ struct dfl_feature {u64 id;int resource_index;void __iomem *ioaddr;const struct dfl_feature_ops *ops; +void *priv; };#define DEV_STATUS_IN_USE 0
Signature · 1 line
1.8.3.1
PATCH v3 16/16 fpga: dfl: fme: add performance reporting support
In reply to Wu HaoThis patch adds support for performance reporting private feature for FPGA Management Engine (FME). Actually it supports 4 categories performance counters, 'clock', 'cache', 'iommu' and 'fabric', user could read the performance counter via exposed sysfs interfaces. Please refer to sysfs doc for more details.
---
v3: replace scnprintf with sprintf in sysfs interfaces.
update sysfs doc kernel version and date.
fix sysfs doc issue for fabric counter.
refine PERF_OBJ_ATTR_* macro, doesn't count on __ATTR anymore. introduce PERF_OBJ_ATTR_F_* macro, as it needs to use different filenames for some of the sysfs attributes.
remove kobject_del when destroy kobject, kobject_put is enough. do sysfs_remove_groups first when destroying perf_obj. WARN_ON_ONCE in case internal parms are wrong in read_*_count().
--- Documentation/ABI/testing/sysfs-platform-dfl-fme | 93 +++ drivers/fpga/Makefile | 1 + drivers/fpga/dfl-fme-main.c | 4 + drivers/fpga/dfl-fme-perf.c | 962 +++++++++++++++++++++++ drivers/fpga/dfl-fme.h | 2 + drivers/fpga/dfl.c | 1 + drivers/fpga/dfl.h | 2 + 7 files changed, 1065 insertions(+) create mode 100644 drivers/fpga/dfl-fme-perf.c
Documentation/ABI/testing/sysfs-platform-dfl-fme +93 -0
@@ -119,3 +119,96 @@ Description: Write-only. Write error code to this file to clear all errors logged in errors, first_error and next_error. Write fails with -EINVAL if input parsing fails or input error code doesn't match. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/clock +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Only. Read for Accelerator Function Unit (AFU) clock + counter. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/cache/freeze +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Write. Read this file for the current status of 'cache' + category performance counters, and Write '1' or '0' to freeze + or unfreeze 'cache' performance counters. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/cache/<counter> +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Only. Read 'cache' category performance counters: + read_hit, read_miss, write_hit, write_miss, hold_request, + data_write_port_contention, tag_write_port_contention, + tx_req_stall, rx_req_stall and rx_eviction. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/iommu/freeze +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Write. Read this file for the current status of 'iommu' + category performance counters, and Write '1' or '0' to freeze + or unfreeze 'iommu' performance counters. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/iommu/<sip_counter> +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Only. Read 'iommu' category 'sip' sub category + performance counters: iotlb_4k_hit, iotlb_2m_hit, + iotlb_1g_hit, slpwc_l3_hit, slpwc_l4_hit, rcc_hit, + rcc_miss, iotlb_4k_miss, iotlb_2m_miss, iotlb_1g_miss, + slpwc_l3_miss and slpwc_l4_miss. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/iommu/afu0/<counter> +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Only. Read 'iommu' category 'afuX' sub category + performance counters: read_transaction, write_transaction, + devtlb_read_hit, devtlb_write_hit, devtlb_4k_fill, + devtlb_2m_fill and devtlb_1g_fill. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/fabric/freeze +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Write. Read this file for the current status of 'fabric' + category performance counters, and Write '1' or '0' to freeze + or unfreeze 'fabric' performance counters. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/fabric/<counter> +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Only. Read 'fabric' category performance counters: + pcie0_read, pcie0_write, pcie1_read, pcie1_write, + upi_read, upi_write, mmio_read and mmio_write. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/fabric/enable +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Write. Read this file for current status of device level + fabric counters. Write "1" to enable device level fabric + counters. Once device level fabric counters are enabled, port + level fabric counters will be disabled automatically. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/fabric/port0/<counter> +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Only. Read 'fabric' category "portX" sub category + performance counters: pcie0_read, pcie0_write, pcie1_read, + pcie1_write, upi_read, upi_write and mmio_read. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/fabric/port0/enable +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Write. Read this file for current status of port level + fabric counters. Write "1" to enable port level fabric counters. + Once port level fabric counters are enabled, device level fabric + counters will be disabled automatically.
drivers/fpga/Makefile +1 -0
@@ -40,6 +40,7 @@ obj-$(CONFIG_FPGA_DFL_FME_REGION) += dfl-fme-region.o obj-$(CONFIG_FPGA_DFL_AFU) += dfl-afu.o dfl-fme-objs := dfl-fme-main.o dfl-fme-pr.o dfl-fme-error.o +dfl-fme-objs += dfl-fme-perf.o dfl-afu-objs := dfl-afu-main.o dfl-afu-region.o dfl-afu-dma-region.o dfl-afu-objs += dfl-afu-error.o
drivers/fpga/dfl-fme-main.c +4 -0
@@ -231,6 +231,10 @@ static long fme_hdr_ioctl(struct platform_device *pdev, .ops = &fme_global_err_ops, }, { + .id_table = fme_perf_id_table, + .ops = &fme_perf_ops, + }, + { .ops = NULL, }, };
drivers/fpga/dfl-fme-perf.c new file +962 -0
962 lines not on this page · raw message
drivers/fpga/dfl-fme.h +2 -0
@@ -39,5 +39,7 @@ struct dfl_fme {extern const struct dfl_feature_id fme_pr_mgmt_id_table[];extern const struct dfl_feature_ops fme_global_err_ops;extern const struct dfl_feature_id fme_global_err_id_table[]; +extern const struct dfl_feature_ops fme_perf_ops; +extern const struct dfl_feature_id fme_perf_id_table[];#endif /* __DFL_FME_H */
drivers/fpga/dfl.c +1 -0
@@ -521,6 +521,7 @@ static int build_info_commit_dev(struct build_feature_devs_info *binfo)struct dfl_feature *feature = &pdata->features[index];/* save resource information for each feature */ + feature->pdev = fdev; feature->id = finfo->fid; feature->resource_index = index; feature->ioaddr = finfo->ioaddr;
drivers/fpga/dfl.h +2 -0
@@ -191,6 +191,7 @@ struct dfl_feature_driver {/** * struct dfl_feature - sub feature of the feature devices * +* @pdev: parent platform device. * @id: sub feature id. * @resource_index: each sub feature has one mmio resource for its registers. * this index is used to find its mmio resource from the
@@ -200,6 +201,7 @@ struct dfl_feature_driver {* @priv: priv data of this feature. */ struct dfl_feature { +struct platform_device *pdev;u64 id;int resource_index;void __iomem *ioaddr;
Signature · 1 line
1.8.3.1
Re: [PATCH v3 16/16] fpga: dfl: fme: add performance reporting support
On Mon, May 27, 2019 at 12:39 AM Wu Hao <[email protected]> wrote:
Hi Hao,
Just one correction that I saw below, sorry I didn't catch it last time.
Quoted 10 lines
This patch adds support for performance reporting private feature for FPGA Management Engine (FME). Actually it supports 4 categories performance counters, 'clock', 'cache', 'iommu' and 'fabric', user could read the performance counter via exposed sysfs interfaces. Please refer to sysfs doc for more details.
Signed-off-by Luwei Kang <[email protected]>Signed-off-by Xu Yilun <[email protected]>Signed-off-by Wu Hao <[email protected]>
Quoted 329 lines
---
v3: replace scnprintf with sprintf in sysfs interfaces.
update sysfs doc kernel version and date.
fix sysfs doc issue for fabric counter.
refine PERF_OBJ_ATTR_* macro, doesn't count on__ATTRanymore. introduce PERF_OBJ_ATTR_F_* macro, as it needs to use different filenames for some of the sysfs attributes.
removekobject_delwhen destroy kobject,kobject_putis enough. dosysfs_remove_groupsfirst when destroyingperf_obj.WARN_ON_ONCEin case internal parms are wrong in read_*_count().--- Documentation/ABI/testing/sysfs-platform-dfl-fme | 93 +++ drivers/fpga/Makefile | 1 + drivers/fpga/dfl-fme-main.c | 4 + drivers/fpga/dfl-fme-perf.c | 962 +++++++++++++++++++++++ drivers/fpga/dfl-fme.h | 2 + drivers/fpga/dfl.c | 1 + drivers/fpga/dfl.h | 2 + 7 files changed, 1065 insertions(+) create mode 100644 drivers/fpga/dfl-fme-perf.cDocumentation/ABI/testing/sysfs-platform-dfl-fme +93
-0@@ -119,3 +119,96 @@ Description: Write-only. Write error code to this file to clear all errors logged in errors, first_error and next_error. Write fails with -EINVAL if input parsing fails or input error code doesn't match. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/clock +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Only. Read for Accelerator Function Unit (AFU) clock + counter. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/cache/freeze +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Write. Read this file for the current status of 'cache' + category performance counters, and Write '1' or '0' to freeze + or unfreeze 'cache' performance counters. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/cache/<counter> +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Only. Read 'cache' category performance counters: + read_hit, read_miss, write_hit, write_miss, hold_request, + data_write_port_contention, tag_write_port_contention, + tx_req_stall, rx_req_stall and rx_eviction. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/iommu/freeze +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Write. Read this file for the current status of 'iommu' + category performance counters, and Write '1' or '0' to freeze + or unfreeze 'iommu' performance counters. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/iommu/<sip_counter> +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Only. Read 'iommu' category 'sip' sub category + performance counters: iotlb_4k_hit, iotlb_2m_hit, + iotlb_1g_hit, slpwc_l3_hit, slpwc_l4_hit, rcc_hit, + rcc_miss, iotlb_4k_miss, iotlb_2m_miss, iotlb_1g_miss, + slpwc_l3_miss and slpwc_l4_miss. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/iommu/afu0/<counter> +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Only. Read 'iommu' category 'afuX' sub category + performance counters: read_transaction, write_transaction, + devtlb_read_hit, devtlb_write_hit, devtlb_4k_fill, + devtlb_2m_fill and devtlb_1g_fill. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/fabric/freeze +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Write. Read this file for the current status of 'fabric' + category performance counters, and Write '1' or '0' to freeze + or unfreeze 'fabric' performance counters. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/fabric/<counter> +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Only. Read 'fabric' category performance counters: + pcie0_read, pcie0_write, pcie1_read, pcie1_write, + upi_read, upi_write, mmio_read and mmio_write. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/fabric/enable +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Write. Read this file for current status of device level + fabric counters. Write "1" to enable device level fabric + counters. Once device level fabric counters are enabled, port + level fabric counters will be disabled automatically. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/fabric/port0/<counter> +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Only. Read 'fabric' category "portX" sub category + performance counters: pcie0_read, pcie0_write, pcie1_read, + pcie1_write, upi_read, upi_write and mmio_read. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/fabric/port0/enable +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Write. Read this file for current status of port level + fabric counters. Write "1" to enable port level fabric counters. + Once port level fabric counters are enabled, device level fabric + counters will be disabled automatically.drivers/fpga/Makefile +1
-0@@ -40,6 +40,7 @@ obj-$(CONFIG_FPGA_DFL_FME_REGION) += dfl-fme-region.o obj-$(CONFIG_FPGA_DFL_AFU) += dfl-afu.o dfl-fme-objs := dfl-fme-main.o dfl-fme-pr.o dfl-fme-error.o +dfl-fme-objs += dfl-fme-perf.o dfl-afu-objs := dfl-afu-main.o dfl-afu-region.o dfl-afu-dma-region.o dfl-afu-objs += dfl-afu-error.odrivers/fpga/dfl-fme-main.c +4
-0@@ -231,6 +231,10 @@ static long fme_hdr_ioctl(struct platform_device *pdev, .ops = &fme_global_err_ops, }, { + .id_table = fme_perf_id_table, + .ops = &fme_perf_ops, + }, + { .ops = NULL, }, };drivers/fpga/dfl-fme-perf.c new file +174
-0@@ -0,0 +1,962 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Driver for FPGA Management Engine (FME) Global Performance Reporting +* +* Copyright 2019 Intel Corporation, Inc. +* +* Authors: +* Kang Luwei <[email protected]> +* Xiao Guangrong <[email protected]> +* Wu Hao <[email protected]> +* Joseph Grecco <[email protected]> +* Enno Luebbers <[email protected]> +* Tim Whisonant <[email protected]> +* Ananda Ravuri <[email protected]> +* Mitchel, Henry <[email protected]> +*/ + +#include "dfl.h" +#include "dfl-fme.h" + +/* +* Performance Counter Registers for Cache. +* +* Cache Events are listed below as CACHE_EVNT_*. +*/ +#define CACHE_CTRL 0x8 +#define CACHE_RESET_CNTR BIT_ULL(0) +#define CACHE_FREEZE_CNTR BIT_ULL(8) +#define CACHE_CTRL_EVNT GENMASK_ULL(19, 16) +#define CACHE_EVNT_RD_HIT 0x0 +#define CACHE_EVNT_WR_HIT 0x1 +#define CACHE_EVNT_RD_MISS 0x2 +#define CACHE_EVNT_WR_MISS 0x3 +#define CACHE_EVNT_RSVD 0x4 +#define CACHE_EVNT_HOLD_REQ 0x5 +#define CACHE_EVNT_DATA_WR_PORT_CONTEN 0x6 +#define CACHE_EVNT_TAG_WR_PORT_CONTEN 0x7 +#define CACHE_EVNT_TX_REQ_STALL 0x8 +#define CACHE_EVNT_RX_REQ_STALL 0x9 +#define CACHE_EVNT_EVICTIONS 0xa +#define CACHE_EVNT_MAX CACHE_EVNT_EVICTIONS +#define CACHE_CHANNEL_SEL BIT_ULL(20) +#define CACHE_CHANNEL_RD 0 +#define CACHE_CHANNEL_WR 1 +#define CACHE_CHANNEL_MAX 2 +#define CACHE_CNTR0 0x10 +#define CACHE_CNTR1 0x18 +#define CACHE_CNTR_EVNT_CNTR GENMASK_ULL(47, 0) +#define CACHE_CNTR_EVNT GENMASK_ULL(63, 60) + +/* +* Performance Counter Registers for Fabric. +* +* Fabric Events are listed below as FAB_EVNT_* +*/ +#define FAB_CTRL 0x20 +#define FAB_RESET_CNTR BIT_ULL(0) +#define FAB_FREEZE_CNTR BIT_ULL(8) +#define FAB_CTRL_EVNT GENMASK_ULL(19, 16) +#define FAB_EVNT_PCIE0_RD 0x0 +#define FAB_EVNT_PCIE0_WR 0x1 +#define FAB_EVNT_PCIE1_RD 0x2 +#define FAB_EVNT_PCIE1_WR 0x3 +#define FAB_EVNT_UPI_RD 0x4 +#define FAB_EVNT_UPI_WR 0x5 +#define FAB_EVNT_MMIO_RD 0x6 +#define FAB_EVNT_MMIO_WR 0x7 +#define FAB_EVNT_MAX FAB_EVNT_MMIO_WR +#define FAB_PORT_ID GENMASK_ULL(21, 20) +#define FAB_PORT_FILTER BIT_ULL(23) +#define FAB_PORT_FILTER_DISABLE 0 +#define FAB_PORT_FILTER_ENABLE 1 +#define FAB_CNTR 0x28 +#define FAB_CNTR_EVNT_CNTR GENMASK_ULL(59, 0) +#define FAB_CNTR_EVNT GENMASK_ULL(63, 60) + +/* +* Performance Counter Registers for Clock. +* +* Clock Counter can't be reset or frozen by SW. +*/ +#define CLK_CNTR 0x30 + +/* +* Performance Counter Registers for IOMMU / VT-D. +* +* VT-D Events are listed below as VTD_EVNT_* and VTD_SIP_EVNT_* +*/ +#define VTD_CTRL 0x38 +#define VTD_RESET_CNTR BIT_ULL(0) +#define VTD_FREEZE_CNTR BIT_ULL(8) +#define VTD_CTRL_EVNT GENMASK_ULL(19, 16) +#define VTD_EVNT_AFU_MEM_RD_TRANS 0x0 +#define VTD_EVNT_AFU_MEM_WR_TRANS 0x1 +#define VTD_EVNT_AFU_DEVTLB_RD_HIT 0x2 +#define VTD_EVNT_AFU_DEVTLB_WR_HIT 0x3 +#define VTD_EVNT_DEVTLB_4K_FILL 0x4 +#define VTD_EVNT_DEVTLB_2M_FILL 0x5 +#define VTD_EVNT_DEVTLB_1G_FILL 0x6 +#define VTD_EVNT_MAX VTD_EVNT_DEVTLB_1G_FILL +#define VTD_CNTR 0x40 +#define VTD_CNTR_EVNT GENMASK_ULL(63, 60) +#define VTD_CNTR_EVNT_CNTR GENMASK_ULL(47, 0) +#define VTD_SIP_CTRL 0x48 +#define VTD_SIP_RESET_CNTR BIT_ULL(0) +#define VTD_SIP_FREEZE_CNTR BIT_ULL(8) +#define VTD_SIP_CTRL_EVNT GENMASK_ULL(19, 16) +#define VTD_SIP_EVNT_IOTLB_4K_HIT 0x0 +#define VTD_SIP_EVNT_IOTLB_2M_HIT 0x1 +#define VTD_SIP_EVNT_IOTLB_1G_HIT 0x2 +#define VTD_SIP_EVNT_SLPWC_L3_HIT 0x3 +#define VTD_SIP_EVNT_SLPWC_L4_HIT 0x4 +#define VTD_SIP_EVNT_RCC_HIT 0x5 +#define VTD_SIP_EVNT_IOTLB_4K_MISS 0x6 +#define VTD_SIP_EVNT_IOTLB_2M_MISS 0x7 +#define VTD_SIP_EVNT_IOTLB_1G_MISS 0x8 +#define VTD_SIP_EVNT_SLPWC_L3_MISS 0x9 +#define VTD_SIP_EVNT_SLPWC_L4_MISS 0xa +#define VTD_SIP_EVNT_RCC_MISS 0xb +#define VTD_SIP_EVNT_MAX VTD_SIP_EVNT_RCC_MISS +#define VTD_SIP_CNTR 0X50 +#define VTD_SIP_CNTR_EVNT GENMASK_ULL(63, 60) +#define VTD_SIP_CNTR_EVNT_CNTR GENMASK_ULL(47, 0) + +#define PERF_OBJ_ROOT_ID (~0) + +#define PERF_TIMEOUT 30 + +/** +* struct perf_object - object of performance counter +* +* @id: instance id. PERF_OBJ_ROOT_ID indicates it is a parent object which +* counts performance counters for all instances. +* @attr_groups: the sysfs files are associated with this object. +* @feature: pointer to related private feature. +* @node: used to link itself to parent's children list. +* @children: used to link its children objects together. +* @kobj: generic kobject interface. +* +* 'node' and 'children' are used to construct parent-children hierarchy. +*/ +struct perf_object { +int id; +const struct attribute_group **attr_groups; +struct dfl_feature *feature; + +struct list_head node; +struct list_head children; +struct kobject kobj; +}; + +/** +* struct perf_obj_attribute - attribute of perf object +* +* @attr: attribute of this perf object. +* @show: show callback for sysfs attribute. +* @store: store callback for sysfs attribute. +*/ +struct perf_obj_attribute { +struct attribute attr; +ssize_t (*show)(struct perf_object *pobj,char *buf); +ssize_t (*store)(struct perf_object *pobj, +const char *buf,size_t n); +}; + +#define to_perf_obj_attr (_attr) \ + container_of(_attr, struct perf_obj_attribute, attr) +#define to_perf_obj (_kobj) \ + container_of(_kobj, struct perf_object, kobj) + +#define __POBJ_ATTR (_name, _mode, _show, _store) { \ + .attr = {.name = __stringify(_name), \ + .mode = VERIFY_OCTAL_PERMISSIONS(_mode) }, \ + .show = _show, \
drivers/fpga/dfl-fme-perf.c line 184
Quoted 10 lines
drivers/fpga/dfl-fme-perf.c new file +10
-0+ .store = _store, \ +} + +#define PERF_OBJ_ATTR_F_RO (_name, _filename) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_filename, 0444, _name##_show, NULL) + +#define PERF_OBJ_ATTR_F_WO (_name, _filename) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_filename, 0200, NULL, _name##_store)
Please remove the macros that aren't actually used. I think that includes PERF_OBJ_ATTR_F_RO, PERF_OBJ_ATTR_F_WO, PERF_OBJ_ATTR_WO, and PERF_OBJ_ATTR_RW.
Quoted 825 lines
drivers/fpga/dfl-fme-perf.c new file +778
-0+ +#define PERF_OBJ_ATTR_F_RW (_name, _filename) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_filename, 0644, _name##_show, _name##_store) + +#define PERF_OBJ_ATTR_RO (_name) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_name, 0444, _name##_show, NULL) + +#define PERF_OBJ_ATTR_WO (_name) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_name, 0200, NULL, _name##_store) + +#define PERF_OBJ_ATTR_RW (_name) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_name, 0644, _name##_show, _name##_store) + +static ssize_t perf_obj_attr_show (struct kobject *kobj, +struct attribute *__attr,char *buf) +{ +struct perf_obj_attribute *attr =to_perf_obj_attr (__attr); +struct perf_object *pobj =to_perf_obj (kobj); +ssize_t ret = -EIO ; + +if (attr->show) + ret = attr->show (pobj, buf); +return ret; +} + +static ssize_t perf_obj_attr_store (struct kobject *kobj, +struct attribute *__attr, +const char *buf,size_t n) +{ +struct perf_obj_attribute *attr =to_perf_obj_attr (__attr); +struct perf_object *pobj =to_perf_obj (kobj); +ssize_t ret = -EIO ; + +if (attr->store) + ret = attr->store (pobj, buf, n); +return ret; +} + +static const struct sysfs_ops perf_obj_sysfs_ops = { + .show = perf_obj_attr_show, + .store = perf_obj_attr_store, +}; + +static void perf_obj_release (struct kobject *kobj) +{ +kfree (to_perf_obj (kobj)); +} + +static struct kobj_type perf_obj_ktype = { + .sysfs_ops = &perf_obj_sysfs_ops, + .release = perf_obj_release, +}; + +static struct perf_object * +create_perf_obj (struct dfl_feature *feature,struct kobject *parent,int id, +const struct attribute_group **groups,const char *name) +{ +struct perf_object *pobj; +int ret; + + pobj =kzalloc (sizeof (*pobj),GFP_KERNEL ); +if (!pobj) +return ERR_PTR (-ENOMEM ); + + pobj->id = id; + pobj->feature = feature; + pobj->attr_groups = groups; +INIT_LIST_HEAD (&pobj->node); +INIT_LIST_HEAD (&pobj->children); + +if (id !=PERF_OBJ_ROOT_ID ) + ret =kobject_init_and_add (&pobj->kobj, &perf_obj_ktype, + parent,"%s%d" , name, id); +else + ret =kobject_init_and_add (&pobj->kobj, &perf_obj_ktype, + parent,"%s" , name); +if (ret) + goto put_exit; + +if (pobj->attr_groups) { + ret =sysfs_create_groups (&pobj->kobj, pobj->attr_groups); +if (ret) + goto put_exit; + } + +return pobj; + +put_exit: +kobject_put (&pobj->kobj); +return ERR_PTR (ret); +} + +/* +* Counter Sysfs Interface for Clock. +*/ +static ssize_t clock_show (struct perf_object *pobj,char *buf) +{ +void __iomem *base = pobj->feature->ioaddr; + +return sprintf (buf,"0x%llx\n" , + (unsigned long long )readq (base +CLK_CNTR )); +} +static PERF_OBJ_ATTR_RO (clock); + +static struct attribute *clock_attrs[] = { + &perf_obj_attr_clock.attr, +NULL , +}; + +static struct attribute_group clock_attr_group = { + .attrs = clock_attrs, +}; + +static const struct attribute_group *perf_dev_attr_groups[] = { + &clock_attr_group, +NULL , +}; + +static void destroy_perf_obj (struct perf_object *pobj) +{ +struct perf_object *obj, *obj_tmp; + +if (pobj->attr_groups) +sysfs_remove_groups (&pobj->kobj, pobj->attr_groups); + +list_for_each_entry_safe (obj, obj_tmp, &pobj->children, node) +destroy_perf_obj (obj); + +list_del (&pobj->node); +kobject_put (&pobj->kobj); +} + +static struct perf_object *create_perf_dev (struct dfl_feature *feature) +{ +struct platform_device *pdev = feature->pdev; + +return create_perf_obj (feature, &pdev->dev.kobj,PERF_OBJ_ROOT_ID , + perf_dev_attr_groups,"perf" ); +} + +/* +* Counter Sysfs Interfaces for Cache. +*/ +static ssize_t cache_freeze_show (struct perf_object *pobj,char *buf) +{ +void __iomem *base = pobj->feature->ioaddr; +u64 v; + + v =readq (base +CACHE_CTRL ); + +return sprintf (buf,"%u\n" , + (unsigned int )FIELD_GET (CACHE_FREEZE_CNTR , v)); +} + +static ssize_t cache_freeze_store (struct perf_object *pobj, +const char *buf,size_t n) +{ +struct dfl_feature *feature = pobj->feature; +struct dfl_feature_platform_data *pdata; +void __iomem *base = feature->ioaddr; +bool state; +u64 v; + +if (strtobool (buf, &state)) +return -EINVAL ; + + pdata =dev_get_platdata (&feature->pdev->dev); + +mutex_lock (&pdata->lock); + v =readq (base +CACHE_CTRL ); + v &= ~CACHE_FREEZE_CNTR ; + v |=FIELD_PREP (CACHE_FREEZE_CNTR , state ?1 :0 ); +writeq (v, base +CACHE_CTRL ); +mutex_unlock (&pdata->lock); + +return n; +} +static PERF_OBJ_ATTR_F_RW(cache_freeze, freeze); + +static ssize_t read_cache_counter (struct perf_object *pobj,char *buf, +u8 channel,u8 event) +{ +struct dfl_feature *feature = pobj->feature; +struct dfl_feature_platform_data *pdata; +void __iomem *base = feature->ioaddr; +u64 v, count; + +WARN_ON_ONCE (event >CACHE_EVNT_MAX || channel >CACHE_CHANNEL_MAX ); + + pdata =dev_get_platdata (&feature->pdev->dev); + +mutex_lock (&pdata->lock); +/* set channel access type and cache event code. */ + v =readq (base +CACHE_CTRL ); + v &= ~(CACHE_CHANNEL_SEL |CACHE_CTRL_EVNT ); + v |=FIELD_PREP (CACHE_CHANNEL_SEL , channel); + v |=FIELD_PREP (CACHE_CTRL_EVNT , event); +writeq (v, base +CACHE_CTRL ); + +if (readq_poll_timeout (base +CACHE_CNTR0 , v, +FIELD_GET (CACHE_CNTR_EVNT , v) == event, +1 ,PERF_TIMEOUT )) { +dev_err (&feature->pdev->dev,"timeout, unmatched cache event type in counter registers.\n" ); +mutex_unlock (&pdata->lock); +return -ETIMEDOUT ; + } + + v =readq (base +CACHE_CNTR0 ); + count =FIELD_GET (CACHE_CNTR_EVNT_CNTR , v); + v =readq (base +CACHE_CNTR1 ); + count +=FIELD_GET (CACHE_CNTR_EVNT_CNTR , v); +mutex_unlock (&pdata->lock); + +return sprintf (buf,"0x%llx\n" , (unsigned long long )count); +} + +#define CACHE_SHOW (name, channel, event) \ +static ssize_t name##_show(struct perf_object *pobj, char *buf) \ +{ \ + return read_cache_counter(pobj, buf, channel, event); \ +} \ +static PERF_OBJ_ATTR_RO(name) + +CACHE_SHOW (read_hit,CACHE_CHANNEL_RD ,CACHE_EVNT_RD_HIT ); +CACHE_SHOW (read_miss,CACHE_CHANNEL_RD ,CACHE_EVNT_RD_MISS ); +CACHE_SHOW (write_hit,CACHE_CHANNEL_WR ,CACHE_EVNT_WR_HIT ); +CACHE_SHOW (write_miss,CACHE_CHANNEL_WR ,CACHE_EVNT_WR_MISS ); +CACHE_SHOW (hold_request,CACHE_CHANNEL_RD ,CACHE_EVNT_HOLD_REQ ); +CACHE_SHOW (tx_req_stall,CACHE_CHANNEL_RD ,CACHE_EVNT_TX_REQ_STALL ); +CACHE_SHOW (rx_req_stall,CACHE_CHANNEL_RD ,CACHE_EVNT_RX_REQ_STALL ); +CACHE_SHOW (rx_eviction,CACHE_CHANNEL_RD ,CACHE_EVNT_EVICTIONS ); +CACHE_SHOW (data_write_port_contention,CACHE_CHANNEL_WR , +CACHE_EVNT_DATA_WR_PORT_CONTEN ); +CACHE_SHOW (tag_write_port_contention,CACHE_CHANNEL_WR , +CACHE_EVNT_TAG_WR_PORT_CONTEN ); + +static struct attribute *cache_attrs[] = { + &perf_obj_attr_read_hit.attr, + &perf_obj_attr_read_miss.attr, + &perf_obj_attr_write_hit.attr, + &perf_obj_attr_write_miss.attr, + &perf_obj_attr_hold_request.attr, + &perf_obj_attr_data_write_port_contention.attr, + &perf_obj_attr_tag_write_port_contention.attr, + &perf_obj_attr_tx_req_stall.attr, + &perf_obj_attr_rx_req_stall.attr, + &perf_obj_attr_rx_eviction.attr, + &perf_obj_attr_cache_freeze.attr, +NULL , +}; + +static struct attribute_group cache_attr_group = { + .attrs = cache_attrs, +}; + +static const struct attribute_group *cache_attr_groups[] = { + &cache_attr_group, +NULL , +}; + +static int create_perf_cache_obj (struct perf_object *perf_dev) +{ +struct perf_object *pobj; + + pobj =create_perf_obj (perf_dev->feature, &perf_dev->kobj, +PERF_OBJ_ROOT_ID , cache_attr_groups,"cache" ); +if (IS_ERR (pobj)) +return PTR_ERR (pobj); + +list_add (&pobj->node, &perf_dev->children); + +return 0 ; +} + +/* +* Counter Sysfs Interfaces for VT-D / IOMMU. +*/ +static ssize_t vtd_freeze_show (struct perf_object *pobj,char *buf) +{ +void __iomem *base = pobj->feature->ioaddr; +u64 v; + + v =readq (base +VTD_CTRL ); + +return sprintf (buf,"%u\n" , + (unsigned int )FIELD_GET (VTD_FREEZE_CNTR , v)); +} + +static ssize_t vtd_freeze_store (struct perf_object *pobj, +const char *buf,size_t n) +{ +struct dfl_feature *feature = pobj->feature; +struct dfl_feature_platform_data *pdata; +void __iomem *base = feature->ioaddr; +bool state; +u64 v; + +if (strtobool (buf, &state)) +return -EINVAL ; + + pdata =dev_get_platdata (&feature->pdev->dev); + +mutex_lock (&pdata->lock); + v =readq (base +VTD_CTRL ); + v &= ~VTD_FREEZE_CNTR ; + v |=FIELD_PREP (VTD_FREEZE_CNTR , state ?1 :0 ); +writeq (v, base +VTD_CTRL ); +mutex_unlock (&pdata->lock); + +return n; +} +static PERF_OBJ_ATTR_F_RW(vtd_freeze, freeze); + +static struct attribute *iommu_top_attrs[] = { + &perf_obj_attr_vtd_freeze.attr, +NULL , +}; + +static struct attribute_group iommu_top_attr_group = { + .attrs = iommu_top_attrs, +}; + +static ssize_t read_iommu_sip_counter (struct perf_object *pobj, +u8 event,char *buf) +{ +struct dfl_feature *feature = pobj->feature; +struct dfl_feature_platform_data *pdata; +void __iomem *base = feature->ioaddr; +u64 v, count; + +WARN_ON_ONCE (event >VTD_SIP_EVNT_MAX ); + + pdata =dev_get_platdata (&feature->pdev->dev); + +mutex_lock (&pdata->lock); + v =readq (base +VTD_SIP_CTRL ); + v &= ~VTD_SIP_CTRL_EVNT ; + v |=FIELD_PREP (VTD_SIP_CTRL_EVNT , event); +writeq (v, base +VTD_SIP_CTRL ); + +if (readq_poll_timeout (base +VTD_SIP_CNTR , v, +FIELD_GET (VTD_SIP_CNTR_EVNT , v) == event, +1 ,PERF_TIMEOUT )) { +dev_err (&feature->pdev->dev,"timeout, unmatched VTd SIP event type in counter registers\n" ); +mutex_unlock (&pdata->lock); +return -ETIMEDOUT ; + } + + v =readq (base +VTD_SIP_CNTR ); + count =FIELD_GET (VTD_SIP_CNTR_EVNT_CNTR , v); +mutex_unlock (&pdata->lock); + +return sprintf (buf,"0x%llx\n" , (unsigned long long )count); +} + +#define VTD_SIP_SHOW (name, event) \ +static ssize_t name##_show(struct perf_object *pobj, char *buf) \ +{ \ + return read_iommu_sip_counter(pobj, event, buf); \ +} \ +static PERF_OBJ_ATTR_RO(name) + +VTD_SIP_SHOW (iotlb_4k_hit,VTD_SIP_EVNT_IOTLB_4K_HIT ); +VTD_SIP_SHOW (iotlb_2m_hit,VTD_SIP_EVNT_IOTLB_2M_HIT ); +VTD_SIP_SHOW (iotlb_1g_hit,VTD_SIP_EVNT_IOTLB_1G_HIT ); +VTD_SIP_SHOW (slpwc_l3_hit,VTD_SIP_EVNT_SLPWC_L3_HIT ); +VTD_SIP_SHOW (slpwc_l4_hit,VTD_SIP_EVNT_SLPWC_L4_HIT ); +VTD_SIP_SHOW (rcc_hit,VTD_SIP_EVNT_RCC_HIT ); +VTD_SIP_SHOW (iotlb_4k_miss,VTD_SIP_EVNT_IOTLB_4K_MISS ); +VTD_SIP_SHOW (iotlb_2m_miss,VTD_SIP_EVNT_IOTLB_2M_MISS ); +VTD_SIP_SHOW (iotlb_1g_miss,VTD_SIP_EVNT_IOTLB_1G_MISS ); +VTD_SIP_SHOW (slpwc_l3_miss,VTD_SIP_EVNT_SLPWC_L3_MISS ); +VTD_SIP_SHOW (slpwc_l4_miss,VTD_SIP_EVNT_SLPWC_L4_MISS ); +VTD_SIP_SHOW (rcc_miss,VTD_SIP_EVNT_RCC_MISS ); + +static struct attribute *iommu_sip_attrs[] = { + &perf_obj_attr_iotlb_4k_hit.attr, + &perf_obj_attr_iotlb_2m_hit.attr, + &perf_obj_attr_iotlb_1g_hit.attr, + &perf_obj_attr_slpwc_l3_hit.attr, + &perf_obj_attr_slpwc_l4_hit.attr, + &perf_obj_attr_rcc_hit.attr, + &perf_obj_attr_iotlb_4k_miss.attr, + &perf_obj_attr_iotlb_2m_miss.attr, + &perf_obj_attr_iotlb_1g_miss.attr, + &perf_obj_attr_slpwc_l3_miss.attr, + &perf_obj_attr_slpwc_l4_miss.attr, + &perf_obj_attr_rcc_miss.attr, +NULL , +}; + +static struct attribute_group iommu_sip_attr_group = { + .attrs = iommu_sip_attrs, +}; + +static const struct attribute_group *iommu_top_attr_groups[] = { + &iommu_top_attr_group, + &iommu_sip_attr_group, +NULL , +}; + +static ssize_t read_iommu_counter (struct perf_object *pobj,u8 event,char *buf) +{ +struct dfl_feature *feature = pobj->feature; +struct dfl_feature_platform_data *pdata; +void __iomem *base = feature->ioaddr; +u64 v, count; + +WARN_ON_ONCE (event >VTD_EVNT_MAX ); + + event += pobj->id; + pdata =dev_get_platdata (&feature->pdev->dev); + +mutex_lock (&pdata->lock); + v =readq (base +VTD_CTRL ); + v &= ~VTD_CTRL_EVNT ; + v |=FIELD_PREP (VTD_CTRL_EVNT , event); +writeq (v, base +VTD_CTRL ); + +if (readq_poll_timeout (base +VTD_CNTR , v, +FIELD_GET (VTD_CNTR_EVNT , v) == event,1 , +PERF_TIMEOUT )) { +dev_err (&feature->pdev->dev,"timeout, unmatched VTd event type in counter registers\n" ); +mutex_unlock (&pdata->lock); +return -ETIMEDOUT ; + } + + v =readq (base +VTD_CNTR ); + count =FIELD_GET (VTD_CNTR_EVNT_CNTR , v); +mutex_unlock (&pdata->lock); + +return sprintf (buf,"0x%llx\n" , (unsigned long long )count); +} + +#define VTD_SHOW (name, base_event) \ +static ssize_t name##_show(struct perf_object *pobj, char *buf) \ +{ \ + return read_iommu_counter(pobj, base_event, buf); \ +} \ +static PERF_OBJ_ATTR_RO(name) + +VTD_SHOW (read_transaction,VTD_EVNT_AFU_MEM_RD_TRANS ); +VTD_SHOW (write_transaction,VTD_EVNT_AFU_MEM_WR_TRANS ); +VTD_SHOW (devtlb_read_hit,VTD_EVNT_AFU_DEVTLB_RD_HIT ); +VTD_SHOW (devtlb_write_hit,VTD_EVNT_AFU_DEVTLB_WR_HIT ); +VTD_SHOW (devtlb_4k_fill,VTD_EVNT_DEVTLB_4K_FILL ); +VTD_SHOW (devtlb_2m_fill,VTD_EVNT_DEVTLB_2M_FILL ); +VTD_SHOW (devtlb_1g_fill,VTD_EVNT_DEVTLB_1G_FILL ); + +static struct attribute *iommu_attrs[] = { + &perf_obj_attr_read_transaction.attr, + &perf_obj_attr_write_transaction.attr, + &perf_obj_attr_devtlb_read_hit.attr, + &perf_obj_attr_devtlb_write_hit.attr, + &perf_obj_attr_devtlb_4k_fill.attr, + &perf_obj_attr_devtlb_2m_fill.attr, + &perf_obj_attr_devtlb_1g_fill.attr, +NULL , +}; + +static struct attribute_group iommu_attr_group = { + .attrs = iommu_attrs, +}; + +static const struct attribute_group *iommu_attr_groups[] = { + &iommu_attr_group, +NULL , +}; + +#define PERF_MAX_PORT_NUM 1 + +static int create_perf_iommu_obj (struct perf_object *perf_dev) +{ +struct dfl_feature *feature = perf_dev->feature; +struct device *dev = &feature->pdev->dev; +struct perf_object *pobj, *obj; +void __iomem *base; +u64 v; +int i; + +/* check if iommu is not supported on this device. */ + base =dfl_get_feature_ioaddr_by_id (dev,FME_FEATURE_ID_HEADER ); + v =readq (base +FME_HDR_CAP ); +if (!FIELD_GET (FME_CAP_IOMMU_AVL , v)) +return 0 ; + + pobj =create_perf_obj (feature, &perf_dev->kobj,PERF_OBJ_ROOT_ID , + iommu_top_attr_groups,"iommu" ); +if (IS_ERR (pobj)) +return PTR_ERR (pobj); + +list_add (&pobj->node, &perf_dev->children); + +for (i =0 ; i <PERF_MAX_PORT_NUM ; i++) { + obj =create_perf_obj (feature, &pobj->kobj, i, + iommu_attr_groups,"afu" ); +if (IS_ERR (obj)) +return PTR_ERR (obj); + +list_add (&obj->node, &pobj->children); + } + +return 0 ; +} + +/* +* Counter Sysfs Interfaces for Fabric +*/ +static bool fabric_pobj_is_enabled (struct perf_object *pobj) +{ +struct dfl_feature *feature = pobj->feature; +void __iomem *base = feature->ioaddr; +u64 v; + + v =readq (base +FAB_CTRL ); + +if (FIELD_GET (FAB_PORT_FILTER , v) ==FAB_PORT_FILTER_DISABLE ) +return pobj->id ==PERF_OBJ_ROOT_ID ; + +return pobj->id ==FIELD_GET (FAB_PORT_ID , v); +} + +static ssize_t read_fabric_counter (struct perf_object *pobj, +u8 event,char *buf) +{ +struct dfl_feature *feature = pobj->feature; +struct dfl_feature_platform_data *pdata; +void __iomem *base = feature->ioaddr; +u64 v, count =0 ; + +WARN_ON_ONCE (event >FAB_EVNT_MAX ); + + pdata =dev_get_platdata (&feature->pdev->dev); + +mutex_lock (&pdata->lock); +/* if it is disabled, force the counter to return zero. */ +if (!fabric_pobj_is_enabled (pobj)) + goto exit; + + v =readq (base +FAB_CTRL ); + v &= ~FAB_CTRL_EVNT ; + v |=FIELD_PREP (FAB_CTRL_EVNT , event); +writeq (v, base +FAB_CTRL ); + +if (readq_poll_timeout (base +FAB_CNTR , v, +FIELD_GET (FAB_CNTR_EVNT , v) == event, +1 ,PERF_TIMEOUT )) { +dev_err (&feature->pdev->dev,"timeout, unmatched fab event type in counter registers.\n" ); +mutex_unlock (&pdata->lock); +return -ETIMEDOUT ; + } + + v =readq (base +FAB_CNTR ); + count =FIELD_GET (FAB_CNTR_EVNT_CNTR , v); +exit: +mutex_unlock (&pdata->lock); + +return sprintf (buf,"0x%llx\n" , (unsigned long long )count); +} + +#define FAB_SHOW (name, event) \ +static ssize_t name##_show(struct perf_object *pobj, char *buf) \ +{ \ + return read_fabric_counter(pobj, event, buf); \ +} \ +static PERF_OBJ_ATTR_RO(name) + +FAB_SHOW (pcie0_read,FAB_EVNT_PCIE0_RD ); +FAB_SHOW (pcie0_write,FAB_EVNT_PCIE0_WR ); +FAB_SHOW (pcie1_read,FAB_EVNT_PCIE1_RD ); +FAB_SHOW (pcie1_write,FAB_EVNT_PCIE1_WR ); +FAB_SHOW (upi_read,FAB_EVNT_UPI_RD ); +FAB_SHOW (upi_write,FAB_EVNT_UPI_WR ); +FAB_SHOW (mmio_read,FAB_EVNT_MMIO_RD ); +FAB_SHOW (mmio_write,FAB_EVNT_MMIO_WR ); + +static ssize_t fab_enable_show (struct perf_object *pobj,char *buf) +{ +return sprintf (buf,"%u\n" , + (unsigned int )!!fabric_pobj_is_enabled (pobj)); +} + +/* +* If enable one port or all port event counter in fabric, other +* fabric event counter originally enabled will be disable automatically. +*/ +static ssize_t fab_enable_store (struct perf_object *pobj, +const char *buf,size_t n) +{ +struct dfl_feature *feature = pobj->feature; +struct dfl_feature_platform_data *pdata; +void __iomem *base = feature->ioaddr; +bool state; +u64 v; + +if (strtobool (buf, &state) || !state) +return -EINVAL ; + + pdata =dev_get_platdata (&feature->pdev->dev); + +/* if it is already enabled. */ +if (fabric_pobj_is_enabled (pobj)) +return n; + +mutex_lock (&pdata->lock); + v =readq (base +FAB_CTRL ); + v &= ~(FAB_PORT_FILTER |FAB_PORT_ID ); + +if (pobj->id ==PERF_OBJ_ROOT_ID ) { + v |=FIELD_PREP (FAB_PORT_FILTER ,FAB_PORT_FILTER_DISABLE ); + }else { + v |=FIELD_PREP (FAB_PORT_FILTER ,FAB_PORT_FILTER_ENABLE ); + v |=FIELD_PREP (FAB_PORT_ID , pobj->id); + } +writeq (v, base +FAB_CTRL ); +mutex_unlock (&pdata->lock); + +return n; +} +static PERF_OBJ_ATTR_F_RW(fab_enable, enable); + +static struct attribute *fabric_attrs[] = { + &perf_obj_attr_pcie0_read.attr, + &perf_obj_attr_pcie0_write.attr, + &perf_obj_attr_pcie1_read.attr, + &perf_obj_attr_pcie1_write.attr, + &perf_obj_attr_upi_read.attr, + &perf_obj_attr_upi_write.attr, + &perf_obj_attr_mmio_read.attr, + &perf_obj_attr_mmio_write.attr, + &perf_obj_attr_fab_enable.attr, +NULL , +}; + +static struct attribute_group fabric_attr_group = { + .attrs = fabric_attrs, +}; + +static const struct attribute_group *fabric_attr_groups[] = { + &fabric_attr_group, +NULL , +}; + +static ssize_t fab_freeze_show (struct perf_object *pobj,char *buf) +{ +void __iomem *base = pobj->feature->ioaddr; +u64 v; + + v =readq (base +FAB_CTRL ); + +return sprintf (buf,"%u\n" , + (unsigned int )FIELD_GET (FAB_FREEZE_CNTR , v)); +} + +static ssize_t fab_freeze_store (struct perf_object *pobj, +const char *buf,size_t n) +{ +struct dfl_feature *feature = pobj->feature; +struct dfl_feature_platform_data *pdata; +void __iomem *base = feature->ioaddr; +bool state; +u64 v; + +if (strtobool (buf, &state)) +return -EINVAL ; + + pdata =dev_get_platdata (&feature->pdev->dev); + +mutex_lock (&pdata->lock); + v =readq (base +FAB_CTRL ); + v &= ~FAB_FREEZE_CNTR ; + v |=FIELD_PREP (FAB_FREEZE_CNTR , state ?1 :0 ); +writeq (v, base +FAB_CTRL ); +mutex_unlock (&pdata->lock); + +return n; +} +static PERF_OBJ_ATTR_F_RW(fab_freeze, freeze); + +static struct attribute *fabric_top_attrs[] = { + &perf_obj_attr_fab_freeze.attr, +NULL , +}; + +static struct attribute_group fabric_top_attr_group = { + .attrs = fabric_top_attrs, +}; + +static const struct attribute_group *fabric_top_attr_groups[] = { + &fabric_attr_group, + &fabric_top_attr_group, +NULL , +}; + +static int create_perf_fabric_obj (struct perf_object *perf_dev) +{ +struct perf_object *pobj, *obj; +int i; + + pobj =create_perf_obj (perf_dev->feature, &perf_dev->kobj, +PERF_OBJ_ROOT_ID , fabric_top_attr_groups, +"fabric" ); +if (IS_ERR (pobj)) +return PTR_ERR (pobj); + +list_add (&pobj->node, &perf_dev->children); + +for (i =0 ; i <PERF_MAX_PORT_NUM ; i++) { + obj =create_perf_obj (perf_dev->feature, &pobj->kobj, i, + fabric_attr_groups,"port" ); +if (IS_ERR (obj)) +return PTR_ERR (obj); + +list_add (&obj->node, &pobj->children); + } + +return 0 ; +} + +static int fme_perf_init (struct platform_device *pdev, +struct dfl_feature *feature) +{ +struct perf_object *perf_dev; +int ret; + + perf_dev =create_perf_dev (feature); +if (IS_ERR (perf_dev)) +return PTR_ERR (perf_dev); + + ret =create_perf_fabric_obj (perf_dev); +if (ret) + goto done; + +if (feature->id ==FME_FEATURE_ID_GLOBAL_IPERF ) { +/* +* Cache and IOMMU(VT-D) performance counters are not supported +* on discreted solutions e.g. Intel Programmable Acceleration +* Card based on PCIe. +*/ + ret =create_perf_cache_obj (perf_dev); +if (ret) + goto done; + + ret =create_perf_iommu_obj (perf_dev); +if (ret) + goto done; + } + + feature->priv = perf_dev; +return 0 ; + +done: +destroy_perf_obj (perf_dev); +return ret; +} + +static void fme_perf_uinit (struct platform_device *pdev, +struct dfl_feature *feature) +{ +struct perf_object *perf_dev = feature->priv; + +destroy_perf_obj (perf_dev); +} + +const struct dfl_feature_id fme_perf_id_table[] = { + {.id =FME_FEATURE_ID_GLOBAL_IPERF ,}, + {.id =FME_FEATURE_ID_GLOBAL_DPERF ,}, + {0 ,} +}; + +const struct dfl_feature_ops fme_perf_ops = { + .init = fme_perf_init, + .uinit = fme_perf_uinit, +};drivers/fpga/dfl-fme.h +2
-0@@ -39,5 +39,7 @@ struct dfl_fme {extern const struct dfl_feature_id fme_pr_mgmt_id_table[];extern const struct dfl_feature_ops fme_global_err_ops;extern const struct dfl_feature_id fme_global_err_id_table[]; +extern const struct dfl_feature_ops fme_perf_ops; +extern const struct dfl_feature_id fme_perf_id_table[];#endif /* __DFL_FME_H */ drivers/fpga/dfl.c +1
-0@@ -521,6 +521,7 @@ static int build_info_commit_dev(struct build_feature_devs_info *binfo)struct dfl_feature *feature = &pdata->features[index];/* save resource information for each feature */ + feature->pdev = fdev; feature->id = finfo->fid; feature->resource_index = index; feature->ioaddr = finfo->ioaddr;drivers/fpga/dfl.h +2
-1@@ -191,6 +191,7 @@ struct dfl_feature_driver {/** * struct dfl_feature - sub feature of the feature devices * +* @pdev: parent platform device. * @id: sub feature id. * @resource_index: each sub feature has one mmio resource for its registers. * this index is used to find its mmio resource from the @@ -200,6 +201,7 @@ struct dfl_feature_driver {* @priv: priv data of this feature. */ struct dfl_feature { +struct platform_device *pdev;u64 id;int resource_index;void __iomem *ioaddr; --1.8.3.1
Re: [PATCH v3 16/16] fpga: dfl: fme: add performance reporting support
Quoted 5 lines · Alan Tull
On Mon, May 27, 2019 at 12:39 AM Wu Hao <[email protected]> wrote:
Hi Hao,
Just one correction that I saw below, sorry I didn't catch it last time.
Hi Alan
Thanks for the review. I will remove the code below which is not used.
Hao
Quoted 1,183 lines
Quoted 11 lines
This patch adds support for performance reporting private feature for FPGA Management Engine (FME). Actually it supports 4 categories performance counters, 'clock', 'cache', 'iommu' and 'fabric', user could read the performance counter via exposed sysfs interfaces. Please refer to sysfs doc for more details.
Signed-off-by Luwei Kang <[email protected]>Signed-off-by Xu Yilun <[email protected]>Signed-off-by Wu Hao <[email protected]>Acked-by Alan Tull <[email protected]>Quoted 329 lines
---
v3: replace scnprintf with sprintf in sysfs interfaces.
update sysfs doc kernel version and date.
fix sysfs doc issue for fabric counter.
refine PERF_OBJ_ATTR_* macro, doesn't count on__ATTRanymore. introduce PERF_OBJ_ATTR_F_* macro, as it needs to use different filenames for some of the sysfs attributes.
removekobject_delwhen destroy kobject,kobject_putis enough. dosysfs_remove_groupsfirst when destroyingperf_obj.WARN_ON_ONCEin case internal parms are wrong in read_*_count().--- Documentation/ABI/testing/sysfs-platform-dfl-fme | 93 +++ drivers/fpga/Makefile | 1 + drivers/fpga/dfl-fme-main.c | 4 + drivers/fpga/dfl-fme-perf.c | 962 +++++++++++++++++++++++ drivers/fpga/dfl-fme.h | 2 + drivers/fpga/dfl.c | 1 + drivers/fpga/dfl.h | 2 + 7 files changed, 1065 insertions(+) create mode 100644 drivers/fpga/dfl-fme-perf.cDocumentation/ABI/testing/sysfs-platform-dfl-fme +93
-0@@ -119,3 +119,96 @@ Description: Write-only. Write error code to this file to clear all errors logged in errors, first_error and next_error. Write fails with -EINVAL if input parsing fails or input error code doesn't match. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/clock +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Only. Read for Accelerator Function Unit (AFU) clock + counter. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/cache/freeze +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Write. Read this file for the current status of 'cache' + category performance counters, and Write '1' or '0' to freeze + or unfreeze 'cache' performance counters. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/cache/<counter> +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Only. Read 'cache' category performance counters: + read_hit, read_miss, write_hit, write_miss, hold_request, + data_write_port_contention, tag_write_port_contention, + tx_req_stall, rx_req_stall and rx_eviction. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/iommu/freeze +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Write. Read this file for the current status of 'iommu' + category performance counters, and Write '1' or '0' to freeze + or unfreeze 'iommu' performance counters. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/iommu/<sip_counter> +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Only. Read 'iommu' category 'sip' sub category + performance counters: iotlb_4k_hit, iotlb_2m_hit, + iotlb_1g_hit, slpwc_l3_hit, slpwc_l4_hit, rcc_hit, + rcc_miss, iotlb_4k_miss, iotlb_2m_miss, iotlb_1g_miss, + slpwc_l3_miss and slpwc_l4_miss. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/iommu/afu0/<counter> +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Only. Read 'iommu' category 'afuX' sub category + performance counters: read_transaction, write_transaction, + devtlb_read_hit, devtlb_write_hit, devtlb_4k_fill, + devtlb_2m_fill and devtlb_1g_fill. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/fabric/freeze +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Write. Read this file for the current status of 'fabric' + category performance counters, and Write '1' or '0' to freeze + or unfreeze 'fabric' performance counters. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/fabric/<counter> +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Only. Read 'fabric' category performance counters: + pcie0_read, pcie0_write, pcie1_read, pcie1_write, + upi_read, upi_write, mmio_read and mmio_write. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/fabric/enable +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Write. Read this file for current status of device level + fabric counters. Write "1" to enable device level fabric + counters. Once device level fabric counters are enabled, port + level fabric counters will be disabled automatically. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/fabric/port0/<counter> +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Only. Read 'fabric' category "portX" sub category + performance counters: pcie0_read, pcie0_write, pcie1_read, + pcie1_write, upi_read, upi_write and mmio_read. + +What: /sys/bus/platform/devices/dfl-fme.0/perf/fabric/port0/enable +Date: May 2019 +KernelVersion: 5.3 +Contact: Wu Hao <[email protected]> +Description: Read-Write. Read this file for current status of port level + fabric counters. Write "1" to enable port level fabric counters. + Once port level fabric counters are enabled, device level fabric + counters will be disabled automatically.drivers/fpga/Makefile +1
-0@@ -40,6 +40,7 @@ obj-$(CONFIG_FPGA_DFL_FME_REGION) += dfl-fme-region.o obj-$(CONFIG_FPGA_DFL_AFU) += dfl-afu.o dfl-fme-objs := dfl-fme-main.o dfl-fme-pr.o dfl-fme-error.o +dfl-fme-objs += dfl-fme-perf.o dfl-afu-objs := dfl-afu-main.o dfl-afu-region.o dfl-afu-dma-region.o dfl-afu-objs += dfl-afu-error.odrivers/fpga/dfl-fme-main.c +4
-0@@ -231,6 +231,10 @@ static long fme_hdr_ioctl(struct platform_device *pdev, .ops = &fme_global_err_ops, }, { + .id_table = fme_perf_id_table, + .ops = &fme_perf_ops, + }, + { .ops = NULL, }, };drivers/fpga/dfl-fme-perf.c new file +174
-0@@ -0,0 +1,962 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Driver for FPGA Management Engine (FME) Global Performance Reporting +* +* Copyright 2019 Intel Corporation, Inc. +* +* Authors: +* Kang Luwei <[email protected]> +* Xiao Guangrong <[email protected]> +* Wu Hao <[email protected]> +* Joseph Grecco <[email protected]> +* Enno Luebbers <[email protected]> +* Tim Whisonant <[email protected]> +* Ananda Ravuri <[email protected]> +* Mitchel, Henry <[email protected]> +*/ + +#include "dfl.h" +#include "dfl-fme.h" + +/* +* Performance Counter Registers for Cache. +* +* Cache Events are listed below as CACHE_EVNT_*. +*/ +#define CACHE_CTRL 0x8 +#define CACHE_RESET_CNTR BIT_ULL(0) +#define CACHE_FREEZE_CNTR BIT_ULL(8) +#define CACHE_CTRL_EVNT GENMASK_ULL(19, 16) +#define CACHE_EVNT_RD_HIT 0x0 +#define CACHE_EVNT_WR_HIT 0x1 +#define CACHE_EVNT_RD_MISS 0x2 +#define CACHE_EVNT_WR_MISS 0x3 +#define CACHE_EVNT_RSVD 0x4 +#define CACHE_EVNT_HOLD_REQ 0x5 +#define CACHE_EVNT_DATA_WR_PORT_CONTEN 0x6 +#define CACHE_EVNT_TAG_WR_PORT_CONTEN 0x7 +#define CACHE_EVNT_TX_REQ_STALL 0x8 +#define CACHE_EVNT_RX_REQ_STALL 0x9 +#define CACHE_EVNT_EVICTIONS 0xa +#define CACHE_EVNT_MAX CACHE_EVNT_EVICTIONS +#define CACHE_CHANNEL_SEL BIT_ULL(20) +#define CACHE_CHANNEL_RD 0 +#define CACHE_CHANNEL_WR 1 +#define CACHE_CHANNEL_MAX 2 +#define CACHE_CNTR0 0x10 +#define CACHE_CNTR1 0x18 +#define CACHE_CNTR_EVNT_CNTR GENMASK_ULL(47, 0) +#define CACHE_CNTR_EVNT GENMASK_ULL(63, 60) + +/* +* Performance Counter Registers for Fabric. +* +* Fabric Events are listed below as FAB_EVNT_* +*/ +#define FAB_CTRL 0x20 +#define FAB_RESET_CNTR BIT_ULL(0) +#define FAB_FREEZE_CNTR BIT_ULL(8) +#define FAB_CTRL_EVNT GENMASK_ULL(19, 16) +#define FAB_EVNT_PCIE0_RD 0x0 +#define FAB_EVNT_PCIE0_WR 0x1 +#define FAB_EVNT_PCIE1_RD 0x2 +#define FAB_EVNT_PCIE1_WR 0x3 +#define FAB_EVNT_UPI_RD 0x4 +#define FAB_EVNT_UPI_WR 0x5 +#define FAB_EVNT_MMIO_RD 0x6 +#define FAB_EVNT_MMIO_WR 0x7 +#define FAB_EVNT_MAX FAB_EVNT_MMIO_WR +#define FAB_PORT_ID GENMASK_ULL(21, 20) +#define FAB_PORT_FILTER BIT_ULL(23) +#define FAB_PORT_FILTER_DISABLE 0 +#define FAB_PORT_FILTER_ENABLE 1 +#define FAB_CNTR 0x28 +#define FAB_CNTR_EVNT_CNTR GENMASK_ULL(59, 0) +#define FAB_CNTR_EVNT GENMASK_ULL(63, 60) + +/* +* Performance Counter Registers for Clock. +* +* Clock Counter can't be reset or frozen by SW. +*/ +#define CLK_CNTR 0x30 + +/* +* Performance Counter Registers for IOMMU / VT-D. +* +* VT-D Events are listed below as VTD_EVNT_* and VTD_SIP_EVNT_* +*/ +#define VTD_CTRL 0x38 +#define VTD_RESET_CNTR BIT_ULL(0) +#define VTD_FREEZE_CNTR BIT_ULL(8) +#define VTD_CTRL_EVNT GENMASK_ULL(19, 16) +#define VTD_EVNT_AFU_MEM_RD_TRANS 0x0 +#define VTD_EVNT_AFU_MEM_WR_TRANS 0x1 +#define VTD_EVNT_AFU_DEVTLB_RD_HIT 0x2 +#define VTD_EVNT_AFU_DEVTLB_WR_HIT 0x3 +#define VTD_EVNT_DEVTLB_4K_FILL 0x4 +#define VTD_EVNT_DEVTLB_2M_FILL 0x5 +#define VTD_EVNT_DEVTLB_1G_FILL 0x6 +#define VTD_EVNT_MAX VTD_EVNT_DEVTLB_1G_FILL +#define VTD_CNTR 0x40 +#define VTD_CNTR_EVNT GENMASK_ULL(63, 60) +#define VTD_CNTR_EVNT_CNTR GENMASK_ULL(47, 0) +#define VTD_SIP_CTRL 0x48 +#define VTD_SIP_RESET_CNTR BIT_ULL(0) +#define VTD_SIP_FREEZE_CNTR BIT_ULL(8) +#define VTD_SIP_CTRL_EVNT GENMASK_ULL(19, 16) +#define VTD_SIP_EVNT_IOTLB_4K_HIT 0x0 +#define VTD_SIP_EVNT_IOTLB_2M_HIT 0x1 +#define VTD_SIP_EVNT_IOTLB_1G_HIT 0x2 +#define VTD_SIP_EVNT_SLPWC_L3_HIT 0x3 +#define VTD_SIP_EVNT_SLPWC_L4_HIT 0x4 +#define VTD_SIP_EVNT_RCC_HIT 0x5 +#define VTD_SIP_EVNT_IOTLB_4K_MISS 0x6 +#define VTD_SIP_EVNT_IOTLB_2M_MISS 0x7 +#define VTD_SIP_EVNT_IOTLB_1G_MISS 0x8 +#define VTD_SIP_EVNT_SLPWC_L3_MISS 0x9 +#define VTD_SIP_EVNT_SLPWC_L4_MISS 0xa +#define VTD_SIP_EVNT_RCC_MISS 0xb +#define VTD_SIP_EVNT_MAX VTD_SIP_EVNT_RCC_MISS +#define VTD_SIP_CNTR 0X50 +#define VTD_SIP_CNTR_EVNT GENMASK_ULL(63, 60) +#define VTD_SIP_CNTR_EVNT_CNTR GENMASK_ULL(47, 0) + +#define PERF_OBJ_ROOT_ID (~0) + +#define PERF_TIMEOUT 30 + +/** +* struct perf_object - object of performance counter +* +* @id: instance id. PERF_OBJ_ROOT_ID indicates it is a parent object which +* counts performance counters for all instances. +* @attr_groups: the sysfs files are associated with this object. +* @feature: pointer to related private feature. +* @node: used to link itself to parent's children list. +* @children: used to link its children objects together. +* @kobj: generic kobject interface. +* +* 'node' and 'children' are used to construct parent-children hierarchy. +*/ +struct perf_object { +int id; +const struct attribute_group **attr_groups; +struct dfl_feature *feature; + +struct list_head node; +struct list_head children; +struct kobject kobj; +}; + +/** +* struct perf_obj_attribute - attribute of perf object +* +* @attr: attribute of this perf object. +* @show: show callback for sysfs attribute. +* @store: store callback for sysfs attribute. +*/ +struct perf_obj_attribute { +struct attribute attr; +ssize_t (*show)(struct perf_object *pobj,char *buf); +ssize_t (*store)(struct perf_object *pobj, +const char *buf,size_t n); +}; + +#define to_perf_obj_attr (_attr) \ + container_of(_attr, struct perf_obj_attribute, attr) +#define to_perf_obj (_kobj) \ + container_of(_kobj, struct perf_object, kobj) + +#define __POBJ_ATTR (_name, _mode, _show, _store) { \ + .attr = {.name = __stringify(_name), \ + .mode = VERIFY_OCTAL_PERMISSIONS(_mode) }, \ + .show = _show, \drivers/fpga/dfl-fme-perf.c line 184
Quoted 10 lines
drivers/fpga/dfl-fme-perf.c new file +10
-0+ .store = _store, \ +} + +#define PERF_OBJ_ATTR_F_RO (_name, _filename) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_filename, 0444, _name##_show, NULL) + +#define PERF_OBJ_ATTR_F_WO (_name, _filename) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_filename, 0200, NULL, _name##_store)Please remove the macros that aren't actually used. I think that includes
PERF_OBJ_ATTR_F_RO,PERF_OBJ_ATTR_F_WO,PERF_OBJ_ATTR_WO, andPERF_OBJ_ATTR_RW.Quoted 825 lines
drivers/fpga/dfl-fme-perf.c new file +778
-0+ +#define PERF_OBJ_ATTR_F_RW (_name, _filename) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_filename, 0644, _name##_show, _name##_store) + +#define PERF_OBJ_ATTR_RO (_name) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_name, 0444, _name##_show, NULL) + +#define PERF_OBJ_ATTR_WO (_name) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_name, 0200, NULL, _name##_store) + +#define PERF_OBJ_ATTR_RW (_name) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_name, 0644, _name##_show, _name##_store) + +static ssize_t perf_obj_attr_show (struct kobject *kobj, +struct attribute *__attr,char *buf) +{ +struct perf_obj_attribute *attr =to_perf_obj_attr (__attr); +struct perf_object *pobj =to_perf_obj (kobj); +ssize_t ret = -EIO ; + +if (attr->show) + ret = attr->show (pobj, buf); +return ret; +} + +static ssize_t perf_obj_attr_store (struct kobject *kobj, +struct attribute *__attr, +const char *buf,size_t n) +{ +struct perf_obj_attribute *attr =to_perf_obj_attr (__attr); +struct perf_object *pobj =to_perf_obj (kobj); +ssize_t ret = -EIO ; + +if (attr->store) + ret = attr->store (pobj, buf, n); +return ret; +} + +static const struct sysfs_ops perf_obj_sysfs_ops = { + .show = perf_obj_attr_show, + .store = perf_obj_attr_store, +}; + +static void perf_obj_release (struct kobject *kobj) +{ +kfree (to_perf_obj (kobj)); +} + +static struct kobj_type perf_obj_ktype = { + .sysfs_ops = &perf_obj_sysfs_ops, + .release = perf_obj_release, +}; + +static struct perf_object * +create_perf_obj (struct dfl_feature *feature,struct kobject *parent,int id, +const struct attribute_group **groups,const char *name) +{ +struct perf_object *pobj; +int ret; + + pobj =kzalloc (sizeof (*pobj),GFP_KERNEL ); +if (!pobj) +return ERR_PTR (-ENOMEM ); + + pobj->id = id; + pobj->feature = feature; + pobj->attr_groups = groups; +INIT_LIST_HEAD (&pobj->node); +INIT_LIST_HEAD (&pobj->children); + +if (id !=PERF_OBJ_ROOT_ID ) + ret =kobject_init_and_add (&pobj->kobj, &perf_obj_ktype, + parent,"%s%d" , name, id); +else + ret =kobject_init_and_add (&pobj->kobj, &perf_obj_ktype, + parent,"%s" , name); +if (ret) + goto put_exit; + +if (pobj->attr_groups) { + ret =sysfs_create_groups (&pobj->kobj, pobj->attr_groups); +if (ret) + goto put_exit; + } + +return pobj; + +put_exit: +kobject_put (&pobj->kobj); +return ERR_PTR (ret); +} + +/* +* Counter Sysfs Interface for Clock. +*/ +static ssize_t clock_show (struct perf_object *pobj,char *buf) +{ +void __iomem *base = pobj->feature->ioaddr; + +return sprintf (buf,"0x%llx\n" , + (unsigned long long )readq (base +CLK_CNTR )); +} +static PERF_OBJ_ATTR_RO (clock); + +static struct attribute *clock_attrs[] = { + &perf_obj_attr_clock.attr, +NULL , +}; + +static struct attribute_group clock_attr_group = { + .attrs = clock_attrs, +}; + +static const struct attribute_group *perf_dev_attr_groups[] = { + &clock_attr_group, +NULL , +}; + +static void destroy_perf_obj (struct perf_object *pobj) +{ +struct perf_object *obj, *obj_tmp; + +if (pobj->attr_groups) +sysfs_remove_groups (&pobj->kobj, pobj->attr_groups); + +list_for_each_entry_safe (obj, obj_tmp, &pobj->children, node) +destroy_perf_obj (obj); + +list_del (&pobj->node); +kobject_put (&pobj->kobj); +} + +static struct perf_object *create_perf_dev (struct dfl_feature *feature) +{ +struct platform_device *pdev = feature->pdev; + +return create_perf_obj (feature, &pdev->dev.kobj,PERF_OBJ_ROOT_ID , + perf_dev_attr_groups,"perf" ); +} + +/* +* Counter Sysfs Interfaces for Cache. +*/ +static ssize_t cache_freeze_show (struct perf_object *pobj,char *buf) +{ +void __iomem *base = pobj->feature->ioaddr; +u64 v; + + v =readq (base +CACHE_CTRL ); + +return sprintf (buf,"%u\n" , + (unsigned int )FIELD_GET (CACHE_FREEZE_CNTR , v)); +} + +static ssize_t cache_freeze_store (struct perf_object *pobj, +const char *buf,size_t n) +{ +struct dfl_feature *feature = pobj->feature; +struct dfl_feature_platform_data *pdata; +void __iomem *base = feature->ioaddr; +bool state; +u64 v; + +if (strtobool (buf, &state)) +return -EINVAL ; + + pdata =dev_get_platdata (&feature->pdev->dev); + +mutex_lock (&pdata->lock); + v =readq (base +CACHE_CTRL ); + v &= ~CACHE_FREEZE_CNTR ; + v |=FIELD_PREP (CACHE_FREEZE_CNTR , state ?1 :0 ); +writeq (v, base +CACHE_CTRL ); +mutex_unlock (&pdata->lock); + +return n; +} +static PERF_OBJ_ATTR_F_RW(cache_freeze, freeze); + +static ssize_t read_cache_counter (struct perf_object *pobj,char *buf, +u8 channel,u8 event) +{ +struct dfl_feature *feature = pobj->feature; +struct dfl_feature_platform_data *pdata; +void __iomem *base = feature->ioaddr; +u64 v, count; + +WARN_ON_ONCE (event >CACHE_EVNT_MAX || channel >CACHE_CHANNEL_MAX ); + + pdata =dev_get_platdata (&feature->pdev->dev); + +mutex_lock (&pdata->lock); +/* set channel access type and cache event code. */ + v =readq (base +CACHE_CTRL ); + v &= ~(CACHE_CHANNEL_SEL |CACHE_CTRL_EVNT ); + v |=FIELD_PREP (CACHE_CHANNEL_SEL , channel); + v |=FIELD_PREP (CACHE_CTRL_EVNT , event); +writeq (v, base +CACHE_CTRL ); + +if (readq_poll_timeout (base +CACHE_CNTR0 , v, +FIELD_GET (CACHE_CNTR_EVNT , v) == event, +1 ,PERF_TIMEOUT )) { +dev_err (&feature->pdev->dev,"timeout, unmatched cache event type in counter registers.\n" ); +mutex_unlock (&pdata->lock); +return -ETIMEDOUT ; + } + + v =readq (base +CACHE_CNTR0 ); + count =FIELD_GET (CACHE_CNTR_EVNT_CNTR , v); + v =readq (base +CACHE_CNTR1 ); + count +=FIELD_GET (CACHE_CNTR_EVNT_CNTR , v); +mutex_unlock (&pdata->lock); + +return sprintf (buf,"0x%llx\n" , (unsigned long long )count); +} + +#define CACHE_SHOW (name, channel, event) \ +static ssize_t name##_show(struct perf_object *pobj, char *buf) \ +{ \ + return read_cache_counter(pobj, buf, channel, event); \ +} \ +static PERF_OBJ_ATTR_RO(name) + +CACHE_SHOW (read_hit,CACHE_CHANNEL_RD ,CACHE_EVNT_RD_HIT ); +CACHE_SHOW (read_miss,CACHE_CHANNEL_RD ,CACHE_EVNT_RD_MISS ); +CACHE_SHOW (write_hit,CACHE_CHANNEL_WR ,CACHE_EVNT_WR_HIT ); +CACHE_SHOW (write_miss,CACHE_CHANNEL_WR ,CACHE_EVNT_WR_MISS ); +CACHE_SHOW (hold_request,CACHE_CHANNEL_RD ,CACHE_EVNT_HOLD_REQ ); +CACHE_SHOW (tx_req_stall,CACHE_CHANNEL_RD ,CACHE_EVNT_TX_REQ_STALL ); +CACHE_SHOW (rx_req_stall,CACHE_CHANNEL_RD ,CACHE_EVNT_RX_REQ_STALL ); +CACHE_SHOW (rx_eviction,CACHE_CHANNEL_RD ,CACHE_EVNT_EVICTIONS ); +CACHE_SHOW (data_write_port_contention,CACHE_CHANNEL_WR , +CACHE_EVNT_DATA_WR_PORT_CONTEN ); +CACHE_SHOW (tag_write_port_contention,CACHE_CHANNEL_WR , +CACHE_EVNT_TAG_WR_PORT_CONTEN ); + +static struct attribute *cache_attrs[] = { + &perf_obj_attr_read_hit.attr, + &perf_obj_attr_read_miss.attr, + &perf_obj_attr_write_hit.attr, + &perf_obj_attr_write_miss.attr, + &perf_obj_attr_hold_request.attr, + &perf_obj_attr_data_write_port_contention.attr, + &perf_obj_attr_tag_write_port_contention.attr, + &perf_obj_attr_tx_req_stall.attr, + &perf_obj_attr_rx_req_stall.attr, + &perf_obj_attr_rx_eviction.attr, + &perf_obj_attr_cache_freeze.attr, +NULL , +}; + +static struct attribute_group cache_attr_group = { + .attrs = cache_attrs, +}; + +static const struct attribute_group *cache_attr_groups[] = { + &cache_attr_group, +NULL , +}; + +static int create_perf_cache_obj (struct perf_object *perf_dev) +{ +struct perf_object *pobj; + + pobj =create_perf_obj (perf_dev->feature, &perf_dev->kobj, +PERF_OBJ_ROOT_ID , cache_attr_groups,"cache" ); +if (IS_ERR (pobj)) +return PTR_ERR (pobj); + +list_add (&pobj->node, &perf_dev->children); + +return 0 ; +} + +/* +* Counter Sysfs Interfaces for VT-D / IOMMU. +*/ +static ssize_t vtd_freeze_show (struct perf_object *pobj,char *buf) +{ +void __iomem *base = pobj->feature->ioaddr; +u64 v; + + v =readq (base +VTD_CTRL ); + +return sprintf (buf,"%u\n" , + (unsigned int )FIELD_GET (VTD_FREEZE_CNTR , v)); +} + +static ssize_t vtd_freeze_store (struct perf_object *pobj, +const char *buf,size_t n) +{ +struct dfl_feature *feature = pobj->feature; +struct dfl_feature_platform_data *pdata; +void __iomem *base = feature->ioaddr; +bool state; +u64 v; + +if (strtobool (buf, &state)) +return -EINVAL ; + + pdata =dev_get_platdata (&feature->pdev->dev); + +mutex_lock (&pdata->lock); + v =readq (base +VTD_CTRL ); + v &= ~VTD_FREEZE_CNTR ; + v |=FIELD_PREP (VTD_FREEZE_CNTR , state ?1 :0 ); +writeq (v, base +VTD_CTRL ); +mutex_unlock (&pdata->lock); + +return n; +} +static PERF_OBJ_ATTR_F_RW(vtd_freeze, freeze); + +static struct attribute *iommu_top_attrs[] = { + &perf_obj_attr_vtd_freeze.attr, +NULL , +}; + +static struct attribute_group iommu_top_attr_group = { + .attrs = iommu_top_attrs, +}; + +static ssize_t read_iommu_sip_counter (struct perf_object *pobj, +u8 event,char *buf) +{ +struct dfl_feature *feature = pobj->feature; +struct dfl_feature_platform_data *pdata; +void __iomem *base = feature->ioaddr; +u64 v, count; + +WARN_ON_ONCE (event >VTD_SIP_EVNT_MAX ); + + pdata =dev_get_platdata (&feature->pdev->dev); + +mutex_lock (&pdata->lock); + v =readq (base +VTD_SIP_CTRL ); + v &= ~VTD_SIP_CTRL_EVNT ; + v |=FIELD_PREP (VTD_SIP_CTRL_EVNT , event); +writeq (v, base +VTD_SIP_CTRL ); + +if (readq_poll_timeout (base +VTD_SIP_CNTR , v, +FIELD_GET (VTD_SIP_CNTR_EVNT , v) == event, +1 ,PERF_TIMEOUT )) { +dev_err (&feature->pdev->dev,"timeout, unmatched VTd SIP event type in counter registers\n" ); +mutex_unlock (&pdata->lock); +return -ETIMEDOUT ; + } + + v =readq (base +VTD_SIP_CNTR ); + count =FIELD_GET (VTD_SIP_CNTR_EVNT_CNTR , v); +mutex_unlock (&pdata->lock); + +return sprintf (buf,"0x%llx\n" , (unsigned long long )count); +} + +#define VTD_SIP_SHOW (name, event) \ +static ssize_t name##_show(struct perf_object *pobj, char *buf) \ +{ \ + return read_iommu_sip_counter(pobj, event, buf); \ +} \ +static PERF_OBJ_ATTR_RO(name) + +VTD_SIP_SHOW (iotlb_4k_hit,VTD_SIP_EVNT_IOTLB_4K_HIT ); +VTD_SIP_SHOW (iotlb_2m_hit,VTD_SIP_EVNT_IOTLB_2M_HIT ); +VTD_SIP_SHOW (iotlb_1g_hit,VTD_SIP_EVNT_IOTLB_1G_HIT ); +VTD_SIP_SHOW (slpwc_l3_hit,VTD_SIP_EVNT_SLPWC_L3_HIT ); +VTD_SIP_SHOW (slpwc_l4_hit,VTD_SIP_EVNT_SLPWC_L4_HIT ); +VTD_SIP_SHOW (rcc_hit,VTD_SIP_EVNT_RCC_HIT ); +VTD_SIP_SHOW (iotlb_4k_miss,VTD_SIP_EVNT_IOTLB_4K_MISS ); +VTD_SIP_SHOW (iotlb_2m_miss,VTD_SIP_EVNT_IOTLB_2M_MISS ); +VTD_SIP_SHOW (iotlb_1g_miss,VTD_SIP_EVNT_IOTLB_1G_MISS ); +VTD_SIP_SHOW (slpwc_l3_miss,VTD_SIP_EVNT_SLPWC_L3_MISS ); +VTD_SIP_SHOW (slpwc_l4_miss,VTD_SIP_EVNT_SLPWC_L4_MISS ); +VTD_SIP_SHOW (rcc_miss,VTD_SIP_EVNT_RCC_MISS ); + +static struct attribute *iommu_sip_attrs[] = { + &perf_obj_attr_iotlb_4k_hit.attr, + &perf_obj_attr_iotlb_2m_hit.attr, + &perf_obj_attr_iotlb_1g_hit.attr, + &perf_obj_attr_slpwc_l3_hit.attr, + &perf_obj_attr_slpwc_l4_hit.attr, + &perf_obj_attr_rcc_hit.attr, + &perf_obj_attr_iotlb_4k_miss.attr, + &perf_obj_attr_iotlb_2m_miss.attr, + &perf_obj_attr_iotlb_1g_miss.attr, + &perf_obj_attr_slpwc_l3_miss.attr, + &perf_obj_attr_slpwc_l4_miss.attr, + &perf_obj_attr_rcc_miss.attr, +NULL , +}; + +static struct attribute_group iommu_sip_attr_group = { + .attrs = iommu_sip_attrs, +}; + +static const struct attribute_group *iommu_top_attr_groups[] = { + &iommu_top_attr_group, + &iommu_sip_attr_group, +NULL , +}; + +static ssize_t read_iommu_counter (struct perf_object *pobj,u8 event,char *buf) +{ +struct dfl_feature *feature = pobj->feature; +struct dfl_feature_platform_data *pdata; +void __iomem *base = feature->ioaddr; +u64 v, count; + +WARN_ON_ONCE (event >VTD_EVNT_MAX ); + + event += pobj->id; + pdata =dev_get_platdata (&feature->pdev->dev); + +mutex_lock (&pdata->lock); + v =readq (base +VTD_CTRL ); + v &= ~VTD_CTRL_EVNT ; + v |=FIELD_PREP (VTD_CTRL_EVNT , event); +writeq (v, base +VTD_CTRL ); + +if (readq_poll_timeout (base +VTD_CNTR , v, +FIELD_GET (VTD_CNTR_EVNT , v) == event,1 , +PERF_TIMEOUT )) { +dev_err (&feature->pdev->dev,"timeout, unmatched VTd event type in counter registers\n" ); +mutex_unlock (&pdata->lock); +return -ETIMEDOUT ; + } + + v =readq (base +VTD_CNTR ); + count =FIELD_GET (VTD_CNTR_EVNT_CNTR , v); +mutex_unlock (&pdata->lock); + +return sprintf (buf,"0x%llx\n" , (unsigned long long )count); +} + +#define VTD_SHOW (name, base_event) \ +static ssize_t name##_show(struct perf_object *pobj, char *buf) \ +{ \ + return read_iommu_counter(pobj, base_event, buf); \ +} \ +static PERF_OBJ_ATTR_RO(name) + +VTD_SHOW (read_transaction,VTD_EVNT_AFU_MEM_RD_TRANS ); +VTD_SHOW (write_transaction,VTD_EVNT_AFU_MEM_WR_TRANS ); +VTD_SHOW (devtlb_read_hit,VTD_EVNT_AFU_DEVTLB_RD_HIT ); +VTD_SHOW (devtlb_write_hit,VTD_EVNT_AFU_DEVTLB_WR_HIT ); +VTD_SHOW (devtlb_4k_fill,VTD_EVNT_DEVTLB_4K_FILL ); +VTD_SHOW (devtlb_2m_fill,VTD_EVNT_DEVTLB_2M_FILL ); +VTD_SHOW (devtlb_1g_fill,VTD_EVNT_DEVTLB_1G_FILL ); + +static struct attribute *iommu_attrs[] = { + &perf_obj_attr_read_transaction.attr, + &perf_obj_attr_write_transaction.attr, + &perf_obj_attr_devtlb_read_hit.attr, + &perf_obj_attr_devtlb_write_hit.attr, + &perf_obj_attr_devtlb_4k_fill.attr, + &perf_obj_attr_devtlb_2m_fill.attr, + &perf_obj_attr_devtlb_1g_fill.attr, +NULL , +}; + +static struct attribute_group iommu_attr_group = { + .attrs = iommu_attrs, +}; + +static const struct attribute_group *iommu_attr_groups[] = { + &iommu_attr_group, +NULL , +}; + +#define PERF_MAX_PORT_NUM 1 + +static int create_perf_iommu_obj (struct perf_object *perf_dev) +{ +struct dfl_feature *feature = perf_dev->feature; +struct device *dev = &feature->pdev->dev; +struct perf_object *pobj, *obj; +void __iomem *base; +u64 v; +int i; + +/* check if iommu is not supported on this device. */ + base =dfl_get_feature_ioaddr_by_id (dev,FME_FEATURE_ID_HEADER ); + v =readq (base +FME_HDR_CAP ); +if (!FIELD_GET (FME_CAP_IOMMU_AVL , v)) +return 0 ; + + pobj =create_perf_obj (feature, &perf_dev->kobj,PERF_OBJ_ROOT_ID , + iommu_top_attr_groups,"iommu" ); +if (IS_ERR (pobj)) +return PTR_ERR (pobj); + +list_add (&pobj->node, &perf_dev->children); + +for (i =0 ; i <PERF_MAX_PORT_NUM ; i++) { + obj =create_perf_obj (feature, &pobj->kobj, i, + iommu_attr_groups,"afu" ); +if (IS_ERR (obj)) +return PTR_ERR (obj); + +list_add (&obj->node, &pobj->children); + } + +return 0 ; +} + +/* +* Counter Sysfs Interfaces for Fabric +*/ +static bool fabric_pobj_is_enabled (struct perf_object *pobj) +{ +struct dfl_feature *feature = pobj->feature; +void __iomem *base = feature->ioaddr; +u64 v; + + v =readq (base +FAB_CTRL ); + +if (FIELD_GET (FAB_PORT_FILTER , v) ==FAB_PORT_FILTER_DISABLE ) +return pobj->id ==PERF_OBJ_ROOT_ID ; + +return pobj->id ==FIELD_GET (FAB_PORT_ID , v); +} + +static ssize_t read_fabric_counter (struct perf_object *pobj, +u8 event,char *buf) +{ +struct dfl_feature *feature = pobj->feature; +struct dfl_feature_platform_data *pdata; +void __iomem *base = feature->ioaddr; +u64 v, count =0 ; + +WARN_ON_ONCE (event >FAB_EVNT_MAX ); + + pdata =dev_get_platdata (&feature->pdev->dev); + +mutex_lock (&pdata->lock); +/* if it is disabled, force the counter to return zero. */ +if (!fabric_pobj_is_enabled (pobj)) + goto exit; + + v =readq (base +FAB_CTRL ); + v &= ~FAB_CTRL_EVNT ; + v |=FIELD_PREP (FAB_CTRL_EVNT , event); +writeq (v, base +FAB_CTRL ); + +if (readq_poll_timeout (base +FAB_CNTR , v, +FIELD_GET (FAB_CNTR_EVNT , v) == event, +1 ,PERF_TIMEOUT )) { +dev_err (&feature->pdev->dev,"timeout, unmatched fab event type in counter registers.\n" ); +mutex_unlock (&pdata->lock); +return -ETIMEDOUT ; + } + + v =readq (base +FAB_CNTR ); + count =FIELD_GET (FAB_CNTR_EVNT_CNTR , v); +exit: +mutex_unlock (&pdata->lock); + +return sprintf (buf,"0x%llx\n" , (unsigned long long )count); +} + +#define FAB_SHOW (name, event) \ +static ssize_t name##_show(struct perf_object *pobj, char *buf) \ +{ \ + return read_fabric_counter(pobj, event, buf); \ +} \ +static PERF_OBJ_ATTR_RO(name) + +FAB_SHOW (pcie0_read,FAB_EVNT_PCIE0_RD ); +FAB_SHOW (pcie0_write,FAB_EVNT_PCIE0_WR ); +FAB_SHOW (pcie1_read,FAB_EVNT_PCIE1_RD ); +FAB_SHOW (pcie1_write,FAB_EVNT_PCIE1_WR ); +FAB_SHOW (upi_read,FAB_EVNT_UPI_RD ); +FAB_SHOW (upi_write,FAB_EVNT_UPI_WR ); +FAB_SHOW (mmio_read,FAB_EVNT_MMIO_RD ); +FAB_SHOW (mmio_write,FAB_EVNT_MMIO_WR ); + +static ssize_t fab_enable_show (struct perf_object *pobj,char *buf) +{ +return sprintf (buf,"%u\n" , + (unsigned int )!!fabric_pobj_is_enabled (pobj)); +} + +/* +* If enable one port or all port event counter in fabric, other +* fabric event counter originally enabled will be disable automatically. +*/ +static ssize_t fab_enable_store (struct perf_object *pobj, +const char *buf,size_t n) +{ +struct dfl_feature *feature = pobj->feature; +struct dfl_feature_platform_data *pdata; +void __iomem *base = feature->ioaddr; +bool state; +u64 v; + +if (strtobool (buf, &state) || !state) +return -EINVAL ; + + pdata =dev_get_platdata (&feature->pdev->dev); + +/* if it is already enabled. */ +if (fabric_pobj_is_enabled (pobj)) +return n; + +mutex_lock (&pdata->lock); + v =readq (base +FAB_CTRL ); + v &= ~(FAB_PORT_FILTER |FAB_PORT_ID ); + +if (pobj->id ==PERF_OBJ_ROOT_ID ) { + v |=FIELD_PREP (FAB_PORT_FILTER ,FAB_PORT_FILTER_DISABLE ); + }else { + v |=FIELD_PREP (FAB_PORT_FILTER ,FAB_PORT_FILTER_ENABLE ); + v |=FIELD_PREP (FAB_PORT_ID , pobj->id); + } +writeq (v, base +FAB_CTRL ); +mutex_unlock (&pdata->lock); + +return n; +} +static PERF_OBJ_ATTR_F_RW(fab_enable, enable); + +static struct attribute *fabric_attrs[] = { + &perf_obj_attr_pcie0_read.attr, + &perf_obj_attr_pcie0_write.attr, + &perf_obj_attr_pcie1_read.attr, + &perf_obj_attr_pcie1_write.attr, + &perf_obj_attr_upi_read.attr, + &perf_obj_attr_upi_write.attr, + &perf_obj_attr_mmio_read.attr, + &perf_obj_attr_mmio_write.attr, + &perf_obj_attr_fab_enable.attr, +NULL , +}; + +static struct attribute_group fabric_attr_group = { + .attrs = fabric_attrs, +}; + +static const struct attribute_group *fabric_attr_groups[] = { + &fabric_attr_group, +NULL , +}; + +static ssize_t fab_freeze_show (struct perf_object *pobj,char *buf) +{ +void __iomem *base = pobj->feature->ioaddr; +u64 v; + + v =readq (base +FAB_CTRL ); + +return sprintf (buf,"%u\n" , + (unsigned int )FIELD_GET (FAB_FREEZE_CNTR , v)); +} + +static ssize_t fab_freeze_store (struct perf_object *pobj, +const char *buf,size_t n) +{ +struct dfl_feature *feature = pobj->feature; +struct dfl_feature_platform_data *pdata; +void __iomem *base = feature->ioaddr; +bool state; +u64 v; + +if (strtobool (buf, &state)) +return -EINVAL ; + + pdata =dev_get_platdata (&feature->pdev->dev); + +mutex_lock (&pdata->lock); + v =readq (base +FAB_CTRL ); + v &= ~FAB_FREEZE_CNTR ; + v |=FIELD_PREP (FAB_FREEZE_CNTR , state ?1 :0 ); +writeq (v, base +FAB_CTRL ); +mutex_unlock (&pdata->lock); + +return n; +} +static PERF_OBJ_ATTR_F_RW(fab_freeze, freeze); + +static struct attribute *fabric_top_attrs[] = { + &perf_obj_attr_fab_freeze.attr, +NULL , +}; + +static struct attribute_group fabric_top_attr_group = { + .attrs = fabric_top_attrs, +}; + +static const struct attribute_group *fabric_top_attr_groups[] = { + &fabric_attr_group, + &fabric_top_attr_group, +NULL , +}; + +static int create_perf_fabric_obj (struct perf_object *perf_dev) +{ +struct perf_object *pobj, *obj; +int i; + + pobj =create_perf_obj (perf_dev->feature, &perf_dev->kobj, +PERF_OBJ_ROOT_ID , fabric_top_attr_groups, +"fabric" ); +if (IS_ERR (pobj)) +return PTR_ERR (pobj); + +list_add (&pobj->node, &perf_dev->children); + +for (i =0 ; i <PERF_MAX_PORT_NUM ; i++) { + obj =create_perf_obj (perf_dev->feature, &pobj->kobj, i, + fabric_attr_groups,"port" ); +if (IS_ERR (obj)) +return PTR_ERR (obj); + +list_add (&obj->node, &pobj->children); + } + +return 0 ; +} + +static int fme_perf_init (struct platform_device *pdev, +struct dfl_feature *feature) +{ +struct perf_object *perf_dev; +int ret; + + perf_dev =create_perf_dev (feature); +if (IS_ERR (perf_dev)) +return PTR_ERR (perf_dev); + + ret =create_perf_fabric_obj (perf_dev); +if (ret) + goto done; + +if (feature->id ==FME_FEATURE_ID_GLOBAL_IPERF ) { +/* +* Cache and IOMMU(VT-D) performance counters are not supported +* on discreted solutions e.g. Intel Programmable Acceleration +* Card based on PCIe. +*/ + ret =create_perf_cache_obj (perf_dev); +if (ret) + goto done; + + ret =create_perf_iommu_obj (perf_dev); +if (ret) + goto done; + } + + feature->priv = perf_dev; +return 0 ; + +done: +destroy_perf_obj (perf_dev); +return ret; +} + +static void fme_perf_uinit (struct platform_device *pdev, +struct dfl_feature *feature) +{ +struct perf_object *perf_dev = feature->priv; + +destroy_perf_obj (perf_dev); +} + +const struct dfl_feature_id fme_perf_id_table[] = { + {.id =FME_FEATURE_ID_GLOBAL_IPERF ,}, + {.id =FME_FEATURE_ID_GLOBAL_DPERF ,}, + {0 ,} +}; + +const struct dfl_feature_ops fme_perf_ops = { + .init = fme_perf_init, + .uinit = fme_perf_uinit, +};drivers/fpga/dfl-fme.h +2
-0@@ -39,5 +39,7 @@ struct dfl_fme {extern const struct dfl_feature_id fme_pr_mgmt_id_table[];extern const struct dfl_feature_ops fme_global_err_ops;extern const struct dfl_feature_id fme_global_err_id_table[]; +extern const struct dfl_feature_ops fme_perf_ops; +extern const struct dfl_feature_id fme_perf_id_table[];#endif /* __DFL_FME_H */ drivers/fpga/dfl.c +1
-0@@ -521,6 +521,7 @@ static int build_info_commit_dev(struct build_feature_devs_info *binfo)struct dfl_feature *feature = &pdata->features[index];/* save resource information for each feature */ + feature->pdev = fdev; feature->id = finfo->fid; feature->resource_index = index; feature->ioaddr = finfo->ioaddr;drivers/fpga/dfl.h +2
-1@@ -191,6 +191,7 @@ struct dfl_feature_driver {/** * struct dfl_feature - sub feature of the feature devices * +* @pdev: parent platform device. * @id: sub feature id. * @resource_index: each sub feature has one mmio resource for its registers. * this index is used to find its mmio resource from the @@ -200,6 +201,7 @@ struct dfl_feature_driver {* @priv: priv data of this feature. */ struct dfl_feature { +struct platform_device *pdev;u64 id;int resource_index;void __iomem *ioaddr; --1.8.3.1
Re: [PATCH v3 16/16] fpga: dfl: fme: add performance reporting support
In reply to Wu HaoQuoted 142 lines · Wu Hao
drivers/fpga/dfl-fme-perf.c new file +139
-0@@ -0,0 +1,962 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Driver for FPGA Management Engine (FME) Global Performance Reporting +* +* Copyright 2019 Intel Corporation, Inc. +* +* Authors: +* Kang Luwei <[email protected]> +* Xiao Guangrong <[email protected]> +* Wu Hao <[email protected]> +* Joseph Grecco <[email protected]> +* Enno Luebbers <[email protected]> +* Tim Whisonant <[email protected]> +* Ananda Ravuri <[email protected]> +* Mitchel, Henry <[email protected]> +*/ + +#include "dfl.h" +#include "dfl-fme.h" + +/* +* Performance Counter Registers for Cache. +* +* Cache Events are listed below as CACHE_EVNT_*. +*/ +#define CACHE_CTRL 0x8 +#define CACHE_RESET_CNTR BIT_ULL(0) +#define CACHE_FREEZE_CNTR BIT_ULL(8) +#define CACHE_CTRL_EVNT GENMASK_ULL(19, 16) +#define CACHE_EVNT_RD_HIT 0x0 +#define CACHE_EVNT_WR_HIT 0x1 +#define CACHE_EVNT_RD_MISS 0x2 +#define CACHE_EVNT_WR_MISS 0x3 +#define CACHE_EVNT_RSVD 0x4 +#define CACHE_EVNT_HOLD_REQ 0x5 +#define CACHE_EVNT_DATA_WR_PORT_CONTEN 0x6 +#define CACHE_EVNT_TAG_WR_PORT_CONTEN 0x7 +#define CACHE_EVNT_TX_REQ_STALL 0x8 +#define CACHE_EVNT_RX_REQ_STALL 0x9 +#define CACHE_EVNT_EVICTIONS 0xa +#define CACHE_EVNT_MAX CACHE_EVNT_EVICTIONS +#define CACHE_CHANNEL_SEL BIT_ULL(20) +#define CACHE_CHANNEL_RD 0 +#define CACHE_CHANNEL_WR 1 +#define CACHE_CHANNEL_MAX 2 +#define CACHE_CNTR0 0x10 +#define CACHE_CNTR1 0x18 +#define CACHE_CNTR_EVNT_CNTR GENMASK_ULL(47, 0) +#define CACHE_CNTR_EVNT GENMASK_ULL(63, 60) + +/* +* Performance Counter Registers for Fabric. +* +* Fabric Events are listed below as FAB_EVNT_* +*/ +#define FAB_CTRL 0x20 +#define FAB_RESET_CNTR BIT_ULL(0) +#define FAB_FREEZE_CNTR BIT_ULL(8) +#define FAB_CTRL_EVNT GENMASK_ULL(19, 16) +#define FAB_EVNT_PCIE0_RD 0x0 +#define FAB_EVNT_PCIE0_WR 0x1 +#define FAB_EVNT_PCIE1_RD 0x2 +#define FAB_EVNT_PCIE1_WR 0x3 +#define FAB_EVNT_UPI_RD 0x4 +#define FAB_EVNT_UPI_WR 0x5 +#define FAB_EVNT_MMIO_RD 0x6 +#define FAB_EVNT_MMIO_WR 0x7 +#define FAB_EVNT_MAX FAB_EVNT_MMIO_WR +#define FAB_PORT_ID GENMASK_ULL(21, 20) +#define FAB_PORT_FILTER BIT_ULL(23) +#define FAB_PORT_FILTER_DISABLE 0 +#define FAB_PORT_FILTER_ENABLE 1 +#define FAB_CNTR 0x28 +#define FAB_CNTR_EVNT_CNTR GENMASK_ULL(59, 0) +#define FAB_CNTR_EVNT GENMASK_ULL(63, 60) + +/* +* Performance Counter Registers for Clock. +* +* Clock Counter can't be reset or frozen by SW. +*/ +#define CLK_CNTR 0x30 + +/* +* Performance Counter Registers for IOMMU / VT-D. +* +* VT-D Events are listed below as VTD_EVNT_* and VTD_SIP_EVNT_* +*/ +#define VTD_CTRL 0x38 +#define VTD_RESET_CNTR BIT_ULL(0) +#define VTD_FREEZE_CNTR BIT_ULL(8) +#define VTD_CTRL_EVNT GENMASK_ULL(19, 16) +#define VTD_EVNT_AFU_MEM_RD_TRANS 0x0 +#define VTD_EVNT_AFU_MEM_WR_TRANS 0x1 +#define VTD_EVNT_AFU_DEVTLB_RD_HIT 0x2 +#define VTD_EVNT_AFU_DEVTLB_WR_HIT 0x3 +#define VTD_EVNT_DEVTLB_4K_FILL 0x4 +#define VTD_EVNT_DEVTLB_2M_FILL 0x5 +#define VTD_EVNT_DEVTLB_1G_FILL 0x6 +#define VTD_EVNT_MAX VTD_EVNT_DEVTLB_1G_FILL +#define VTD_CNTR 0x40 +#define VTD_CNTR_EVNT GENMASK_ULL(63, 60) +#define VTD_CNTR_EVNT_CNTR GENMASK_ULL(47, 0) +#define VTD_SIP_CTRL 0x48 +#define VTD_SIP_RESET_CNTR BIT_ULL(0) +#define VTD_SIP_FREEZE_CNTR BIT_ULL(8) +#define VTD_SIP_CTRL_EVNT GENMASK_ULL(19, 16) +#define VTD_SIP_EVNT_IOTLB_4K_HIT 0x0 +#define VTD_SIP_EVNT_IOTLB_2M_HIT 0x1 +#define VTD_SIP_EVNT_IOTLB_1G_HIT 0x2 +#define VTD_SIP_EVNT_SLPWC_L3_HIT 0x3 +#define VTD_SIP_EVNT_SLPWC_L4_HIT 0x4 +#define VTD_SIP_EVNT_RCC_HIT 0x5 +#define VTD_SIP_EVNT_IOTLB_4K_MISS 0x6 +#define VTD_SIP_EVNT_IOTLB_2M_MISS 0x7 +#define VTD_SIP_EVNT_IOTLB_1G_MISS 0x8 +#define VTD_SIP_EVNT_SLPWC_L3_MISS 0x9 +#define VTD_SIP_EVNT_SLPWC_L4_MISS 0xa +#define VTD_SIP_EVNT_RCC_MISS 0xb +#define VTD_SIP_EVNT_MAX VTD_SIP_EVNT_RCC_MISS +#define VTD_SIP_CNTR 0X50 +#define VTD_SIP_CNTR_EVNT GENMASK_ULL(63, 60) +#define VTD_SIP_CNTR_EVNT_CNTR GENMASK_ULL(47, 0) + +#define PERF_OBJ_ROOT_ID (~0) + +#define PERF_TIMEOUT 30 + +/** +* struct perf_object - object of performance counter +* +* @id: instance id. PERF_OBJ_ROOT_ID indicates it is a parent object which +* counts performance counters for all instances. +* @attr_groups: the sysfs files are associated with this object. +* @feature: pointer to related private feature. +* @node: used to link itself to parent's children list. +* @children: used to link its children objects together. +* @kobj: generic kobject interface. +*
drivers/fpga/dfl-fme-perf.c line 149
Quoted 10 lines
drivers/fpga/dfl-fme-perf.c new file +10
-0+* 'node' and 'children' are used to construct parent-children hierarchy. +*/ +struct perf_object { +int id; +const struct attribute_group **attr_groups; +struct dfl_feature *feature; + +struct list_head node; +struct list_head children; +struct kobject kobj;
Woah, why are you using a "raw" kobject and not a 'struct device' here? You just broke userspace and no libraries will see your kobject's properties as the "chain" of struct devices is not happening anymore.
Why can this not just be a 'struct device'?
Quoted 41 lines
drivers/fpga/dfl-fme-perf.c new file +41
-0+}; + +/** +* struct perf_obj_attribute - attribute of perf object +* +* @attr: attribute of this perf object. +* @show: show callback for sysfs attribute. +* @store: store callback for sysfs attribute. +*/ +struct perf_obj_attribute { +struct attribute attr; +ssize_t (*show)(struct perf_object *pobj,char *buf); +ssize_t (*store)(struct perf_object *pobj, +const char *buf,size_t n); +}; + +#define to_perf_obj_attr (_attr) \ + container_of(_attr, struct perf_obj_attribute, attr) +#define to_perf_obj (_kobj) \ + container_of(_kobj, struct perf_object, kobj) + +#define __POBJ_ATTR (_name, _mode, _show, _store) { \ + .attr = {.name = __stringify(_name), \ + .mode = VERIFY_OCTAL_PERMISSIONS(_mode) }, \ + .show = _show, \ + .store = _store, \ +} + +#define PERF_OBJ_ATTR_F_RO (_name, _filename) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_filename, 0444, _name##_show, NULL) + +#define PERF_OBJ_ATTR_F_WO (_name, _filename) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_filename, 0200, NULL, _name##_store) + +#define PERF_OBJ_ATTR_F_RW (_name, _filename) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_filename, 0644, _name##_show, _name##_store) + +#define PERF_OBJ_ATTR_RO (_name) \
drivers/fpga/dfl-fme-perf.c line 200
Quoted 10 lines
drivers/fpga/dfl-fme-perf.c new file +10
-0+struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_name, 0444, _name##_show, NULL) + +#define PERF_OBJ_ATTR_WO (_name) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_name, 0200, NULL, _name##_store) + +#define PERF_OBJ_ATTR_RW (_name) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_name, 0644, _name##_show, _name##_store)
When you have to roll your own sysfs attributes for a single driver, that is a HUGE hint you are doing something wrong. No driver for an individual device should EVER have to do this.
Please use the driver core properly and do not route around it.
thanks,
greg k-h
Re: [PATCH v3 16/16] fpga: dfl: fme: add performance reporting support
Quoted 158 lines · Greg KH
Quoted 142 lines · Wu Hao
drivers/fpga/dfl-fme-perf.c new file +139
-0@@ -0,0 +1,962 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Driver for FPGA Management Engine (FME) Global Performance Reporting +* +* Copyright 2019 Intel Corporation, Inc. +* +* Authors: +* Kang Luwei <[email protected]> +* Xiao Guangrong <[email protected]> +* Wu Hao <[email protected]> +* Joseph Grecco <[email protected]> +* Enno Luebbers <[email protected]> +* Tim Whisonant <[email protected]> +* Ananda Ravuri <[email protected]> +* Mitchel, Henry <[email protected]> +*/ + +#include "dfl.h" +#include "dfl-fme.h" + +/* +* Performance Counter Registers for Cache. +* +* Cache Events are listed below as CACHE_EVNT_*. +*/ +#define CACHE_CTRL 0x8 +#define CACHE_RESET_CNTR BIT_ULL(0) +#define CACHE_FREEZE_CNTR BIT_ULL(8) +#define CACHE_CTRL_EVNT GENMASK_ULL(19, 16) +#define CACHE_EVNT_RD_HIT 0x0 +#define CACHE_EVNT_WR_HIT 0x1 +#define CACHE_EVNT_RD_MISS 0x2 +#define CACHE_EVNT_WR_MISS 0x3 +#define CACHE_EVNT_RSVD 0x4 +#define CACHE_EVNT_HOLD_REQ 0x5 +#define CACHE_EVNT_DATA_WR_PORT_CONTEN 0x6 +#define CACHE_EVNT_TAG_WR_PORT_CONTEN 0x7 +#define CACHE_EVNT_TX_REQ_STALL 0x8 +#define CACHE_EVNT_RX_REQ_STALL 0x9 +#define CACHE_EVNT_EVICTIONS 0xa +#define CACHE_EVNT_MAX CACHE_EVNT_EVICTIONS +#define CACHE_CHANNEL_SEL BIT_ULL(20) +#define CACHE_CHANNEL_RD 0 +#define CACHE_CHANNEL_WR 1 +#define CACHE_CHANNEL_MAX 2 +#define CACHE_CNTR0 0x10 +#define CACHE_CNTR1 0x18 +#define CACHE_CNTR_EVNT_CNTR GENMASK_ULL(47, 0) +#define CACHE_CNTR_EVNT GENMASK_ULL(63, 60) + +/* +* Performance Counter Registers for Fabric. +* +* Fabric Events are listed below as FAB_EVNT_* +*/ +#define FAB_CTRL 0x20 +#define FAB_RESET_CNTR BIT_ULL(0) +#define FAB_FREEZE_CNTR BIT_ULL(8) +#define FAB_CTRL_EVNT GENMASK_ULL(19, 16) +#define FAB_EVNT_PCIE0_RD 0x0 +#define FAB_EVNT_PCIE0_WR 0x1 +#define FAB_EVNT_PCIE1_RD 0x2 +#define FAB_EVNT_PCIE1_WR 0x3 +#define FAB_EVNT_UPI_RD 0x4 +#define FAB_EVNT_UPI_WR 0x5 +#define FAB_EVNT_MMIO_RD 0x6 +#define FAB_EVNT_MMIO_WR 0x7 +#define FAB_EVNT_MAX FAB_EVNT_MMIO_WR +#define FAB_PORT_ID GENMASK_ULL(21, 20) +#define FAB_PORT_FILTER BIT_ULL(23) +#define FAB_PORT_FILTER_DISABLE 0 +#define FAB_PORT_FILTER_ENABLE 1 +#define FAB_CNTR 0x28 +#define FAB_CNTR_EVNT_CNTR GENMASK_ULL(59, 0) +#define FAB_CNTR_EVNT GENMASK_ULL(63, 60) + +/* +* Performance Counter Registers for Clock. +* +* Clock Counter can't be reset or frozen by SW. +*/ +#define CLK_CNTR 0x30 + +/* +* Performance Counter Registers for IOMMU / VT-D. +* +* VT-D Events are listed below as VTD_EVNT_* and VTD_SIP_EVNT_* +*/ +#define VTD_CTRL 0x38 +#define VTD_RESET_CNTR BIT_ULL(0) +#define VTD_FREEZE_CNTR BIT_ULL(8) +#define VTD_CTRL_EVNT GENMASK_ULL(19, 16) +#define VTD_EVNT_AFU_MEM_RD_TRANS 0x0 +#define VTD_EVNT_AFU_MEM_WR_TRANS 0x1 +#define VTD_EVNT_AFU_DEVTLB_RD_HIT 0x2 +#define VTD_EVNT_AFU_DEVTLB_WR_HIT 0x3 +#define VTD_EVNT_DEVTLB_4K_FILL 0x4 +#define VTD_EVNT_DEVTLB_2M_FILL 0x5 +#define VTD_EVNT_DEVTLB_1G_FILL 0x6 +#define VTD_EVNT_MAX VTD_EVNT_DEVTLB_1G_FILL +#define VTD_CNTR 0x40 +#define VTD_CNTR_EVNT GENMASK_ULL(63, 60) +#define VTD_CNTR_EVNT_CNTR GENMASK_ULL(47, 0) +#define VTD_SIP_CTRL 0x48 +#define VTD_SIP_RESET_CNTR BIT_ULL(0) +#define VTD_SIP_FREEZE_CNTR BIT_ULL(8) +#define VTD_SIP_CTRL_EVNT GENMASK_ULL(19, 16) +#define VTD_SIP_EVNT_IOTLB_4K_HIT 0x0 +#define VTD_SIP_EVNT_IOTLB_2M_HIT 0x1 +#define VTD_SIP_EVNT_IOTLB_1G_HIT 0x2 +#define VTD_SIP_EVNT_SLPWC_L3_HIT 0x3 +#define VTD_SIP_EVNT_SLPWC_L4_HIT 0x4 +#define VTD_SIP_EVNT_RCC_HIT 0x5 +#define VTD_SIP_EVNT_IOTLB_4K_MISS 0x6 +#define VTD_SIP_EVNT_IOTLB_2M_MISS 0x7 +#define VTD_SIP_EVNT_IOTLB_1G_MISS 0x8 +#define VTD_SIP_EVNT_SLPWC_L3_MISS 0x9 +#define VTD_SIP_EVNT_SLPWC_L4_MISS 0xa +#define VTD_SIP_EVNT_RCC_MISS 0xb +#define VTD_SIP_EVNT_MAX VTD_SIP_EVNT_RCC_MISS +#define VTD_SIP_CNTR 0X50 +#define VTD_SIP_CNTR_EVNT GENMASK_ULL(63, 60) +#define VTD_SIP_CNTR_EVNT_CNTR GENMASK_ULL(47, 0) + +#define PERF_OBJ_ROOT_ID (~0) + +#define PERF_TIMEOUT 30 + +/** +* struct perf_object - object of performance counter +* +* @id: instance id. PERF_OBJ_ROOT_ID indicates it is a parent object which +* counts performance counters for all instances. +* @attr_groups: the sysfs files are associated with this object. +* @feature: pointer to related private feature. +* @node: used to link itself to parent's children list. +* @children: used to link its children objects together. +* @kobj: generic kobject interface. +* drivers/fpga/dfl-fme-perf.c line 149
Quoted 10 lines
drivers/fpga/dfl-fme-perf.c new file +10
-0+* 'node' and 'children' are used to construct parent-children hierarchy. +*/ +struct perf_object { +int id; +const struct attribute_group **attr_groups; +struct dfl_feature *feature; + +struct list_head node; +struct list_head children; +struct kobject kobj;Woah, why are you using a "raw" kobject and not a 'struct device' here? You just broke userspace and no libraries will see your kobject's properties as the "chain" of struct devices is not happening anymore.
Quoted 1 line
Why can this not just be a 'struct device'?
Hi Greg,
Many thanks for the review and comments.
Actually we are just trying to create sysfs hierarchy for performance counters using these data structures.
If we use 'struct device' instead of kobject, then we have to let userspace code to deal with device's sysfs (e.g. ignore 'uevent' below). This is the only concern from my side now, as I know that using 'struct device' saves code as we don't need to introduce a new perf_obj_attribute then.
dfl-fme.0/perf/
├── iommu │ ├── afu0 │ │ ├── devtlb_1g_fill │ │ ├── devtlb_2m_fill │ │ ├── devtlb_4k_fill │ │ ├── devtlb_read_hit │ │ ├── devtlb_write_hit │ │ ├── read_transaction │ │ ├── uevent │ │ └── write_transaction │ ├── freeze │ ├── iotlb_1g_hit │ ├── iotlb_1g_miss ...
└── uevent
...
Do you think if we could keep it or it's better to use 'struct device'?
Quoted 58 lines
Quoted 43 lines
drivers/fpga/dfl-fme-perf.c new file +41
-0+}; + +/** +* struct perf_obj_attribute - attribute of perf object +* +* @attr: attribute of this perf object. +* @show: show callback for sysfs attribute. +* @store: store callback for sysfs attribute. +*/ +struct perf_obj_attribute { +struct attribute attr; +ssize_t (*show)(struct perf_object *pobj,char *buf); +ssize_t (*store)(struct perf_object *pobj, +const char *buf,size_t n); +}; + +#define to_perf_obj_attr (_attr) \ + container_of(_attr, struct perf_obj_attribute, attr) +#define to_perf_obj (_kobj) \ + container_of(_kobj, struct perf_object, kobj) + +#define __POBJ_ATTR (_name, _mode, _show, _store) { \ + .attr = {.name = __stringify(_name), \ + .mode = VERIFY_OCTAL_PERMISSIONS(_mode) }, \ + .show = _show, \ + .store = _store, \ +} + +#define PERF_OBJ_ATTR_F_RO (_name, _filename) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_filename, 0444, _name##_show, NULL) + +#define PERF_OBJ_ATTR_F_WO (_name, _filename) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_filename, 0200, NULL, _name##_store) + +#define PERF_OBJ_ATTR_F_RW (_name, _filename) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_filename, 0644, _name##_show, _name##_store) + +#define PERF_OBJ_ATTR_RO (_name) \drivers/fpga/dfl-fme-perf.c line 200
Quoted 10 lines
drivers/fpga/dfl-fme-perf.c new file +10
-0+struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_name, 0444, _name##_show, NULL) + +#define PERF_OBJ_ATTR_WO (_name) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_name, 0200, NULL, _name##_store) + +#define PERF_OBJ_ATTR_RW (_name) \ +struct perf_obj_attribute perf_obj_attr_##_name = \ + __POBJ_ATTR(_name, 0644, _name##_show, _name##_store)When you have to roll your own sysfs attributes for a single driver, that is a HUGE hint you are doing something wrong. No driver for an individual device should EVER have to do this.
Quoted 1 line
Please use the driver core properly and do not route around it.
Sure. Thanks!
Hao
Quoted 4 lines
thanks,
greg k-h
Re: [PATCH v3 16/16] fpga: dfl: fme: add performance reporting support
Quoted 188 lines · Wu Hao
Quoted 158 lines · Greg KH
Quoted 142 lines · Wu Hao
drivers/fpga/dfl-fme-perf.c new file +139
-0@@ -0,0 +1,962 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Driver for FPGA Management Engine (FME) Global Performance Reporting +* +* Copyright 2019 Intel Corporation, Inc. +* +* Authors: +* Kang Luwei <[email protected]> +* Xiao Guangrong <[email protected]> +* Wu Hao <[email protected]> +* Joseph Grecco <[email protected]> +* Enno Luebbers <[email protected]> +* Tim Whisonant <[email protected]> +* Ananda Ravuri <[email protected]> +* Mitchel, Henry <[email protected]> +*/ + +#include "dfl.h" +#include "dfl-fme.h" + +/* +* Performance Counter Registers for Cache. +* +* Cache Events are listed below as CACHE_EVNT_*. +*/ +#define CACHE_CTRL 0x8 +#define CACHE_RESET_CNTR BIT_ULL(0) +#define CACHE_FREEZE_CNTR BIT_ULL(8) +#define CACHE_CTRL_EVNT GENMASK_ULL(19, 16) +#define CACHE_EVNT_RD_HIT 0x0 +#define CACHE_EVNT_WR_HIT 0x1 +#define CACHE_EVNT_RD_MISS 0x2 +#define CACHE_EVNT_WR_MISS 0x3 +#define CACHE_EVNT_RSVD 0x4 +#define CACHE_EVNT_HOLD_REQ 0x5 +#define CACHE_EVNT_DATA_WR_PORT_CONTEN 0x6 +#define CACHE_EVNT_TAG_WR_PORT_CONTEN 0x7 +#define CACHE_EVNT_TX_REQ_STALL 0x8 +#define CACHE_EVNT_RX_REQ_STALL 0x9 +#define CACHE_EVNT_EVICTIONS 0xa +#define CACHE_EVNT_MAX CACHE_EVNT_EVICTIONS +#define CACHE_CHANNEL_SEL BIT_ULL(20) +#define CACHE_CHANNEL_RD 0 +#define CACHE_CHANNEL_WR 1 +#define CACHE_CHANNEL_MAX 2 +#define CACHE_CNTR0 0x10 +#define CACHE_CNTR1 0x18 +#define CACHE_CNTR_EVNT_CNTR GENMASK_ULL(47, 0) +#define CACHE_CNTR_EVNT GENMASK_ULL(63, 60) + +/* +* Performance Counter Registers for Fabric. +* +* Fabric Events are listed below as FAB_EVNT_* +*/ +#define FAB_CTRL 0x20 +#define FAB_RESET_CNTR BIT_ULL(0) +#define FAB_FREEZE_CNTR BIT_ULL(8) +#define FAB_CTRL_EVNT GENMASK_ULL(19, 16) +#define FAB_EVNT_PCIE0_RD 0x0 +#define FAB_EVNT_PCIE0_WR 0x1 +#define FAB_EVNT_PCIE1_RD 0x2 +#define FAB_EVNT_PCIE1_WR 0x3 +#define FAB_EVNT_UPI_RD 0x4 +#define FAB_EVNT_UPI_WR 0x5 +#define FAB_EVNT_MMIO_RD 0x6 +#define FAB_EVNT_MMIO_WR 0x7 +#define FAB_EVNT_MAX FAB_EVNT_MMIO_WR +#define FAB_PORT_ID GENMASK_ULL(21, 20) +#define FAB_PORT_FILTER BIT_ULL(23) +#define FAB_PORT_FILTER_DISABLE 0 +#define FAB_PORT_FILTER_ENABLE 1 +#define FAB_CNTR 0x28 +#define FAB_CNTR_EVNT_CNTR GENMASK_ULL(59, 0) +#define FAB_CNTR_EVNT GENMASK_ULL(63, 60) + +/* +* Performance Counter Registers for Clock. +* +* Clock Counter can't be reset or frozen by SW. +*/ +#define CLK_CNTR 0x30 + +/* +* Performance Counter Registers for IOMMU / VT-D. +* +* VT-D Events are listed below as VTD_EVNT_* and VTD_SIP_EVNT_* +*/ +#define VTD_CTRL 0x38 +#define VTD_RESET_CNTR BIT_ULL(0) +#define VTD_FREEZE_CNTR BIT_ULL(8) +#define VTD_CTRL_EVNT GENMASK_ULL(19, 16) +#define VTD_EVNT_AFU_MEM_RD_TRANS 0x0 +#define VTD_EVNT_AFU_MEM_WR_TRANS 0x1 +#define VTD_EVNT_AFU_DEVTLB_RD_HIT 0x2 +#define VTD_EVNT_AFU_DEVTLB_WR_HIT 0x3 +#define VTD_EVNT_DEVTLB_4K_FILL 0x4 +#define VTD_EVNT_DEVTLB_2M_FILL 0x5 +#define VTD_EVNT_DEVTLB_1G_FILL 0x6 +#define VTD_EVNT_MAX VTD_EVNT_DEVTLB_1G_FILL +#define VTD_CNTR 0x40 +#define VTD_CNTR_EVNT GENMASK_ULL(63, 60) +#define VTD_CNTR_EVNT_CNTR GENMASK_ULL(47, 0) +#define VTD_SIP_CTRL 0x48 +#define VTD_SIP_RESET_CNTR BIT_ULL(0) +#define VTD_SIP_FREEZE_CNTR BIT_ULL(8) +#define VTD_SIP_CTRL_EVNT GENMASK_ULL(19, 16) +#define VTD_SIP_EVNT_IOTLB_4K_HIT 0x0 +#define VTD_SIP_EVNT_IOTLB_2M_HIT 0x1 +#define VTD_SIP_EVNT_IOTLB_1G_HIT 0x2 +#define VTD_SIP_EVNT_SLPWC_L3_HIT 0x3 +#define VTD_SIP_EVNT_SLPWC_L4_HIT 0x4 +#define VTD_SIP_EVNT_RCC_HIT 0x5 +#define VTD_SIP_EVNT_IOTLB_4K_MISS 0x6 +#define VTD_SIP_EVNT_IOTLB_2M_MISS 0x7 +#define VTD_SIP_EVNT_IOTLB_1G_MISS 0x8 +#define VTD_SIP_EVNT_SLPWC_L3_MISS 0x9 +#define VTD_SIP_EVNT_SLPWC_L4_MISS 0xa +#define VTD_SIP_EVNT_RCC_MISS 0xb +#define VTD_SIP_EVNT_MAX VTD_SIP_EVNT_RCC_MISS +#define VTD_SIP_CNTR 0X50 +#define VTD_SIP_CNTR_EVNT GENMASK_ULL(63, 60) +#define VTD_SIP_CNTR_EVNT_CNTR GENMASK_ULL(47, 0) + +#define PERF_OBJ_ROOT_ID (~0) + +#define PERF_TIMEOUT 30 + +/** +* struct perf_object - object of performance counter +* +* @id: instance id. PERF_OBJ_ROOT_ID indicates it is a parent object which +* counts performance counters for all instances. +* @attr_groups: the sysfs files are associated with this object. +* @feature: pointer to related private feature. +* @node: used to link itself to parent's children list. +* @children: used to link its children objects together. +* @kobj: generic kobject interface. +* drivers/fpga/dfl-fme-perf.c line 149
Quoted 10 lines
drivers/fpga/dfl-fme-perf.c new file +10
-0+* 'node' and 'children' are used to construct parent-children hierarchy. +*/ +struct perf_object { +int id; +const struct attribute_group **attr_groups; +struct dfl_feature *feature; + +struct list_head node; +struct list_head children; +struct kobject kobj;Woah, why are you using a "raw" kobject and not a 'struct device' here? You just broke userspace and no libraries will see your kobject's properties as the "chain" of struct devices is not happening anymore.
Quoted 1 line
Why can this not just be a 'struct device'?
Hi Greg,
Many thanks for the review and comments.
Actually we are just trying to create sysfs hierarchy for performance counters using these data structures.
If we use 'struct device' instead of kobject, then we have to let userspace code to deal with device's sysfs (e.g. ignore 'uevent' below). This is the only concern from my side now, as I know that using 'struct device' saves code as we don't need to introduce a new
perf_obj_attributethen.dfl-fme.0/perf/
├── iommu │ ├── afu0 │ │ ├── devtlb_1g_fill │ │ ├── devtlb_2m_fill │ │ ├── devtlb_4k_fill │ │ ├── devtlb_read_hit │ │ ├── devtlb_write_hit │ │ ├── read_transaction │ │ ├── uevent │ │ └── write_transaction │ ├── freeze │ ├── iotlb_1g_hit │ ├── iotlb_1g_miss ...
Quoted 4 lines
└── uevent
...Do you think if we could keep it or it's better to use 'struct device'?
What about using the attribute group name? That gives you a subdir for free. Doing anything "deeper" than one level means that you really have a child device, and yes, you need to use a 'struct device'. Make it part of your bus and just have it be a different "type" and all should be good.
Again, NEVER use a raw kobject as a child of a 'struct device', that will break things.
And please cc: me on this series from now on, as you are obviously trying to do complex things with the driver model and sysfs and it is easy to get very wrong.
But wait, step back, why does this one driver have such a "special" user/kernel api that unique to it and nothing else? That's also a big red flag, why not just use the normal perf api that everyone else uses?
thanks,
greg k-h
Re: [PATCH v3 16/16] fpga: dfl: fme: add performance reporting support
Quoted 203 lines · Greg KH
Quoted 188 lines · Wu Hao
Quoted 158 lines · Greg KH
Quoted 142 lines · Wu Hao
drivers/fpga/dfl-fme-perf.c new file +139
-0@@ -0,0 +1,962 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Driver for FPGA Management Engine (FME) Global Performance Reporting +* +* Copyright 2019 Intel Corporation, Inc. +* +* Authors: +* Kang Luwei <[email protected]> +* Xiao Guangrong <[email protected]> +* Wu Hao <[email protected]> +* Joseph Grecco <[email protected]> +* Enno Luebbers <[email protected]> +* Tim Whisonant <[email protected]> +* Ananda Ravuri <[email protected]> +* Mitchel, Henry <[email protected]> +*/ + +#include "dfl.h" +#include "dfl-fme.h" + +/* +* Performance Counter Registers for Cache. +* +* Cache Events are listed below as CACHE_EVNT_*. +*/ +#define CACHE_CTRL 0x8 +#define CACHE_RESET_CNTR BIT_ULL(0) +#define CACHE_FREEZE_CNTR BIT_ULL(8) +#define CACHE_CTRL_EVNT GENMASK_ULL(19, 16) +#define CACHE_EVNT_RD_HIT 0x0 +#define CACHE_EVNT_WR_HIT 0x1 +#define CACHE_EVNT_RD_MISS 0x2 +#define CACHE_EVNT_WR_MISS 0x3 +#define CACHE_EVNT_RSVD 0x4 +#define CACHE_EVNT_HOLD_REQ 0x5 +#define CACHE_EVNT_DATA_WR_PORT_CONTEN 0x6 +#define CACHE_EVNT_TAG_WR_PORT_CONTEN 0x7 +#define CACHE_EVNT_TX_REQ_STALL 0x8 +#define CACHE_EVNT_RX_REQ_STALL 0x9 +#define CACHE_EVNT_EVICTIONS 0xa +#define CACHE_EVNT_MAX CACHE_EVNT_EVICTIONS +#define CACHE_CHANNEL_SEL BIT_ULL(20) +#define CACHE_CHANNEL_RD 0 +#define CACHE_CHANNEL_WR 1 +#define CACHE_CHANNEL_MAX 2 +#define CACHE_CNTR0 0x10 +#define CACHE_CNTR1 0x18 +#define CACHE_CNTR_EVNT_CNTR GENMASK_ULL(47, 0) +#define CACHE_CNTR_EVNT GENMASK_ULL(63, 60) + +/* +* Performance Counter Registers for Fabric. +* +* Fabric Events are listed below as FAB_EVNT_* +*/ +#define FAB_CTRL 0x20 +#define FAB_RESET_CNTR BIT_ULL(0) +#define FAB_FREEZE_CNTR BIT_ULL(8) +#define FAB_CTRL_EVNT GENMASK_ULL(19, 16) +#define FAB_EVNT_PCIE0_RD 0x0 +#define FAB_EVNT_PCIE0_WR 0x1 +#define FAB_EVNT_PCIE1_RD 0x2 +#define FAB_EVNT_PCIE1_WR 0x3 +#define FAB_EVNT_UPI_RD 0x4 +#define FAB_EVNT_UPI_WR 0x5 +#define FAB_EVNT_MMIO_RD 0x6 +#define FAB_EVNT_MMIO_WR 0x7 +#define FAB_EVNT_MAX FAB_EVNT_MMIO_WR +#define FAB_PORT_ID GENMASK_ULL(21, 20) +#define FAB_PORT_FILTER BIT_ULL(23) +#define FAB_PORT_FILTER_DISABLE 0 +#define FAB_PORT_FILTER_ENABLE 1 +#define FAB_CNTR 0x28 +#define FAB_CNTR_EVNT_CNTR GENMASK_ULL(59, 0) +#define FAB_CNTR_EVNT GENMASK_ULL(63, 60) + +/* +* Performance Counter Registers for Clock. +* +* Clock Counter can't be reset or frozen by SW. +*/ +#define CLK_CNTR 0x30 + +/* +* Performance Counter Registers for IOMMU / VT-D. +* +* VT-D Events are listed below as VTD_EVNT_* and VTD_SIP_EVNT_* +*/ +#define VTD_CTRL 0x38 +#define VTD_RESET_CNTR BIT_ULL(0) +#define VTD_FREEZE_CNTR BIT_ULL(8) +#define VTD_CTRL_EVNT GENMASK_ULL(19, 16) +#define VTD_EVNT_AFU_MEM_RD_TRANS 0x0 +#define VTD_EVNT_AFU_MEM_WR_TRANS 0x1 +#define VTD_EVNT_AFU_DEVTLB_RD_HIT 0x2 +#define VTD_EVNT_AFU_DEVTLB_WR_HIT 0x3 +#define VTD_EVNT_DEVTLB_4K_FILL 0x4 +#define VTD_EVNT_DEVTLB_2M_FILL 0x5 +#define VTD_EVNT_DEVTLB_1G_FILL 0x6 +#define VTD_EVNT_MAX VTD_EVNT_DEVTLB_1G_FILL +#define VTD_CNTR 0x40 +#define VTD_CNTR_EVNT GENMASK_ULL(63, 60) +#define VTD_CNTR_EVNT_CNTR GENMASK_ULL(47, 0) +#define VTD_SIP_CTRL 0x48 +#define VTD_SIP_RESET_CNTR BIT_ULL(0) +#define VTD_SIP_FREEZE_CNTR BIT_ULL(8) +#define VTD_SIP_CTRL_EVNT GENMASK_ULL(19, 16) +#define VTD_SIP_EVNT_IOTLB_4K_HIT 0x0 +#define VTD_SIP_EVNT_IOTLB_2M_HIT 0x1 +#define VTD_SIP_EVNT_IOTLB_1G_HIT 0x2 +#define VTD_SIP_EVNT_SLPWC_L3_HIT 0x3 +#define VTD_SIP_EVNT_SLPWC_L4_HIT 0x4 +#define VTD_SIP_EVNT_RCC_HIT 0x5 +#define VTD_SIP_EVNT_IOTLB_4K_MISS 0x6 +#define VTD_SIP_EVNT_IOTLB_2M_MISS 0x7 +#define VTD_SIP_EVNT_IOTLB_1G_MISS 0x8 +#define VTD_SIP_EVNT_SLPWC_L3_MISS 0x9 +#define VTD_SIP_EVNT_SLPWC_L4_MISS 0xa +#define VTD_SIP_EVNT_RCC_MISS 0xb +#define VTD_SIP_EVNT_MAX VTD_SIP_EVNT_RCC_MISS +#define VTD_SIP_CNTR 0X50 +#define VTD_SIP_CNTR_EVNT GENMASK_ULL(63, 60) +#define VTD_SIP_CNTR_EVNT_CNTR GENMASK_ULL(47, 0) + +#define PERF_OBJ_ROOT_ID (~0) + +#define PERF_TIMEOUT 30 + +/** +* struct perf_object - object of performance counter +* +* @id: instance id. PERF_OBJ_ROOT_ID indicates it is a parent object which +* counts performance counters for all instances. +* @attr_groups: the sysfs files are associated with this object. +* @feature: pointer to related private feature. +* @node: used to link itself to parent's children list. +* @children: used to link its children objects together. +* @kobj: generic kobject interface. +* drivers/fpga/dfl-fme-perf.c line 149
Quoted 10 lines
drivers/fpga/dfl-fme-perf.c new file +10
-0+* 'node' and 'children' are used to construct parent-children hierarchy. +*/ +struct perf_object { +int id; +const struct attribute_group **attr_groups; +struct dfl_feature *feature; + +struct list_head node; +struct list_head children; +struct kobject kobj;Woah, why are you using a "raw" kobject and not a 'struct device' here? You just broke userspace and no libraries will see your kobject's properties as the "chain" of struct devices is not happening anymore.
Quoted 1 line
Why can this not just be a 'struct device'?
Hi Greg,
Many thanks for the review and comments.
Actually we are just trying to create sysfs hierarchy for performance counters using these data structures.
If we use 'struct device' instead of kobject, then we have to let userspace code to deal with device's sysfs (e.g. ignore 'uevent' below). This is the only concern from my side now, as I know that using 'struct device' saves code as we don't need to introduce a new
perf_obj_attributethen.dfl-fme.0/perf/
├── iommu │ ├── afu0 │ │ ├── devtlb_1g_fill │ │ ├── devtlb_2m_fill │ │ ├── devtlb_4k_fill │ │ ├── devtlb_read_hit │ │ ├── devtlb_write_hit │ │ ├── read_transaction │ │ ├── uevent │ │ └── write_transaction │ ├── freeze │ ├── iotlb_1g_hit │ ├── iotlb_1g_miss ...Quoted 4 lines
└── uevent
...Do you think if we could keep it or it's better to use 'struct device'?
What about using the attribute group name? That gives you a subdir for free. Doing anything "deeper" than one level means that you really have a child device, and yes, you need to use a 'struct device'. Make it part of your bus and just have it be a different "type" and all should be good.
Again, NEVER use a raw kobject as a child of a 'struct device', that will break things.
Quoted 8 lines
And please cc: me on this series from now on, as you are obviously trying to do complex things with the driver model and sysfs and it is easy to get very wrong.
But wait, step back, why does this one driver have such a "special" user/kernel api that unique to it and nothing else? That's also a big red flag, why not just use the normal perf api that everyone else uses?
Hi Greg,
Actually we just tried to add some interfaces for users to read hardware counters, Yes, I fully agree that we should use the existing apis whenever possible. I will look into perf api to see if we can use them instead.
Many thanks for the review and comments!
Hao
Quoted 3 lines
thanks,
greg k-h