vfio/pci: add denylist and disable qat
Subsystems (4)
v5 cover vfio/pci: add denylist and disable qat
This patchset defines a denylist of devices in the vfio-pci module and adds the current generation of Intel(R) QuickAssist devices to it as they are not designed to run in an untrusted environment.
By default, if a device is in the denylist, the probe of vfio-pci fails. If a user wants to use a device in the denylist, he needs to disable the full denylist providing the option disable_denylist=1 at the load of vfio-pci or specifying that parameter in a config file in /etc/modprobe.d.
This series also moves the device ids definitions present in the qat driver to linux/pci_ids.h since they will be shared between the vfio-pci and the qat drivers and replaces the custom ADF_SYSTEM_DEVICE macro with PCI_VDEVICE.
The series is applicable to Herbert's tree. Patches 1 to 3 apply also to Alex's tree (next). Patches 4 and 5 are optional and can be applied at a later stage.
Changes from v4:
- Patch #2: added Reviewed-by tag from Cornelia Huck
- Patch #5: added Suggested-by tag as this change was suggested internally by Andy Shevchenko
- Patches 1-5: added Reviewed-by tag from Fiona Trahe
Changes from v3:
- Patch #1: included Acked-by tag, after ack from Bjorn Helgaas
- Patch #2: s/prevents/allows/ in module parameter description
Changes from v2:
- Renamed blocklist in denylist
- Patch #2: reworded module parameter description to clarify why a device is in the denylist
- Patch #2: reworded warning that occurs when denylist is enabled and device is present in that list
Changes from v1:
- Reworked commit messages:
Patches #1, #2 and #3: capitalized first character after column to comply to subject line convention
Patch #3: Capitalized QAT acronym and added link and doc number for document "Intel® QuickAssist Technology (Intel® QAT) Software for Linux"
Giovanni Cabiddu (5):
PCI: Add Intel QuickAssist device IDs
vfio/pci: Add device denylist
vfio/pci: Add QAT devices to denylist
crypto: qat - replace device ids defines
crypto: qat - use PCI_VDEVICE
drivers/crypto/qat/qat_c3xxx/adf_drv.c | 11 ++--- drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 11 ++--- drivers/crypto/qat/qat_c62x/adf_drv.c | 11 ++--- drivers/crypto/qat/qat_c62xvf/adf_drv.c | 11 ++--- .../crypto/qat/qat_common/adf_accel_devices.h | 6 --- drivers/crypto/qat/qat_common/qat_hal.c | 7 +-- drivers/crypto/qat/qat_common/qat_uclo.c | 9 ++-- drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 11 ++--- drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 11 ++--- drivers/vfio/pci/vfio_pci.c | 48 +++++++++++++++++++ include/linux/pci_ids.h | 6 +++ 11 files changed, 87 insertions(+), 55 deletions(-)
Signature · 1 line
2.26.2
PATCH v5 1/5 PCI: Add Intel QuickAssist device IDs
Add device IDs for the following Intel QuickAssist devices: DH895XCC, C3XXX and C62X.
The defines in this patch are going to be referenced in two independent drivers, qat and vfio-pci.
--- include/linux/pci_ids.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/linux/pci_ids.h +6 -0
@@ -2659,6 +2659,8 @@#define PCI_DEVICE_ID_INTEL_80332_1 0x0332#define PCI_DEVICE_ID_INTEL_80333_0 0x0370#define PCI_DEVICE_ID_INTEL_80333_1 0x0372 +#define PCI_DEVICE_ID_INTEL_QAT_DH895XCC 0x0435 +#define PCI_DEVICE_ID_INTEL_QAT_DH895XCC_VF 0x0443#define PCI_DEVICE_ID_INTEL_82375 0x0482#define PCI_DEVICE_ID_INTEL_82424 0x0483#define PCI_DEVICE_ID_INTEL_82378 0x0484
@@ -2708,6 +2710,8 @@#define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_4C_NHI 0x1577#define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_4C_BRIDGE 0x1578#define PCI_DEVICE_ID_INTEL_80960_RP 0x1960 +#define PCI_DEVICE_ID_INTEL_QAT_C3XXX 0x19e2 +#define PCI_DEVICE_ID_INTEL_QAT_C3XXX_VF 0x19e3#define PCI_DEVICE_ID_INTEL_82840_HB 0x1a21#define PCI_DEVICE_ID_INTEL_82845_HB 0x1a30#define PCI_DEVICE_ID_INTEL_IOAT 0x1a38
@@ -2924,6 +2928,8 @@#define PCI_DEVICE_ID_INTEL_IOAT_JSF7 0x3717#define PCI_DEVICE_ID_INTEL_IOAT_JSF8 0x3718#define PCI_DEVICE_ID_INTEL_IOAT_JSF9 0x3719 +#define PCI_DEVICE_ID_INTEL_QAT_C62X 0x37c8 +#define PCI_DEVICE_ID_INTEL_QAT_C62X_VF 0x37c9#define PCI_DEVICE_ID_INTEL_ICH10_0 0x3a14#define PCI_DEVICE_ID_INTEL_ICH10_1 0x3a16#define PCI_DEVICE_ID_INTEL_ICH10_2 0x3a18
Signature · 1 line
2.26.2
PATCH v5 2/5 vfio/pci: Add device denylist
In reply to Giovanni CabidduAdd denylist of devices that by default are not probed by vfio-pci. Devices in this list may be susceptible to untrusted application, even if the IOMMU is enabled. To be accessed via vfio-pci, the user has to explicitly disable the denylist.
The denylist can be disabled via the module parameter disable_denylist.
--- drivers/vfio/pci/vfio_pci.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
drivers/vfio/pci/vfio_pci.c +33 -0
@@ -60,6 +60,10 @@ module_param(enable_sriov, bool, 0644);MODULE_PARM_DESC (enable_sriov,"Enable support for SR-IOV configuration. Enabling SR-IOV on a PF typically requires support of the userspace PF driver, enabling VFs without such support may result in non-functional VFs or PF." );#endif +static bool disable_denylist; +module_param (disable_denylist, bool,0444 ); +MODULE_PARM_DESC (disable_denylist,"Disable use of device denylist. Disabling the denylist allows binding to devices with known errata that may lead to exploitable stability or security issues when accessed by untrusted users." ); +static inline bool vfio_vga_disabled (void ) {#ifdef CONFIG_VFIO_PCI_VGA
@@ -69,6 +73,29 @@ static inline bool vfio_vga_disabled(void)#endif } +static bool vfio_pci_dev_in_denylist (struct pci_dev *pdev) +{ +return false; +} + +static bool vfio_pci_is_denylisted (struct pci_dev *pdev) +{ +if (!vfio_pci_dev_in_denylist (pdev)) +return false; + +if (disable_denylist) { +pci_warn (pdev, +"device denylist disabled - allowing device %04x:%04x.\n" , + pdev->vendor, pdev->device); +return false; + } + +pci_warn (pdev,"%04x:%04x exists in vfio-pci device denylist, driver probing disallowed.\n" , + pdev->vendor, pdev->device); + +return true; +} +/* * Our VGA arbiter participation is limited since we don't know anything * about the device itself. However, if the device is the only VGA device
@@ -1847,6 +1874,9 @@ static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)struct iommu_group *group;int ret; +if (vfio_pci_is_denylisted (pdev)) +return -EINVAL ; +if (pdev->hdr_type !=PCI_HEADER_TYPE_NORMAL )return -EINVAL ;
@@ -2336,6 +2366,9 @@ static int __init vfio_pci_init(void)vfio_pci_fill_ids (); +if (disable_denylist) +pr_warn ("device denylist disabled.\n" ); +return 0 ; out_driver:
Signature · 1 line
2.26.2
PATCH v5 3/5 vfio/pci: Add QAT devices to denylist
In reply to Giovanni CabidduThe current generation of Intel® QuickAssist Technology devices are not designed to run in an untrusted environment because of the following issues reported in the document "Intel® QuickAssist Technology (Intel® QAT) Software for Linux" (document number 336211-014):
QATE-39220 - GEN - Intel® QAT API submissions with bad addresses that
trigger DMA to invalid or unmapped addresses can cause a platform hang
QATE-7495 - GEN - An incorrectly formatted request to Intel® QAT can
hang the entire Intel® QAT Endpoint
The document is downloadable from https://01.org/intel-quickassist-technology
at the following link:
https://01.org/sites/default/files/downloads/336211-014-qatforlinux-releasenotes-hwv1.7_0.pdf
This patch adds the following QAT devices to the denylist: DH895XCC, C3XXX and C62X.
--- drivers/vfio/pci/vfio_pci.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/vfio/pci/vfio_pci.c +15 -0
@@ -75,6 +75,21 @@ static inline bool vfio_vga_disabled(void)static bool vfio_pci_dev_in_denylist (struct pci_dev *pdev) { +switch (pdev->vendor) { +case PCI_VENDOR_ID_INTEL : +switch (pdev->device) { +case PCI_DEVICE_ID_INTEL_QAT_C3XXX : +case PCI_DEVICE_ID_INTEL_QAT_C3XXX_VF : +case PCI_DEVICE_ID_INTEL_QAT_C62X : +case PCI_DEVICE_ID_INTEL_QAT_C62X_VF : +case PCI_DEVICE_ID_INTEL_QAT_DH895XCC : +case PCI_DEVICE_ID_INTEL_QAT_DH895XCC_VF : +return true; +default : +return false; + } + } +return false; }
Signature · 1 line
2.26.2
PATCH v5 4/5 crypto: qat - replace device ids defines
In reply to Giovanni CabidduReplace device ids defined in the QAT drivers with the ones in include/linux/pci_ids.h.
--- drivers/crypto/qat/qat_c3xxx/adf_drv.c | 6 +++--- drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 6 +++--- drivers/crypto/qat/qat_c62x/adf_drv.c | 6 +++--- drivers/crypto/qat/qat_c62xvf/adf_drv.c | 6 +++--- drivers/crypto/qat/qat_common/adf_accel_devices.h | 6 ------ drivers/crypto/qat/qat_common/qat_hal.c | 7 ++++--- drivers/crypto/qat/qat_common/qat_uclo.c | 9 +++++---- drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 6 +++--- drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 6 +++--- 9 files changed, 27 insertions(+), 31 deletions(-)
drivers/crypto/qat/qat_c3xxx/adf_drv.c +3 -3
@@ -22,7 +22,7 @@ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}static const struct pci_device_id adf_pci_tbl[] = { -ADF_SYSTEM_DEVICE (ADF_C3XXX_PCI_DEVICE_ID ), +ADF_SYSTEM_DEVICE (PCI_DEVICE_ID_INTEL_QAT_C3XXX ), {0 ,} };MODULE_DEVICE_TABLE (pci, adf_pci_tbl);
@@ -58,7 +58,7 @@ static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)if (accel_dev->hw_device) {switch (accel_pci_dev->pci_dev->device) { -case ADF_C3XXX_PCI_DEVICE_ID : +case PCI_DEVICE_ID_INTEL_QAT_C3XXX :adf_clean_hw_data_c3xxx (accel_dev->hw_device);break ;default :
@@ -83,7 +83,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)int ret;switch (ent->device) { -case ADF_C3XXX_PCI_DEVICE_ID : +case PCI_DEVICE_ID_INTEL_QAT_C3XXX :break ;default :dev_err (&pdev->dev,"Invalid device 0x%x.\n" , ent->device);
drivers/crypto/qat/qat_c3xxxvf/adf_drv.c +3 -3
@@ -22,7 +22,7 @@ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}static const struct pci_device_id adf_pci_tbl[] = { -ADF_SYSTEM_DEVICE (ADF_C3XXXIOV_PCI_DEVICE_ID ), +ADF_SYSTEM_DEVICE (PCI_DEVICE_ID_INTEL_QAT_C3XXX_VF ), {0 ,} };MODULE_DEVICE_TABLE (pci, adf_pci_tbl);
@@ -58,7 +58,7 @@ static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)if (accel_dev->hw_device) {switch (accel_pci_dev->pci_dev->device) { -case ADF_C3XXXIOV_PCI_DEVICE_ID : +case PCI_DEVICE_ID_INTEL_QAT_C3XXX_VF :adf_clean_hw_data_c3xxxiov (accel_dev->hw_device);break ;default :
@@ -85,7 +85,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)int ret;switch (ent->device) { -case ADF_C3XXXIOV_PCI_DEVICE_ID : +case PCI_DEVICE_ID_INTEL_QAT_C3XXX_VF :break ;default :dev_err (&pdev->dev,"Invalid device 0x%x.\n" , ent->device);
drivers/crypto/qat/qat_c62x/adf_drv.c +3 -3
@@ -22,7 +22,7 @@ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}static const struct pci_device_id adf_pci_tbl[] = { -ADF_SYSTEM_DEVICE (ADF_C62X_PCI_DEVICE_ID ), +ADF_SYSTEM_DEVICE (PCI_DEVICE_ID_INTEL_QAT_C62X ), {0 ,} };MODULE_DEVICE_TABLE (pci, adf_pci_tbl);
@@ -58,7 +58,7 @@ static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)if (accel_dev->hw_device) {switch (accel_pci_dev->pci_dev->device) { -case ADF_C62X_PCI_DEVICE_ID : +case PCI_DEVICE_ID_INTEL_QAT_C62X :adf_clean_hw_data_c62x (accel_dev->hw_device);break ;default :
@@ -83,7 +83,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)int ret;switch (ent->device) { -case ADF_C62X_PCI_DEVICE_ID : +case PCI_DEVICE_ID_INTEL_QAT_C62X :break ;default :dev_err (&pdev->dev,"Invalid device 0x%x.\n" , ent->device);
drivers/crypto/qat/qat_c62xvf/adf_drv.c +3 -3
@@ -22,7 +22,7 @@ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}static const struct pci_device_id adf_pci_tbl[] = { -ADF_SYSTEM_DEVICE (ADF_C62XIOV_PCI_DEVICE_ID ), +ADF_SYSTEM_DEVICE (PCI_DEVICE_ID_INTEL_QAT_C62X_VF ), {0 ,} };MODULE_DEVICE_TABLE (pci, adf_pci_tbl);
@@ -58,7 +58,7 @@ static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)if (accel_dev->hw_device) {switch (accel_pci_dev->pci_dev->device) { -case ADF_C62XIOV_PCI_DEVICE_ID : +case PCI_DEVICE_ID_INTEL_QAT_C62X_VF :adf_clean_hw_data_c62xiov (accel_dev->hw_device);break ;default :
@@ -85,7 +85,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)int ret;switch (ent->device) { -case ADF_C62XIOV_PCI_DEVICE_ID : +case PCI_DEVICE_ID_INTEL_QAT_C62X_VF :break ;default :dev_err (&pdev->dev,"Invalid device 0x%x.\n" , ent->device);
drivers/crypto/qat/qat_common/adf_accel_devices.h +0 -6
@@ -15,12 +15,6 @@#define ADF_C62XVF_DEVICE_NAME "c6xxvf"#define ADF_C3XXX_DEVICE_NAME "c3xxx"#define ADF_C3XXXVF_DEVICE_NAME "c3xxxvf" -#define ADF_DH895XCC_PCI_DEVICE_ID 0x435 -#define ADF_DH895XCCIOV_PCI_DEVICE_ID 0x443 -#define ADF_C62X_PCI_DEVICE_ID 0x37c8 -#define ADF_C62XIOV_PCI_DEVICE_ID 0x37c9 -#define ADF_C3XXX_PCI_DEVICE_ID 0x19e2 -#define ADF_C3XXXIOV_PCI_DEVICE_ID 0x19e3#define ADF_ERRSOU3 (0x3A000 + 0x0C)#define ADF_ERRSOU5 (0x3A000 + 0xD8)#define ADF_DEVICE_FUSECTL_OFFSET 0x40
drivers/crypto/qat/qat_common/qat_hal.c +4 -3
@@ -2,6 +2,7 @@/* Copyright(c) 2014 - 2020 Intel Corporation */ #include <linux/slab.h> #include <linux/delay.h> +#include <linux/pci_ids.h> #include "adf_accel_devices.h" #include "adf_common_drv.h"
@@ -412,7 +413,7 @@ static int qat_hal_init_esram(struct icp_qat_fw_loader_handle *handle)unsigned int csr_val;int times =30 ; -if (handle->pci_dev->device !=ADF_DH895XCC_PCI_DEVICE_ID ) +if (handle->pci_dev->device !=PCI_DEVICE_ID_INTEL_QAT_DH895XCC )return 0 ; csr_val =ADF_CSR_RD (csr_addr,0 );
@@ -672,13 +673,13 @@ int qat_hal_init(struct adf_accel_dev *accel_dev) (void __iomem *)((uintptr_t )handle->hal_cap_ae_xfer_csr_addr_v +LOCAL_TO_XFER_REG_OFFSET ); handle->pci_dev = pci_info->pci_dev; -if (handle->pci_dev->device ==ADF_DH895XCC_PCI_DEVICE_ID ) { +if (handle->pci_dev->device ==PCI_DEVICE_ID_INTEL_QAT_DH895XCC ) { sram_bar = &pci_info->pci_bars[hw_data->get_sram_bar_id (hw_data)]; handle->hal_sram_addr_v = sram_bar->virt_addr; } handle->fw_auth = (handle->pci_dev->device == -ADF_DH895XCC_PCI_DEVICE_ID ) ? false : true; +PCI_DEVICE_ID_INTEL_QAT_DH895XCC ) ? false : true; handle->hal_handle =kzalloc (sizeof (*handle->hal_handle),GFP_KERNEL );if (!handle->hal_handle) goto out_hal_handle;
drivers/crypto/qat/qat_common/qat_uclo.c +5 -4
@@ -4,6 +4,7 @@#include <linux/ctype.h> #include <linux/kernel.h> #include <linux/delay.h> +#include <linux/pci_ids.h> #include "adf_accel_devices.h" #include "adf_common_drv.h" #include "icp_qat_uclo.h"
@@ -711,11 +712,11 @@ static unsigned int qat_uclo_get_dev_type(struct icp_qat_fw_loader_handle *handle) {switch (handle->pci_dev->device) { -case ADF_DH895XCC_PCI_DEVICE_ID : +case PCI_DEVICE_ID_INTEL_QAT_DH895XCC :return ICP_QAT_AC_895XCC_DEV_TYPE ; -case ADF_C62X_PCI_DEVICE_ID : +case PCI_DEVICE_ID_INTEL_QAT_C62X :return ICP_QAT_AC_C62X_DEV_TYPE ; -case ADF_C3XXX_PCI_DEVICE_ID : +case PCI_DEVICE_ID_INTEL_QAT_C3XXX :return ICP_QAT_AC_C3XXX_DEV_TYPE ;default : pr_err("QAT: unsupported device 0x%x\n",
@@ -1391,7 +1392,7 @@ int qat_uclo_wr_mimage(struct icp_qat_fw_loader_handle *handle, status =qat_uclo_auth_fw (handle, desc);qat_uclo_ummap_auth_fw (handle, &desc); }else { -if (handle->pci_dev->device ==ADF_C3XXX_PCI_DEVICE_ID ) { +if (handle->pci_dev->device ==PCI_DEVICE_ID_INTEL_QAT_C3XXX ) {pr_err ("QAT: C3XXX doesn't support unsigned MMP\n" );return -EINVAL ; }
drivers/crypto/qat/qat_dh895xcc/adf_drv.c +3 -3
@@ -22,7 +22,7 @@ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}static const struct pci_device_id adf_pci_tbl[] = { -ADF_SYSTEM_DEVICE (ADF_DH895XCC_PCI_DEVICE_ID ), +ADF_SYSTEM_DEVICE (PCI_DEVICE_ID_INTEL_QAT_DH895XCC ), {0 ,} };MODULE_DEVICE_TABLE (pci, adf_pci_tbl);
@@ -58,7 +58,7 @@ static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)if (accel_dev->hw_device) {switch (accel_pci_dev->pci_dev->device) { -case ADF_DH895XCC_PCI_DEVICE_ID : +case PCI_DEVICE_ID_INTEL_QAT_DH895XCC :adf_clean_hw_data_dh895xcc (accel_dev->hw_device);break ;default :
@@ -83,7 +83,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)int ret;switch (ent->device) { -case ADF_DH895XCC_PCI_DEVICE_ID : +case PCI_DEVICE_ID_INTEL_QAT_DH895XCC :break ;default :dev_err (&pdev->dev,"Invalid device 0x%x.\n" , ent->device);
drivers/crypto/qat/qat_dh895xccvf/adf_drv.c +3 -3
@@ -22,7 +22,7 @@ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}static const struct pci_device_id adf_pci_tbl[] = { -ADF_SYSTEM_DEVICE (ADF_DH895XCCIOV_PCI_DEVICE_ID ), +ADF_SYSTEM_DEVICE (PCI_DEVICE_ID_INTEL_QAT_DH895XCC_VF ), {0 ,} };MODULE_DEVICE_TABLE (pci, adf_pci_tbl);
@@ -58,7 +58,7 @@ static void adf_cleanup_accel(struct adf_accel_dev *accel_dev)if (accel_dev->hw_device) {switch (accel_pci_dev->pci_dev->device) { -case ADF_DH895XCCIOV_PCI_DEVICE_ID : +case PCI_DEVICE_ID_INTEL_QAT_DH895XCC_VF :adf_clean_hw_data_dh895xcciov (accel_dev->hw_device);break ;default :
@@ -85,7 +85,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)int ret;switch (ent->device) { -case ADF_DH895XCCIOV_PCI_DEVICE_ID : +case PCI_DEVICE_ID_INTEL_QAT_DH895XCC_VF :break ;default :dev_err (&pdev->dev,"Invalid device 0x%x.\n" , ent->device);
Signature · 1 line
2.26.2
PATCH v5 5/5 crypto: qat - use PCI_VDEVICE
In reply to Giovanni CabidduBuild pci_device_id structure using the PCI_VDEVICE macro. This removes any references to the ADF_SYSTEM_DEVICE macro.
--- drivers/crypto/qat/qat_c3xxx/adf_drv.c | 7 ++----- drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 7 ++----- drivers/crypto/qat/qat_c62x/adf_drv.c | 7 ++----- drivers/crypto/qat/qat_c62xvf/adf_drv.c | 7 ++----- drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 7 ++----- drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 7 ++----- 6 files changed, 12 insertions(+), 30 deletions(-)
drivers/crypto/qat/qat_c3xxx/adf_drv.c +2 -5
@@ -18,12 +18,9 @@#include <adf_cfg.h> #include "adf_c3xxx_hw_data.h" -#define ADF_SYSTEM_DEVICE (device_id) \ - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)} -static const struct pci_device_id adf_pci_tbl[] = { -ADF_SYSTEM_DEVICE (PCI_DEVICE_ID_INTEL_QAT_C3XXX ), - {0 ,} + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_QAT_C3XXX ), }, + { } };MODULE_DEVICE_TABLE (pci, adf_pci_tbl);
drivers/crypto/qat/qat_c3xxxvf/adf_drv.c +2 -5
@@ -18,12 +18,9 @@#include <adf_cfg.h> #include "adf_c3xxxvf_hw_data.h" -#define ADF_SYSTEM_DEVICE (device_id) \ - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)} -static const struct pci_device_id adf_pci_tbl[] = { -ADF_SYSTEM_DEVICE (PCI_DEVICE_ID_INTEL_QAT_C3XXX_VF ), - {0 ,} + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_QAT_C3XXX_VF ), }, + { } };MODULE_DEVICE_TABLE (pci, adf_pci_tbl);
drivers/crypto/qat/qat_c62x/adf_drv.c +2 -5
@@ -18,12 +18,9 @@#include <adf_cfg.h> #include "adf_c62x_hw_data.h" -#define ADF_SYSTEM_DEVICE (device_id) \ - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)} -static const struct pci_device_id adf_pci_tbl[] = { -ADF_SYSTEM_DEVICE (PCI_DEVICE_ID_INTEL_QAT_C62X ), - {0 ,} + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_QAT_C62X ), }, + { } };MODULE_DEVICE_TABLE (pci, adf_pci_tbl);
drivers/crypto/qat/qat_c62xvf/adf_drv.c +2 -5
@@ -18,12 +18,9 @@#include <adf_cfg.h> #include "adf_c62xvf_hw_data.h" -#define ADF_SYSTEM_DEVICE (device_id) \ - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)} -static const struct pci_device_id adf_pci_tbl[] = { -ADF_SYSTEM_DEVICE (PCI_DEVICE_ID_INTEL_QAT_C62X_VF ), - {0 ,} + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_QAT_C62X_VF ), }, + { } };MODULE_DEVICE_TABLE (pci, adf_pci_tbl);
drivers/crypto/qat/qat_dh895xcc/adf_drv.c +2 -5
@@ -18,12 +18,9 @@#include <adf_cfg.h> #include "adf_dh895xcc_hw_data.h" -#define ADF_SYSTEM_DEVICE (device_id) \ - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)} -static const struct pci_device_id adf_pci_tbl[] = { -ADF_SYSTEM_DEVICE (PCI_DEVICE_ID_INTEL_QAT_DH895XCC ), - {0 ,} + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_QAT_DH895XCC ), }, + { } };MODULE_DEVICE_TABLE (pci, adf_pci_tbl);
drivers/crypto/qat/qat_dh895xccvf/adf_drv.c +2 -5
@@ -18,12 +18,9 @@#include <adf_cfg.h> #include "adf_dh895xccvf_hw_data.h" -#define ADF_SYSTEM_DEVICE (device_id) \ - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)} -static const struct pci_device_id adf_pci_tbl[] = { -ADF_SYSTEM_DEVICE (PCI_DEVICE_ID_INTEL_QAT_DH895XCC_VF ), - {0 ,} + {PCI_VDEVICE (INTEL ,PCI_DEVICE_ID_INTEL_QAT_DH895XCC_VF ), }, + { } };MODULE_DEVICE_TABLE (pci, adf_pci_tbl);
Signature · 1 line
2.26.2
Quoted 10 lines · Giovanni Cabiddu
This patchset defines a denylist of devices in the vfio-pci module and adds the current generation of Intel(R) QuickAssist devices to it as they are not designed to run in an untrusted environment.
By default, if a device is in the denylist, the probe of vfio-pci fails. If a user wants to use a device in the denylist, he needs to disable the full denylist providing the option disable_denylist=1 at the load of vfio-pci or specifying that parameter in a config file in
/etc/modprobe.d.
Quoted 7 lines
This series also moves the device ids definitions present in the qat driver to
linux/pci_ids.hsince they will be shared between the vfio-pci and the qat drivers and replaces the customADF_SYSTEM_DEVICEmacro withPCI_VDEVICE.The series is applicable to Herbert's tree. Patches 1 to 3 apply also to Alex's tree (next). Patches 4 and 5 are optional and can be applied at a later stage.
Thanks!
FWIW,
Quoted 48 lines
Changes from v4:
- Patch #2: added Reviewed-by tag from Cornelia Huck
- Patch #5: added Suggested-by tag as this change was suggested internally by Andy Shevchenko
- Patches 1-5: added Reviewed-by tag from Fiona TraheChanges from v3:
- Patch #1: included Acked-by tag, after ack from Bjorn Helgaas
- Patch #2: s/prevents/allows/ in module parameter descriptionChanges from v2:
- Renamed blocklist in denylist
- Patch #2: reworded module parameter description to clarify why a device is in the denylist
- Patch #2: reworded warning that occurs when denylist is enabled and device is present in that listChanges from v1:
- Reworked commit messages:
Patches #1, #2 and #3: capitalized first character after column to comply to subject line convention
Patch #3: Capitalized QAT acronym and added link and doc number for document "Intel® QuickAssist Technology (Intel® QAT) Software for Linux"Giovanni Cabiddu (5):
PCI: Add Intel QuickAssist device IDs
vfio/pci: Add device denylist
vfio/pci: Add QAT devices to denylist
crypto: qat - replace device ids defines
crypto: qat - usePCI_VDEVICEdrivers/crypto/qat/qat_c3xxx/adf_drv.c | 11 ++--- drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 11 ++--- drivers/crypto/qat/qat_c62x/adf_drv.c | 11 ++--- drivers/crypto/qat/qat_c62xvf/adf_drv.c | 11 ++--- .../crypto/qat/qat_common/adf_accel_devices.h | 6 --- drivers/crypto/qat/qat_common/qat_hal.c | 7 +-- drivers/crypto/qat/qat_common/qat_uclo.c | 9 ++-- drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 11 ++--- drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 11 ++--- drivers/vfio/pci/vfio_pci.c | 48 +++++++++++++++++++ include/linux/pci_ids.h | 6 +++ 11 files changed, 87 insertions(+), 55 deletions(-)--
2.26.2
Signature · 2 lines
With Best Regards, Andy Shevchenko