* [PATCH 2/2] drm/radeon: finally fix the racy VMA setup
[not found] ` <20190927123425.17513-1-christian.koenig-5C7GfCeVMHo@public.gmane.org>
@ 2019-09-27 12:34 ` Christian König
2019-10-02 17:51 ` Huang, Ray
0 siblings, 1 reply; 12+ messages in thread
From: Christian König @ 2019-09-27 12:34 UTC (permalink / raw
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Finally clean up the VMA setup for radeon now that TTM exports the
necessary functions.
Not functional change, but only compile tested.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/radeon/radeon_ttm.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index a05e10724d46..f3ef304a67ee 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -880,9 +880,6 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
man->size = size >> PAGE_SHIFT;
}
-static struct vm_operations_struct radeon_ttm_vm_ops;
-static const struct vm_operations_struct *ttm_vm_ops = NULL;
-
static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
{
struct ttm_buffer_object *bo;
@@ -890,34 +887,36 @@ static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
vm_fault_t ret;
bo = (struct ttm_buffer_object *)vmf->vma->vm_private_data;
- if (bo == NULL) {
+ if (bo == NULL)
return VM_FAULT_NOPAGE;
- }
+
rdev = radeon_get_rdev(bo->bdev);
down_read(&rdev->pm.mclk_lock);
- ret = ttm_vm_ops->fault(vmf);
+ ret = ttm_bo_vm_fault(vmf);
up_read(&rdev->pm.mclk_lock);
return ret;
}
+static struct vm_operations_struct radeon_ttm_vm_ops = {
+ .fault = radeon_ttm_fault,
+ .open = ttm_bo_vm_open,
+ .close = ttm_bo_vm_close,
+ .access = ttm_bo_vm_access
+};
+
int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
{
int r;
struct drm_file *file_priv = filp->private_data;
struct radeon_device *rdev = file_priv->minor->dev->dev_private;
- if (rdev == NULL) {
+ if (rdev == NULL)
return -EINVAL;
- }
+
r = ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
- if (unlikely(r != 0)) {
+ if (unlikely(r != 0))
return r;
- }
- if (unlikely(ttm_vm_ops == NULL)) {
- ttm_vm_ops = vma->vm_ops;
- radeon_ttm_vm_ops = *ttm_vm_ops;
- radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
- }
+
vma->vm_ops = &radeon_ttm_vm_ops;
return 0;
}
--
2.14.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread
* RE: [PATCH 2/2] drm/radeon: finally fix the racy VMA setup
2019-09-27 12:34 ` [PATCH 2/2] drm/radeon: finally fix the racy VMA setup Christian König
@ 2019-10-02 17:51 ` Huang, Ray
0 siblings, 0 replies; 12+ messages in thread
From: Huang, Ray @ 2019-10-02 17:51 UTC (permalink / raw
To: Christian König, amd-gfx@lists.freedesktop.org,
dri-devel@lists.freedesktop.org
Reviewed-by: Huang Rui <ray.huang@amd.com>
-----Original Message-----
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Christian König
Sent: Friday, September 27, 2019 8:34 AM
To: amd-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org
Subject: [PATCH 2/2] drm/radeon: finally fix the racy VMA setup
Finally clean up the VMA setup for radeon now that TTM exports the necessary functions.
Not functional change, but only compile tested.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/radeon/radeon_ttm.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index a05e10724d46..f3ef304a67ee 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -880,9 +880,6 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
man->size = size >> PAGE_SHIFT;
}
-static struct vm_operations_struct radeon_ttm_vm_ops; -static const struct vm_operations_struct *ttm_vm_ops = NULL;
-
static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf) {
struct ttm_buffer_object *bo;
@@ -890,34 +887,36 @@ static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
vm_fault_t ret;
bo = (struct ttm_buffer_object *)vmf->vma->vm_private_data;
- if (bo == NULL) {
+ if (bo == NULL)
return VM_FAULT_NOPAGE;
- }
+
rdev = radeon_get_rdev(bo->bdev);
down_read(&rdev->pm.mclk_lock);
- ret = ttm_vm_ops->fault(vmf);
+ ret = ttm_bo_vm_fault(vmf);
up_read(&rdev->pm.mclk_lock);
return ret;
}
+static struct vm_operations_struct radeon_ttm_vm_ops = {
+ .fault = radeon_ttm_fault,
+ .open = ttm_bo_vm_open,
+ .close = ttm_bo_vm_close,
+ .access = ttm_bo_vm_access
+};
+
int radeon_mmap(struct file *filp, struct vm_area_struct *vma) {
int r;
struct drm_file *file_priv = filp->private_data;
struct radeon_device *rdev = file_priv->minor->dev->dev_private;
- if (rdev == NULL) {
+ if (rdev == NULL)
return -EINVAL;
- }
+
r = ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
- if (unlikely(r != 0)) {
+ if (unlikely(r != 0))
return r;
- }
- if (unlikely(ttm_vm_ops == NULL)) {
- ttm_vm_ops = vma->vm_ops;
- radeon_ttm_vm_ops = *ttm_vm_ops;
- radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
- }
+
vma->vm_ops = &radeon_ttm_vm_ops;
return 0;
}
--
2.14.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 1/2] drm/ttm: also export ttm_bo_vm_fault v2
@ 2019-11-07 12:01 ` Christian König
0 siblings, 0 replies; 12+ messages in thread
From: Christian König @ 2019-11-07 12:01 UTC (permalink / raw
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
From: Christian König <ckoenig.leichtzumerken@gmail.com>
That is needed by at least a cleanup in radeon.
v2: also export ttm_bo_vm_access
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
---
drivers/gpu/drm/ttm/ttm_bo_vm.c | 8 +++++---
include/drm/ttm/ttm_bo_api.h | 6 ++++++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
index 91466cfb6f16..e6495ca2630b 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -308,7 +308,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf,
}
EXPORT_SYMBOL(ttm_bo_vm_fault_reserved);
-static vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf)
+vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf)
{
struct vm_area_struct *vma = vmf->vma;
pgprot_t prot;
@@ -328,6 +328,7 @@ static vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf)
return ret;
}
+EXPORT_SYMBOL(ttm_bo_vm_fault);
void ttm_bo_vm_open(struct vm_area_struct *vma)
{
@@ -387,8 +388,8 @@ static int ttm_bo_vm_access_kmap(struct ttm_buffer_object *bo,
return len;
}
-static int ttm_bo_vm_access(struct vm_area_struct *vma, unsigned long addr,
- void *buf, int len, int write)
+int ttm_bo_vm_access(struct vm_area_struct *vma, unsigned long addr,
+ void *buf, int len, int write)
{
unsigned long offset = (addr) - vma->vm_start;
struct ttm_buffer_object *bo = vma->vm_private_data;
@@ -424,6 +425,7 @@ static int ttm_bo_vm_access(struct vm_area_struct *vma, unsigned long addr,
return ret;
}
+EXPORT_SYMBOL(ttm_bo_vm_access);
static const struct vm_operations_struct ttm_bo_vm_ops = {
.fault = ttm_bo_vm_fault,
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
index e8b0f0c66059..66ca49db9633 100644
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -734,7 +734,13 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf,
pgprot_t prot,
pgoff_t num_prefault);
+vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf);
+
void ttm_bo_vm_open(struct vm_area_struct *vma);
void ttm_bo_vm_close(struct vm_area_struct *vma);
+
+int ttm_bo_vm_access(struct vm_area_struct *vma, unsigned long addr,
+ void *buf, int len, int write);
+
#endif
--
2.20.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 1/2] drm/ttm: also export ttm_bo_vm_fault v2
@ 2019-11-07 12:01 ` Christian König
0 siblings, 0 replies; 12+ messages in thread
From: Christian König @ 2019-11-07 12:01 UTC (permalink / raw
To: dri-devel, amd-gfx
From: Christian König <ckoenig.leichtzumerken@gmail.com>
That is needed by at least a cleanup in radeon.
v2: also export ttm_bo_vm_access
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
---
drivers/gpu/drm/ttm/ttm_bo_vm.c | 8 +++++---
include/drm/ttm/ttm_bo_api.h | 6 ++++++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
index 91466cfb6f16..e6495ca2630b 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -308,7 +308,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf,
}
EXPORT_SYMBOL(ttm_bo_vm_fault_reserved);
-static vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf)
+vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf)
{
struct vm_area_struct *vma = vmf->vma;
pgprot_t prot;
@@ -328,6 +328,7 @@ static vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf)
return ret;
}
+EXPORT_SYMBOL(ttm_bo_vm_fault);
void ttm_bo_vm_open(struct vm_area_struct *vma)
{
@@ -387,8 +388,8 @@ static int ttm_bo_vm_access_kmap(struct ttm_buffer_object *bo,
return len;
}
-static int ttm_bo_vm_access(struct vm_area_struct *vma, unsigned long addr,
- void *buf, int len, int write)
+int ttm_bo_vm_access(struct vm_area_struct *vma, unsigned long addr,
+ void *buf, int len, int write)
{
unsigned long offset = (addr) - vma->vm_start;
struct ttm_buffer_object *bo = vma->vm_private_data;
@@ -424,6 +425,7 @@ static int ttm_bo_vm_access(struct vm_area_struct *vma, unsigned long addr,
return ret;
}
+EXPORT_SYMBOL(ttm_bo_vm_access);
static const struct vm_operations_struct ttm_bo_vm_ops = {
.fault = ttm_bo_vm_fault,
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
index e8b0f0c66059..66ca49db9633 100644
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -734,7 +734,13 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf,
pgprot_t prot,
pgoff_t num_prefault);
+vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf);
+
void ttm_bo_vm_open(struct vm_area_struct *vma);
void ttm_bo_vm_close(struct vm_area_struct *vma);
+
+int ttm_bo_vm_access(struct vm_area_struct *vma, unsigned long addr,
+ void *buf, int len, int write);
+
#endif
--
2.20.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 1/2] drm/ttm: also export ttm_bo_vm_fault v2
@ 2019-11-07 12:01 ` Christian König
0 siblings, 0 replies; 12+ messages in thread
From: Christian König @ 2019-11-07 12:01 UTC (permalink / raw
To: dri-devel, amd-gfx
From: Christian König <ckoenig.leichtzumerken@gmail.com>
That is needed by at least a cleanup in radeon.
v2: also export ttm_bo_vm_access
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
---
drivers/gpu/drm/ttm/ttm_bo_vm.c | 8 +++++---
include/drm/ttm/ttm_bo_api.h | 6 ++++++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
index 91466cfb6f16..e6495ca2630b 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -308,7 +308,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf,
}
EXPORT_SYMBOL(ttm_bo_vm_fault_reserved);
-static vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf)
+vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf)
{
struct vm_area_struct *vma = vmf->vma;
pgprot_t prot;
@@ -328,6 +328,7 @@ static vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf)
return ret;
}
+EXPORT_SYMBOL(ttm_bo_vm_fault);
void ttm_bo_vm_open(struct vm_area_struct *vma)
{
@@ -387,8 +388,8 @@ static int ttm_bo_vm_access_kmap(struct ttm_buffer_object *bo,
return len;
}
-static int ttm_bo_vm_access(struct vm_area_struct *vma, unsigned long addr,
- void *buf, int len, int write)
+int ttm_bo_vm_access(struct vm_area_struct *vma, unsigned long addr,
+ void *buf, int len, int write)
{
unsigned long offset = (addr) - vma->vm_start;
struct ttm_buffer_object *bo = vma->vm_private_data;
@@ -424,6 +425,7 @@ static int ttm_bo_vm_access(struct vm_area_struct *vma, unsigned long addr,
return ret;
}
+EXPORT_SYMBOL(ttm_bo_vm_access);
static const struct vm_operations_struct ttm_bo_vm_ops = {
.fault = ttm_bo_vm_fault,
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
index e8b0f0c66059..66ca49db9633 100644
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -734,7 +734,13 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf,
pgprot_t prot,
pgoff_t num_prefault);
+vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf);
+
void ttm_bo_vm_open(struct vm_area_struct *vma);
void ttm_bo_vm_close(struct vm_area_struct *vma);
+
+int ttm_bo_vm_access(struct vm_area_struct *vma, unsigned long addr,
+ void *buf, int len, int write);
+
#endif
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/2] drm/radeon: finally fix the racy VMA setup
@ 2019-11-07 12:01 ` Christian König
0 siblings, 0 replies; 12+ messages in thread
From: Christian König @ 2019-11-07 12:01 UTC (permalink / raw
To: dri-devel, amd-gfx
From: Christian König <ckoenig.leichtzumerken@gmail.com>
Finally clean up the VMA setup for radeon now that TTM exports the
necessary functions.
No functional change, but only compile tested.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
---
drivers/gpu/drm/radeon/radeon_ttm.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 098bc9f40b98..91993a233cb0 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -881,9 +881,6 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
man->size = size >> PAGE_SHIFT;
}
-static struct vm_operations_struct radeon_ttm_vm_ops;
-static const struct vm_operations_struct *ttm_vm_ops = NULL;
-
static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
{
struct ttm_buffer_object *bo;
@@ -891,34 +888,36 @@ static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
vm_fault_t ret;
bo = (struct ttm_buffer_object *)vmf->vma->vm_private_data;
- if (bo == NULL) {
+ if (bo == NULL)
return VM_FAULT_NOPAGE;
- }
+
rdev = radeon_get_rdev(bo->bdev);
down_read(&rdev->pm.mclk_lock);
- ret = ttm_vm_ops->fault(vmf);
+ ret = ttm_bo_vm_fault(vmf);
up_read(&rdev->pm.mclk_lock);
return ret;
}
+static struct vm_operations_struct radeon_ttm_vm_ops = {
+ .fault = radeon_ttm_fault,
+ .open = ttm_bo_vm_open,
+ .close = ttm_bo_vm_close,
+ .access = ttm_bo_vm_access
+};
+
int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
{
int r;
struct drm_file *file_priv = filp->private_data;
struct radeon_device *rdev = file_priv->minor->dev->dev_private;
- if (rdev == NULL) {
+ if (rdev == NULL)
return -EINVAL;
- }
+
r = ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
- if (unlikely(r != 0)) {
+ if (unlikely(r != 0))
return r;
- }
- if (unlikely(ttm_vm_ops == NULL)) {
- ttm_vm_ops = vma->vm_ops;
- radeon_ttm_vm_ops = *ttm_vm_ops;
- radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
- }
+
vma->vm_ops = &radeon_ttm_vm_ops;
return 0;
}
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/2] drm/radeon: finally fix the racy VMA setup
@ 2019-11-07 12:01 ` Christian König
0 siblings, 0 replies; 12+ messages in thread
From: Christian König @ 2019-11-07 12:01 UTC (permalink / raw
To: dri-devel, amd-gfx
From: Christian König <ckoenig.leichtzumerken@gmail.com>
Finally clean up the VMA setup for radeon now that TTM exports the
necessary functions.
No functional change, but only compile tested.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
---
drivers/gpu/drm/radeon/radeon_ttm.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 098bc9f40b98..91993a233cb0 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -881,9 +881,6 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
man->size = size >> PAGE_SHIFT;
}
-static struct vm_operations_struct radeon_ttm_vm_ops;
-static const struct vm_operations_struct *ttm_vm_ops = NULL;
-
static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
{
struct ttm_buffer_object *bo;
@@ -891,34 +888,36 @@ static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
vm_fault_t ret;
bo = (struct ttm_buffer_object *)vmf->vma->vm_private_data;
- if (bo == NULL) {
+ if (bo == NULL)
return VM_FAULT_NOPAGE;
- }
+
rdev = radeon_get_rdev(bo->bdev);
down_read(&rdev->pm.mclk_lock);
- ret = ttm_vm_ops->fault(vmf);
+ ret = ttm_bo_vm_fault(vmf);
up_read(&rdev->pm.mclk_lock);
return ret;
}
+static struct vm_operations_struct radeon_ttm_vm_ops = {
+ .fault = radeon_ttm_fault,
+ .open = ttm_bo_vm_open,
+ .close = ttm_bo_vm_close,
+ .access = ttm_bo_vm_access
+};
+
int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
{
int r;
struct drm_file *file_priv = filp->private_data;
struct radeon_device *rdev = file_priv->minor->dev->dev_private;
- if (rdev == NULL) {
+ if (rdev == NULL)
return -EINVAL;
- }
+
r = ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
- if (unlikely(r != 0)) {
+ if (unlikely(r != 0))
return r;
- }
- if (unlikely(ttm_vm_ops == NULL)) {
- ttm_vm_ops = vma->vm_ops;
- radeon_ttm_vm_ops = *ttm_vm_ops;
- radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
- }
+
vma->vm_ops = &radeon_ttm_vm_ops;
return 0;
}
--
2.20.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 2/2] drm/radeon: finally fix the racy VMA setup
@ 2019-11-07 12:03 ` Christian König
0 siblings, 0 replies; 12+ messages in thread
From: Christian König @ 2019-11-07 12:03 UTC (permalink / raw
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Alex Deucher
Hey Alex,
any objections that I merge those two patches through drm-misc-next?
It's a cleanup I wanted to do for years and Thomas finally fixed up TTM
for this.
Cheers,
Christian.
Am 07.11.19 um 13:01 schrieb Christian König:
> From: Christian König <ckoenig.leichtzumerken@gmail.com>
>
> Finally clean up the VMA setup for radeon now that TTM exports the
> necessary functions.
>
> No functional change, but only compile tested.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> Reviewed-by: Huang Rui <ray.huang@amd.com>
> ---
> drivers/gpu/drm/radeon/radeon_ttm.c | 29 ++++++++++++++---------------
> 1 file changed, 14 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> index 098bc9f40b98..91993a233cb0 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -881,9 +881,6 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
> man->size = size >> PAGE_SHIFT;
> }
>
> -static struct vm_operations_struct radeon_ttm_vm_ops;
> -static const struct vm_operations_struct *ttm_vm_ops = NULL;
> -
> static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
> {
> struct ttm_buffer_object *bo;
> @@ -891,34 +888,36 @@ static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
> vm_fault_t ret;
>
> bo = (struct ttm_buffer_object *)vmf->vma->vm_private_data;
> - if (bo == NULL) {
> + if (bo == NULL)
> return VM_FAULT_NOPAGE;
> - }
> +
> rdev = radeon_get_rdev(bo->bdev);
> down_read(&rdev->pm.mclk_lock);
> - ret = ttm_vm_ops->fault(vmf);
> + ret = ttm_bo_vm_fault(vmf);
> up_read(&rdev->pm.mclk_lock);
> return ret;
> }
>
> +static struct vm_operations_struct radeon_ttm_vm_ops = {
> + .fault = radeon_ttm_fault,
> + .open = ttm_bo_vm_open,
> + .close = ttm_bo_vm_close,
> + .access = ttm_bo_vm_access
> +};
> +
> int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
> {
> int r;
> struct drm_file *file_priv = filp->private_data;
> struct radeon_device *rdev = file_priv->minor->dev->dev_private;
>
> - if (rdev == NULL) {
> + if (rdev == NULL)
> return -EINVAL;
> - }
> +
> r = ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
> - if (unlikely(r != 0)) {
> + if (unlikely(r != 0))
> return r;
> - }
> - if (unlikely(ttm_vm_ops == NULL)) {
> - ttm_vm_ops = vma->vm_ops;
> - radeon_ttm_vm_ops = *ttm_vm_ops;
> - radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
> - }
> +
> vma->vm_ops = &radeon_ttm_vm_ops;
> return 0;
> }
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/2] drm/radeon: finally fix the racy VMA setup
@ 2019-11-07 12:03 ` Christian König
0 siblings, 0 replies; 12+ messages in thread
From: Christian König @ 2019-11-07 12:03 UTC (permalink / raw
To: dri-devel, amd-gfx, Alex Deucher
Hey Alex,
any objections that I merge those two patches through drm-misc-next?
It's a cleanup I wanted to do for years and Thomas finally fixed up TTM
for this.
Cheers,
Christian.
Am 07.11.19 um 13:01 schrieb Christian König:
> From: Christian König <ckoenig.leichtzumerken@gmail.com>
>
> Finally clean up the VMA setup for radeon now that TTM exports the
> necessary functions.
>
> No functional change, but only compile tested.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> Reviewed-by: Huang Rui <ray.huang@amd.com>
> ---
> drivers/gpu/drm/radeon/radeon_ttm.c | 29 ++++++++++++++---------------
> 1 file changed, 14 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> index 098bc9f40b98..91993a233cb0 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -881,9 +881,6 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
> man->size = size >> PAGE_SHIFT;
> }
>
> -static struct vm_operations_struct radeon_ttm_vm_ops;
> -static const struct vm_operations_struct *ttm_vm_ops = NULL;
> -
> static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
> {
> struct ttm_buffer_object *bo;
> @@ -891,34 +888,36 @@ static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
> vm_fault_t ret;
>
> bo = (struct ttm_buffer_object *)vmf->vma->vm_private_data;
> - if (bo == NULL) {
> + if (bo == NULL)
> return VM_FAULT_NOPAGE;
> - }
> +
> rdev = radeon_get_rdev(bo->bdev);
> down_read(&rdev->pm.mclk_lock);
> - ret = ttm_vm_ops->fault(vmf);
> + ret = ttm_bo_vm_fault(vmf);
> up_read(&rdev->pm.mclk_lock);
> return ret;
> }
>
> +static struct vm_operations_struct radeon_ttm_vm_ops = {
> + .fault = radeon_ttm_fault,
> + .open = ttm_bo_vm_open,
> + .close = ttm_bo_vm_close,
> + .access = ttm_bo_vm_access
> +};
> +
> int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
> {
> int r;
> struct drm_file *file_priv = filp->private_data;
> struct radeon_device *rdev = file_priv->minor->dev->dev_private;
>
> - if (rdev == NULL) {
> + if (rdev == NULL)
> return -EINVAL;
> - }
> +
> r = ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
> - if (unlikely(r != 0)) {
> + if (unlikely(r != 0))
> return r;
> - }
> - if (unlikely(ttm_vm_ops == NULL)) {
> - ttm_vm_ops = vma->vm_ops;
> - radeon_ttm_vm_ops = *ttm_vm_ops;
> - radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
> - }
> +
> vma->vm_ops = &radeon_ttm_vm_ops;
> return 0;
> }
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/2] drm/radeon: finally fix the racy VMA setup
@ 2019-11-07 12:03 ` Christian König
0 siblings, 0 replies; 12+ messages in thread
From: Christian König @ 2019-11-07 12:03 UTC (permalink / raw
To: dri-devel, amd-gfx, Alex Deucher
Hey Alex,
any objections that I merge those two patches through drm-misc-next?
It's a cleanup I wanted to do for years and Thomas finally fixed up TTM
for this.
Cheers,
Christian.
Am 07.11.19 um 13:01 schrieb Christian König:
> From: Christian König <ckoenig.leichtzumerken@gmail.com>
>
> Finally clean up the VMA setup for radeon now that TTM exports the
> necessary functions.
>
> No functional change, but only compile tested.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> Reviewed-by: Huang Rui <ray.huang@amd.com>
> ---
> drivers/gpu/drm/radeon/radeon_ttm.c | 29 ++++++++++++++---------------
> 1 file changed, 14 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> index 098bc9f40b98..91993a233cb0 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -881,9 +881,6 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
> man->size = size >> PAGE_SHIFT;
> }
>
> -static struct vm_operations_struct radeon_ttm_vm_ops;
> -static const struct vm_operations_struct *ttm_vm_ops = NULL;
> -
> static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
> {
> struct ttm_buffer_object *bo;
> @@ -891,34 +888,36 @@ static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
> vm_fault_t ret;
>
> bo = (struct ttm_buffer_object *)vmf->vma->vm_private_data;
> - if (bo == NULL) {
> + if (bo == NULL)
> return VM_FAULT_NOPAGE;
> - }
> +
> rdev = radeon_get_rdev(bo->bdev);
> down_read(&rdev->pm.mclk_lock);
> - ret = ttm_vm_ops->fault(vmf);
> + ret = ttm_bo_vm_fault(vmf);
> up_read(&rdev->pm.mclk_lock);
> return ret;
> }
>
> +static struct vm_operations_struct radeon_ttm_vm_ops = {
> + .fault = radeon_ttm_fault,
> + .open = ttm_bo_vm_open,
> + .close = ttm_bo_vm_close,
> + .access = ttm_bo_vm_access
> +};
> +
> int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
> {
> int r;
> struct drm_file *file_priv = filp->private_data;
> struct radeon_device *rdev = file_priv->minor->dev->dev_private;
>
> - if (rdev == NULL) {
> + if (rdev == NULL)
> return -EINVAL;
> - }
> +
> r = ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
> - if (unlikely(r != 0)) {
> + if (unlikely(r != 0))
> return r;
> - }
> - if (unlikely(ttm_vm_ops == NULL)) {
> - ttm_vm_ops = vma->vm_ops;
> - radeon_ttm_vm_ops = *ttm_vm_ops;
> - radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
> - }
> +
> vma->vm_ops = &radeon_ttm_vm_ops;
> return 0;
> }
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/2] drm/radeon: finally fix the racy VMA setup
@ 2019-11-07 14:07 ` Alex Deucher
0 siblings, 0 replies; 12+ messages in thread
From: Alex Deucher @ 2019-11-07 14:07 UTC (permalink / raw
To: Christian König
Cc: Alex Deucher, amd-gfx list, Maling list - DRI developers
On Thu, Nov 7, 2019 at 7:03 AM Christian König
<ckoenig.leichtzumerken@gmail.com> wrote:
>
> Hey Alex,
>
> any objections that I merge those two patches through drm-misc-next?
>
> It's a cleanup I wanted to do for years and Thomas finally fixed up TTM
> for this.
Fine with me. Series is:
Acked-by: Alex Deucher <alexander.deucher@amd.com>
>
> Cheers,
> Christian.
>
> Am 07.11.19 um 13:01 schrieb Christian König:
> > From: Christian König <ckoenig.leichtzumerken@gmail.com>
> >
> > Finally clean up the VMA setup for radeon now that TTM exports the
> > necessary functions.
> >
> > No functional change, but only compile tested.
> >
> > Signed-off-by: Christian König <christian.koenig@amd.com>
> > Reviewed-by: Huang Rui <ray.huang@amd.com>
> > ---
> > drivers/gpu/drm/radeon/radeon_ttm.c | 29 ++++++++++++++---------------
> > 1 file changed, 14 insertions(+), 15 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> > index 098bc9f40b98..91993a233cb0 100644
> > --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> > +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> > @@ -881,9 +881,6 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
> > man->size = size >> PAGE_SHIFT;
> > }
> >
> > -static struct vm_operations_struct radeon_ttm_vm_ops;
> > -static const struct vm_operations_struct *ttm_vm_ops = NULL;
> > -
> > static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
> > {
> > struct ttm_buffer_object *bo;
> > @@ -891,34 +888,36 @@ static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
> > vm_fault_t ret;
> >
> > bo = (struct ttm_buffer_object *)vmf->vma->vm_private_data;
> > - if (bo == NULL) {
> > + if (bo == NULL)
> > return VM_FAULT_NOPAGE;
> > - }
> > +
> > rdev = radeon_get_rdev(bo->bdev);
> > down_read(&rdev->pm.mclk_lock);
> > - ret = ttm_vm_ops->fault(vmf);
> > + ret = ttm_bo_vm_fault(vmf);
> > up_read(&rdev->pm.mclk_lock);
> > return ret;
> > }
> >
> > +static struct vm_operations_struct radeon_ttm_vm_ops = {
> > + .fault = radeon_ttm_fault,
> > + .open = ttm_bo_vm_open,
> > + .close = ttm_bo_vm_close,
> > + .access = ttm_bo_vm_access
> > +};
> > +
> > int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
> > {
> > int r;
> > struct drm_file *file_priv = filp->private_data;
> > struct radeon_device *rdev = file_priv->minor->dev->dev_private;
> >
> > - if (rdev == NULL) {
> > + if (rdev == NULL)
> > return -EINVAL;
> > - }
> > +
> > r = ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
> > - if (unlikely(r != 0)) {
> > + if (unlikely(r != 0))
> > return r;
> > - }
> > - if (unlikely(ttm_vm_ops == NULL)) {
> > - ttm_vm_ops = vma->vm_ops;
> > - radeon_ttm_vm_ops = *ttm_vm_ops;
> > - radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
> > - }
> > +
> > vma->vm_ops = &radeon_ttm_vm_ops;
> > return 0;
> > }
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/2] drm/radeon: finally fix the racy VMA setup
@ 2019-11-07 14:07 ` Alex Deucher
0 siblings, 0 replies; 12+ messages in thread
From: Alex Deucher @ 2019-11-07 14:07 UTC (permalink / raw
To: Christian König
Cc: Alex Deucher, amd-gfx list, Maling list - DRI developers
On Thu, Nov 7, 2019 at 7:03 AM Christian König
<ckoenig.leichtzumerken@gmail.com> wrote:
>
> Hey Alex,
>
> any objections that I merge those two patches through drm-misc-next?
>
> It's a cleanup I wanted to do for years and Thomas finally fixed up TTM
> for this.
Fine with me. Series is:
Acked-by: Alex Deucher <alexander.deucher@amd.com>
>
> Cheers,
> Christian.
>
> Am 07.11.19 um 13:01 schrieb Christian König:
> > From: Christian König <ckoenig.leichtzumerken@gmail.com>
> >
> > Finally clean up the VMA setup for radeon now that TTM exports the
> > necessary functions.
> >
> > No functional change, but only compile tested.
> >
> > Signed-off-by: Christian König <christian.koenig@amd.com>
> > Reviewed-by: Huang Rui <ray.huang@amd.com>
> > ---
> > drivers/gpu/drm/radeon/radeon_ttm.c | 29 ++++++++++++++---------------
> > 1 file changed, 14 insertions(+), 15 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> > index 098bc9f40b98..91993a233cb0 100644
> > --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> > +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> > @@ -881,9 +881,6 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
> > man->size = size >> PAGE_SHIFT;
> > }
> >
> > -static struct vm_operations_struct radeon_ttm_vm_ops;
> > -static const struct vm_operations_struct *ttm_vm_ops = NULL;
> > -
> > static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
> > {
> > struct ttm_buffer_object *bo;
> > @@ -891,34 +888,36 @@ static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
> > vm_fault_t ret;
> >
> > bo = (struct ttm_buffer_object *)vmf->vma->vm_private_data;
> > - if (bo == NULL) {
> > + if (bo == NULL)
> > return VM_FAULT_NOPAGE;
> > - }
> > +
> > rdev = radeon_get_rdev(bo->bdev);
> > down_read(&rdev->pm.mclk_lock);
> > - ret = ttm_vm_ops->fault(vmf);
> > + ret = ttm_bo_vm_fault(vmf);
> > up_read(&rdev->pm.mclk_lock);
> > return ret;
> > }
> >
> > +static struct vm_operations_struct radeon_ttm_vm_ops = {
> > + .fault = radeon_ttm_fault,
> > + .open = ttm_bo_vm_open,
> > + .close = ttm_bo_vm_close,
> > + .access = ttm_bo_vm_access
> > +};
> > +
> > int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
> > {
> > int r;
> > struct drm_file *file_priv = filp->private_data;
> > struct radeon_device *rdev = file_priv->minor->dev->dev_private;
> >
> > - if (rdev == NULL) {
> > + if (rdev == NULL)
> > return -EINVAL;
> > - }
> > +
> > r = ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
> > - if (unlikely(r != 0)) {
> > + if (unlikely(r != 0))
> > return r;
> > - }
> > - if (unlikely(ttm_vm_ops == NULL)) {
> > - ttm_vm_ops = vma->vm_ops;
> > - radeon_ttm_vm_ops = *ttm_vm_ops;
> > - radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
> > - }
> > +
> > vma->vm_ops = &radeon_ttm_vm_ops;
> > return 0;
> > }
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2019-11-07 14:07 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-07 12:01 [PATCH 1/2] drm/ttm: also export ttm_bo_vm_fault v2 Christian König
2019-11-07 12:01 ` Christian König
2019-11-07 12:01 ` Christian König
2019-11-07 12:01 ` [PATCH 2/2] drm/radeon: finally fix the racy VMA setup Christian König
2019-11-07 12:01 ` Christian König
[not found] ` <20191107120118.2825-2-christian.koenig-5C7GfCeVMHo@public.gmane.org>
2019-11-07 12:03 ` Christian König
2019-11-07 12:03 ` Christian König
2019-11-07 12:03 ` Christian König
2019-11-07 14:07 ` Alex Deucher
2019-11-07 14:07 ` Alex Deucher
-- strict thread matches above, loose matches on Subject: below --
2019-09-27 12:34 [PATCH 1/2] drm/ttm: also export ttm_bo_vm_fault Christian König
[not found] ` <20190927123425.17513-1-christian.koenig-5C7GfCeVMHo@public.gmane.org>
2019-09-27 12:34 ` [PATCH 2/2] drm/radeon: finally fix the racy VMA setup Christian König
2019-10-02 17:51 ` Huang, Ray
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.