* [PATCH] uacce: remove uacce_vma_fault
@ 2020-06-15 13:55 Zhangfei Gao
2020-06-17 9:32 ` Jean-Philippe Brucker
0 siblings, 1 reply; 2+ messages in thread
From: Zhangfei Gao @ 2020-06-15 13:55 UTC (permalink / raw)
To: Greg Kroah-Hartman, Arnd Bergmann, Herbert Xu, jean-philippe,
kenneth-lee-2012, Wangzhou
Cc: linux-accelerators, linux-kernel, linux-crypto, iommu, Zhangfei Gao
Fix NULL pointer error if removing uacce's parent module during app's
running. SIGBUS is already reported by do_page_fault, so uacce_vma_fault
is not needed. If providing vma_fault, vmf->page has to be filled as well,
required by __do_fault.
Reported-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
---
drivers/misc/uacce/uacce.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/drivers/misc/uacce/uacce.c b/drivers/misc/uacce/uacce.c
index 107028e..aa91f69 100644
--- a/drivers/misc/uacce/uacce.c
+++ b/drivers/misc/uacce/uacce.c
@@ -179,14 +179,6 @@ static int uacce_fops_release(struct inode *inode, struct file *filep)
return 0;
}
-static vm_fault_t uacce_vma_fault(struct vm_fault *vmf)
-{
- if (vmf->flags & (FAULT_FLAG_MKWRITE | FAULT_FLAG_WRITE))
- return VM_FAULT_SIGBUS;
-
- return 0;
-}
-
static void uacce_vma_close(struct vm_area_struct *vma)
{
struct uacce_queue *q = vma->vm_private_data;
@@ -199,7 +191,6 @@ static void uacce_vma_close(struct vm_area_struct *vma)
}
static const struct vm_operations_struct uacce_vm_ops = {
- .fault = uacce_vma_fault,
.close = uacce_vma_close,
};
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] uacce: remove uacce_vma_fault
2020-06-15 13:55 [PATCH] uacce: remove uacce_vma_fault Zhangfei Gao
@ 2020-06-17 9:32 ` Jean-Philippe Brucker
0 siblings, 0 replies; 2+ messages in thread
From: Jean-Philippe Brucker @ 2020-06-17 9:32 UTC (permalink / raw)
To: Zhangfei Gao
Cc: Greg Kroah-Hartman, Arnd Bergmann, Herbert Xu, kenneth-lee-2012,
Wangzhou, linux-accelerators, linux-kernel, linux-crypto, iommu
On Mon, Jun 15, 2020 at 09:55:57PM +0800, Zhangfei Gao wrote:
> Fix NULL pointer error if removing uacce's parent module during app's
> running. SIGBUS is already reported by do_page_fault, so uacce_vma_fault
> is not needed. If providing vma_fault, vmf->page has to be filled as well,
> required by __do_fault.
>
> Reported-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
> Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
> ---
> drivers/misc/uacce/uacce.c | 9 ---------
> 1 file changed, 9 deletions(-)
>
> diff --git a/drivers/misc/uacce/uacce.c b/drivers/misc/uacce/uacce.c
> index 107028e..aa91f69 100644
> --- a/drivers/misc/uacce/uacce.c
> +++ b/drivers/misc/uacce/uacce.c
> @@ -179,14 +179,6 @@ static int uacce_fops_release(struct inode *inode, struct file *filep)
> return 0;
> }
>
> -static vm_fault_t uacce_vma_fault(struct vm_fault *vmf)
> -{
> - if (vmf->flags & (FAULT_FLAG_MKWRITE | FAULT_FLAG_WRITE))
> - return VM_FAULT_SIGBUS;
> -
> - return 0;
> -}
> -
> static void uacce_vma_close(struct vm_area_struct *vma)
> {
> struct uacce_queue *q = vma->vm_private_data;
> @@ -199,7 +191,6 @@ static void uacce_vma_close(struct vm_area_struct *vma)
> }
>
> static const struct vm_operations_struct uacce_vm_ops = {
> - .fault = uacce_vma_fault,
> .close = uacce_vma_close,
> };
>
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-17 9:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-15 13:55 [PATCH] uacce: remove uacce_vma_fault Zhangfei Gao
2020-06-17 9:32 ` Jean-Philippe Brucker
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).