drm/panfrost: Restructure the GEM object creation
Subsystems (3)
Rob Herring
maintainerPATCH 1/5 drm/panfrost: Restructure the GEM object creation
Setting the GPU VA when creating the GEM object doesn't allow for any conditional adjustments. In preparation to support adjusting the mapping, restructure the GEM object creation to map the GEM object after we've created the base shmem object.
--- drivers/gpu/drm/panfrost/panfrost_drv.c | 21 +++------ drivers/gpu/drm/panfrost/panfrost_gem.c | 58 ++++++++++++++++++++----- drivers/gpu/drm/panfrost/panfrost_gem.h | 5 +++ 3 files changed, 59 insertions(+), 25 deletions(-)
drivers/gpu/drm/panfrost/panfrost_drv.c +6 -15
@@ -46,29 +46,20 @@ static int panfrost_ioctl_get_param(struct drm_device *ddev, void *data, structstatic int panfrost_ioctl_create_bo (struct drm_device *dev,void *data,struct drm_file *file) { -int ret; -struct drm_gem_shmem_object *shmem; +struct panfrost_gem_object *bo;struct drm_panfrost_create_bo *args = data;if (!args->size || args->flags || args->pad)return -EINVAL ; - shmem =drm_gem_shmem_create_with_handle (file, dev, args->size, - &args->handle); -if (IS_ERR (shmem)) -return PTR_ERR (shmem); - - ret =panfrost_mmu_map (to_panfrost_bo (&shmem->base)); -if (ret) - goto err_free; + bo =panfrost_gem_create_with_handle (file, dev, args->size, args->flags, + &args->handle); +if (IS_ERR (bo)) +return PTR_ERR (bo); - args->offset =to_panfrost_bo (&shmem->base)->node.start <<PAGE_SHIFT ; + args->offset = bo->node.start <<PAGE_SHIFT ;return 0 ; - -err_free: -drm_gem_handle_delete (file, args->handle); -return ret; }/**
drivers/gpu/drm/panfrost/panfrost_gem.c +48 -10
100 lines not on this page · raw message
drivers/gpu/drm/panfrost/panfrost_gem.h +5 -0
@@ -22,6 +22,11 @@ struct panfrost_gem_object *to_panfrost_bo(struct drm_gem_object *obj)struct drm_gem_object *panfrost_gem_create_object (struct drm_device *dev,size_t size); +struct panfrost_gem_object * +panfrost_gem_create_with_handle (struct drm_file *file_priv, +struct drm_device *dev,size_t size,u32 flags, +uint32_t *handle); +struct drm_gem_object * panfrost_gem_prime_import_sg_table(struct drm_device *dev, struct dma_buf_attachment *attach,
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Rob Herring
maintainerPATCH 2/5 drm/panfrost: Split panfrost_mmu_map SG list mapping to its own function
In preparation to create partial GPU mappings of BOs on page faults, split out the SG list handling of panfrost_mmu_map().
--- drivers/gpu/drm/panfrost/panfrost_mmu.c | 52 +++++++++++++++---------- 1 file changed, 31 insertions(+), 21 deletions(-)
drivers/gpu/drm/panfrost/panfrost_mmu.c +31 -21
@@ -167,27 +167,13 @@ static size_t get_pgsize(u64 addr, size_t size)return SZ_2M ; } -int panfrost_mmu_map (struct panfrost_gem_object *bo) +static int mmu_map_sg (struct panfrost_device *pfdev,u64 iova, +int prot,struct sg_table *sgt) { -struct drm_gem_object *obj = &bo->base.base; -struct panfrost_device *pfdev =to_panfrost_device (obj->dev); -struct io_pgtable_ops *ops = pfdev->mmu->pgtbl_ops; -u64 iova = bo->node.start <<PAGE_SHIFT ;unsigned int count;struct scatterlist *sgl; -struct sg_table *sgt; -int ret; - -if (WARN_ON (bo->is_mapped)) -return 0 ; - - sgt =drm_gem_shmem_get_pages_sgt (obj); -if (WARN_ON (IS_ERR (sgt))) -return PTR_ERR (sgt); - - ret =pm_runtime_get_sync (pfdev->dev); -if (ret <0 ) -return ret; +struct io_pgtable_ops *ops = pfdev->mmu->pgtbl_ops; +u64 start_iova = iova;mutex_lock (&pfdev->mmu->lock);
@@ -200,18 +186,42 @@ int panfrost_mmu_map(struct panfrost_gem_object *bo)while (len) {size_t pgsize =get_pgsize (iova | paddr, len); - ops->map (ops, iova, paddr, pgsize,IOMMU_WRITE |IOMMU_READ ); + ops->map (ops, iova, paddr, pgsize, prot); iova += pgsize; paddr += pgsize; len -= pgsize; } } -mmu_hw_do_operation (pfdev,0 , bo->node.start <<PAGE_SHIFT , - bo->node.size <<PAGE_SHIFT ,AS_COMMAND_FLUSH_PT ); +mmu_hw_do_operation (pfdev,0 , start_iova, iova - start_iova, +AS_COMMAND_FLUSH_PT );mutex_unlock (&pfdev->mmu->lock); +return 0 ; +} + +int panfrost_mmu_map (struct panfrost_gem_object *bo) +{ +struct drm_gem_object *obj = &bo->base.base; +struct panfrost_device *pfdev =to_panfrost_device (obj->dev); +struct sg_table *sgt; +int ret; +int prot =IOMMU_READ |IOMMU_WRITE ; + +if (WARN_ON (bo->is_mapped)) +return 0 ; + + sgt =drm_gem_shmem_get_pages_sgt (obj); +if (WARN_ON (IS_ERR (sgt))) +return PTR_ERR (sgt); + + ret =pm_runtime_get_sync (pfdev->dev); +if (ret <0 ) +return ret; + +mmu_map_sg (pfdev, bo->node.start <<PAGE_SHIFT , prot, sgt); +pm_runtime_mark_last_busy (pfdev->dev);pm_runtime_put_autosuspend (pfdev->dev); bo->is_mapped = true;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 2/5] drm/panfrost: Split panfrost_mmu_map SG list mapping to its own function
Quoted 9 lines · Rob Herring
In preparation to create partial GPU mappings of BOs on page faults, split out the SG list handling of
panfrost_mmu_map().Cc Tomeu Vizoso <[email protected]>Cc Boris Brezillon <[email protected]>Cc Robin Murphy <[email protected]>Cc Steven Price <[email protected]>Cc Alyssa Rosenzweig <[email protected]>Signed-off-by Rob Herring <[email protected]>
Quoted 77 lines
--- drivers/gpu/drm/panfrost/panfrost_mmu.c | 52 +++++++++++++++---------- 1 file changed, 31 insertions(+), 21 deletions(-)drivers/gpu/drm/panfrost/panfrost_mmu.c +24
-21@@ -167,27 +167,13 @@ static size_t get_pgsize(u64 addr, size_t size)return SZ_2M ; } -int panfrost_mmu_map (struct panfrost_gem_object *bo) +static int mmu_map_sg (struct panfrost_device *pfdev,u64 iova, +int prot,struct sg_table *sgt) { -struct drm_gem_object *obj = &bo->base.base; -struct panfrost_device *pfdev =to_panfrost_device (obj->dev); -struct io_pgtable_ops *ops = pfdev->mmu->pgtbl_ops; -u64 iova = bo->node.start <<PAGE_SHIFT ;unsigned int count;struct scatterlist *sgl; -struct sg_table *sgt; -int ret; - -if (WARN_ON (bo->is_mapped)) -return 0 ; - - sgt =drm_gem_shmem_get_pages_sgt (obj); -if (WARN_ON (IS_ERR (sgt))) -return PTR_ERR (sgt); - - ret =pm_runtime_get_sync (pfdev->dev); -if (ret <0 ) -return ret; +struct io_pgtable_ops *ops = pfdev->mmu->pgtbl_ops; +u64 start_iova = iova;mutex_lock (&pfdev->mmu->lock);@@ -200,18 +186,42 @@ int panfrost_mmu_map(struct panfrost_gem_object *bo)while (len) {size_t pgsize =get_pgsize (iova | paddr, len); - ops->map (ops, iova, paddr, pgsize,IOMMU_WRITE |IOMMU_READ ); + ops->map (ops, iova, paddr, pgsize, prot); iova += pgsize; paddr += pgsize; len -= pgsize; } } -mmu_hw_do_operation (pfdev,0 , bo->node.start <<PAGE_SHIFT , - bo->node.size <<PAGE_SHIFT ,AS_COMMAND_FLUSH_PT ); +mmu_hw_do_operation (pfdev,0 , start_iova, iova - start_iova, +AS_COMMAND_FLUSH_PT );mutex_unlock (&pfdev->mmu->lock); +return 0 ; +} + +int panfrost_mmu_map (struct panfrost_gem_object *bo) +{ +struct drm_gem_object *obj = &bo->base.base; +struct panfrost_device *pfdev =to_panfrost_device (obj->dev); +struct sg_table *sgt; +int ret; +int prot =IOMMU_READ |IOMMU_WRITE ; + +if (WARN_ON (bo->is_mapped)) +return 0 ; + + sgt =drm_gem_shmem_get_pages_sgt (obj); +if (WARN_ON (IS_ERR (sgt))) +return PTR_ERR (sgt);
drivers/gpu/drm/panfrost/panfrost_mmu.c int panfrost_mmu_map(struct panfrost_gem_object *bo) · line 227
Quoted 10 lines
drivers/gpu/drm/panfrost/panfrost_mmu.c +7
-0+ + ret =pm_runtime_get_sync (pfdev->dev); +if (ret <0 ) +return ret; + +mmu_map_sg (pfdev, bo->node.start <<PAGE_SHIFT , prot, sgt); +pm_runtime_mark_last_busy (pfdev->dev);pm_runtime_put_autosuspend (pfdev->dev); bo->is_mapped = true;
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Rob Herring
maintainerPATCH 3/5 drm/panfrost: Add a no execute flag for BO allocations
In reply to Rob HerringExecutable buffers have an alignment restriction that they can't cross 16MB boundary as the GPU program counter is 24-bits. This restriction is currently not handled and we just get lucky. As current userspace assumes all BOs are executable, that has to remain the default. So add a new PANFROST_BO_NOEXEC flag to allow userspace to indicate which BOs are not executable.
There is also a restriction that executable buffers cannot start or end on a 4GB boundary. This is mostly avoided as there is only 4GB of space currently and the beginning is already blocked out for NULL ptr detection. Add support to handle this restriction fully regardless of the current constraints.
For existing userspace, all created BOs remain executable, but the GPU VA alignment will be increased to the size of the BO. This shouldn't matter as there is plenty of GPU VA space.
--- drivers/gpu/drm/panfrost/panfrost_drv.c | 20 +++++++++++++++++++- drivers/gpu/drm/panfrost/panfrost_gem.c | 18 ++++++++++++++++-- drivers/gpu/drm/panfrost/panfrost_gem.h | 3 ++- drivers/gpu/drm/panfrost/panfrost_mmu.c | 3 +++ include/uapi/drm/panfrost_drm.h | 2 ++ 5 files changed, 42 insertions(+), 4 deletions(-)
drivers/gpu/drm/panfrost/panfrost_drv.c +19 -1
@@ -49,7 +49,8 @@ static int panfrost_ioctl_create_bo(struct drm_device *dev, void *data,struct panfrost_gem_object *bo;struct drm_panfrost_create_bo *args = data; -if (!args->size || args->flags || args->pad) +if (!args->size || args->pad || + (args->flags & ~PANFROST_BO_NOEXEC ))return -EINVAL ; bo = panfrost_gem_create_with_handle(file, dev, args->size, args->flags,
@@ -367,6 +368,22 @@ static struct drm_driver panfrost_drm_driver = { .gem_prime_mmap = drm_gem_prime_mmap, }; +#define PFN_4G_MASK ((SZ_4G - 1) >> PAGE_SHIFT) + +static void panfrost_drm_mm_color_adjust (const struct drm_mm_node *node, +unsigned long color, +u64 *start,u64 *end) +{ +/* Executable buffers can't start or end on a 4GB boundary */ +if (!color) { +if ((*start &PFN_4G_MASK ) ==0 ) + (*start)++; + +if ((*end &PFN_4G_MASK ) ==0 ) + (*end)--; + } +} +static int panfrost_probe (struct platform_device *pdev) {struct panfrost_device *pfdev;
@@ -394,6 +411,7 @@ static int panfrost_probe(struct platform_device *pdev)/* 4G enough for now. can be 48-bit */ drm_mm_init (&pfdev->mm,SZ_32M >>PAGE_SHIFT , (SZ_4G -SZ_32M ) >>PAGE_SHIFT ); + pfdev->mm.color_adjust = panfrost_drm_mm_color_adjust;pm_runtime_use_autosuspend (pfdev->dev);pm_runtime_set_autosuspend_delay (pfdev->dev,50 );/* ~3 frames */
drivers/gpu/drm/panfrost/panfrost_gem.c +16 -2
@@ -66,11 +66,23 @@ static int panfrost_gem_map(struct panfrost_device *pfdev, struct panfrost_gem_o {int ret;size_t size = bo->base.base.size; -u64 align = size >=SZ_2M ?SZ_2M >>PAGE_SHIFT :0 ; +u64 align; + +/* +* Executable buffers cannot cross a 16MB boundary as the program +* counter is 24-bits. We assume executable buffers will be less than +* 16MB and aligning executable buffers to their size will avoid +* crossing a 16MB boundary. +*/ +if (!bo->noexec) + align = size >>PAGE_SHIFT ; +else + align = size >=SZ_2M ?SZ_2M >>PAGE_SHIFT :0 ;spin_lock (&pfdev->mm_lock); ret =drm_mm_insert_node_generic (&pfdev->mm, &bo->node, - size >>PAGE_SHIFT , align,0 ,0 ); + size >>PAGE_SHIFT , align, + bo->noexec,0 );spin_unlock (&pfdev->mm_lock);if (ret)return ret;
@@ -96,6 +108,7 @@ panfrost_gem_create_with_handle(struct drm_file *file_priv,return ERR_CAST (shmem); bo =to_panfrost_bo (&shmem->base); + bo->noexec = !!(flags &PANFROST_BO_NOEXEC ); ret =panfrost_gem_map (pfdev, bo);if (ret)
@@ -123,6 +136,7 @@ panfrost_gem_prime_import_sg_table(struct drm_device *dev,return ERR_CAST (obj); pobj =to_panfrost_bo (obj); + pobj->noexec = true; ret =panfrost_gem_map (pfdev, pobj);if (ret)
drivers/gpu/drm/panfrost/panfrost_gem.h +2 -1
@@ -11,7 +11,8 @@ struct panfrost_gem_object {struct drm_gem_shmem_object base;struct drm_mm_node node; -bool is_mapped; + bool is_mapped :1; + bool noexec :1; }; static inline
drivers/gpu/drm/panfrost/panfrost_mmu.c +3 -0
@@ -212,6 +212,9 @@ int panfrost_mmu_map(struct panfrost_gem_object *bo)if (WARN_ON (bo->is_mapped))return 0 ; +if (bo->noexec) + prot |=IOMMU_NOEXEC ; + sgt =drm_gem_shmem_get_pages_sgt (obj);if (WARN_ON (IS_ERR (sgt)))return PTR_ERR (sgt);
include/uapi/drm/panfrost_drm.h +2 -0
@@ -82,6 +82,8 @@ struct drm_panfrost_wait_bo {__s64 timeout_ns;/* absolute */ }; +#define PANFROST_BO_NOEXEC 1 +/** * struct drm_panfrost_create_bo - ioctl argument for creating Panfrost BOs. *
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): [email protected]
Rob Herring
maintainerRe: [PATCH 3/5] drm/panfrost: Add a no execute flag for BO allocations
Quoted 69 lines · Steven Price
Quoted 3 lines · Rob Herring
Executable buffers have an alignment restriction that they can't cross 16MB boundary as the GPU program counter is 24-bits. This restriction is currently not handled and we just get lucky. As current userspace
Actually it depends which GPU you are using - some do have a bigger program counter - so it might be the choice of GPU to test on rather than just luck. But kbase always assumes the worst case (24 bit) as in practise that's enough.
Quoted 58 lines
assumes all BOs are executable, that has to remain the default. So add a new
PANFROST_BO_NOEXECflag to allow userspace to indicate which BOs are not executable.There is also a restriction that executable buffers cannot start or end on a 4GB boundary. This is mostly avoided as there is only 4GB of space currently and the beginning is already blocked out for NULL ptr detection. Add support to handle this restriction fully regardless of the current constraints.
For existing userspace, all created BOs remain executable, but the GPU VA alignment will be increased to the size of the BO. This shouldn't matter as there is plenty of GPU VA space.
Cc Tomeu Vizoso <[email protected]>Cc Boris Brezillon <[email protected]>Cc Robin Murphy <[email protected]>Cc Steven Price <[email protected]>Cc Alyssa Rosenzweig <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/panfrost/panfrost_drv.c | 20 +++++++++++++++++++- drivers/gpu/drm/panfrost/panfrost_gem.c | 18 ++++++++++++++++-- drivers/gpu/drm/panfrost/panfrost_gem.h | 3 ++- drivers/gpu/drm/panfrost/panfrost_mmu.c | 3 +++ include/uapi/drm/panfrost_drm.h | 2 ++ 5 files changed, 42 insertions(+), 4 deletions(-)drivers/gpu/drm/panfrost/panfrost_drv.c +14
-1@@ -49,7 +49,8 @@ static int panfrost_ioctl_create_bo(struct drm_device *dev, void *data,struct panfrost_gem_object *bo;struct drm_panfrost_create_bo *args = data; -if (!args->size || args->flags || args->pad) +if (!args->size || args->pad || + (args->flags & ~PANFROST_BO_NOEXEC ))return -EINVAL ; bo = panfrost_gem_create_with_handle(file, dev, args->size, args->flags,@@ -367,6 +368,22 @@ static struct drm_driver panfrost_drm_driver = { .gem_prime_mmap = drm_gem_prime_mmap, }; +#define PFN_4G_MASK ((SZ_4G - 1) >> PAGE_SHIFT) + +static void panfrost_drm_mm_color_adjust (const struct drm_mm_node *node, +unsigned long color, +u64 *start,u64 *end) +{ +/* Executable buffers can't start or end on a 4GB boundary */ +if (!color) { +if ((*start &PFN_4G_MASK ) ==0 ) + (*start)++; + +if ((*end &PFN_4G_MASK ) ==0 )
Quoted 8 lines
drivers/gpu/drm/panfrost/panfrost_drv.c static struct drm_driver panfrost_drm_driver = { · line 385
Quoted 3 lines
drivers/gpu/drm/panfrost/panfrost_drv.c +3
-0+ (*end)--; + } +}Unless I'm mistaken this won't actually provide the guarantee if the memory region is >4GB (which admittedly it isn't at the moment). For example a 8GB region would have the beginning/end trimmed off, but there's another 4GB in the middle which could be allocated next to.
Humm, other than not allowing sizes greater than 4G-(2*PAGE_SIZE), I'm not sure how we solve that. I guess avoiding sizes of (n*4G - PAGE_SIZE) would avoid the problem. Seems like almost 4GB executable buffer should be enough for anyone(TM).
Quoted 2 lines
Also a minor issue, but we might want to consider having some constants for 'color' - it's not obvious from this code that color==no_exec.
Yeah, I was just going worry about that when we had a second bit to pass.
Rob
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Steven Price
maintainerRe: [PATCH 3/5] drm/panfrost: Add a no execute flag for BO allocations
Quoted 79 lines · Rob Herring
Quoted 69 lines · Steven Price
Quoted 3 lines · Rob Herring
Executable buffers have an alignment restriction that they can't cross 16MB boundary as the GPU program counter is 24-bits. This restriction is currently not handled and we just get lucky. As current userspace
Actually it depends which GPU you are using - some do have a bigger program counter - so it might be the choice of GPU to test on rather than just luck. But kbase always assumes the worst case (24 bit) as in practise that's enough.
Quoted 58 lines
assumes all BOs are executable, that has to remain the default. So add a new
PANFROST_BO_NOEXECflag to allow userspace to indicate which BOs are not executable.There is also a restriction that executable buffers cannot start or end on a 4GB boundary. This is mostly avoided as there is only 4GB of space currently and the beginning is already blocked out for NULL ptr detection. Add support to handle this restriction fully regardless of the current constraints.
For existing userspace, all created BOs remain executable, but the GPU VA alignment will be increased to the size of the BO. This shouldn't matter as there is plenty of GPU VA space.
Cc Tomeu Vizoso <[email protected]>Cc Boris Brezillon <[email protected]>Cc Robin Murphy <[email protected]>Cc Steven Price <[email protected]>Cc Alyssa Rosenzweig <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/panfrost/panfrost_drv.c | 20 +++++++++++++++++++- drivers/gpu/drm/panfrost/panfrost_gem.c | 18 ++++++++++++++++-- drivers/gpu/drm/panfrost/panfrost_gem.h | 3 ++- drivers/gpu/drm/panfrost/panfrost_mmu.c | 3 +++ include/uapi/drm/panfrost_drm.h | 2 ++ 5 files changed, 42 insertions(+), 4 deletions(-)drivers/gpu/drm/panfrost/panfrost_drv.c +14
-1@@ -49,7 +49,8 @@ static int panfrost_ioctl_create_bo(struct drm_device *dev, void *data,struct panfrost_gem_object *bo;struct drm_panfrost_create_bo *args = data; -if (!args->size || args->flags || args->pad) +if (!args->size || args->pad || + (args->flags & ~PANFROST_BO_NOEXEC ))return -EINVAL ; bo = panfrost_gem_create_with_handle(file, dev, args->size, args->flags,@@ -367,6 +368,22 @@ static struct drm_driver panfrost_drm_driver = { .gem_prime_mmap = drm_gem_prime_mmap, }; +#define PFN_4G_MASK ((SZ_4G - 1) >> PAGE_SHIFT) + +static void panfrost_drm_mm_color_adjust (const struct drm_mm_node *node, +unsigned long color, +u64 *start,u64 *end) +{ +/* Executable buffers can't start or end on a 4GB boundary */ +if (!color) { +if ((*start &PFN_4G_MASK ) ==0 ) + (*start)++; + +if ((*end &PFN_4G_MASK ) ==0 )Quoted 8 lines
drivers/gpu/drm/panfrost/panfrost_drv.c static struct drm_driver panfrost_drm_driver = { · line 385
Quoted 3 lines
drivers/gpu/drm/panfrost/panfrost_drv.c +3
-0+ (*end)--; + } +}Unless I'm mistaken this won't actually provide the guarantee if the memory region is >4GB (which admittedly it isn't at the moment). For example a 8GB region would have the beginning/end trimmed off, but there's another 4GB in the middle which could be allocated next to.
Quoted 4 lines
Humm, other than not allowing sizes greater than 4G-(2*PAGE_SIZE), I'm not sure how we solve that. I guess avoiding sizes of (n*4G -
PAGE_SIZE) would avoid the problem. Seems like almost 4GB executable buffer should be enough for anyone(TM).
I was thinking of something like:
if ((*end & ~PFN_4G_MASK) != (*start & ~PFN_4G_MASK)) {
if ((*start & PFN_4G_MASK) +
(SZ_16M >> PAGE_SHIFT) < PFN_4G_MASK)
*end = (*start & ~PFN_4G_MASK) +
(SZ_4GB - SZ_16M) >> PAGE_SHIFT;
else
*start = (*end & ~PFN_4G_MASK) + (SZ_16M) >> PAGE_SHIFT;
}So split the region depending on where we can find a free 16MB region which doesn't cross 4GB.
But like you say: 4GB should be enough for anyone ;)
Quoted 4 lines
Quoted 2 lines
Also a minor issue, but we might want to consider having some constants for 'color' - it's not obvious from this code that color==no_exec.
Yeah, I was just going worry about that when we had a second bit to pass.
One other 'minor' issue I noticed as I was writing the above. PAGE_SIZE is of course the CPU page size - we could have the situation of CPU and GPU page size being different (e.g. CONFIG_ARM64_64K_PAGES). I'm not sure whether we want to support this or not (kbase doesn't). Also in theory some GPUs do support 64K (AS_TRANSCFG_ADRMODE_AARCH64_64K) - but kbase has never used this so I don't know if it works... ;)
Steve
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Rob Herring
maintainerRe: [PATCH 3/5] drm/panfrost: Add a no execute flag for BO allocations
Quoted 97 lines · Steven Price
Quoted 79 lines · Rob Herring
Quoted 69 lines · Steven Price
Quoted 3 lines · Rob Herring
Executable buffers have an alignment restriction that they can't cross 16MB boundary as the GPU program counter is 24-bits. This restriction is currently not handled and we just get lucky. As current userspace
Actually it depends which GPU you are using - some do have a bigger program counter - so it might be the choice of GPU to test on rather than just luck. But kbase always assumes the worst case (24 bit) as in practise that's enough.
Quoted 58 lines
assumes all BOs are executable, that has to remain the default. So add a new
PANFROST_BO_NOEXECflag to allow userspace to indicate which BOs are not executable.There is also a restriction that executable buffers cannot start or end on a 4GB boundary. This is mostly avoided as there is only 4GB of space currently and the beginning is already blocked out for NULL ptr detection. Add support to handle this restriction fully regardless of the current constraints.
For existing userspace, all created BOs remain executable, but the GPU VA alignment will be increased to the size of the BO. This shouldn't matter as there is plenty of GPU VA space.
Cc Tomeu Vizoso <[email protected]>Cc Boris Brezillon <[email protected]>Cc Robin Murphy <[email protected]>Cc Steven Price <[email protected]>Cc Alyssa Rosenzweig <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/panfrost/panfrost_drv.c | 20 +++++++++++++++++++- drivers/gpu/drm/panfrost/panfrost_gem.c | 18 ++++++++++++++++-- drivers/gpu/drm/panfrost/panfrost_gem.h | 3 ++- drivers/gpu/drm/panfrost/panfrost_mmu.c | 3 +++ include/uapi/drm/panfrost_drm.h | 2 ++ 5 files changed, 42 insertions(+), 4 deletions(-)drivers/gpu/drm/panfrost/panfrost_drv.c +14
-1@@ -49,7 +49,8 @@ static int panfrost_ioctl_create_bo(struct drm_device *dev, void *data,struct panfrost_gem_object *bo;struct drm_panfrost_create_bo *args = data; -if (!args->size || args->flags || args->pad) +if (!args->size || args->pad || + (args->flags & ~PANFROST_BO_NOEXEC ))return -EINVAL ; bo = panfrost_gem_create_with_handle(file, dev, args->size, args->flags,@@ -367,6 +368,22 @@ static struct drm_driver panfrost_drm_driver = { .gem_prime_mmap = drm_gem_prime_mmap, }; +#define PFN_4G_MASK ((SZ_4G - 1) >> PAGE_SHIFT) + +static void panfrost_drm_mm_color_adjust (const struct drm_mm_node *node, +unsigned long color, +u64 *start,u64 *end) +{ +/* Executable buffers can't start or end on a 4GB boundary */ +if (!color) { +if ((*start &PFN_4G_MASK ) ==0 ) + (*start)++; + +if ((*end &PFN_4G_MASK ) ==0 )Quoted 8 lines
drivers/gpu/drm/panfrost/panfrost_drv.c static struct drm_driver panfrost_drm_driver = { · line 385
Quoted 3 lines
drivers/gpu/drm/panfrost/panfrost_drv.c +3
-0+ (*end)--; + } +}Unless I'm mistaken this won't actually provide the guarantee if the memory region is >4GB (which admittedly it isn't at the moment). For example a 8GB region would have the beginning/end trimmed off, but there's another 4GB in the middle which could be allocated next to.
Quoted 4 lines
Humm, other than not allowing sizes greater than 4G-(2*PAGE_SIZE), I'm not sure how we solve that. I guess avoiding sizes of (n*4G -
PAGE_SIZE) would avoid the problem. Seems like almost 4GB executable buffer should be enough for anyone(TM).I was thinking of something like:
if ((*end & ~PFN_4G_MASK) != (*start & ~PFN_4G_MASK)) { if ((*start & PFN_4G_MASK) + (SZ_16M >> PAGE_SHIFT) < PFN_4G_MASK) *end = (*start & ~PFN_4G_MASK) + (SZ_4GB - SZ_16M) >> PAGE_SHIFT; else *start = (*end & ~PFN_4G_MASK) + (SZ_16M) >> PAGE_SHIFT; }
Quoted 2 lines
So split the region depending on where we can find a free 16MB region which doesn't cross 4GB.
Here's what I ended up with. It's slightly different in that the start and end don't get 16MB aligned. The code already takes care of the alignment which also is not necessarily 16MB, but 'align = size' as that's sufficient to not cross a 16MB boundary.
#define PFN_4G (SZ_4G >> PAGE_SHIFT) #define PFN_4G_MASK (PFN_4G - 1) #define PFN_16M (SZ_16M >> PAGE_SHIFT)
static void panfrost_drm_mm_color_adjust(const struct drm_mm_node *node,
unsigned long color, u64 *start, u64 *end)
{
/* Executable buffers can't start or end on a 4GB boundary */
if (!(color & PANFROST_BO_NOEXEC)) {
if ((*start & PFN_4G_MASK) == 0)
(*start)++;
if ((*end & PFN_4G_MASK) == 0)
(*end)--;
/* Ensure start and end are in the same 4GB range */
if ((*end & ~PFN_4G_MASK) != (*start & ~PFN_4G_MASK)) {
if ((*start & PFN_4G_MASK) + PFN_16M < PFN_4G_MASK)
*end = (*start & ~PFN_4G_MASK) + PFN_4G - 1;
else
*start = (*end & ~PFN_4G_MASK) + 1;
}
}
}Quoted 6 lines
But like you say: 4GB should be enough for anyone ;)
Quoted 3 lines
Quoted 2 lines
Also a minor issue, but we might want to consider having some constants for 'color' - it's not obvious from this code that color==no_exec.
Quoted 8 lines
Quoted 1 line
Yeah, I was just going worry about that when we had a second bit to pass.
One other 'minor' issue I noticed as I was writing the above.
PAGE_SIZEis of course the CPU page size - we could have the situation of CPU and GPU page size being different (e.g.CONFIG_ARM64_64K_PAGES). I'm not sure whether we want to support this or not (kbase doesn't). Also in theory some GPUs do support 64K (AS_TRANSCFG_ADRMODE_AARCH64_64K) - but kbase has never used this so I don't know if it works... ;)
Shhh! I have thought about that, but was ignoring for now.
Rob
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Steven Price
maintainerRe: [PATCH 3/5] drm/panfrost: Add a no execute flag for BO allocations
Quoted 124 lines · Rob Herring
Quoted 97 lines · Steven Price
Quoted 79 lines · Rob Herring
Quoted 69 lines · Steven Price
Quoted 3 lines · Rob Herring
Executable buffers have an alignment restriction that they can't cross 16MB boundary as the GPU program counter is 24-bits. This restriction is currently not handled and we just get lucky. As current userspace
Actually it depends which GPU you are using - some do have a bigger program counter - so it might be the choice of GPU to test on rather than just luck. But kbase always assumes the worst case (24 bit) as in practise that's enough.
Quoted 58 lines
assumes all BOs are executable, that has to remain the default. So add a new
PANFROST_BO_NOEXECflag to allow userspace to indicate which BOs are not executable.There is also a restriction that executable buffers cannot start or end on a 4GB boundary. This is mostly avoided as there is only 4GB of space currently and the beginning is already blocked out for NULL ptr detection. Add support to handle this restriction fully regardless of the current constraints.
For existing userspace, all created BOs remain executable, but the GPU VA alignment will be increased to the size of the BO. This shouldn't matter as there is plenty of GPU VA space.
Cc Tomeu Vizoso <[email protected]>Cc Boris Brezillon <[email protected]>Cc Robin Murphy <[email protected]>Cc Steven Price <[email protected]>Cc Alyssa Rosenzweig <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/panfrost/panfrost_drv.c | 20 +++++++++++++++++++- drivers/gpu/drm/panfrost/panfrost_gem.c | 18 ++++++++++++++++-- drivers/gpu/drm/panfrost/panfrost_gem.h | 3 ++- drivers/gpu/drm/panfrost/panfrost_mmu.c | 3 +++ include/uapi/drm/panfrost_drm.h | 2 ++ 5 files changed, 42 insertions(+), 4 deletions(-)drivers/gpu/drm/panfrost/panfrost_drv.c +14
-1@@ -49,7 +49,8 @@ static int panfrost_ioctl_create_bo(struct drm_device *dev, void *data,struct panfrost_gem_object *bo;struct drm_panfrost_create_bo *args = data; -if (!args->size || args->flags || args->pad) +if (!args->size || args->pad || + (args->flags & ~PANFROST_BO_NOEXEC ))return -EINVAL ; bo = panfrost_gem_create_with_handle(file, dev, args->size, args->flags,@@ -367,6 +368,22 @@ static struct drm_driver panfrost_drm_driver = { .gem_prime_mmap = drm_gem_prime_mmap, }; +#define PFN_4G_MASK ((SZ_4G - 1) >> PAGE_SHIFT) + +static void panfrost_drm_mm_color_adjust (const struct drm_mm_node *node, +unsigned long color, +u64 *start,u64 *end) +{ +/* Executable buffers can't start or end on a 4GB boundary */ +if (!color) { +if ((*start &PFN_4G_MASK ) ==0 ) + (*start)++; + +if ((*end &PFN_4G_MASK ) ==0 )Quoted 8 lines
drivers/gpu/drm/panfrost/panfrost_drv.c static struct drm_driver panfrost_drm_driver = { · line 385
Quoted 3 lines
drivers/gpu/drm/panfrost/panfrost_drv.c +3
-0+ (*end)--; + } +}Unless I'm mistaken this won't actually provide the guarantee if the memory region is >4GB (which admittedly it isn't at the moment). For example a 8GB region would have the beginning/end trimmed off, but there's another 4GB in the middle which could be allocated next to.
Quoted 4 lines
Humm, other than not allowing sizes greater than 4G-(2*PAGE_SIZE), I'm not sure how we solve that. I guess avoiding sizes of (n*4G -
PAGE_SIZE) would avoid the problem. Seems like almost 4GB executable buffer should be enough for anyone(TM).I was thinking of something like:
if ((*end & ~PFN_4G_MASK) != (*start & ~PFN_4G_MASK)) { if ((*start & PFN_4G_MASK) + (SZ_16M >> PAGE_SHIFT) < PFN_4G_MASK) *end = (*start & ~PFN_4G_MASK) + (SZ_4GB - SZ_16M) >> PAGE_SHIFT; else *start = (*end & ~PFN_4G_MASK) + (SZ_16M) >> PAGE_SHIFT; }Quoted 2 lines
So split the region depending on where we can find a free 16MB region which doesn't cross 4GB.
Here's what I ended up with. It's slightly different in that the start and end don't get 16MB aligned. The code already takes care of the alignment which also is not necessarily 16MB, but 'align = size' as that's sufficient to not cross a 16MB boundary.
#define PFN_4G (SZ_4G >> PAGE_SHIFT) #define PFN_4G_MASK (PFN_4G - 1) #define PFN_16M (SZ_16M >> PAGE_SHIFT)static void panfrost_drm_mm_color_adjust(const struct
drm_mm_node*node,
unsigned long color, u64 *start, u64 *end){ /* Executable buffers can't start or end on a 4GB boundary */ if (!(color & PANFROST_BO_NOEXEC)) { if ((*start & PFN_4G_MASK) == 0) (*start)++; if ((*end & PFN_4G_MASK) == 0) (*end)--; /* Ensure start and end are in the same 4GB range */ if ((*end & ~PFN_4G_MASK) != (*start & ~PFN_4G_MASK)) {
Quoted 8 lines
if ((*start & PFN_4G_MASK) + PFN_16M < PFN_4G_MASK)
*end = (*start & ~PFN_4G_MASK) + PFN_4G - 1;
else
*start = (*end & ~PFN_4G_MASK) + 1;
}
}
}Yes, that's a much more readable version of what I wrote ;)
Steve
Quoted 15 lines
Quoted 6 lines
But like you say: 4GB should be enough for anyone ;)
Quoted 3 lines
Quoted 2 lines
Also a minor issue, but we might want to consider having some constants for 'color' - it's not obvious from this code that color==no_exec.
Quoted 8 lines
Quoted 1 line
Yeah, I was just going worry about that when we had a second bit to pass.
One other 'minor' issue I noticed as I was writing the above.
PAGE_SIZEis of course the CPU page size - we could have the situation of CPU and GPU page size being different (e.g.CONFIG_ARM64_64K_PAGES). I'm not sure whether we want to support this or not (kbase doesn't). Also in theory some GPUs do support 64K (AS_TRANSCFG_ADRMODE_AARCH64_64K) - but kbase has never used this so I don't know if it works... ;)
Quoted 8 lines
Shhh! I have thought about that, but was ignoring for now.
Rob
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 3/5] drm/panfrost: Add a no execute flag for BO allocations
In reply to Rob HerringQuoted 124 lines · Rob Herring
Quoted 97 lines · Steven Price
Quoted 79 lines · Rob Herring
Quoted 69 lines · Steven Price
Quoted 3 lines · Rob Herring
Executable buffers have an alignment restriction that they can't cross 16MB boundary as the GPU program counter is 24-bits. This restriction is currently not handled and we just get lucky. As current userspace
Actually it depends which GPU you are using - some do have a bigger program counter - so it might be the choice of GPU to test on rather than just luck. But kbase always assumes the worst case (24 bit) as in practise that's enough.
Quoted 58 lines
assumes all BOs are executable, that has to remain the default. So add a new
PANFROST_BO_NOEXECflag to allow userspace to indicate which BOs are not executable.There is also a restriction that executable buffers cannot start or end on a 4GB boundary. This is mostly avoided as there is only 4GB of space currently and the beginning is already blocked out for NULL ptr detection. Add support to handle this restriction fully regardless of the current constraints.
For existing userspace, all created BOs remain executable, but the GPU VA alignment will be increased to the size of the BO. This shouldn't matter as there is plenty of GPU VA space.
Cc Tomeu Vizoso <[email protected]>Cc Boris Brezillon <[email protected]>Cc Robin Murphy <[email protected]>Cc Steven Price <[email protected]>Cc Alyssa Rosenzweig <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/panfrost/panfrost_drv.c | 20 +++++++++++++++++++- drivers/gpu/drm/panfrost/panfrost_gem.c | 18 ++++++++++++++++-- drivers/gpu/drm/panfrost/panfrost_gem.h | 3 ++- drivers/gpu/drm/panfrost/panfrost_mmu.c | 3 +++ include/uapi/drm/panfrost_drm.h | 2 ++ 5 files changed, 42 insertions(+), 4 deletions(-)drivers/gpu/drm/panfrost/panfrost_drv.c +14
-1@@ -49,7 +49,8 @@ static int panfrost_ioctl_create_bo(struct drm_device *dev, void *data,struct panfrost_gem_object *bo;struct drm_panfrost_create_bo *args = data; -if (!args->size || args->flags || args->pad) +if (!args->size || args->pad || + (args->flags & ~PANFROST_BO_NOEXEC ))return -EINVAL ; bo = panfrost_gem_create_with_handle(file, dev, args->size, args->flags,@@ -367,6 +368,22 @@ static struct drm_driver panfrost_drm_driver = { .gem_prime_mmap = drm_gem_prime_mmap, }; +#define PFN_4G_MASK ((SZ_4G - 1) >> PAGE_SHIFT) + +static void panfrost_drm_mm_color_adjust (const struct drm_mm_node *node, +unsigned long color, +u64 *start,u64 *end) +{ +/* Executable buffers can't start or end on a 4GB boundary */ +if (!color) { +if ((*start &PFN_4G_MASK ) ==0 ) + (*start)++; + +if ((*end &PFN_4G_MASK ) ==0 )Quoted 8 lines
drivers/gpu/drm/panfrost/panfrost_drv.c static struct drm_driver panfrost_drm_driver = { · line 385
Quoted 3 lines
drivers/gpu/drm/panfrost/panfrost_drv.c +3
-0+ (*end)--; + } +}Unless I'm mistaken this won't actually provide the guarantee if the memory region is >4GB (which admittedly it isn't at the moment). For example a 8GB region would have the beginning/end trimmed off, but there's another 4GB in the middle which could be allocated next to.
Quoted 4 lines
Humm, other than not allowing sizes greater than 4G-(2*PAGE_SIZE), I'm not sure how we solve that. I guess avoiding sizes of (n*4G -
PAGE_SIZE) would avoid the problem. Seems like almost 4GB executable buffer should be enough for anyone(TM).I was thinking of something like:
if ((*end & ~PFN_4G_MASK) != (*start & ~PFN_4G_MASK)) { if ((*start & PFN_4G_MASK) + (SZ_16M >> PAGE_SHIFT) < PFN_4G_MASK) *end = (*start & ~PFN_4G_MASK) + (SZ_4GB - SZ_16M) >> PAGE_SHIFT; else *start = (*end & ~PFN_4G_MASK) + (SZ_16M) >> PAGE_SHIFT; }Quoted 2 lines
So split the region depending on where we can find a free 16MB region which doesn't cross 4GB.
Here's what I ended up with. It's slightly different in that the start and end don't get 16MB aligned. The code already takes care of the alignment which also is not necessarily 16MB, but 'align = size' as that's sufficient to not cross a 16MB boundary.
#define PFN_4G (SZ_4G >> PAGE_SHIFT) #define PFN_4G_MASK (PFN_4G - 1) #define PFN_16M (SZ_16M >> PAGE_SHIFT)static void panfrost_drm_mm_color_adjust(const struct
drm_mm_node*node,
unsigned long color, u64 *start, u64 *end){ /* Executable buffers can't start or end on a 4GB boundary */ if (!(color & PANFROST_BO_NOEXEC)) { if ((*start & PFN_4G_MASK) == 0) (*start)++; if ((*end & PFN_4G_MASK) == 0) (*end)--; /* Ensure start and end are in the same 4GB range */ if ((*end & ~PFN_4G_MASK) != (*start & ~PFN_4G_MASK)) {
Quoted 8 lines
if ((*start & PFN_4G_MASK) + PFN_16M < PFN_4G_MASK)
*end = (*start & ~PFN_4G_MASK) + PFN_4G - 1;
else
*start = (*end & ~PFN_4G_MASK) + 1;
}
}
}If you're happy with the additional restriction that a buffer can't cross a 4GB boundary (which does seem to be required for certain kinds of buffers anyway), then I don't think it needs to be anywhere near that complex:
if (!(*start & PFN_4G_MASK)) *start++ *end = min(*end, ALIGN(*start, PFN_4G) - 1);
Quoted 8 lines
Quoted 8 lines
But like you say: 4GB should be enough for anyone ;)
Quoted 4 lines
Quoted 2 lines
Also a minor issue, but we might want to consider having some constants for 'color' - it's not obvious from this code that color==no_exec.
Yeah, I was just going worry about that when we had a second bit to pass.
Quoted 8 lines
Quoted 6 lines
One other 'minor' issue I noticed as I was writing the above.
PAGE_SIZEis of course the CPU page size - we could have the situation of CPU and GPU page size being different (e.g.CONFIG_ARM64_64K_PAGES). I'm not sure whether we want to support this or not (kbase doesn't). Also in theory some GPUs do support 64K (AS_TRANSCFG_ADRMODE_AARCH64_64K) - but kbase has never used this so I don't know if it works... ;)Shhh! I have thought about that, but was ignoring for now.
In general, I don't think that should be too great a concern - we already handle it for IOMMUs, provided the minimum IOMMU page size is no larger than PAGE_SIZE, which should always be the case here too. Looking at how panfrost_mmu_map() is implemented, and given that we're already trying to handle stuff at 2MB granularity where possible, I don't see any obvious reasons for 64K pages not to work already (assuming there aren't any 4K assumptions baked into the userspace side). I might have to give it a try...
Robin.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Steven Price
maintainerRe: [PATCH 3/5] drm/panfrost: Add a no execute flag for BO allocations
Quoted 150 lines · Robin Murphy
Quoted 145 lines · Rob Herring
Quoted 110 lines · Steven Price
Quoted 91 lines · Rob Herring
Quoted 80 lines · Steven Price
Quoted 5 lines · Rob Herring
Executable buffers have an alignment restriction that they can't cross
16MB boundary as the GPU program counter is 24-bits. This restriction is
currently not handled and we just get lucky. As current userspaceActually it depends which GPU you are using - some do have a bigger program counter - so it might be the choice of GPU to test on rather than just luck. But kbase always assumes the worst case (24 bit) as in practise that's enough.
Quoted 67 lines
assumes all BOs are executable, that has to remain the default. So add a
newPANFROST_BO_NOEXECflag to allow userspace to indicate which BOs are
not executable.There is also a restriction that executable buffers cannot start or end
on a 4GB boundary. This is mostly avoided as there is only 4GB of space
currently and the beginning is already blocked out for NULL ptr detection. Add support to handle this restriction fully regardless of the current constraints.For existing userspace, all created BOs remain executable, but the GPU
VA alignment will be increased to the size of the BO. This shouldn't matter as there is plenty of GPU VA space.Cc Tomeu Vizoso <[email protected]>Cc Boris Brezillon <[email protected]>Cc Robin Murphy <[email protected]>Cc Steven Price <[email protected]>Cc Alyssa Rosenzweig <[email protected]>Signed-off-by Rob Herring <[email protected]>---
drivers/gpu/drm/panfrost/panfrost_drv.c | 20 +++++++++++++++++++- drivers/gpu/drm/panfrost/panfrost_gem.c | 18 ++++++++++++++++-- drivers/gpu/drm/panfrost/panfrost_gem.h | 3 ++- drivers/gpu/drm/panfrost/panfrost_mmu.c | 3 +++ include/uapi/drm/panfrost_drm.h | 2 ++ 5 files changed, 42 insertions(+), 4 deletions(-)drivers/gpu/drm/panfrost/panfrost_drv.c +2
-1@@ -49,7 +49,8 @@ static int panfrost_ioctl_create_bo(struct drm_device *dev, void *data, struct panfrost_gem_object *bo; struct drm_panfrost_create_bo *args = data; - if (!args->size || args->flags || args->pad) + if (!args->size || args->pad || + (args->flags & ~PANFROST_BO_NOEXEC)) return -EINVAL;bo = panfrost_gem_create_with_handle(file, dev,
args->size,args->flags,drivers/gpu/drm/panfrost/panfrost_drv.c +12
-0@@ -367,6 +368,22 @@ static struct drm_driver panfrost_drm_driver = { .gem_prime_mmap = drm_gem_prime_mmap, }; +#define PFN_4G_MASK ((SZ_4G - 1) >> PAGE_SHIFT) + +static void panfrost_drm_mm_color_adjust (const struct drm_mm_node *node, + unsigned long color, + u64 *start, u64 *end) +{ + /* Executable buffers can't start or end on a 4GB boundary */ + if (!color) { + if ((*start & PFN_4G_MASK) == 0) + (*start)++; + + if ((*end & PFN_4G_MASK) == 0)Quoted 8 lines
drivers/gpu/drm/panfrost/panfrost_drv.c static struct drm_driver panfrost_drm_driver = { · line 385
Quoted 3 lines
drivers/gpu/drm/panfrost/panfrost_drv.c +3
-0+ (*end)--; + } +}Unless I'm mistaken this won't actually provide the guarantee if the memory region is >4GB (which admittedly it isn't at the moment). For example a 8GB region would have the beginning/end trimmed off, but there's another 4GB in the middle which could be allocated next to.
Quoted 4 lines
Humm, other than not allowing sizes greater than 4G-(2*PAGE_SIZE), I'm not sure how we solve that. I guess avoiding sizes of (n*4G -
PAGE_SIZE) would avoid the problem. Seems like almost 4GB executable buffer should be enough for anyone(TM).I was thinking of something like:
if ((*end & ~PFN_4G_MASK) != (*start & ~PFN_4G_MASK)) { if ((*start &
PFN_4G_MASK) +
(SZ_16M>>PAGE_SHIFT) <PFN_4G_MASK) *end = (*start & ~PFN_4G_MASK) + (SZ_4GB-SZ_16M) >>PAGE_SHIFT; else
*start = (*end & ~PFN_4G_MASK) + (SZ_16M) >>PAGE_SHIFT;
}Quoted 2 lines
So split the region depending on where we can find a free 16MB region which doesn't cross 4GB.
Here's what I ended up with. It's slightly different in that the start and end don't get 16MB aligned. The code already takes care of the alignment which also is not necessarily 16MB, but 'align = size' as that's sufficient to not cross a 16MB boundary.
#define PFN_4G (
SZ_4G>>PAGE_SHIFT)
#define PFN_4G_MASK (PFN_4G- 1)
#define PFN_16M (SZ_16M>>PAGE_SHIFT)static void
panfrost_drm_mm_color_adjust(const struct drm_mm_node *node, unsigned long color, u64 *start, u64 *end){
/* Executable buffers can't start or end on a 4GB boundary */ if (!(color &PANFROST_BO_NOEXEC)) {
if ((*start &PFN_4G_MASK) == 0) (*start)++;if ((*end &
PFN_4G_MASK) == 0)
(*end)--;/* Ensure start and end are in the same 4GB range */ if ((*end & ~PFN_4G_MASK) != (*start & ~PFN_4G_MASK)) { if ((*start &
PFN_4G_MASK) +PFN_16M<PFN_4G_MASK)
*end = (*start & ~PFN_4G_MASK) +PFN_4G- 1;
else
*start = (*end & ~PFN_4G_MASK) + 1;Quoted 3 lines
}
}
}
Quoted 8 lines
If you're happy with the additional restriction that a buffer can't cross a 4GB boundary (which does seem to be required for certain kinds of buffers anyway), then I don't think it needs to be anywhere near that complex:
if (!(*start &
PFN_4G_MASK))
*start++
*end =min(*end, ALIGN(*start, PFN_4G) - 1);
What happens if *start is very near the end of a 4GB boundary? In that case *end - *start might not be as big as 16MB and we could end up failing the allocation IIUC.
Quoted 19 lines
Quoted 10 lines
Quoted 10 lines
But like you say: 4GB should be enough for anyone ;)
Quoted 6 lines
Quoted 3 lines
Also a minor issue, but we might want to consider having some constants
for 'color' - it's not obvious from this code that color==no_exec.Yeah, I was just going worry about that when we had a second bit to pass.
Quoted 8 lines
Quoted 6 lines
One other 'minor' issue I noticed as I was writing the above.
PAGE_SIZEis of course the CPU page size - we could have the situation of CPU and GPU page size being different (e.g.CONFIG_ARM64_64K_PAGES). I'm not sure whether we want to support this or not (kbase doesn't). Also in theory some GPUs do support 64K (AS_TRANSCFG_ADRMODE_AARCH64_64K) - but kbase has never used this so I don't know if it works... ;)Shhh! I have thought about that, but was ignoring for now.
Quoted 8 lines
In general, I don't think that should be too great a concern - we already handle it for IOMMUs, provided the minimum IOMMU page size is no larger than
PAGE_SIZE, which should always be the case here too. Looking at howpanfrost_mmu_map()is implemented, and given that we're already trying to handle stuff at 2MB granularity where possible, I don't see any obvious reasons for 64K pages not to work already (assuming there aren't any 4K assumptions baked into the userspace side). I might have to give it a try...
I'd be interested to know if it works. I know that kbase incorrectly uses PAGE_SIZE in several places (in particular assuming it is the size of the page tables). And I was aware I was in danger of slipping into the same mindset here.
User space shouldn't care too much - other than the size of buffers allocated being rounded up to the CPU's page size. At least the Panfrost user/kernel ABI has sizes in bytes not pages (unlike kbase).
Steve
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 3/5] drm/panfrost: Add a no execute flag for BO allocations
Quoted 156 lines · Steven Price
Quoted 155 lines · Robin Murphy
Quoted 145 lines · Rob Herring
Quoted 110 lines · Steven Price
Quoted 91 lines · Rob Herring
Quoted 80 lines · Steven Price
Quoted 5 lines · Rob Herring
Executable buffers have an alignment restriction that they can't cross
16MB boundary as the GPU program counter is 24-bits. This restriction is
currently not handled and we just get lucky. As current userspaceActually it depends which GPU you are using - some do have a bigger program counter - so it might be the choice of GPU to test on rather than just luck. But kbase always assumes the worst case (24 bit) as in practise that's enough.
Quoted 67 lines
assumes all BOs are executable, that has to remain the default. So add a
newPANFROST_BO_NOEXECflag to allow userspace to indicate which BOs are
not executable.There is also a restriction that executable buffers cannot start or end
on a 4GB boundary. This is mostly avoided as there is only 4GB of space
currently and the beginning is already blocked out for NULL ptr detection. Add support to handle this restriction fully regardless of the current constraints.For existing userspace, all created BOs remain executable, but the GPU
VA alignment will be increased to the size of the BO. This shouldn't matter as there is plenty of GPU VA space.Cc Tomeu Vizoso <[email protected]>Cc Boris Brezillon <[email protected]>Cc Robin Murphy <[email protected]>Cc Steven Price <[email protected]>Cc Alyssa Rosenzweig <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/panfrost/panfrost_drv.c | 20 +++++++++++++++++++- drivers/gpu/drm/panfrost/panfrost_gem.c | 18 ++++++++++++++++-- drivers/gpu/drm/panfrost/panfrost_gem.h | 3 ++- drivers/gpu/drm/panfrost/panfrost_mmu.c | 3 +++ include/uapi/drm/panfrost_drm.h | 2 ++ 5 files changed, 42 insertions(+), 4 deletions(-)drivers/gpu/drm/panfrost/panfrost_drv.c +2
-1@@ -49,7 +49,8 @@ static int panfrost_ioctl_create_bo(struct drm_device *dev, void *data, struct panfrost_gem_object *bo; struct drm_panfrost_create_bo *args = data; - if (!args->size || args->flags || args->pad) + if (!args->size || args->pad || + (args->flags & ~PANFROST_BO_NOEXEC)) return -EINVAL;bo = panfrost_gem_create_with_handle(file, dev,
args->size,args->flags,drivers/gpu/drm/panfrost/panfrost_drv.c +12
-0@@ -367,6 +368,22 @@ static struct drm_driver panfrost_drm_driver = { .gem_prime_mmap = drm_gem_prime_mmap, }; +#define PFN_4G_MASK ((SZ_4G - 1) >> PAGE_SHIFT) + +static void panfrost_drm_mm_color_adjust (const struct drm_mm_node *node, + unsigned long color, + u64 *start, u64 *end) +{ + /* Executable buffers can't start or end on a 4GB boundary */ + if (!color) { + if ((*start & PFN_4G_MASK) == 0) + (*start)++; + + if ((*end & PFN_4G_MASK) == 0)Quoted 8 lines
drivers/gpu/drm/panfrost/panfrost_drv.c static struct drm_driver panfrost_drm_driver = { · line 386
Quoted 3 lines
drivers/gpu/drm/panfrost/panfrost_drv.c +3
-0+ (*end)--; + } +}Unless I'm mistaken this won't actually provide the guarantee if the memory region is >4GB (which admittedly it isn't at the moment). For example a 8GB region would have the beginning/end trimmed off, but there's another 4GB in the middle which could be allocated next to.
Quoted 4 lines
Humm, other than not allowing sizes greater than 4G-(2*PAGE_SIZE), I'm not sure how we solve that. I guess avoiding sizes of (n*4G -
PAGE_SIZE) would avoid the problem. Seems like almost 4GB executable buffer should be enough for anyone(TM).I was thinking of something like:
if ((*end & ~PFN_4G_MASK) != (*start & ~PFN_4G_MASK)) {
if ((*start &PFN_4G_MASK) +
(SZ_16M>>PAGE_SHIFT) <PFN_4G_MASK) *end = (*start & ~PFN_4G_MASK) + (SZ_4GB-SZ_16M) >>PAGE_SHIFT; else
*start = (*end & ~PFN_4G_MASK) + (SZ_16M) >>PAGE_SHIFT;
}Quoted 2 lines
So split the region depending on where we can find a free 16MB region which doesn't cross 4GB.
Here's what I ended up with. It's slightly different in that the start and end don't get 16MB aligned. The code already takes care of the alignment which also is not necessarily 16MB, but 'align = size' as that's sufficient to not cross a 16MB boundary.
#define PFN_4G (
SZ_4G>>PAGE_SHIFT)
#define PFN_4G_MASK (PFN_4G- 1)
#define PFN_16M (SZ_16M>>PAGE_SHIFT)static void panfrost_drm_mm_color_adjust(const struct
drm_mm_node*node,
unsigned long color, u64 *start, u64 *end)
{
/* Executable buffers can't start or end on a 4GB boundary */ if (!(color &PANFROST_BO_NOEXEC)) {
if ((*start &PFN_4G_MASK) == 0) (*start)++;if ((*end &
PFN_4G_MASK) == 0)
(*end)--;/* Ensure start and end are in the same 4GB range */ if ((*end & ~PFN_4G_MASK) != (*start & ~PFN_4G_MASK)) { if ((*start &
PFN_4G_MASK) +PFN_16M<PFN_4G_MASK)
*end = (*start & ~PFN_4G_MASK) +PFN_4G- 1;
else
*start = (*end & ~PFN_4G_MASK) + 1;Quoted 3 lines
}
}
}If you're happy with the additional restriction that a buffer can't cross a 4GB boundary (which does seem to be required for certain kinds of buffers anyway), then I don't think it needs to be anywhere near that complex:
Quoted 7 lines
Quoted 3 lines
if (!(*start &
PFN_4G_MASK))
*start++
*end =min(*end, ALIGN(*start, PFN_4G) - 1);What happens if *start is very near the end of a 4GB boundary? In that case *end - *start might not be as big as 16MB and we could end up failing the allocation IIUC.
Ahem... well, the thing about complicated-and-hard-to-read code is that it turns out to be complicated and hard to read correctly :)
FWIW, having taken a closer look, my interpretation would be something like (even more untested than before):
u64 start_seg = ALIGN(*start, PFN_4G);
u64 end_seg = ALIGN_DOWN(*end, PFN_4G);
if (start_seg - start < end - end_seg) {
*start = end_seg + 1;
*end = min(*end, end_seg + PFN_4G - 1);
} else {
*end = start_seg - 1;
*start = max(*start, start_seg - PFN_4G + 1);
}but at this point I'm sure we're well into personal preference and "shorter does not necessarily imply clearer" territory. More importantly, though, it now occurs to me that the "pick the biggest end" approach seems inherently suboptimal for cases where the [start,end] interval crosses *more* than one boundary. For, say, start = PFN_4G - 1, end = 2 * PFN_4G + 1, either way we'd get caught up on the single page at one end and ignore the full 4GB in the middle :/
Quoted 28 lines
Quoted 19 lines
Quoted 10 lines
Quoted 10 lines
But like you say: 4GB should be enough for anyone ;)
Quoted 6 lines
Quoted 3 lines
Also a minor issue, but we might want to consider having some constants
for 'color' - it's not obvious from this code that color==no_exec.Yeah, I was just going worry about that when we had a second bit to pass.
Quoted 8 lines
Quoted 6 lines
One other 'minor' issue I noticed as I was writing the above.
PAGE_SIZEis of course the CPU page size - we could have the situation of CPU and GPU page size being different (e.g.CONFIG_ARM64_64K_PAGES). I'm not sure whether we want to support this or not (kbase doesn't). Also in theory some GPUs do support 64K (AS_TRANSCFG_ADRMODE_AARCH64_64K) - but kbase has never used this so I don't know if it works... ;)Shhh! I have thought about that, but was ignoring for now.
Quoted 8 lines
In general, I don't think that should be too great a concern - we already handle it for IOMMUs, provided the minimum IOMMU page size is no larger than
PAGE_SIZE, which should always be the case here too. Looking at howpanfrost_mmu_map()is implemented, and given that we're already trying to handle stuff at 2MB granularity where possible, I don't see any obvious reasons for 64K pages not to work already (assuming there aren't any 4K assumptions baked into the userspace side). I might have to give it a try...
Quoted 8 lines
I'd be interested to know if it works. I know that kbase incorrectly uses
PAGE_SIZEin several places (in particular assuming it is the size of the page tables). And I was aware I was in danger of slipping into the same mindset here.User space shouldn't care too much - other than the size of buffers allocated being rounded up to the CPU's page size. At least the Panfrost user/kernel ABI has sizes in bytes not pages (unlike kbase).
Sounds promising - my Juno branch is in a bit of a mess at the moment but once I've got that cleaned up I'll have a quick play.
Robin.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Steven Price
maintainerRe: [PATCH 3/5] drm/panfrost: Add a no execute flag for BO allocations
Quoted 190 lines · Robin Murphy
Quoted 164 lines · Steven Price
Quoted 163 lines · Robin Murphy
Quoted 153 lines · Rob Herring
Quoted 116 lines · Steven Price
Quoted 96 lines · Rob Herring
Quoted 85 lines · Steven Price
Quoted 5 lines · Rob Herring
Executable buffers have an alignment restriction that they can't cross
16MB boundary as the GPU program counter is 24-bits. This restriction is
currently not handled and we just get lucky. As current userspaceActually it depends which GPU you are using - some do have a bigger program counter - so it might be the choice of GPU to test on rather than just luck. But kbase always assumes the worst case (24 bit) as in
practise that's enough.Quoted 71 lines
assumes all BOs are executable, that has to remain the default. So add a
newPANFROST_BO_NOEXECflag to allow userspace to indicate which BOs are
not executable.There is also a restriction that executable buffers cannot start or end
on a 4GB boundary. This is mostly avoided as there is only 4GB of space
currently and the beginning is already blocked out for NULL ptr detection. Add support to handle this restriction fully regardless of
the current constraints.For existing userspace, all created BOs remain executable, but the GPU
VA alignment will be increased to the size of the BO. This shouldn't
matter as there is plenty of GPU VA space.Cc Tomeu Vizoso <[email protected]>Cc Boris Brezillon <[email protected]>Cc Robin Murphy <[email protected]>Cc Steven Price <[email protected]>Cc Alyssa Rosenzweig <[email protected]>Signed-off-by Rob Herring <[email protected]>---
drivers/gpu/drm/panfrost/panfrost_drv.c| 20
+++++++++++++++++++-drivers/gpu/drm/panfrost/panfrost_gem.c | 18 ++++++++++++++++-- drivers/gpu/drm/panfrost/panfrost_gem.h | 3 ++- drivers/gpu/drm/panfrost/panfrost_mmu.c | 3 +++ include/uapi/drm/panfrost_drm.h | 2 ++ 5 files changed, 42 insertions(+), 4 deletions(-)drivers/gpu/drm/panfrost/panfrost_drv.c +2
-1@@ -49,7 +49,8 @@ static int panfrost_ioctl_create_bo(struct drm_device *dev, void *data, struct panfrost_gem_object *bo; struct drm_panfrost_create_bo *args = data; - if (!args->size || args->flags || args->pad) + if (!args->size || args->pad || + (args->flags & ~PANFROST_BO_NOEXEC)) return -EINVAL;bo = panfrost_gem_create_with_handle(file, dev,
args->size,args->flags,drivers/gpu/drm/panfrost/panfrost_drv.c +12
-0@@ -367,6 +368,22 @@ static struct drm_driver panfrost_drm_driver = { .gem_prime_mmap = drm_gem_prime_mmap, }; +#define PFN_4G_MASK ((SZ_4G - 1) >> PAGE_SHIFT) + +static void panfrost_drm_mm_color_adjust (const struct drm_mm_node *node, + unsigned long color, + u64 *start, u64 *end) +{ + /* Executable buffers can't start or end on a 4GB boundary */ + if (!color) { + if ((*start & PFN_4G_MASK) == 0) + (*start)++; + + if ((*end & PFN_4G_MASK) == 0)Quoted 8 lines
drivers/gpu/drm/panfrost/panfrost_drv.c static struct drm_driver · line 387
Quoted 3 lines
drivers/gpu/drm/panfrost/panfrost_drv.c +3
-0+ (*end)--; + } +}Unless I'm mistaken this won't actually provide the guarantee if the memory region is >4GB (which admittedly it isn't at the moment). For example a 8GB region would have the beginning/end trimmed off, but there's another 4GB in the middle which could be allocated next to.
Quoted 5 lines
Humm, other than not allowing sizes greater than 4G-(2*PAGE_SIZE), I'm
not sure how we solve that. I guess avoiding sizes of (n*4G -PAGE_SIZE) would avoid the problem. Seems like almost 4GB executable buffer should be enough for anyone(TM).I was thinking of something like:
if ((*end & ~PFN_4G_MASK) != (*start & ~PFN_4G_MASK)) { if ((*start &
PFN_4G_MASK) +
(SZ_16M>>PAGE_SHIFT) <PFN_4G_MASK) *end = (*start & ~PFN_4G_MASK) + (SZ_4GB-SZ_16M) >>PAGE_SHIFT; else
*start = (*end & ~PFN_4G_MASK) + (SZ_16M) >>PAGE_SHIFT;
}Quoted 2 lines
So split the region depending on where we can find a free 16MB region which doesn't cross 4GB.
Here's what I ended up with. It's slightly different in that the start and end don't get 16MB aligned. The code already takes care of the alignment which also is not necessarily 16MB, but 'align = size' as that's sufficient to not cross a 16MB boundary.
#define PFN_4G (
SZ_4G>>PAGE_SHIFT)
#define PFN_4G_MASK (PFN_4G- 1)
#define PFN_16M (SZ_16M>>PAGE_SHIFT)static void panfrost_drm_mm_color_adjust(const struct
drm_mm_node*node,
unsigned long color, u64 *start, u64 *end) {
/* Executable buffers can't start or end on a 4GB boundary */ if (!(color &PANFROST_BO_NOEXEC)) {
if ((*start &PFN_4G_MASK) == 0) (*start)++;if ((*end &
PFN_4G_MASK) == 0)
(*end)--;/* Ensure start and end are in the same 4GB range */ if ((*end & ~PFN_4G_MASK) != (*start & ~PFN_4G_MASK)) {
if ((*start &PFN_4G_MASK) +PFN_16M<PFN_4G_MASK)
*end = (*start & ~PFN_4G_MASK) +PFN_4G- 1;
else
*start = (*end & ~PFN_4G_MASK) + 1;Quoted 3 lines
}
}
}If you're happy with the additional restriction that a buffer can't cross a 4GB boundary (which does seem to be required for certain kinds of buffers anyway), then I don't think it needs to be anywhere near that complex:
Quoted 7 lines
Quoted 3 lines
if (!(*start &
PFN_4G_MASK))
*start++
*end =min(*end, ALIGN(*start, PFN_4G) - 1);What happens if *start is very near the end of a 4GB boundary? In that case *end - *start might not be as big as 16MB and we could end up failing the allocation IIUC.
Ahem... well, the thing about complicated-and-hard-to-read code is that it turns out to be complicated and hard to read correctly :)
FWIW, having taken a closer look, my interpretation would be something like (even more untested than before):
u64
start_seg=ALIGN(*start, PFN_4G);
u64end_seg=ALIGN_DOWN(*end, PFN_4G);if (
start_seg- start < end -end_seg) { *start =end_seg+ 1;
*end =min(*end, end_seg + PFN_4G - 1); } else {
*end =start_seg- 1;
*start =max(*start, start_seg - PFN_4G + 1); }
Quoted 7 lines
but at this point I'm sure we're well into personal preference and "shorter does not necessarily imply clearer" territory. More importantly, though, it now occurs to me that the "pick the biggest end" approach seems inherently suboptimal for cases where the [start,end] interval crosses *more* than one boundary. For, say, start =
PFN_4G- 1, end = 2 *PFN_4G+ 1, either way we'd get caught up on the single page at one end and ignore the full 4GB in the middle :/
Indeed, that case was just occurring to me too! How about:
u64 next_seg = ALIGN(*start, PFN_4G); if (next_seg - *start <= PFN_16M) *start = next_seg + 1; *end = min(*end, ALIGN(*start, PFN_4G) - 1);
So always allocate at the beginning, but skip past the next 4GB boundary if there's less than 16MB left (or equal to avoid the 4GB boundary).
Steve
Quoted 40 lines
Quoted 31 lines
Quoted 22 lines
Quoted 20 lines
Quoted 10 lines
But like you say: 4GB should be enough for anyone ;)
Quoted 6 lines
Quoted 3 lines
Also a minor issue, but we might want to consider having some constants
for 'color' - it's not obvious from this code that color==no_exec.Yeah, I was just going worry about that when we had a second bit to pass.
Quoted 9 lines
One other 'minor' issue I noticed as I was writing the above.
PAGE_SIZE
is of course the CPU page size - we could have the situation of CPU and
GPU page size being different (e.g.CONFIG_ARM64_64K_PAGES). I'm not sure whether we want to support this or not (kbase doesn't). Also in theory some GPUs do support 64K (AS_TRANSCFG_ADRMODE_AARCH64_64K) - but
kbase has never used this so I don't know if it works... ;)Quoted 1 line
Shhh! I have thought about that, but was ignoring for now.
Quoted 8 lines
In general, I don't think that should be too great a concern - we already handle it for IOMMUs, provided the minimum IOMMU page size is no larger than
PAGE_SIZE, which should always be the case here too. Looking at howpanfrost_mmu_map()is implemented, and given that we're already trying to handle stuff at 2MB granularity where possible, I don't see any obvious reasons for 64K pages not to work already (assuming there aren't any 4K assumptions baked into the userspace side). I might have to give it a try...Quoted 8 lines
I'd be interested to know if it works. I know that kbase incorrectly uses
PAGE_SIZEin several places (in particular assuming it is the size of the page tables). And I was aware I was in danger of slipping into the same mindset here.User space shouldn't care too much - other than the size of buffers allocated being rounded up to the CPU's page size. At least the Panfrost user/kernel ABI has sizes in bytes not pages (unlike kbase).
Quoted 8 lines
Sounds promising - my Juno branch is in a bit of a mess at the moment but once I've got that cleaned up I'll have a quick play.
Robin.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 3/5] drm/panfrost: Add a no execute flag for BO allocations
On 22/07/2019 13:19, Steven Price wrote:
[...]
Quoted 11 lines
Indeed, that case was just occurring to me too! How about:
u64 next_seg = ALIGN(*start, PFN_4G); if (next_seg - *start <= PFN_16M) *start = next_seg + 1; *end = min(*end, ALIGN(*start, PFN_4G) - 1);So always allocate at the beginning, but skip past the next 4GB boundary if there's less than 16MB left (or equal to avoid the 4GB boundary).
Ah, there it is! I think it generalises even further by just changing the condition to "if (next_seg - *start < *end - next_seg)", although we'd need to ensure a signed comparison to cover the case where start and end are already in the same segment.
Robin.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Rob Herring
maintainerRe: [PATCH 3/5] drm/panfrost: Add a no execute flag for BO allocations
Quoted 9 lines · Robin Murphy
On 22/07/2019 13:19, Steven Price wrote:
[...]Quoted 6 lines
Indeed, that case was just occurring to me too! How about:
u64 next_seg = ALIGN(*start, PFN_4G); if (next_seg - *start <= PFN_16M) *start = next_seg + 1;
This could make start > end...
It also doesn't handle not starting on a 4G boundary (or was that condition check supposed to be included still).
Quoted 10 lines
Quoted 5 lines
*end = min(*end, ALIGN(*start, PFN_4G) - 1);So always allocate at the beginning, but skip past the next 4GB boundary if there's less than 16MB left (or equal to avoid the 4GB boundary).
Ah, there it is! I think it generalises even further by just changing the condition to "if (
next_seg- *start < *end -next_seg)", although we'd need to ensure a signed comparison to cover the case where start and end are already in the same segment.
IMO, relying on signed comparsion doesn't really improve the readability...
Rob
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 3/5] drm/panfrost: Add a no execute flag for BO allocations
In reply to Rob HerringThis patch is:
Quoted 165 lines · Rob Herring
Executable buffers have an alignment restriction that they can't cross 16MB boundary as the GPU program counter is 24-bits. This restriction is currently not handled and we just get lucky. As current userspace assumes all BOs are executable, that has to remain the default. So add a new
PANFROST_BO_NOEXECflag to allow userspace to indicate which BOs are not executable.There is also a restriction that executable buffers cannot start or end on a 4GB boundary. This is mostly avoided as there is only 4GB of space currently and the beginning is already blocked out for NULL ptr detection. Add support to handle this restriction fully regardless of the current constraints.
For existing userspace, all created BOs remain executable, but the GPU VA alignment will be increased to the size of the BO. This shouldn't matter as there is plenty of GPU VA space.
Cc Tomeu Vizoso <[email protected]>Cc Boris Brezillon <[email protected]>Cc Robin Murphy <[email protected]>Cc Steven Price <[email protected]>Cc Alyssa Rosenzweig <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/panfrost/panfrost_drv.c | 20 +++++++++++++++++++- drivers/gpu/drm/panfrost/panfrost_gem.c | 18 ++++++++++++++++-- drivers/gpu/drm/panfrost/panfrost_gem.h | 3 ++- drivers/gpu/drm/panfrost/panfrost_mmu.c | 3 +++ include/uapi/drm/panfrost_drm.h | 2 ++ 5 files changed, 42 insertions(+), 4 deletions(-)drivers/gpu/drm/panfrost/panfrost_drv.c +19
-1@@ -49,7 +49,8 @@ static int panfrost_ioctl_create_bo(struct drm_device *dev, void *data,struct panfrost_gem_object *bo;struct drm_panfrost_create_bo *args = data; -if (!args->size || args->flags || args->pad) +if (!args->size || args->pad || + (args->flags & ~PANFROST_BO_NOEXEC ))return -EINVAL ; bo = panfrost_gem_create_with_handle(file, dev, args->size, args->flags,@@ -367,6 +368,22 @@ static struct drm_driver panfrost_drm_driver = { .gem_prime_mmap = drm_gem_prime_mmap, }; +#define PFN_4G_MASK ((SZ_4G - 1) >> PAGE_SHIFT) + +static void panfrost_drm_mm_color_adjust (const struct drm_mm_node *node, +unsigned long color, +u64 *start,u64 *end) +{ +/* Executable buffers can't start or end on a 4GB boundary */ +if (!color) { +if ((*start &PFN_4G_MASK ) ==0 ) + (*start)++; + +if ((*end &PFN_4G_MASK ) ==0 ) + (*end)--; + } +} +static int panfrost_probe (struct platform_device *pdev) {struct panfrost_device *pfdev;@@ -394,6 +411,7 @@ static int panfrost_probe(struct platform_device *pdev)/* 4G enough for now. can be 48-bit */ drm_mm_init (&pfdev->mm,SZ_32M >>PAGE_SHIFT , (SZ_4G -SZ_32M ) >>PAGE_SHIFT ); + pfdev->mm.color_adjust = panfrost_drm_mm_color_adjust;pm_runtime_use_autosuspend (pfdev->dev);pm_runtime_set_autosuspend_delay (pfdev->dev,50 );/* ~3 frames */ drivers/gpu/drm/panfrost/panfrost_gem.c +16
-2@@ -66,11 +66,23 @@ static int panfrost_gem_map(struct panfrost_device *pfdev, struct panfrost_gem_o {int ret;size_t size = bo->base.base.size; -u64 align = size >=SZ_2M ?SZ_2M >>PAGE_SHIFT :0 ; +u64 align; + +/* +* Executable buffers cannot cross a 16MB boundary as the program +* counter is 24-bits. We assume executable buffers will be less than +* 16MB and aligning executable buffers to their size will avoid +* crossing a 16MB boundary. +*/ +if (!bo->noexec) + align = size >>PAGE_SHIFT ; +else + align = size >=SZ_2M ?SZ_2M >>PAGE_SHIFT :0 ;spin_lock (&pfdev->mm_lock); ret =drm_mm_insert_node_generic (&pfdev->mm, &bo->node, - size >>PAGE_SHIFT , align,0 ,0 ); + size >>PAGE_SHIFT , align, + bo->noexec,0 );spin_unlock (&pfdev->mm_lock);if (ret)return ret;@@ -96,6 +108,7 @@ panfrost_gem_create_with_handle(struct drm_file *file_priv,return ERR_CAST (shmem); bo =to_panfrost_bo (&shmem->base); + bo->noexec = !!(flags &PANFROST_BO_NOEXEC ); ret =panfrost_gem_map (pfdev, bo);if (ret)@@ -123,6 +136,7 @@ panfrost_gem_prime_import_sg_table(struct drm_device *dev,return ERR_CAST (obj); pobj =to_panfrost_bo (obj); + pobj->noexec = true; ret =panfrost_gem_map (pfdev, pobj);if (ret)drivers/gpu/drm/panfrost/panfrost_gem.h +2
-1@@ -11,7 +11,8 @@ struct panfrost_gem_object {struct drm_gem_shmem_object base;struct drm_mm_node node; -bool is_mapped; + bool is_mapped :1; + bool noexec :1; }; static inlinedrivers/gpu/drm/panfrost/panfrost_mmu.c +3
-0@@ -212,6 +212,9 @@ int panfrost_mmu_map(struct panfrost_gem_object *bo)if (WARN_ON (bo->is_mapped))return 0 ; +if (bo->noexec) + prot |=IOMMU_NOEXEC ; + sgt =drm_gem_shmem_get_pages_sgt (obj);if (WARN_ON (IS_ERR (sgt)))return PTR_ERR (sgt);include/uapi/drm/panfrost_drm.h +2
-0@@ -82,6 +82,8 @@ struct drm_panfrost_wait_bo {__s64 timeout_ns;/* absolute */ }; +#define PANFROST_BO_NOEXEC 1 +/** * struct drm_panfrost_create_bo - ioctl argument for creating Panfrost BOs. * Signature · 1 line
2.20.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Rob Herring
maintainerPATCH 4/5 drm/panfrost: Add support for GPU heap allocations
In reply to Rob HerringThe midgard/bifrost GPUs need to allocate GPU heap memory which is allocated on GPU page faults and not pinned in memory. The vendor driver calls this functionality GROW_ON_GPF.
This implementation assumes that BOs allocated with the PANFROST_BO_NOEXEC flag are never mmapped or exported. Both of those may actually work, but I'm unsure if there's some interaction there. It would cause the whole object to be pinned in memory which would defeat the point of this.
On faults, we map in 2MB at a time in order to utilize huge pages (if enabled). Currently, once we've mapped pages in, they are only unmapped if the BO is freed. Once we add shrinker support, we can unmap pages with the shrinker.
--- drivers/gpu/drm/panfrost/TODO | 2 - drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- drivers/gpu/drm/panfrost/panfrost_gem.c | 14 ++- drivers/gpu/drm/panfrost/panfrost_gem.h | 8 ++ drivers/gpu/drm/panfrost/panfrost_mmu.c | 114 +++++++++++++++++++++--- include/uapi/drm/panfrost_drm.h | 1 + 6 files changed, 125 insertions(+), 16 deletions(-)
drivers/gpu/drm/panfrost/TODO +0 -2
@@ -14,8 +14,6 @@ The hard part is handling when more address spaces are needed than what the h/w provides. -- Support pinning pages on demand (GPU page faults). - - Support userspace controlled GPU virtual addresses. Needed for Vulkan. (Tomeu) - Support for madvise and a shrinker.
drivers/gpu/drm/panfrost/panfrost_drv.c +1 -1
@@ -50,7 +50,7 @@ static int panfrost_ioctl_create_bo(struct drm_device *dev, void *data,struct drm_panfrost_create_bo *args = data;if (!args->size || args->pad || - (args->flags & ~PANFROST_BO_NOEXEC )) + (args->flags & ~(PANFROST_BO_NOEXEC |PANFROST_BO_HEAP )))return -EINVAL ; bo = panfrost_gem_create_with_handle(file, dev, args->size, args->flags,
drivers/gpu/drm/panfrost/panfrost_gem.c +12 -2
@@ -87,7 +87,10 @@ static int panfrost_gem_map(struct panfrost_device *pfdev, struct panfrost_gem_oif (ret)return ret; -return panfrost_mmu_map (bo); +if (!bo->is_heap) + ret =panfrost_mmu_map (bo); + +return ret; } struct panfrost_gem_object *
@@ -101,7 +104,11 @@ panfrost_gem_create_with_handle(struct drm_file *file_priv,struct drm_gem_shmem_object *shmem;struct panfrost_gem_object *bo; - size =roundup (size,PAGE_SIZE ); +/* Round up heap allocations to 2MB to keep fault handling simple */ +if (flags &PANFROST_BO_HEAP ) + size =roundup (size,SZ_2M ); +else + size =roundup (size,PAGE_SIZE ); shmem =drm_gem_shmem_create_with_handle (file_priv, dev, size, handle);if (IS_ERR (shmem))
@@ -109,6 +116,9 @@ panfrost_gem_create_with_handle(struct drm_file *file_priv, bo =to_panfrost_bo (&shmem->base); bo->noexec = !!(flags &PANFROST_BO_NOEXEC ); + bo->is_heap = !!(flags &PANFROST_BO_HEAP ); +if (bo->is_heap) + bo->noexec = true; ret =panfrost_gem_map (pfdev, bo);if (ret)
drivers/gpu/drm/panfrost/panfrost_gem.h +8 -0
@@ -13,6 +13,7 @@ struct panfrost_gem_object {struct drm_mm_node node; bool is_mapped :1; bool noexec :1; + bool is_heap :1; }; static inline
@@ -21,6 +22,13 @@ struct panfrost_gem_object *to_panfrost_bo(struct drm_gem_object *obj) return container_of(to_drm_gem_shmem_obj(obj), struct panfrost_gem_object, base); } +static inline +struct panfrost_gem_object *drm_mm_node_to_panfrost_bo (struct drm_mm_node *node) +{ + return container_of(node, struct panfrost_gem_object, node); +} + +struct drm_gem_object *panfrost_gem_create_object (struct drm_device *dev,size_t size); struct panfrost_gem_object *
drivers/gpu/drm/panfrost/panfrost_mmu.c +103 -11
160 lines not on this page · raw message
include/uapi/drm/panfrost_drm.h +1 -0
@@ -83,6 +83,7 @@ struct drm_panfrost_wait_bo { };#define PANFROST_BO_NOEXEC 1 +#define PANFROST_BO_HEAP 2/** * struct drm_panfrost_create_bo - ioctl argument for creating Panfrost BOs.
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Steven Price
maintainerRe: [PATCH 4/5] drm/panfrost: Add support for GPU heap allocations
Quoted 86 lines · Rob Herring
The midgard/bifrost GPUs need to allocate GPU heap memory which is allocated on GPU page faults and not pinned in memory. The vendor driver calls this functionality
GROW_ON_GPF.This implementation assumes that BOs allocated with the
PANFROST_BO_NOEXECflag are never mmapped or exported. Both of those may actually work, but I'm unsure if there's some interaction there. It would cause the whole object to be pinned in memory which would defeat the point of this.On faults, we map in 2MB at a time in order to utilize huge pages (if enabled). Currently, once we've mapped pages in, they are only unmapped if the BO is freed. Once we add shrinker support, we can unmap pages with the shrinker.
Cc Tomeu Vizoso <[email protected]>Cc Boris Brezillon <[email protected]>Cc Robin Murphy <[email protected]>Cc Steven Price <[email protected]>Cc Alyssa Rosenzweig <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/panfrost/TODO | 2 - drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- drivers/gpu/drm/panfrost/panfrost_gem.c | 14 ++- drivers/gpu/drm/panfrost/panfrost_gem.h | 8 ++ drivers/gpu/drm/panfrost/panfrost_mmu.c | 114 +++++++++++++++++++++--- include/uapi/drm/panfrost_drm.h | 1 + 6 files changed, 125 insertions(+), 16 deletions(-)drivers/gpu/drm/panfrost/TODO +0
-2@@ -14,8 +14,6 @@ The hard part is handling when more address spaces are needed than what the h/w provides. -- Support pinning pages on demand (GPU page faults). - - Support userspace controlled GPU virtual addresses. Needed for Vulkan. (Tomeu) - Support for madvise and a shrinker.drivers/gpu/drm/panfrost/panfrost_drv.c +1
-1@@ -50,7 +50,7 @@ static int panfrost_ioctl_create_bo(struct drm_device *dev, void *data,struct drm_panfrost_create_bo *args = data;if (!args->size || args->pad || - (args->flags & ~PANFROST_BO_NOEXEC )) + (args->flags & ~(PANFROST_BO_NOEXEC |PANFROST_BO_HEAP )))return -EINVAL ; bo = panfrost_gem_create_with_handle(file, dev, args->size, args->flags,drivers/gpu/drm/panfrost/panfrost_gem.c +9
-2@@ -87,7 +87,10 @@ static int panfrost_gem_map(struct panfrost_device *pfdev, struct panfrost_gem_oif (ret)return ret; -return panfrost_mmu_map (bo); +if (!bo->is_heap) + ret =panfrost_mmu_map (bo); + +return ret; } struct panfrost_gem_object *@@ -101,7 +104,11 @@ panfrost_gem_create_with_handle(struct drm_file *file_priv,struct drm_gem_shmem_object *shmem;struct panfrost_gem_object *bo; - size =roundup (size,PAGE_SIZE ); +/* Round up heap allocations to 2MB to keep fault handling simple */ +if (flags &PANFROST_BO_HEAP ) + size =roundup (size,SZ_2M ); +else + size =roundup (size,PAGE_SIZE ); shmem =drm_gem_shmem_create_with_handle (file_priv, dev, size, handle);if (IS_ERR (shmem))
drivers/gpu/drm/panfrost/panfrost_gem.c panfrost_gem_create_with_handle(struct drm_file *file_priv, · line 121
Quoted 6 lines
drivers/gpu/drm/panfrost/panfrost_gem.c +3
-0@@ -109,6 +116,9 @@ panfrost_gem_create_with_handle(struct drm_file *file_priv, bo =to_panfrost_bo (&shmem->base); bo->noexec = !!(flags &PANFROST_BO_NOEXEC ); + bo->is_heap = !!(flags &PANFROST_BO_HEAP ); +if (bo->is_heap) + bo->noexec = true;
While I agree an executable heap is pretty weird, I'd prefer making this explicit - i.e. failing the allocation if the flags don't make sense.
Quoted 16 lines
drivers/gpu/drm/panfrost/panfrost_gem.c +0
-0ret =panfrost_gem_map (pfdev, bo);if (ret)drivers/gpu/drm/panfrost/panfrost_gem.h +1
-0@@ -13,6 +13,7 @@ struct panfrost_gem_object {struct drm_mm_node node; bool is_mapped :1; bool noexec :1; + bool is_heap :1; }; static inline
drivers/gpu/drm/panfrost/panfrost_gem.h struct panfrost_gem_object *to_panfrost_bo(struct drm_gem_object *obj) · line 31
Quoted 10 lines
drivers/gpu/drm/panfrost/panfrost_gem.h +7
-0@@ -21,6 +22,13 @@ struct panfrost_gem_object *to_panfrost_bo(struct drm_gem_object *obj) return container_of(to_drm_gem_shmem_obj(obj), struct panfrost_gem_object, base); } +static inline +struct panfrost_gem_object *drm_mm_node_to_panfrost_bo (struct drm_mm_node *node) +{ + return container_of(node, struct panfrost_gem_object, node); +} + +
NIT: Extra blank line
Quoted 108 lines
drivers/gpu/drm/panfrost/panfrost_gem.h +0
-0struct drm_gem_object *panfrost_gem_create_object (struct drm_device *dev,size_t size); struct panfrost_gem_object *drivers/gpu/drm/panfrost/panfrost_mmu.c +70
-6@@ -3,6 +3,7 @@/* Copyright (C) 2019 Arm Ltd. */ #include <linux/bitfield.h> #include <linux/delay.h> +#include <linux/dma-mapping.h> #include <linux/interrupt.h> #include <linux/io.h> #include <linux/iopoll.h> @@ -10,6 +11,7 @@#include <linux/iommu.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> +#include <linux/shmem_fs.h> #include <linux/sizes.h> #include "panfrost_device.h" @@ -257,12 +259,12 @@ void panfrost_mmu_unmap(struct panfrost_gem_object *bo)size_t unmapped_page;size_t pgsize =get_pgsize (iova, len - unmapped_len); - unmapped_page = ops->unmap (ops, iova, pgsize); -if (!unmapped_page) -break ; - - iova += unmapped_page; - unmapped_len += unmapped_page; +if (ops->iova_to_phys (ops, iova)) { + unmapped_page = ops->unmap (ops, iova, pgsize); +WARN_ON (unmapped_page != pgsize); + } + iova += pgsize; + unmapped_len += pgsize; } mmu_hw_do_operation(pfdev, 0, bo->node.start << PAGE_SHIFT,@@ -298,6 +300,86 @@ static const struct iommu_gather_ops mmu_tlb_ops = { .tlb_sync = mmu_tlb_sync_context, }; +static struct drm_mm_node *addr_to_drm_mm_node (struct panfrost_device *pfdev,int as,u64 addr) +{ +struct drm_mm_node *node; +u64 offset = addr >>PAGE_SHIFT ; + +drm_mm_for_each_node (node, &pfdev->mm) { +if (offset >= node->start && offset < (node->start + node->size)) +return node; + } +return NULL ; +} + +#define NUM_FAULT_PAGES (SZ_2M / PAGE_SIZE) + +int panfrost_mmu_map_fault_addr (struct panfrost_device *pfdev,int as,u64 addr) +{ +int ret, i; +struct drm_mm_node *node; +struct panfrost_gem_object *bo; +struct address_space *mapping; +pgoff_t page_offset; +struct sg_table sgt = {}; +struct page **pages; + + node =addr_to_drm_mm_node (pfdev, as, addr); +if (!node) +return -ENOENT ; + + bo =drm_mm_node_to_panfrost_bo (node); +if (!bo->is_heap) { +dev_WARN (pfdev->dev,"matching BO is not heap type (GPU VA = %llx)" , + node->start <<PAGE_SHIFT ); +return -EINVAL ; + } +/* Assume 2MB alignment and size multiple */ + addr &= ~((u64 )SZ_2M -1 ); + page_offset = addr >>PAGE_SHIFT ; + page_offset -= node->start; + + pages =kvmalloc_array (NUM_FAULT_PAGES ,sizeof (struct page *),GFP_KERNEL ); +if (!pages) +return -ENOMEM ; + + mapping = bo->base.base.filp->f_mapping; +mapping_set_unevictable (mapping); + +for (i =0 ; i <NUM_FAULT_PAGES ; i++) { + pages[i] =shmem_read_mapping_page (mapping, page_offset + i); +if (IS_ERR (pages[i])) { + ret =PTR_ERR (pages[i]); + goto err_pages; + } + } + + ret =sg_alloc_table_from_pages (&sgt, pages,NUM_FAULT_PAGES ,0 , +SZ_2M ,GFP_KERNEL ); +if (ret) + goto err_pages; + +if (dma_map_sg (pfdev->dev, sgt.sgl, sgt.nents,DMA_BIDIRECTIONAL ) ==0 ) { + ret = -EINVAL ; + goto err_map;
drivers/gpu/drm/panfrost/panfrost_mmu.c static const struct iommu_gather_ops mmu_tlb_ops = { · line 374
Quoted 10 lines
drivers/gpu/drm/panfrost/panfrost_mmu.c +10
-0+ } + +mmu_map_sg (pfdev, addr,IOMMU_WRITE |IOMMU_READ |IOMMU_NOEXEC , &sgt); + +mmu_write (pfdev,MMU_INT_CLEAR ,BIT (as)); + bo->is_mapped = true; + +dev_dbg (pfdev->dev,"mapped page fault @ %llx" , addr); + +return 0 ;
You still need to free sgt and pages - so this should be:
ret = 0;
to fall through to the clean up below:
drivers/gpu/drm/panfrost/panfrost_mmu.c static const struct iommu_gather_ops mmu_tlb_ops = { · line 382
Quoted 8 lines
drivers/gpu/drm/panfrost/panfrost_mmu.c +8
-0+ +err_map: +sg_free_table (&sgt); +err_pages: +kvfree (pages); +return ret; +} +
But actually, you need to store the pages allocated in the buffer object so that they can be freed later. At the moment you have a big memory leak.
Quoted 20 lines
drivers/gpu/drm/panfrost/panfrost_mmu.c +1
-3static const char *access_type_name (struct panfrost_device *pfdev,u32 fault_status) {@@ -323,13 +405,11 @@ static irqreturn_t panfrost_mmu_irq_handler(int irq, void *data) {struct panfrost_device *pfdev = data;u32 status =mmu_read (pfdev,MMU_INT_STAT ); -int i; +int i, ret;if (!status)return IRQ_NONE ; -dev_err (pfdev->dev,"mmu irq status=%x\n" , status); -for (i =0 ; status; i++) {u32 mask =BIT (i) |BIT (i +16 );u64 addr;@@ -350,6 +430,17 @@ static irqreturn_t panfrost_mmu_irq_handler(int irq, void *data) access_type = (fault_status >>8 ) &0x3 ;
drivers/gpu/drm/panfrost/panfrost_mmu.c static irqreturn_t panfrost_mmu_irq_handler(int irq, void *data) · line 440
Quoted 10 lines
drivers/gpu/drm/panfrost/panfrost_mmu.c +8
-0source_id = (fault_status >>16 ); +/* Page fault only */ +if ((status & mask) ==BIT (i)) { +WARN_ON (exception_type <0xC1 || exception_type >0xC4 ); + + ret =panfrost_mmu_map_fault_addr (pfdev, i, addr); +if (!ret) { + status &= ~mask; +continue ;
In this case the IRQ isn't handled and will remain asserted, which probably isn't going to end particularly well.
Ideally you would switch the address space to UNMAPPED to kill off the job, but at the very least we should acknowledge the interrupt and let the GPU timeout reset the GPU to recover (which is equivalent while we still only use the one AS on the GPU).
Steve
Quoted 24 lines
drivers/gpu/drm/panfrost/panfrost_mmu.c +6
-2+ } + } +/* terminal fault, print info about the fault */ dev_err (pfdev->dev, "Unhandled Page fault in AS%d at VA 0x%016llX\n"@@ -391,8 +482,9 @@ int panfrost_mmu_init(struct panfrost_device *pfdev)if (irq <=0 )return -ENODEV ; - err =devm_request_irq (pfdev->dev, irq, panfrost_mmu_irq_handler, -IRQF_SHARED ,"mmu" , pfdev); + err =devm_request_threaded_irq (pfdev->dev, irq,NULL , + panfrost_mmu_irq_handler, +IRQF_ONESHOT ,"mmu" , pfdev);if (err) {dev_err (pfdev->dev,"failed to request mmu irq" );include/uapi/drm/panfrost_drm.h +0
-0
include/uapi/drm/panfrost_drm.h struct drm_panfrost_wait_bo { · line 89
Quoted 7 lines
include/uapi/drm/panfrost_drm.h +1
-0@@ -83,6 +83,7 @@ struct drm_panfrost_wait_bo { };#define PANFROST_BO_NOEXEC 1 +#define PANFROST_BO_HEAP 2/** * struct drm_panfrost_create_bo - ioctl argument for creating Panfrost BOs.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Rob Herring
maintainerRe: [PATCH 4/5] drm/panfrost: Add support for GPU heap allocations
Quoted 89 lines · Steven Price
Quoted 87 lines · Rob Herring
The midgard/bifrost GPUs need to allocate GPU heap memory which is allocated on GPU page faults and not pinned in memory. The vendor driver calls this functionality
GROW_ON_GPF.This implementation assumes that BOs allocated with the
PANFROST_BO_NOEXECflag are never mmapped or exported. Both of those may actually work, but I'm unsure if there's some interaction there. It would cause the whole object to be pinned in memory which would defeat the point of this.On faults, we map in 2MB at a time in order to utilize huge pages (if enabled). Currently, once we've mapped pages in, they are only unmapped if the BO is freed. Once we add shrinker support, we can unmap pages with the shrinker.
Cc Tomeu Vizoso <[email protected]>Cc Boris Brezillon <[email protected]>Cc Robin Murphy <[email protected]>Cc Steven Price <[email protected]>Cc Alyssa Rosenzweig <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/panfrost/TODO | 2 - drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- drivers/gpu/drm/panfrost/panfrost_gem.c | 14 ++- drivers/gpu/drm/panfrost/panfrost_gem.h | 8 ++ drivers/gpu/drm/panfrost/panfrost_mmu.c | 114 +++++++++++++++++++++--- include/uapi/drm/panfrost_drm.h | 1 + 6 files changed, 125 insertions(+), 16 deletions(-)drivers/gpu/drm/panfrost/TODO +0
-2@@ -14,8 +14,6 @@ The hard part is handling when more address spaces are needed than what the h/w provides. -- Support pinning pages on demand (GPU page faults). - - Support userspace controlled GPU virtual addresses. Needed for Vulkan. (Tomeu) - Support for madvise and a shrinker.drivers/gpu/drm/panfrost/panfrost_drv.c +1
-1@@ -50,7 +50,7 @@ static int panfrost_ioctl_create_bo(struct drm_device *dev, void *data,struct drm_panfrost_create_bo *args = data;if (!args->size || args->pad || - (args->flags & ~PANFROST_BO_NOEXEC )) + (args->flags & ~(PANFROST_BO_NOEXEC |PANFROST_BO_HEAP )))return -EINVAL ; bo = panfrost_gem_create_with_handle(file, dev, args->size, args->flags,drivers/gpu/drm/panfrost/panfrost_gem.c +9
-2@@ -87,7 +87,10 @@ static int panfrost_gem_map(struct panfrost_device *pfdev, struct panfrost_gem_oif (ret)return ret; -return panfrost_mmu_map (bo); +if (!bo->is_heap) + ret =panfrost_mmu_map (bo); + +return ret; } struct panfrost_gem_object *@@ -101,7 +104,11 @@ panfrost_gem_create_with_handle(struct drm_file *file_priv,struct drm_gem_shmem_object *shmem;struct panfrost_gem_object *bo; - size =roundup (size,PAGE_SIZE ); +/* Round up heap allocations to 2MB to keep fault handling simple */ +if (flags &PANFROST_BO_HEAP ) + size =roundup (size,SZ_2M ); +else + size =roundup (size,PAGE_SIZE ); shmem =drm_gem_shmem_create_with_handle (file_priv, dev, size, handle);if (IS_ERR (shmem))@@ -109,6 +116,9 @@ panfrost_gem_create_with_handle(struct drm_file *file_priv,
Quoted 8 lines
drivers/gpu/drm/panfrost/panfrost_gem.c panfrost_gem_create_with_handle(struct drm_file *file_priv, · line 121
Quoted 5 lines
drivers/gpu/drm/panfrost/panfrost_gem.c +3
-0bo =to_panfrost_bo (&shmem->base); bo->noexec = !!(flags &PANFROST_BO_NOEXEC ); + bo->is_heap = !!(flags &PANFROST_BO_HEAP ); +if (bo->is_heap) + bo->noexec = true;While I agree an executable heap is pretty weird, I'd prefer making this explicit - i.e. failing the allocation if the flags don't make sense.
Seems a bit strange too to always have to set NOEXEC when HEAP is set. There's not really any reason to reject setting just HEAP.
[...]
Quoted 61 lines
Quoted 48 lines
drivers/gpu/drm/panfrost/panfrost_gem.c +48
-0+int panfrost_mmu_map_fault_addr (struct panfrost_device *pfdev,int as,u64 addr) +{ +int ret, i; +struct drm_mm_node *node; +struct panfrost_gem_object *bo; +struct address_space *mapping; +pgoff_t page_offset; +struct sg_table sgt = {}; +struct page **pages; + + node =addr_to_drm_mm_node (pfdev, as, addr); +if (!node) +return -ENOENT ; + + bo =drm_mm_node_to_panfrost_bo (node); +if (!bo->is_heap) { +dev_WARN (pfdev->dev,"matching BO is not heap type (GPU VA = %llx)" , + node->start <<PAGE_SHIFT ); +return -EINVAL ; + } +/* Assume 2MB alignment and size multiple */ + addr &= ~((u64 )SZ_2M -1 ); + page_offset = addr >>PAGE_SHIFT ; + page_offset -= node->start; + + pages =kvmalloc_array (NUM_FAULT_PAGES ,sizeof (struct page *),GFP_KERNEL ); +if (!pages) +return -ENOMEM ; + + mapping = bo->base.base.filp->f_mapping; +mapping_set_unevictable (mapping); + +for (i =0 ; i <NUM_FAULT_PAGES ; i++) { + pages[i] =shmem_read_mapping_page (mapping, page_offset + i); +if (IS_ERR (pages[i])) { + ret =PTR_ERR (pages[i]); + goto err_pages; + } + } + + ret =sg_alloc_table_from_pages (&sgt, pages,NUM_FAULT_PAGES ,0 , +SZ_2M ,GFP_KERNEL ); +if (ret) + goto err_pages; + +if (dma_map_sg (pfdev->dev, sgt.sgl, sgt.nents,DMA_BIDIRECTIONAL ) ==0 ) { + ret = -EINVAL ; + goto err_map;drivers/gpu/drm/panfrost/panfrost_gem.c panfrost_gem_create_with_handle(struct drm_file *file_priv,
Quoted 10 lines
drivers/gpu/drm/panfrost/panfrost_gem.c +10
-0+ } + +mmu_map_sg (pfdev, addr,IOMMU_WRITE |IOMMU_READ |IOMMU_NOEXEC , &sgt); + +mmu_write (pfdev,MMU_INT_CLEAR ,BIT (as)); + bo->is_mapped = true; + +dev_dbg (pfdev->dev,"mapped page fault @ %llx" , addr); + +return 0 ;You still need to free sgt and pages - so this should be:
Quoted 3 lines
ret = 0;
to fall through to the clean up below:
I think I had that then thought I forgot the return...
Quoted 12 lines
drivers/gpu/drm/panfrost/panfrost_gem.c
Quoted 9 lines
drivers/gpu/drm/panfrost/panfrost_gem.c +8
-0+ +err_map: +sg_free_table (&sgt); +err_pages: +kvfree (pages); +return ret; +} +But actually, you need to store the pages allocated in the buffer object so that they can be freed later. At the moment you have a big memory leak.
Ah yes, now I see the memory ends up in 'Unevictable' bucket. I'd been looking at the shmem counts and it seemed fine. I have it working now, but still need to figure out how to do a dma_unmap.
Quoted 22 lines
Quoted 22 lines
static const char *access_type_name(struct
panfrost_device*pfdev,
u32fault_status)
{drivers/gpu/drm/panfrost/panfrost_gem.c +1
-3@@ -323,13 +405,11 @@ static irqreturn_t panfrost_mmu_irq_handler(int irq, void *data) {struct panfrost_device *pfdev = data;u32 status =mmu_read (pfdev,MMU_INT_STAT ); -int i; +int i, ret;if (!status)return IRQ_NONE ; -dev_err (pfdev->dev,"mmu irq status=%x\n" , status); -for (i =0 ; status; i++) {u32 mask =BIT (i) |BIT (i +16 );u64 addr;@@ -350,6 +430,17 @@ static irqreturn_t panfrost_mmu_irq_handler(int irq, void *data) access_type = (fault_status >>8 ) &0x3 ; source_id = (fault_status >>16 );
Quoted 11 lines
drivers/gpu/drm/panfrost/panfrost_gem.c static irqreturn_t panfrost_mmu_irq_handler(int irq, void *data) · line 440
Quoted 8 lines
drivers/gpu/drm/panfrost/panfrost_gem.c +8
-0+/* Page fault only */ +if ((status & mask) ==BIT (i)) { +WARN_ON (exception_type <0xC1 || exception_type >0xC4 ); + + ret =panfrost_mmu_map_fault_addr (pfdev, i, addr); +if (!ret) { + status &= ~mask; +continue ;In this case the IRQ isn't handled and will remain asserted, which probably isn't going to end particularly well.
This is the success condition. We've already cleared the interrupt in panfrost_mmu_map_fault_addr. On failure, we fall thru printing out the next message and clear the interrupt. Maybe it would be better to clear the interrupt in 1 place...
Quoted 5 lines
Ideally you would switch the address space to UNMAPPED to kill off the job, but at the very least we should acknowledge the interrupt and let the GPU timeout reset the GPU to recover (which is equivalent while we still only use the one AS on the GPU).
I'll hopefully remember this detail when doing multiple AS.
Thanks for the review.
Rob
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Steven Price
maintainerRe: [PATCH 4/5] drm/panfrost: Add support for GPU heap allocations
Quoted 99 lines · Rob Herring
Quoted 89 lines · Steven Price
Quoted 87 lines · Rob Herring
The midgard/bifrost GPUs need to allocate GPU heap memory which is allocated on GPU page faults and not pinned in memory. The vendor driver calls this functionality
GROW_ON_GPF.This implementation assumes that BOs allocated with the
PANFROST_BO_NOEXECflag are never mmapped or exported. Both of those may actually work, but I'm unsure if there's some interaction there. It would cause the whole object to be pinned in memory which would defeat the point of this.On faults, we map in 2MB at a time in order to utilize huge pages (if enabled). Currently, once we've mapped pages in, they are only unmapped if the BO is freed. Once we add shrinker support, we can unmap pages with the shrinker.
Cc Tomeu Vizoso <[email protected]>Cc Boris Brezillon <[email protected]>Cc Robin Murphy <[email protected]>Cc Steven Price <[email protected]>Cc Alyssa Rosenzweig <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/gpu/drm/panfrost/TODO | 2 - drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- drivers/gpu/drm/panfrost/panfrost_gem.c | 14 ++- drivers/gpu/drm/panfrost/panfrost_gem.h | 8 ++ drivers/gpu/drm/panfrost/panfrost_mmu.c | 114 +++++++++++++++++++++--- include/uapi/drm/panfrost_drm.h | 1 + 6 files changed, 125 insertions(+), 16 deletions(-)drivers/gpu/drm/panfrost/TODO +0
-2@@ -14,8 +14,6 @@ The hard part is handling when more address spaces are needed than what the h/w provides. -- Support pinning pages on demand (GPU page faults). - - Support userspace controlled GPU virtual addresses. Needed for Vulkan. (Tomeu) - Support for madvise and a shrinker.drivers/gpu/drm/panfrost/panfrost_drv.c +1
-1@@ -50,7 +50,7 @@ static int panfrost_ioctl_create_bo(struct drm_device *dev, void *data,struct drm_panfrost_create_bo *args = data;if (!args->size || args->pad || - (args->flags & ~PANFROST_BO_NOEXEC )) + (args->flags & ~(PANFROST_BO_NOEXEC |PANFROST_BO_HEAP )))return -EINVAL ; bo = panfrost_gem_create_with_handle(file, dev, args->size, args->flags,drivers/gpu/drm/panfrost/panfrost_gem.c +9
-2@@ -87,7 +87,10 @@ static int panfrost_gem_map(struct panfrost_device *pfdev, struct panfrost_gem_oif (ret)return ret; -return panfrost_mmu_map (bo); +if (!bo->is_heap) + ret =panfrost_mmu_map (bo); + +return ret; } struct panfrost_gem_object *@@ -101,7 +104,11 @@ panfrost_gem_create_with_handle(struct drm_file *file_priv,struct drm_gem_shmem_object *shmem;struct panfrost_gem_object *bo; - size =roundup (size,PAGE_SIZE ); +/* Round up heap allocations to 2MB to keep fault handling simple */ +if (flags &PANFROST_BO_HEAP ) + size =roundup (size,SZ_2M ); +else + size =roundup (size,PAGE_SIZE ); shmem =drm_gem_shmem_create_with_handle (file_priv, dev, size, handle);if (IS_ERR (shmem))@@ -109,6 +116,9 @@ panfrost_gem_create_with_handle(struct drm_file *file_priv,Quoted 8 lines
drivers/gpu/drm/panfrost/panfrost_gem.c panfrost_gem_create_with_handle(struct drm_file *file_priv, · line 121
Quoted 5 lines
drivers/gpu/drm/panfrost/panfrost_gem.c +3
-0bo =to_panfrost_bo (&shmem->base); bo->noexec = !!(flags &PANFROST_BO_NOEXEC ); + bo->is_heap = !!(flags &PANFROST_BO_HEAP ); +if (bo->is_heap) + bo->noexec = true;While I agree an executable heap is pretty weird, I'd prefer making this explicit - i.e. failing the allocation if the flags don't make sense.
Quoted 2 lines
Seems a bit strange too to always have to set NOEXEC when HEAP is set. There's not really any reason to reject setting just HEAP.
Personally I prefer an explicit API, so you get exactly what you requested (no extra properties added on). But I'm not too bothered because I can't actually see why HEAP would ever be used without NOEXEC.
Quoted 63 lines
[...]
Quoted 61 lines
Quoted 48 lines
drivers/gpu/drm/panfrost/panfrost_gem.c +48
-0+int panfrost_mmu_map_fault_addr (struct panfrost_device *pfdev,int as,u64 addr) +{ +int ret, i; +struct drm_mm_node *node; +struct panfrost_gem_object *bo; +struct address_space *mapping; +pgoff_t page_offset; +struct sg_table sgt = {}; +struct page **pages; + + node =addr_to_drm_mm_node (pfdev, as, addr); +if (!node) +return -ENOENT ; + + bo =drm_mm_node_to_panfrost_bo (node); +if (!bo->is_heap) { +dev_WARN (pfdev->dev,"matching BO is not heap type (GPU VA = %llx)" , + node->start <<PAGE_SHIFT ); +return -EINVAL ; + } +/* Assume 2MB alignment and size multiple */ + addr &= ~((u64 )SZ_2M -1 ); + page_offset = addr >>PAGE_SHIFT ; + page_offset -= node->start; + + pages =kvmalloc_array (NUM_FAULT_PAGES ,sizeof (struct page *),GFP_KERNEL ); +if (!pages) +return -ENOMEM ; + + mapping = bo->base.base.filp->f_mapping; +mapping_set_unevictable (mapping); + +for (i =0 ; i <NUM_FAULT_PAGES ; i++) { + pages[i] =shmem_read_mapping_page (mapping, page_offset + i); +if (IS_ERR (pages[i])) { + ret =PTR_ERR (pages[i]); + goto err_pages; + } + } + + ret =sg_alloc_table_from_pages (&sgt, pages,NUM_FAULT_PAGES ,0 , +SZ_2M ,GFP_KERNEL ); +if (ret) + goto err_pages; + +if (dma_map_sg (pfdev->dev, sgt.sgl, sgt.nents,DMA_BIDIRECTIONAL ) ==0 ) { + ret = -EINVAL ; + goto err_map;drivers/gpu/drm/panfrost/panfrost_gem.c
Quoted 10 lines
drivers/gpu/drm/panfrost/panfrost_gem.c +10
-0+ } + +mmu_map_sg (pfdev, addr,IOMMU_WRITE |IOMMU_READ |IOMMU_NOEXEC , &sgt); + +mmu_write (pfdev,MMU_INT_CLEAR ,BIT (as)); + bo->is_mapped = true; + +dev_dbg (pfdev->dev,"mapped page fault @ %llx" , addr); + +return 0 ;You still need to free sgt and pages - so this should be:
Quoted 5 lines
Quoted 3 lines
ret = 0;
to fall through to the clean up below:
I think I had that then thought I forgot the return...
Might be an idea to rename the labels to "out_xxx" to make it look less like the return is missing? :)
Quoted 13 lines
Quoted 12 lines
drivers/gpu/drm/panfrost/panfrost_gem.c
Quoted 9 lines
drivers/gpu/drm/panfrost/panfrost_gem.c +8
-0+ +err_map: +sg_free_table (&sgt); +err_pages: +kvfree (pages); +return ret; +} +But actually, you need to store the pages allocated in the buffer object so that they can be freed later. At the moment you have a big memory leak.
Quoted 3 lines
Ah yes, now I see the memory ends up in 'Unevictable' bucket. I'd been looking at the shmem counts and it seemed fine. I have it working now, but still need to figure out how to do a
dma_unmap.
I was purely looking at the memory usage in 'top'. I was hoping it would be lower using HEAP, but instead I saw the leak. I'm afraid I gave up trying to figure out the best way of implementing the dma_unmap - so good luck! :)
Quoted 34 lines
Quoted 22 lines
Quoted 22 lines
static const char *access_type_name(struct
panfrost_device*pfdev,
u32fault_status)
{drivers/gpu/drm/panfrost/panfrost_gem.c +1
-3@@ -323,13 +405,11 @@ static irqreturn_t panfrost_mmu_irq_handler(int irq, void *data) {struct panfrost_device *pfdev = data;u32 status =mmu_read (pfdev,MMU_INT_STAT ); -int i; +int i, ret;if (!status)return IRQ_NONE ; -dev_err (pfdev->dev,"mmu irq status=%x\n" , status); -for (i =0 ; status; i++) {u32 mask =BIT (i) |BIT (i +16 );u64 addr;@@ -350,6 +430,17 @@ static irqreturn_t panfrost_mmu_irq_handler(int irq, void *data) access_type = (fault_status >>8 ) &0x3 ; source_id = (fault_status >>16 );Quoted 11 lines
drivers/gpu/drm/panfrost/panfrost_gem.c static irqreturn_t panfrost_mmu_irq_handler(int irq, void *data) · line 440
Quoted 8 lines
drivers/gpu/drm/panfrost/panfrost_gem.c +8
-0+/* Page fault only */ +if ((status & mask) ==BIT (i)) { +WARN_ON (exception_type <0xC1 || exception_type >0xC4 ); + + ret =panfrost_mmu_map_fault_addr (pfdev, i, addr); +if (!ret) { + status &= ~mask; +continue ;In this case the IRQ isn't handled and will remain asserted, which probably isn't going to end particularly well.
Quoted 4 lines
This is the success condition. We've already cleared the interrupt in
panfrost_mmu_map_fault_addr. On failure, we fall thru printing out the next message and clear the interrupt. Maybe it would be better to clear the interrupt in 1 place...
You're absolutely right - sorry for the noise. I think I must have misread and assumed this was the failure condition. Like you say though it might be cleaner to only have the one place that the interrupt is cleared.
Quoted 7 lines
Quoted 5 lines
Ideally you would switch the address space to UNMAPPED to kill off the job, but at the very least we should acknowledge the interrupt and let the GPU timeout reset the GPU to recover (which is equivalent while we still only use the one AS on the GPU).
I'll hopefully remember this detail when doing multiple AS.
A fair bit of the complexity of kbase comes from trying to avoid the possibility of one process DoSing another by submitting malicious jobs. The MMU in particular will basically just pause until it is kicked when a page fault happens, so UNMAPPED is needed to trigger a failure back into the execution units to allow the threads to progress and report failure - which is important if there's another job competing for the same execution units.
Steve
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 4/5] drm/panfrost: Add support for GPU heap allocations
Quoted 2 lines
A fair bit of the complexity of kbase comes from trying to avoid the possibility of one process DoSing another by submitting malicious jobs.
...and yet it was still doable so easily (by accident, with buggy jobs instead of malicious jobs).... sigh...
Still is on the mainline kernel (e.g. running dEQP in a window in Weston, some faults triggered in dEQP end up messing up Weston's rendering outside the deqp window). What's our threat model here?
Is "banning WebGL on Panfrost" allowed? :)
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 4/5] drm/panfrost: Add support for GPU heap allocations
Quoted 4 lines · Alyssa Rosenzweig
Quoted 3 lines
A fair bit of the complexity of kbase comes from trying to avoid the possibility of one process DoSing another by submitting malicious jobs.
Quoted 8 lines
...and yet it was still doable so easily (by accident, with buggy jobs instead of malicious jobs).... sigh...
Still is on the mainline kernel (e.g. running dEQP in a window in Weston, some faults triggered in dEQP end up messing up Weston's rendering outside the deqp window). What's our threat model here?
Is "banning WebGL on Panfrost" allowed? :)
I think what Panfrost needs to do is to give browsers as much support as possible to make WebGL secure. This includes making best use of the HW to that end, and implementing any robustness-related extensions that may be available.
Cheers,
Tomeu
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 4/5] drm/panfrost: Add support for GPU heap allocations
In reply to Steven PriceQuoted 2 lines
While I agree an executable heap is pretty weird, I'd prefer making this explicit - i.e. failing the allocation if the flags don't make sense.
The only use case for an executable heap I can think of is an attacker trying to exploit a GPU-side heap overflow, and that's seriously stretching it ;)
Making executable? mutually exclusive with growable? is quite sane to me.
Quoted 233 lines
Quoted 17 lines
drivers/gpu/drm/panfrost/panfrost_gem.c +0
-0ret =panfrost_gem_map (pfdev, bo);if (ret)drivers/gpu/drm/panfrost/panfrost_gem.h +1
-0@@ -13,6 +13,7 @@ struct panfrost_gem_object {struct drm_mm_node node; bool is_mapped :1; bool noexec :1; + bool is_heap :1; }; static inlinedrivers/gpu/drm/panfrost/panfrost_gem.h struct panfrost_gem_object *to_panfrost_bo(struct drm_gem_object *obj) · line 31
Quoted 10 lines
drivers/gpu/drm/panfrost/panfrost_gem.h +7
-0@@ -21,6 +22,13 @@ struct panfrost_gem_object *to_panfrost_bo(struct drm_gem_object *obj) return container_of(to_drm_gem_shmem_obj(obj), struct panfrost_gem_object, base); } +static inline +struct panfrost_gem_object *drm_mm_node_to_panfrost_bo (struct drm_mm_node *node) +{ + return container_of(node, struct panfrost_gem_object, node); +} + +NIT: Extra blank line
Quoted 108 lines
drivers/gpu/drm/panfrost/panfrost_gem.h +0
-0struct drm_gem_object *panfrost_gem_create_object (struct drm_device *dev,size_t size); struct panfrost_gem_object *drivers/gpu/drm/panfrost/panfrost_mmu.c +70
-6@@ -3,6 +3,7 @@/* Copyright (C) 2019 Arm Ltd. */ #include <linux/bitfield.h> #include <linux/delay.h> +#include <linux/dma-mapping.h> #include <linux/interrupt.h> #include <linux/io.h> #include <linux/iopoll.h> @@ -10,6 +11,7 @@#include <linux/iommu.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> +#include <linux/shmem_fs.h> #include <linux/sizes.h> #include "panfrost_device.h" @@ -257,12 +259,12 @@ void panfrost_mmu_unmap(struct panfrost_gem_object *bo)size_t unmapped_page;size_t pgsize =get_pgsize (iova, len - unmapped_len); - unmapped_page = ops->unmap (ops, iova, pgsize); -if (!unmapped_page) -break ; - - iova += unmapped_page; - unmapped_len += unmapped_page; +if (ops->iova_to_phys (ops, iova)) { + unmapped_page = ops->unmap (ops, iova, pgsize); +WARN_ON (unmapped_page != pgsize); + } + iova += pgsize; + unmapped_len += pgsize; } mmu_hw_do_operation(pfdev, 0, bo->node.start << PAGE_SHIFT,@@ -298,6 +300,86 @@ static const struct iommu_gather_ops mmu_tlb_ops = { .tlb_sync = mmu_tlb_sync_context, }; +static struct drm_mm_node *addr_to_drm_mm_node (struct panfrost_device *pfdev,int as,u64 addr) +{ +struct drm_mm_node *node; +u64 offset = addr >>PAGE_SHIFT ; + +drm_mm_for_each_node (node, &pfdev->mm) { +if (offset >= node->start && offset < (node->start + node->size)) +return node; + } +return NULL ; +} + +#define NUM_FAULT_PAGES (SZ_2M / PAGE_SIZE) + +int panfrost_mmu_map_fault_addr (struct panfrost_device *pfdev,int as,u64 addr) +{ +int ret, i; +struct drm_mm_node *node; +struct panfrost_gem_object *bo; +struct address_space *mapping; +pgoff_t page_offset; +struct sg_table sgt = {}; +struct page **pages; + + node =addr_to_drm_mm_node (pfdev, as, addr); +if (!node) +return -ENOENT ; + + bo =drm_mm_node_to_panfrost_bo (node); +if (!bo->is_heap) { +dev_WARN (pfdev->dev,"matching BO is not heap type (GPU VA = %llx)" , + node->start <<PAGE_SHIFT ); +return -EINVAL ; + } +/* Assume 2MB alignment and size multiple */ + addr &= ~((u64 )SZ_2M -1 ); + page_offset = addr >>PAGE_SHIFT ; + page_offset -= node->start; + + pages =kvmalloc_array (NUM_FAULT_PAGES ,sizeof (struct page *),GFP_KERNEL ); +if (!pages) +return -ENOMEM ; + + mapping = bo->base.base.filp->f_mapping; +mapping_set_unevictable (mapping); + +for (i =0 ; i <NUM_FAULT_PAGES ; i++) { + pages[i] =shmem_read_mapping_page (mapping, page_offset + i); +if (IS_ERR (pages[i])) { + ret =PTR_ERR (pages[i]); + goto err_pages; + } + } + + ret =sg_alloc_table_from_pages (&sgt, pages,NUM_FAULT_PAGES ,0 , +SZ_2M ,GFP_KERNEL ); +if (ret) + goto err_pages; + +if (dma_map_sg (pfdev->dev, sgt.sgl, sgt.nents,DMA_BIDIRECTIONAL ) ==0 ) { + ret = -EINVAL ; + goto err_map;drivers/gpu/drm/panfrost/panfrost_mmu.c static const struct iommu_gather_ops mmu_tlb_ops = { · line 374
Quoted 10 lines
drivers/gpu/drm/panfrost/panfrost_mmu.c +10
-0+ } + +mmu_map_sg (pfdev, addr,IOMMU_WRITE |IOMMU_READ |IOMMU_NOEXEC , &sgt); + +mmu_write (pfdev,MMU_INT_CLEAR ,BIT (as)); + bo->is_mapped = true; + +dev_dbg (pfdev->dev,"mapped page fault @ %llx" , addr); + +return 0 ;You still need to free sgt and pages - so this should be:
ret = 0;
to fall through to the clean up below:
drivers/gpu/drm/panfrost/panfrost_mmu.c static const struct iommu_gather_ops mmu_tlb_ops = { · line 382
Quoted 8 lines
drivers/gpu/drm/panfrost/panfrost_mmu.c +8
-0+ +err_map: +sg_free_table (&sgt); +err_pages: +kvfree (pages); +return ret; +} +But actually, you need to store the pages allocated in the buffer object so that they can be freed later. At the moment you have a big memory leak.
Quoted 20 lines
drivers/gpu/drm/panfrost/panfrost_mmu.c +1
-3static const char *access_type_name (struct panfrost_device *pfdev,u32 fault_status) {@@ -323,13 +405,11 @@ static irqreturn_t panfrost_mmu_irq_handler(int irq, void *data) {struct panfrost_device *pfdev = data;u32 status =mmu_read (pfdev,MMU_INT_STAT ); -int i; +int i, ret;if (!status)return IRQ_NONE ; -dev_err (pfdev->dev,"mmu irq status=%x\n" , status); -for (i =0 ; status; i++) {u32 mask =BIT (i) |BIT (i +16 );u64 addr;@@ -350,6 +430,17 @@ static irqreturn_t panfrost_mmu_irq_handler(int irq, void *data) access_type = (fault_status >>8 ) &0x3 ;drivers/gpu/drm/panfrost/panfrost_mmu.c static irqreturn_t panfrost_mmu_irq_handler(int irq, void *data) · line 440
Quoted 10 lines
drivers/gpu/drm/panfrost/panfrost_mmu.c +8
-0source_id = (fault_status >>16 ); +/* Page fault only */ +if ((status & mask) ==BIT (i)) { +WARN_ON (exception_type <0xC1 || exception_type >0xC4 ); + + ret =panfrost_mmu_map_fault_addr (pfdev, i, addr); +if (!ret) { + status &= ~mask; +continue ;In this case the IRQ isn't handled and will remain asserted, which probably isn't going to end particularly well.
Ideally you would switch the address space to UNMAPPED to kill off the job, but at the very least we should acknowledge the interrupt and let the GPU timeout reset the GPU to recover (which is equivalent while we still only use the one AS on the GPU).
Steve
Quoted 25 lines
drivers/gpu/drm/panfrost/panfrost_mmu.c +6
-2+ } + } +/* terminal fault, print info about the fault */ dev_err (pfdev->dev, "Unhandled Page fault in AS%d at VA 0x%016llX\n"@@ -391,8 +482,9 @@ int panfrost_mmu_init(struct panfrost_device *pfdev)if (irq <=0 )return -ENODEV ; - err =devm_request_irq (pfdev->dev, irq, panfrost_mmu_irq_handler, -IRQF_SHARED ,"mmu" , pfdev); + err =devm_request_threaded_irq (pfdev->dev, irq,NULL , + panfrost_mmu_irq_handler, +IRQF_ONESHOT ,"mmu" , pfdev);if (err) {dev_err (pfdev->dev,"failed to request mmu irq" );include/uapi/drm/panfrost_drm.h +0
-0@@ -83,6 +83,7 @@ struct drm_panfrost_wait_bo { };
Quoted 6 lines
include/uapi/drm/panfrost_drm.h struct drm_panfrost_wait_bo { · line 89
Quoted 6 lines
include/uapi/drm/panfrost_drm.h +1
-0#define PANFROST_BO_NOEXEC 1 +#define PANFROST_BO_HEAP 2/** * struct drm_panfrost_create_bo - ioctl argument for creating Panfrost BOs.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): [email protected]
Rob Herring
maintainerRe: [PATCH 4/5] drm/panfrost: Add support for GPU heap allocations
Quoted 8 lines · Alyssa Rosenzweig
Quoted 3 lines
#define
PANFROST_BO_NOEXEC1
+#definePANFROST_BO_HEAP2Bikeshedding, but I don't like this name. There are, I think, multiple GPU-mapped buffers (at least in Panfrost -- I don't know how the blob manages memory) that can be considered heaps of sorts. Some of those are just regular old BOs.
Well, I had 'nomap' which reflected exactly what the kernel would do to the BO and some folks didn't like that either. Granted, exactly what is not mapped wasn't that clear.
It's really a question of give userspace exactly what it asks for or tell the kernel how the BO is going to be used and it will decide the details (which could change). It's similar to asking for a linear buffer vs. scanout buffer.
Quoted 3 lines
What makes these special is that they're growable. Calling it "heap" is okay inside the kernel, but for the UABI, I'd prefer an explicit "
PANFROST_BO_GROWABLE(_HEAP)" to make it obvious what's going on.
IMO, 'growable' means the BO is one size and then grows to a new size. But we're not resizing the BO, but rather just delaying the GPU mapping and sparsely mapping it.
Rob
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Rob Herring
maintainerPATCH 5/5 drm/panfrost: Bump driver version to 1.1
In reply to Rob HerringIncrement the driver version to expose the new BO allocation flags.
--- drivers/gpu/drm/panfrost/panfrost_drv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/panfrost/panfrost_drv.c +6 -1
@@ -348,6 +348,11 @@ static const struct drm_ioctl_desc panfrost_drm_driver_ioctls[] = {DEFINE_DRM_GEM_SHMEM_FOPS (panfrost_drm_driver_fops); +/* +* Panfrost driver version: +* - 1.0 - initial interface +* - 1.1 - adds HEAP and NOEXEC flags for CREATE_BO +*/ static struct drm_driver panfrost_drm_driver = { .driver_features =DRIVER_RENDER |DRIVER_GEM |DRIVER_SYNCOBJ , .open = panfrost_open,
@@ -359,7 +364,7 @@ static struct drm_driver panfrost_drm_driver = { .desc = "panfrost DRM", .date = "20180908", .major = 1, - .minor = 0, + .minor = 1, .gem_create_object = panfrost_gem_create_object, .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): [email protected]
Rob Herring
maintainerQuoted 14 lines · Steven Price
Quoted 11 lines · Rob Herring
Setting the GPU VA when creating the GEM object doesn't allow for any conditional adjustments. In preparation to support adjusting the mapping, restructure the GEM object creation to map the GEM object after we've created the base shmem object.
Cc Tomeu Vizoso <[email protected]>Cc Boris Brezillon <[email protected]>Cc Robin Murphy <[email protected]>Cc Steven Price <[email protected]>Cc Alyssa Rosenzweig <[email protected]>Signed-off-by Rob Herring <[email protected]>
Quoted 4 lines
Hi Rob,
I couldn't work out what base this series should be applied to, but I've tried manually applying it against Linus' tree and run a few tests.
It's drm-misc-next plus some fixes in drm-misc-fixes that haven't been merged into drm-misc-next yet. I'll post a git branch on the next version.
Quoted 56 lines
PANFROST_BO_NOEXECworks as expected, butPANFROST_BO_HEAPseems to cause a memory leak.Quoted 53 lines
--- drivers/gpu/drm/panfrost/panfrost_drv.c | 21 +++------ drivers/gpu/drm/panfrost/panfrost_gem.c | 58 ++++++++++++++++++++----- drivers/gpu/drm/panfrost/panfrost_gem.h | 5 +++ 3 files changed, 59 insertions(+), 25 deletions(-)drivers/gpu/drm/panfrost/panfrost_drv.c +6
-15@@ -46,29 +46,20 @@ static int panfrost_ioctl_get_param(struct drm_device *ddev, void *data, structstatic int panfrost_ioctl_create_bo (struct drm_device *dev,void *data,struct drm_file *file) { -int ret; -struct drm_gem_shmem_object *shmem; +struct panfrost_gem_object *bo;struct drm_panfrost_create_bo *args = data;if (!args->size || args->flags || args->pad)return -EINVAL ; - shmem =drm_gem_shmem_create_with_handle (file, dev, args->size, - &args->handle); -if (IS_ERR (shmem)) -return PTR_ERR (shmem); - - ret =panfrost_mmu_map (to_panfrost_bo (&shmem->base)); -if (ret) - goto err_free; + bo =panfrost_gem_create_with_handle (file, dev, args->size, args->flags, + &args->handle); +if (IS_ERR (bo)) +return PTR_ERR (bo); - args->offset =to_panfrost_bo (&shmem->base)->node.start <<PAGE_SHIFT ; + args->offset = bo->node.start <<PAGE_SHIFT ;return 0 ; - -err_free: -drm_gem_handle_delete (file, args->handle); -return ret; }/** drivers/gpu/drm/panfrost/panfrost_gem.c +0
-0@@ -23,7 +23,8 @@ static void panfrost_gem_free_object(struct drm_gem_object *obj)panfrost_mmu_unmap (bo);
Quoted 7 lines
drivers/gpu/drm/panfrost/panfrost_gem.c static void panfrost_gem_free_object(struct drm_gem_object *obj) · line 27
Quoted 4 lines
drivers/gpu/drm/panfrost/panfrost_gem.c +2
-1spin_lock (&pfdev->mm_lock); -drm_mm_remove_node (&bo->node); +if (drm_mm_node_allocated (&bo->node)) +drm_mm_remove_node (&bo->node);I'm not sure this change should be here - it looks more like it was meant as part of patch 4.
It's needed here because because we do the mapping later instead of the .gem_create_object() hook. So when we free the object in case of errors, the mapping may or may not have been created.
Rob
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel