Move to use cgroups for userspace persistent allocations
Subsystems (7)
Yishai Hadas
maintainercover Move to use cgroups for userspace persistent allocations
This series changes the vfio and its sub drivers to use GFP_KERNEL_ACCOUNT for userspace persistent allocations.
The GFP_KERNEL_ACCOUNT option lets the memory allocator know that this is untrusted allocation triggered from userspace and should be a subject of kmem accountingis, and as such it is controlled by the cgroup mechanism. [1]
As part of this change, we allow loading in mlx5 driver larger images than 512 MB by dropping the arbitrary hard-coded value that we have today and move to use the max device loading value which is for now 4GB.
In addition, the first patch from the series fixes a UBSAN note in mlx5 that was reported once the kernel was compiled with this option.
[1] https://www.kernel.org/doc/html/latest/core-api/memory-allocation.html
Changes from V0: https://www.spinics.net/lists/kvm/msg299508.html
Patch #2 - Fix MAX_LOAD_SIZE to use BIT_ULL instead of BIT as was
reported by the krobot test.
Yishai
Jason Gunthorpe (1):
vfio: Use GFP_KERNEL_ACCOUNT for userspace persistent allocations
Yishai Hadas (5):
vfio/mlx5: Fix UBSAN note
vfio/mlx5: Allow loading of larger images than 512 MB vfio/hisi: Use GFP_KERNEL_ACCOUNT for userspace persistent allocations vfio/fsl-mc: Use GFP_KERNEL_ACCOUNT for userspace persistent
allocations
vfio/platform: Use GFP_KERNEL_ACCOUNT for userspace persistent
allocations
drivers/vfio/container.c | 2 +- drivers/vfio/fsl-mc/vfio_fsl_mc.c | 2 +- drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c | 4 ++-- .../vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 4 ++-- drivers/vfio/pci/mlx5/cmd.c | 17 +++++++++-------- drivers/vfio/pci/mlx5/main.c | 19 ++++++++++--------- drivers/vfio/pci/vfio_pci_config.c | 6 +++--- drivers/vfio/pci/vfio_pci_core.c | 7 ++++--- drivers/vfio/pci/vfio_pci_igd.c | 2 +- drivers/vfio/pci/vfio_pci_intrs.c | 10 ++++++---- drivers/vfio/pci/vfio_pci_rdwr.c | 2 +- drivers/vfio/platform/vfio_platform_common.c | 2 +- drivers/vfio/platform/vfio_platform_irq.c | 8 ++++---- drivers/vfio/virqfd.c | 2 +- 14 files changed, 46 insertions(+), 41 deletions(-)
Signature · 1 line
2.18.1
Yishai Hadas
maintainerPATCH 1/6 vfio/mlx5: Fix UBSAN note
Prevent calling roundup_pow_of_two() with value of 0 as it causes the below UBSAN note.
Move this code and its few extra related lines to be called only when it's really applicable.
UBSAN: shift-out-of-bounds in ./include/linux/log2.h:57:13 shift exponent 64 is too large for 64-bit type 'long unsigned int' CPU: 15 PID: 1639 Comm: live_migration Not tainted 6.1.0-rc4 #1116 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0x45/0x59 ubsan_epilogue+0x5/0x36 __ubsan_handle_shift_out_of_bounds.cold+0x61/0xef ? lock_is_held_type+0x98/0x110 ? rcu_read_lock_sched_held+0x3f/0x70 mlx5vf_create_rc_qp.cold+0xe4/0xf2 [mlx5_vfio_pci] mlx5vf_start_page_tracker+0x769/0xcd0 [mlx5_vfio_pci] vfio_device_fops_unl_ioctl+0x63f/0x700 [vfio] __x64_sys_ioctl+0x433/0x9a0 do_syscall_64+0x3d/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd </TASK>
--- drivers/vfio/pci/mlx5/cmd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/vfio/pci/mlx5/cmd.c +3 -3
@@ -1036,14 +1036,14 @@ mlx5vf_create_rc_qp(struct mlx5_core_dev *mdev,if (!qp)return ERR_PTR (-ENOMEM ); - qp->rq.wqe_cnt =roundup_pow_of_two (max_recv_wr); - log_rq_stride =ilog2 (MLX5_SEND_WQE_DS ); - log_rq_sz =ilog2 (qp->rq.wqe_cnt); err =mlx5_db_alloc_node (mdev, &qp->db, mdev->priv.numa_node);if (err) goto err_free;if (max_recv_wr) { + qp->rq.wqe_cnt =roundup_pow_of_two (max_recv_wr); + log_rq_stride =ilog2 (MLX5_SEND_WQE_DS ); + log_rq_sz =ilog2 (qp->rq.wqe_cnt); err =mlx5_frag_buf_alloc_node (mdev,wq_get_byte_sz (log_rq_sz, log_rq_stride), &qp->buf, mdev->priv.numa_node);
Signature · 1 line
2.18.1
Yishai Hadas
maintainerPATCH 2/6 vfio/mlx5: Allow loading of larger images than 512 MB
In reply to Yishai HadasAllow loading of larger images than 512 MB by dropping the arbitrary hard-coded value that we have today and move to use the max device loading value which is for now 4GB.
As part of that we move to use the GFP_KERNEL_ACCOUNT option upon allocating the persistent data of mlx5 and rely on the cgroup to provide the memory limit for the given user.
The GFP_KERNEL_ACCOUNT option lets the memory allocator know that this is untrusted allocation triggered from userspace and should be a subject of kmem accountingis, and as such it is controlled by the cgroup mechanism.
--- drivers/vfio/pci/mlx5/cmd.c | 11 ++++++----- drivers/vfio/pci/mlx5/main.c | 19 ++++++++++--------- 2 files changed, 16 insertions(+), 14 deletions(-)
drivers/vfio/pci/mlx5/cmd.c +6 -5
@@ -373,7 +373,7 @@ mlx5vf_alloc_data_buffer(struct mlx5_vf_migration_file *migf,struct mlx5_vhca_data_buffer *buf;int ret; - buf =kzalloc (sizeof (*buf),GFP_KERNEL ); + buf =kzalloc (sizeof (*buf),GFP_KERNEL_ACCOUNT );if (!buf)return ERR_PTR (-ENOMEM );
@@ -1032,7 +1032,7 @@ mlx5vf_create_rc_qp(struct mlx5_core_dev *mdev,void *in;int err; - qp =kzalloc (sizeof (*qp),GFP_KERNEL ); + qp =kzalloc (sizeof (*qp),GFP_KERNEL_ACCOUNT );if (!qp)return ERR_PTR (-ENOMEM );
@@ -1213,12 +1213,13 @@ static int alloc_recv_pages(struct mlx5_vhca_recv_buf *recv_buf,int i; recv_buf->page_list =kvcalloc (npages,sizeof (*recv_buf->page_list), -GFP_KERNEL ); +GFP_KERNEL_ACCOUNT );if (!recv_buf->page_list)return -ENOMEM ;for (;;) { - filled =alloc_pages_bulk_array (GFP_KERNEL , npages - done, + filled =alloc_pages_bulk_array (GFP_KERNEL_ACCOUNT , + npages - done, recv_buf->page_list + done);if (!filled) goto err;
@@ -1248,7 +1249,7 @@ static int register_dma_recv_pages(struct mlx5_core_dev *mdev, recv_buf->dma_addrs =kvcalloc (recv_buf->npages,sizeof (*recv_buf->dma_addrs), -GFP_KERNEL ); +GFP_KERNEL_ACCOUNT );if (!recv_buf->dma_addrs)return -ENOMEM ;
drivers/vfio/pci/mlx5/main.c +10 -9
@@ -21,8 +21,8 @@#include "cmd.h" -/* Arbitrary to prevent userspace from consuming endless memory */ -#define MAX_MIGRATION_SIZE (512*1024*1024) +/* Device specification max LOAD size */ +#define MAX_LOAD_SIZE (BIT_ULL(__mlx5_bit_sz(load_vhca_state_in, size)) - 1)static struct mlx5vf_pci_core_device *mlx5vf_drvdata (struct pci_dev *pdev) {
@@ -73,12 +73,13 @@ int mlx5vf_add_migration_pages(struct mlx5_vhca_data_buffer *buf,int ret; to_fill = min_t(unsigned int, npages, PAGE_SIZE / sizeof(*page_list)); - page_list =kvzalloc (to_fill *sizeof (*page_list),GFP_KERNEL ); + page_list =kvzalloc (to_fill *sizeof (*page_list),GFP_KERNEL_ACCOUNT );if (!page_list)return -ENOMEM ; do { - filled = alloc_pages_bulk_array(GFP_KERNEL, to_fill, page_list); + filled = alloc_pages_bulk_array(GFP_KERNEL_ACCOUNT, to_fill, + page_list); if (!filled) { ret = -ENOMEM; goto err;
@@ -87,7 +88,7 @@ int mlx5vf_add_migration_pages(struct mlx5_vhca_data_buffer *buf, ret =sg_alloc_append_table_from_pages ( &buf->table, page_list, filled,0 , filled <<PAGE_SHIFT ,UINT_MAX ,SG_MAX_SINGLE_ALLOC , -GFP_KERNEL ); +GFP_KERNEL_ACCOUNT );if (ret) goto err;
@@ -467,7 +468,7 @@ mlx5vf_pci_save_device_data(struct mlx5vf_pci_core_device *mvdev, bool track)size_t length;int ret; - migf =kzalloc (sizeof (*migf),GFP_KERNEL ); + migf =kzalloc (sizeof (*migf),GFP_KERNEL_ACCOUNT );if (!migf)return ERR_PTR (-ENOMEM );
@@ -564,7 +565,7 @@ mlx5vf_resume_read_image_no_header(struct mlx5_vhca_data_buffer *vhca_buf, {int ret; -if (requested_length >MAX_MIGRATION_SIZE ) +if (requested_length >MAX_LOAD_SIZE )return -ENOMEM ;if (vhca_buf->allocated_length < requested_length) {
@@ -648,7 +649,7 @@ mlx5vf_resume_read_header(struct mlx5_vf_migration_file *migf,u64 flags; vhca_buf->header_image_size =le64_to_cpup ((__le64 *)to_buff); -if (vhca_buf->header_image_size >MAX_MIGRATION_SIZE ) { +if (vhca_buf->header_image_size >MAX_LOAD_SIZE ) { ret = -ENOMEM ; goto end; }
@@ -781,7 +782,7 @@ mlx5vf_pci_resume_device_data(struct mlx5vf_pci_core_device *mvdev)struct mlx5_vhca_data_buffer *buf;int ret; - migf =kzalloc (sizeof (*migf),GFP_KERNEL ); + migf =kzalloc (sizeof (*migf),GFP_KERNEL_ACCOUNT );if (!migf)return ERR_PTR (-ENOMEM );
Signature · 1 line
2.18.1
Yishai Hadas
maintainerPATCH 3/6 vfio: Use GFP_KERNEL_ACCOUNT for userspace persistent allocations
In reply to Yishai HadasFrom: Jason Gunthorpe <[email protected]>
Use GFP_KERNEL_ACCOUNT for userspace persistent allocations.
The GFP_KERNEL_ACCOUNT option lets the memory allocator know that this is untrusted allocation triggered from userspace and should be a subject of kmem accountingis, and as such it is controlled by the cgroup mechanism.
The way to find the relevant allocations was for example to look at the close_device function and trace back all the kfrees to their allocations.
--- drivers/vfio/container.c | 2 +- drivers/vfio/pci/vfio_pci_config.c | 6 +++--- drivers/vfio/pci/vfio_pci_core.c | 7 ++++--- drivers/vfio/pci/vfio_pci_igd.c | 2 +- drivers/vfio/pci/vfio_pci_intrs.c | 10 ++++++---- drivers/vfio/pci/vfio_pci_rdwr.c | 2 +- drivers/vfio/virqfd.c | 2 +- 7 files changed, 17 insertions(+), 14 deletions(-)
drivers/vfio/container.c +1 -1
@@ -367,7 +367,7 @@ static int vfio_fops_open(struct inode *inode, struct file *filep) {struct vfio_container *container; - container =kzalloc (sizeof (*container),GFP_KERNEL ); + container =kzalloc (sizeof (*container),GFP_KERNEL_ACCOUNT );if (!container)return -ENOMEM ;
drivers/vfio/pci/vfio_pci_config.c +3 -3
@@ -1244,7 +1244,7 @@ static int vfio_msi_cap_len(struct vfio_pci_core_device *vdev, u8 pos)if (vdev->msi_perm)return len; - vdev->msi_perm =kmalloc (sizeof (struct perm_bits ),GFP_KERNEL ); + vdev->msi_perm =kmalloc (sizeof (struct perm_bits ),GFP_KERNEL_ACCOUNT );if (!vdev->msi_perm)return -ENOMEM ;
@@ -1731,11 +1731,11 @@ int vfio_config_init(struct vfio_pci_core_device *vdev)* no requirements on the length of a capability, so the gap between * capabilities needs byte granularity. */ - map =kmalloc (pdev->cfg_size,GFP_KERNEL ); + map =kmalloc (pdev->cfg_size,GFP_KERNEL_ACCOUNT );if (!map)return -ENOMEM ; - vconfig =kmalloc (pdev->cfg_size,GFP_KERNEL ); + vconfig =kmalloc (pdev->cfg_size,GFP_KERNEL_ACCOUNT );if (!vconfig) {kfree (map);return -ENOMEM ;
drivers/vfio/pci/vfio_pci_core.c +4 -3
@@ -144,7 +144,8 @@ static void vfio_pci_probe_mmaps(struct vfio_pci_core_device *vdev)* of the exclusive page in case that hot-add * device's bar is assigned into it. */ - dummy_res =kzalloc (sizeof (*dummy_res),GFP_KERNEL ); + dummy_res = +kzalloc (sizeof (*dummy_res),GFP_KERNEL_ACCOUNT );if (dummy_res ==NULL ) goto no_mmap;
@@ -863,7 +864,7 @@ int vfio_pci_core_register_dev_region(struct vfio_pci_core_device *vdev, region =krealloc (vdev->region, (vdev->num_regions +1 ) *sizeof (*region), -GFP_KERNEL ); +GFP_KERNEL_ACCOUNT );if (!region)return -ENOMEM ;
@@ -1644,7 +1645,7 @@ static int __vfio_pci_add_vma(struct vfio_pci_core_device *vdev, {struct vfio_pci_mmap_vma *mmap_vma; - mmap_vma =kmalloc (sizeof (*mmap_vma),GFP_KERNEL ); + mmap_vma =kmalloc (sizeof (*mmap_vma),GFP_KERNEL_ACCOUNT );if (!mmap_vma)return -ENOMEM ;
drivers/vfio/pci/vfio_pci_igd.c +1 -1
@@ -180,7 +180,7 @@ static int vfio_pci_igd_opregion_init(struct vfio_pci_core_device *vdev)if (!addr || !(~addr))return -ENODEV ; - opregionvbt =kzalloc (sizeof (*opregionvbt),GFP_KERNEL ); + opregionvbt =kzalloc (sizeof (*opregionvbt),GFP_KERNEL_ACCOUNT );if (!opregionvbt)return -ENOMEM ;
drivers/vfio/pci/vfio_pci_intrs.c +6 -4
@@ -177,7 +177,7 @@ static int vfio_intx_enable(struct vfio_pci_core_device *vdev)if (!vdev->pdev->irq)return -ENODEV ; - vdev->ctx =kzalloc (sizeof (struct vfio_pci_irq_ctx ),GFP_KERNEL ); + vdev->ctx =kzalloc (sizeof (struct vfio_pci_irq_ctx ),GFP_KERNEL_ACCOUNT );if (!vdev->ctx)return -ENOMEM ;
@@ -216,7 +216,7 @@ static int vfio_intx_set_signal(struct vfio_pci_core_device *vdev, int fd)if (fd <0 )/* Disable only */ return 0 ; - vdev->ctx[0 ].name =kasprintf (GFP_KERNEL ,"vfio-intx(%s)" , + vdev->ctx[0 ].name =kasprintf (GFP_KERNEL_ACCOUNT ,"vfio-intx(%s)" ,pci_name (pdev));if (!vdev->ctx[0 ].name)return -ENOMEM ;
@@ -284,7 +284,8 @@ static int vfio_msi_enable(struct vfio_pci_core_device *vdev, int nvec, bool msiif (!is_irq_none (vdev))return -EINVAL ; - vdev->ctx =kcalloc (nvec,sizeof (struct vfio_pci_irq_ctx ),GFP_KERNEL ); + vdev->ctx =kcalloc (nvec,sizeof (struct vfio_pci_irq_ctx ), +GFP_KERNEL_ACCOUNT );if (!vdev->ctx)return -ENOMEM ;
@@ -343,7 +344,8 @@ static int vfio_msi_set_vector_signal(struct vfio_pci_core_device *vdev,if (fd <0 )return 0 ; - vdev->ctx[vector].name =kasprintf (GFP_KERNEL ,"vfio-msi%s[%d](%s)" , + vdev->ctx[vector].name =kasprintf (GFP_KERNEL_ACCOUNT , +"vfio-msi%s[%d](%s)" , msix ?"x" :"" , vector,pci_name (pdev));if (!vdev->ctx[vector].name)
drivers/vfio/pci/vfio_pci_rdwr.c +1 -1
@@ -470,7 +470,7 @@ int vfio_pci_ioeventfd(struct vfio_pci_core_device *vdev, loff_t offset, goto out_unlock; } - ioeventfd =kzalloc (sizeof (*ioeventfd),GFP_KERNEL ); + ioeventfd =kzalloc (sizeof (*ioeventfd),GFP_KERNEL_ACCOUNT );if (!ioeventfd) { ret = -ENOMEM ; goto out_unlock;
drivers/vfio/virqfd.c +1 -1
@@ -112,7 +112,7 @@ int vfio_virqfd_enable(void *opaque,int ret =0 ;__poll_t events; - virqfd =kzalloc (sizeof (*virqfd),GFP_KERNEL ); + virqfd =kzalloc (sizeof (*virqfd),GFP_KERNEL_ACCOUNT );if (!virqfd)return -ENOMEM ;
Signature · 1 line
2.18.1
Re: [PATCH V1 vfio 3/6] vfio: Use GFP_KERNEL_ACCOUNT for userspace persistent allocations
Quoted 15 lines · Yishai Hadas
From: Jason Gunthorpe <[email protected]>
Use
GFP_KERNEL_ACCOUNTfor userspace persistent allocations.The
GFP_KERNEL_ACCOUNToption lets the memory allocator know that this is untrusted allocation triggered from userspace and should be a subject of kmem accountingis, and as such it is controlled by the cgroup mechanism.The way to find the relevant allocations was for example to look at the
close_devicefunction and trace back all the kfrees to their allocations.Signed-off-by Jason Gunthorpe <[email protected]>Signed-off-by Yishai Hadas <[email protected]>
Quoted 10 lines
--- drivers/vfio/container.c | 2 +- drivers/vfio/pci/vfio_pci_config.c | 6 +++--- drivers/vfio/pci/vfio_pci_core.c | 7 ++++--- drivers/vfio/pci/vfio_pci_igd.c | 2 +- drivers/vfio/pci/vfio_pci_intrs.c | 10 ++++++---- drivers/vfio/pci/vfio_pci_rdwr.c | 2 +- drivers/vfio/virqfd.c | 2 +- 7 files changed, 17 insertions(+), 14 deletions(-)
I am not sure, but should we add the call in the kzalloc done in iova_bitmap_init() too ? It is called from DMA_LOGGING_REPORT | FEATURE_GET. It is not persistent though, but userspace triggerable.
Joao
Yishai Hadas
maintainerRe: [PATCH V1 vfio 3/6] vfio: Use GFP_KERNEL_ACCOUNT for userspace persistent allocations
Quoted 26 lines · Joao Martins
Quoted 15 lines · Yishai Hadas
From: Jason Gunthorpe <[email protected]>
Use
GFP_KERNEL_ACCOUNTfor userspace persistent allocations.The
GFP_KERNEL_ACCOUNToption lets the memory allocator know that this is untrusted allocation triggered from userspace and should be a subject of kmem accountingis, and as such it is controlled by the cgroup mechanism.The way to find the relevant allocations was for example to look at the
close_devicefunction and trace back all the kfrees to their allocations.Signed-off-by Jason Gunthorpe <[email protected]>Signed-off-by Yishai Hadas <[email protected]>Quoted 10 lines
--- drivers/vfio/container.c | 2 +- drivers/vfio/pci/vfio_pci_config.c | 6 +++--- drivers/vfio/pci/vfio_pci_core.c | 7 ++++--- drivers/vfio/pci/vfio_pci_igd.c | 2 +- drivers/vfio/pci/vfio_pci_intrs.c | 10 ++++++---- drivers/vfio/pci/vfio_pci_rdwr.c | 2 +- drivers/vfio/virqfd.c | 2 +- 7 files changed, 17 insertions(+), 14 deletions(-)
Quoted 5 lines
I am not sure, but should we add the call in the kzalloc done in
iova_bitmap_init()too ? It is called fromDMA_LOGGING_REPORT|FEATURE_GET. It is not persistent though, but userspace triggerable.Joao
You referred to the allocation inside iova_bitmap_alloc() I assume, right ?
In any case, we count persistent allocations, so there is no need.
Yishai
Re: [PATCH V1 vfio 3/6] vfio: Use GFP_KERNEL_ACCOUNT for userspace persistent allocations
Quoted 27 lines · Yishai Hadas
Quoted 26 lines · Joao Martins
Quoted 25 lines · Yishai Hadas
From: Jason Gunthorpe <[email protected]>
Use
GFP_KERNEL_ACCOUNTfor userspace persistent allocations.The
GFP_KERNEL_ACCOUNToption lets the memory allocator know that this is untrusted allocation triggered from userspace and should be a subject of kmem accountingis, and as such it is controlled by the cgroup mechanism.The way to find the relevant allocations was for example to look at the
close_devicefunction and trace back all the kfrees to their allocations.Signed-off-by Jason Gunthorpe <[email protected]>Signed-off-by Yishai Hadas <[email protected]>---
drivers/vfio/container.c | 2 +-drivers/vfio/pci/vfio_pci_config.c| 6 +++--- drivers/vfio/pci/vfio_pci_core.c | 7 ++++--- drivers/vfio/pci/vfio_pci_igd.c | 2 +- drivers/vfio/pci/vfio_pci_intrs.c | 10 ++++++---- drivers/vfio/pci/vfio_pci_rdwr.c | 2 +- drivers/vfio/virqfd.c | 2 +-7 files changed, 17 insertions(+), 14 deletions(-)
Quoted 8 lines
Quoted 5 lines
I am not sure, but should we add the call in the kzalloc done in
iova_bitmap_init()too ? It is called fromDMA_LOGGING_REPORT|FEATURE_GET. It is not persistent though, but userspace triggerable.Joao
You referred to the allocation inside
iova_bitmap_alloc()I assume, right ?
Yes.
Quoted 1 line
In any case, we count persistent allocations, so there is no need.
OK
Yishai Hadas
maintainerPATCH 4/6 vfio/hisi: Use GFP_KERNEL_ACCOUNT for userspace persistent allocations
In reply to Yishai HadasUse GFP_KERNEL_ACCOUNT for userspace persistent allocations.
The GFP_KERNEL_ACCOUNT option lets the memory allocator know that this is untrusted allocation triggered from userspace and should be a subject of kmem accountingis, and as such it is controlled by the cgroup mechanism.
--- drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c +2 -2
@@ -744,7 +744,7 @@ hisi_acc_vf_pci_resume(struct hisi_acc_vf_core_device *hisi_acc_vdev) {struct hisi_acc_vf_migration_file *migf; - migf =kzalloc (sizeof (*migf),GFP_KERNEL ); + migf =kzalloc (sizeof (*migf),GFP_KERNEL_ACCOUNT );if (!migf)return ERR_PTR (-ENOMEM );
@@ -863,7 +863,7 @@ hisi_acc_open_saving_migf(struct hisi_acc_vf_core_device *hisi_acc_vdev)struct hisi_acc_vf_migration_file *migf;int ret; - migf =kzalloc (sizeof (*migf),GFP_KERNEL ); + migf =kzalloc (sizeof (*migf),GFP_KERNEL_ACCOUNT );if (!migf)return ERR_PTR (-ENOMEM );
Signature · 1 line
2.18.1
Yishai Hadas
maintainerPATCH 5/6 vfio/fsl-mc: Use GFP_KERNEL_ACCOUNT for userspace persistent allocations
In reply to Yishai HadasUse GFP_KERNEL_ACCOUNT for userspace persistent allocations.
The GFP_KERNEL_ACCOUNT option lets the memory allocator know that this is untrusted allocation triggered from userspace and should be a subject of kmem accountingis, and as such it is controlled by the cgroup mechanism.
--- drivers/vfio/fsl-mc/vfio_fsl_mc.c | 2 +- drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/vfio/fsl-mc/vfio_fsl_mc.c +1 -1
@@ -28,7 +28,7 @@ static int vfio_fsl_mc_open_device(struct vfio_device *core_vdev)int i; vdev->regions =kcalloc (count,sizeof (struct vfio_fsl_mc_region ), -GFP_KERNEL ); +GFP_KERNEL_ACCOUNT );if (!vdev->regions)return -ENOMEM ;
drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c +2 -2
@@ -29,7 +29,7 @@ static int vfio_fsl_mc_irqs_allocate(struct vfio_fsl_mc_device *vdev) irq_count = mc_dev->obj_desc.irq_count; - mc_irq =kcalloc (irq_count,sizeof (*mc_irq),GFP_KERNEL ); + mc_irq =kcalloc (irq_count,sizeof (*mc_irq),GFP_KERNEL_ACCOUNT );if (!mc_irq)return -ENOMEM ;
@@ -77,7 +77,7 @@ static int vfio_set_trigger(struct vfio_fsl_mc_device *vdev,if (fd <0 )/* Disable only */ return 0 ; - irq->name =kasprintf (GFP_KERNEL ,"vfio-irq[%d](%s)" , + irq->name =kasprintf (GFP_KERNEL_ACCOUNT ,"vfio-irq[%d](%s)" , hwirq,dev_name (&vdev->mc_dev->dev));if (!irq->name)return -ENOMEM ;
Signature · 1 line
2.18.1
Yishai Hadas
maintainerPATCH 6/6 vfio/platform: Use GFP_KERNEL_ACCOUNT for userspace persistent allocations
In reply to Yishai HadasUse GFP_KERNEL_ACCOUNT for userspace persistent allocations.
The GFP_KERNEL_ACCOUNT option lets the memory allocator know that this is untrusted allocation triggered from userspace and should be a subject of kmem accountingis, and as such it is controlled by the cgroup mechanism.
--- drivers/vfio/platform/vfio_platform_common.c | 2 +- drivers/vfio/platform/vfio_platform_irq.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/vfio/platform/vfio_platform_common.c +1 -1
@@ -142,7 +142,7 @@ static int vfio_platform_regions_init(struct vfio_platform_device *vdev) cnt++; vdev->regions =kcalloc (cnt,sizeof (struct vfio_platform_region ), -GFP_KERNEL ); +GFP_KERNEL_ACCOUNT );if (!vdev->regions)return -ENOMEM ;
drivers/vfio/platform/vfio_platform_irq.c +4 -4
@@ -186,9 +186,8 @@ static int vfio_set_trigger(struct vfio_platform_device *vdev, int index,if (fd <0 )/* Disable only */ return 0 ; - - irq->name =kasprintf (GFP_KERNEL ,"vfio-irq[%d](%s)" , - irq->hwirq, vdev->name); + irq->name =kasprintf (GFP_KERNEL_ACCOUNT ,"vfio-irq[%d](%s)" , + irq->hwirq, vdev->name);if (!irq->name)return -ENOMEM ;
@@ -286,7 +285,8 @@ int vfio_platform_irq_init(struct vfio_platform_device *vdev)while (vdev->get_irq (vdev, cnt) >=0 ) cnt++; - vdev->irqs =kcalloc (cnt,sizeof (struct vfio_platform_irq ),GFP_KERNEL ); + vdev->irqs =kcalloc (cnt,sizeof (struct vfio_platform_irq ), +GFP_KERNEL_ACCOUNT );if (!vdev->irqs)return -ENOMEM ;
Signature · 1 line
2.18.1
Quoted 26 lines · Yishai Hadas
This series changes the vfio and its sub drivers to use
GFP_KERNEL_ACCOUNTfor userspace persistent allocations.The
GFP_KERNEL_ACCOUNToption lets the memory allocator know that this is untrusted allocation triggered from userspace and should be a subject of kmem accountingis, and as such it is controlled by the cgroup mechanism. [1]As part of this change, we allow loading in mlx5 driver larger images than 512 MB by dropping the arbitrary hard-coded value that we have today and move to use the max device loading value which is for now 4GB.
In addition, the first patch from the series fixes a UBSAN note in mlx5 that was reported once the kernel was compiled with this option.
[1] https://www.kernel.org/doc/html/latest/core-api/memory-allocation.html
Changes from V0: https://www.spinics.net/lists/kvm/msg299508.html
Patch #2 - FixMAX_LOAD_SIZEto useBIT_ULLinstead of BIT as was
reported by the krobot test.Yishai
Jason Gunthorpe (1):
vfio: UseGFP_KERNEL_ACCOUNTfor userspace persistent allocations
Quoted 8 lines
Yishai Hadas (5):
vfio/mlx5: Fix UBSAN note
vfio/mlx5: Allow loading of larger images than 512 MB vfio/hisi: UseGFP_KERNEL_ACCOUNTfor userspace persistent allocations vfio/fsl-mc: UseGFP_KERNEL_ACCOUNTfor userspace persistent
allocations
vfio/platform: UseGFP_KERNEL_ACCOUNTfor userspace persistent
allocations
Jason
Quoted 35 lines · On Sun, 8 Jan 2023 17:44:21 +0200 Yishai Hadas <[email protected]> wrote:
This series changes the vfio and its sub drivers to use
GFP_KERNEL_ACCOUNTfor userspace persistent allocations.The
GFP_KERNEL_ACCOUNToption lets the memory allocator know that this is untrusted allocation triggered from userspace and should be a subject of kmem accountingis, and as such it is controlled by the cgroup mechanism. [1]As part of this change, we allow loading in mlx5 driver larger images than 512 MB by dropping the arbitrary hard-coded value that we have today and move to use the max device loading value which is for now 4GB.
In addition, the first patch from the series fixes a UBSAN note in mlx5 that was reported once the kernel was compiled with this option.
[1] https://www.kernel.org/doc/html/latest/core-api/memory-allocation.html
Changes from V0: https://www.spinics.net/lists/kvm/msg299508.html
Patch #2 - FixMAX_LOAD_SIZEto useBIT_ULLinstead of BIT as was
reported by the krobot test.Yishai
Jason Gunthorpe (1):
vfio: UseGFP_KERNEL_ACCOUNTfor userspace persistent allocationsYishai Hadas (5):
vfio/mlx5: Fix UBSAN note
vfio/mlx5: Allow loading of larger images than 512 MB vfio/hisi: UseGFP_KERNEL_ACCOUNTfor userspace persistent allocations vfio/fsl-mc: UseGFP_KERNEL_ACCOUNTfor userspace persistent
allocations
vfio/platform: UseGFP_KERNEL_ACCOUNTfor userspace persistent
allocations
Quoted 15 lines
drivers/vfio/container.c | 2 +- drivers/vfio/fsl-mc/vfio_fsl_mc.c | 2 +- drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c | 4 ++-- .../vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 4 ++-- drivers/vfio/pci/mlx5/cmd.c | 17 +++++++++-------- drivers/vfio/pci/mlx5/main.c | 19 ++++++++++--------- drivers/vfio/pci/vfio_pci_config.c | 6 +++--- drivers/vfio/pci/vfio_pci_core.c | 7 ++++--- drivers/vfio/pci/vfio_pci_igd.c | 2 +- drivers/vfio/pci/vfio_pci_intrs.c | 10 ++++++---- drivers/vfio/pci/vfio_pci_rdwr.c | 2 +- drivers/vfio/platform/vfio_platform_common.c | 2 +- drivers/vfio/platform/vfio_platform_irq.c | 8 ++++---- drivers/vfio/virqfd.c | 2 +- 14 files changed, 46 insertions(+), 41 deletions(-)
The type1 IOMMU backend is notably absent here among the core files, any reason? Potentially this removes the dma_avail issue as a means to prevent userspace from creating an arbitrarily large number of DMA mappings, right? For compatibility, this might mean setting the DMA entry limit to an excessive number instead as some use cases can already hit the U16_MAX limit now.
Are there any compatibility issues we should expect with this change to accounting otherwise?
Also a nit, the commit logs have a persistent typo throughout "accountingis". I can fix on commit or if we decide on a respin please fix. Thanks,
Alex
Jason Gunthorpe
reviewerQuoted 2 lines · Alex Williamson
The type1 IOMMU backend is notably absent here among the core files, any reason?
Mostly fear that charging alot of memory to the cgroup will become a compatibility problem. I'd be happier if we go along the iommufd path some more and get some field results from cgroup enablement before we think about tackling type 1.
With this series in normal non-abusive cases this is probably only a few pages of ram so it shouldn't be a problem. mlx5 needs huge amounts of memory but it is new so anyone deploying a new mlx5 configuration can set their cgroup accordingly.
If we fully do type 1 we are looking at alot of memory. eg a 1TB guest will charge 2GB just in IOPTE structures at 4k page size. Maybe that is enough to be a problem, I don't know.
Quoted 3 lines
Potentially this removes the
dma_availissue as a means to prevent userspace from creating an arbitrarily large number of DMA mappings, right?
Yes, it is what iommufd did
Quoted 2 lines
Are there any compatibility issues we should expect with this change to accounting otherwise?
Other than things might start hitting the limit, I don't think so?
Jason
Quoted 23 lines · On Wed, 18 Jan 2023 11:15:07 -0400 Jason Gunthorpe <[email protected]> wrote:
Quoted 2 lines · Alex Williamson
The type1 IOMMU backend is notably absent here among the core files, any reason?
Mostly fear that charging alot of memory to the cgroup will become a compatibility problem. I'd be happier if we go along the iommufd path some more and get some field results from cgroup enablement before we think about tackling type 1.
With this series in normal non-abusive cases this is probably only a few pages of ram so it shouldn't be a problem. mlx5 needs huge amounts of memory but it is new so anyone deploying a new mlx5 configuration can set their cgroup accordingly.
If we fully do type 1 we are looking at alot of memory. eg a 1TB guest will charge 2GB just in IOPTE structures at 4k page size. Maybe that is enough to be a problem, I don't know.
Quoted 3 lines
Potentially this removes the
dma_availissue as a means to prevent userspace from creating an arbitrarily large number of DMA mappings, right?
Quoted 6 lines
Yes, it is what iommufd did
Quoted 2 lines
Are there any compatibility issues we should expect with this change to accounting otherwise?
Other than things might start hitting the limit, I don't think so?
Ok, seems like enough FUD to limit the scope for now. We'll need to monitor this for native and compat mode iommufd use. I'll fix the commit log typo, assuming there are no further comments. Thanks,
Alex
Yishai Hadas
maintainerQuoted 26 lines · Alex Williamson
Quoted 23 lines · On Wed, 18 Jan 2023 11:15:07 -0400 Jason Gunthorpe <[email protected]> wrote:
Quoted 2 lines · Alex Williamson
The type1 IOMMU backend is notably absent here among the core files, any reason?
Mostly fear that charging alot of memory to the cgroup will become a compatibility problem. I'd be happier if we go along the iommufd path some more and get some field results from cgroup enablement before we think about tackling type 1.
With this series in normal non-abusive cases this is probably only a few pages of ram so it shouldn't be a problem. mlx5 needs huge amounts of memory but it is new so anyone deploying a new mlx5 configuration can set their cgroup accordingly.
If we fully do type 1 we are looking at alot of memory. eg a 1TB guest will charge 2GB just in IOPTE structures at 4k page size. Maybe that is enough to be a problem, I don't know.
Quoted 3 lines
Potentially this removes the
dma_availissue as a means to prevent userspace from creating an arbitrarily large number of DMA mappings, right?Yes, it is what iommufd did
Quoted 9 lines
Quoted 3 lines
Quoted 2 lines
Are there any compatibility issues we should expect with this change to accounting otherwise?
Other than things might start hitting the limit, I don't think so?
Ok, seems like enough FUD to limit the scope for now. We'll need to monitor this for native and compat mode iommufd use. I'll fix the commit log typo, assuming there are no further comments. Thanks,
Alex
Alex,
Based on the above, can you please take it into your next branch ?
I would like to send soon some small series in mlx5 driver which improves some flows as part of pre_copy to reduce downtime as part of stop_copy.
Some code there should be sent on top of current series.
Thanks,
Yishai
Alex Williamson
AppliedQuoted 35 lines · On Sun, 8 Jan 2023 17:44:21 +0200 Yishai Hadas <[email protected]> wrote:
This series changes the vfio and its sub drivers to use
GFP_KERNEL_ACCOUNTfor userspace persistent allocations.The
GFP_KERNEL_ACCOUNToption lets the memory allocator know that this is untrusted allocation triggered from userspace and should be a subject of kmem accountingis, and as such it is controlled by the cgroup mechanism. [1]As part of this change, we allow loading in mlx5 driver larger images than 512 MB by dropping the arbitrary hard-coded value that we have today and move to use the max device loading value which is for now 4GB.
In addition, the first patch from the series fixes a UBSAN note in mlx5 that was reported once the kernel was compiled with this option.
[1] https://www.kernel.org/doc/html/latest/core-api/memory-allocation.html
Changes from V0: https://www.spinics.net/lists/kvm/msg299508.html
Patch #2 - FixMAX_LOAD_SIZEto useBIT_ULLinstead of BIT as was
reported by the krobot test.Yishai
Jason Gunthorpe (1):
vfio: UseGFP_KERNEL_ACCOUNTfor userspace persistent allocationsYishai Hadas (5):
vfio/mlx5: Fix UBSAN note
vfio/mlx5: Allow loading of larger images than 512 MB vfio/hisi: UseGFP_KERNEL_ACCOUNTfor userspace persistent allocations vfio/fsl-mc: UseGFP_KERNEL_ACCOUNTfor userspace persistent
allocations
vfio/platform: UseGFP_KERNEL_ACCOUNTfor userspace persistent
allocations
Quoted 16 lines
drivers/vfio/container.c | 2 +- drivers/vfio/fsl-mc/vfio_fsl_mc.c | 2 +- drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c | 4 ++-- .../vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 4 ++-- drivers/vfio/pci/mlx5/cmd.c | 17 +++++++++-------- drivers/vfio/pci/mlx5/main.c | 19 ++++++++++--------- drivers/vfio/pci/vfio_pci_config.c | 6 +++--- drivers/vfio/pci/vfio_pci_core.c | 7 ++++--- drivers/vfio/pci/vfio_pci_igd.c | 2 +- drivers/vfio/pci/vfio_pci_intrs.c | 10 ++++++---- drivers/vfio/pci/vfio_pci_rdwr.c | 2 +- drivers/vfio/platform/vfio_platform_common.c | 2 +- drivers/vfio/platform/vfio_platform_irq.c | 8 ++++---- drivers/vfio/virqfd.c | 2 +- 14 files changed, 46 insertions(+), 41 deletions(-)
Applied to vfio next branch for v6.3. Thanks,
Alex