Skip to contentSkip to conversation

Two bug-fixes for HMM

PATCH In review Kuehling, Felix 6 participants 18 messages May 10, 2019 – Jun 6, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover Two bug-fixes for HMM

These problems were found in AMD-internal testing as we're working on adopting HMM. They are rebased against glisse/hmm-5.2-v3. We'd like to get them applied to a mainline Linux kernel as well as drm-next and amd-staging-drm-next sooner rather than later.

Currently the HMM in amd-staging-drm-next is quite far behind hmm-5.2-v3, but the driver changes for HMM are expected to land in 5.2 and will need to be rebased on those HMM changes.

I'd like to work out a flow between Jerome, Dave, Alex and myself that allows us to test the latest version of HMM on amd-staging-drm-next so that ideally everything comes together in master without much need for rebasing and retesting.

Maybe having Jerome's latest HMM changes in drm-next. However, that may create dependencies where Jerome and Dave need to coordinate their pull- requests for master.

Felix Kuehling (1):
mm/hmm: Only set FAULT_FLAG_ALLOW_RETRY for non-blocking

Philip Yang (1):
mm/hmm: support automatic NUMA balancing

 mm/hmm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#1 lore raw

PATCH 1/2 mm/hmm: support automatic NUMA balancing

From: Philip Yang <[email protected]>

While the page is migrating by NUMA balancing, HMM failed to detect this condition and still return the old page. Application will use the new page migrated, but driver pass the old page physical address to GPU, this crash the application later.

Use pte_protnone(pte) to return this condition and then hmm_vma_do_fault will allocate new page.

---
 mm/hmm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/hmm.c +1 -1
index 75d2ea906efb..b65c27d5c119 100644
@@ -554,7 +554,7 @@ static int hmm_vma_handle_pmd(struct mm_walk *walk,
 
 static inline uint64_t pte_to_hmm_pfn_flags(struct hmm_range *range, pte_t pte)
 {
-	if (pte_none(pte) || !pte_present(pte))
+	if (pte_none(pte) || !pte_present(pte) || pte_protnone(pte))
 		return 0;
 	return pte_write(pte) ? range->flags[HMM_PFN_VALID] |
 				range->flags[HMM_PFN_WRITE] :
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] mm/hmm: support automatic NUMA balancing

Quoted 11 lines · Felix

From: Philip Yang <[email protected]>

While the page is migrating by NUMA balancing, HMM failed to detect this condition and still return the old page. Application will use the new page migrated, but driver pass the old page physical address to GPU, this crash the application later.

Use pte_protnone(pte) to return this condition and then hmm_vma_do_fault will allocate new page.

Quoted 20 lines
---
 mm/hmm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/hmm.c +1 -1
index 75d2ea906efb..b65c27d5c119 100644
@@ -554,7 +554,7 @@ static int hmm_vma_handle_pmd(struct mm_walk *walk,
 
 static inline uint64_t pte_to_hmm_pfn_flags(struct hmm_range *range, pte_t pte)
 {
-	if (pte_none(pte) || !pte_present(pte))
+	if (pte_none(pte) || !pte_present(pte) || pte_protnone(pte))
 		return 0;
 	return pte_write(pte) ? range->flags[HMM_PFN_VALID] |
 				range->flags[HMM_PFN_WRITE] :
Signature · 1 line
2.17.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

maintainer
#3 lore raw

Re: [PATCH 1/2] mm/hmm: support automatic NUMA balancing

In reply to Kuehling, Felix
Quoted 11 lines · Felix

From: Philip Yang <[email protected]>

While the page is migrating by NUMA balancing, HMM failed to detect this condition and still return the old page. Application will use the new page migrated, but driver pass the old page physical address to GPU, this crash the application later.

Use pte_protnone(pte) to return this condition and then hmm_vma_do_fault will allocate new page.

This should have included your signed-off-by:, since you were on the patch delivery path. I'll make that change to my copy of the patch, OK?
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#4 lore raw

Re: [PATCH 1/2] mm/hmm: support automatic NUMA balancing

Quoted 9 lines · Andrew Morton
Quoted 7 lines · Felix

From: Philip Yang <[email protected]>

While the page is migrating by NUMA balancing, HMM failed to detect this condition and still return the old page. Application will use the new page migrated, but driver pass the old page physical address to GPU, this crash the application later.

Quoted 8 lines
Quoted 4 lines

Use pte_protnone(pte) to return this condition and then hmm_vma_do_fault will allocate new page.

This should have included your signed-off-by:, since you were on the patch delivery path. I'll make that change to my copy of the patch, OK?

Yes it should have included that.
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#5 lore raw

Re: [PATCH 1/2] mm/hmm: support automatic NUMA balancing

In reply to Andrew Morton
Quoted 11 lines · Andrew Morton

[CAUTION: External Email]

Quoted 7 lines · Felix

From: Philip Yang <[email protected]>

While the page is migrating by NUMA balancing, HMM failed to detect this condition and still return the old page. Application will use the new page migrated, but driver pass the old page physical address to GPU, this crash the application later.

Quoted 8 lines
Quoted 4 lines

Use pte_protnone(pte) to return this condition and then hmm_vma_do_fault will allocate new page.

This should have included your signed-off-by:, since you were on the patch delivery path. I'll make that change to my copy of the patch, OK?

Yes. Thanks!

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#6 lore raw

PATCH 2/2 mm/hmm: Only set FAULT_FLAG_ALLOW_RETRY for non-blocking

In reply to Kuehling, Felix

Don't set this flag by default in hmm_vma_do_fault. It is set conditionally just a few lines below. Setting it unconditionally can lead to handle_mm_fault doing a non-blocking fault, returning -EBUSY and unlocking mmap_sem unexpectedly.

---
 mm/hmm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/hmm.c +1 -1
index b65c27d5c119..3c4f1d62202f 100644
@@ -339,7 +339,7 @@ struct hmm_vma_walk {
 static int hmm_vma_do_fault(struct mm_walk *walk, unsigned long addr,
 			    bool write_fault, uint64_t *pfn)
 {
-	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_REMOTE;
+	unsigned int flags = FAULT_FLAG_REMOTE;
 	struct hmm_vma_walk *hmm_vma_walk = walk->private;
 	struct hmm_range *range = hmm_vma_walk->range;
 	struct vm_area_struct *vma = walk->vma;
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Reviewed-by on v1 2/2
#7 lore raw

Re: [PATCH 2/2] mm/hmm: Only set FAULT_FLAG_ALLOW_RETRY for non-blocking

Quoted 6 lines · Felix

Don't set this flag by default in hmm_vma_do_fault. It is set conditionally just a few lines below. Setting it unconditionally can lead to handle_mm_fault doing a non-blocking fault, returning -EBUSY and unlocking mmap_sem unexpectedly.

Quoted 20 lines
---
 mm/hmm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/hmm.c +1 -1
index b65c27d5c119..3c4f1d62202f 100644
@@ -339,7 +339,7 @@ struct hmm_vma_walk {
 static int hmm_vma_do_fault(struct mm_walk *walk, unsigned long addr,
 			    bool write_fault, uint64_t *pfn)
 {
-	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_REMOTE;
+	unsigned int flags = FAULT_FLAG_REMOTE;
 	struct hmm_vma_walk *hmm_vma_walk = walk->private;
 	struct hmm_range *range = hmm_vma_walk->range;
 	struct vm_area_struct *vma = walk->vma;
Signature · 1 line
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#8 lore raw

Re: [PATCH 2/2] mm/hmm: Only set FAULT_FLAG_ALLOW_RETRY for non-blocking

Hi Jerome,

Do you want me to push the patches to your branch? Or are you going to apply them yourself?

Is your hmm-5.2-v3 branch going to make it into Linux 5.2? If so, do you know when? I'd like to coordinate with Dave Airlie so that we can also get that update into a drm-next branch soon.

I see that Linus merged Dave's pull request for Linux 5.2, which includes the first changes in amdgpu using HMM. They're currently broken without these two patches.

Thanks,
  Felix

Quoted 15 lines · Jerome Glisse

[CAUTION: External Email]

Quoted 6 lines · Felix

Don't set this flag by default in hmm_vma_do_fault. It is set conditionally just a few lines below. Setting it unconditionally can lead to handle_mm_fault doing a non-blocking fault, returning -EBUSY and unlocking mmap_sem unexpectedly.

Quoted 4 lines
---
  mm/hmm.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 16 lines
Quoted 14 lines
mm/hmm.c +1 -2
index b65c27d5c119..3c4f1d62202f 100644
@@ -339,7 +339,7 @@ struct hmm_vma_walk {
  static int hmm_vma_do_fault(struct mm_walk *walk, unsigned long addr,
                           bool write_fault, uint64_t *pfn)
  {
-     unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_REMOTE;
+     unsigned int flags = FAULT_FLAG_REMOTE;
       struct hmm_vma_walk *hmm_vma_walk = walk->private;
       struct hmm_range *range = hmm_vma_walk->range;
       struct vm_area_struct *vma = walk->vma;
--
Quoted 2 lines

2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#9 lore raw

Re: [PATCH 2/2] mm/hmm: Only set FAULT_FLAG_ALLOW_RETRY for non-blocking

Andrew can we get this 2 fixes line up for 5.2 ?

Quoted 5 lines · Felix

Hi Jerome,

Do you want me to push the patches to your branch? Or are you going to apply them yourself?

Quoted 7 lines

Is your hmm-5.2-v3 branch going to make it into Linux 5.2? If so, do you know when? I'd like to coordinate with Dave Airlie so that we can also get that update into a drm-next branch soon.

I see that Linus merged Dave's pull request for Linux 5.2, which includes the first changes in amdgpu using HMM. They're currently broken without these two patches.

HMM patch do not go through any git branch they go through the mmotm collection. So it is not something you can easily coordinate with drm branch.

By broken i expect you mean that if numabalance happens it breaks ? Or it might sleep when you are not expecting it too ?

Cheers,
Jérôme

Quoted 20 lines

Thanks,
  Felix

Quoted 15 lines · Jerome Glisse

[CAUTION: External Email]

Quoted 6 lines · Felix

Don't set this flag by default in hmm_vma_do_fault. It is set conditionally just a few lines below. Setting it unconditionally can lead to handle_mm_fault doing a non-blocking fault, returning -EBUSY and unlocking mmap_sem unexpectedly.

Quoted 4 lines
---
  mm/hmm.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 16 lines
Quoted 8 lines
Quoted 8 lines
mm/hmm.c +0 -0
index b65c27d5c119..3c4f1d62202f 100644
@@ -339,7 +339,7 @@ struct hmm_vma_walk {
  static int hmm_vma_do_fault(struct mm_walk *walk, unsigned long addr,
                           bool write_fault, uint64_t *pfn)
  {
Quoted 8 lines
Quoted 8 lines
mm/hmm.c +1 -2
-     unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_REMOTE;
+     unsigned int flags = FAULT_FLAG_REMOTE;
       struct hmm_vma_walk *hmm_vma_walk = walk->private;
       struct hmm_range *range = hmm_vma_walk->range;
       struct vm_area_struct *vma = walk->vma;
--

2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#10 lore raw

Re: [PATCH 2/2] mm/hmm: Only set FAULT_FLAG_ALLOW_RETRY for non-blocking

[Fixed Alex's email address, sorry for getting it wrong first]

Quoted 17 lines · Jerome Glisse

[CAUTION: External Email]

Andrew can we get this 2 fixes line up for 5.2 ?

Quoted 5 lines · Felix

Hi Jerome,

Do you want me to push the patches to your branch? Or are you going to apply them yourself?

Quoted 7 lines

Is your hmm-5.2-v3 branch going to make it into Linux 5.2? If so, do you know when? I'd like to coordinate with Dave Airlie so that we can also get that update into a drm-next branch soon.

I see that Linus merged Dave's pull request for Linux 5.2, which includes the first changes in amdgpu using HMM. They're currently broken without these two patches.

Quoted 6 lines

HMM patch do not go through any git branch they go through the mmotm collection. So it is not something you can easily coordinate with drm branch.

By broken i expect you mean that if numabalance happens it breaks ? Or it might sleep when you are not expecting it too ?

Without the NUMA fix we'd end up using an outdated physical address in the GPU page table. The problem was caught by a test that got incorrect computation results using OpenCL on a NUMA system.

Without the FAULT_FLAG_ALLOW_RETRY patch, there can be kernel oopses due to incorrect locking/unlocking of mmap_sem. It breaks the promise that hmm_range_fault should not unlock the mmap_sem if block==true. It takes some memory pressure to trigger this.

Regards,
  Felix

Quoted 23 lines

Cheers,
Jérôme

Quoted 19 lines

Thanks,
Felix

Quoted 15 lines · Jerome Glisse

[CAUTION: External Email]

Quoted 6 lines · Felix

Don't set this flag by default in hmm_vma_do_fault. It is set conditionally just a few lines below. Setting it unconditionally can lead to handle_mm_fault doing a non-blocking fault, returning -EBUSY and unlocking mmap_sem unexpectedly.

Quoted 4 lines
---
   mm/hmm.c | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 16 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
mm/hmm.c +0 -0
index b65c27d5c119..3c4f1d62202f 100644
@@ -339,7 +339,7 @@ struct hmm_vma_walk {
   static int hmm_vma_do_fault(struct mm_walk *walk, unsigned long addr,
                            bool write_fault, uint64_t *pfn)
   {
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
mm/hmm.c +1 -2
-     unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_REMOTE;
+     unsigned int flags = FAULT_FLAG_REMOTE;
        struct hmm_vma_walk *hmm_vma_walk = walk->private;
        struct hmm_range *range = hmm_vma_walk->range;
        struct vm_area_struct *vma = walk->vma;
--

2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#11 lore raw

Re: [PATCH 2/2] mm/hmm: Only set FAULT_FLAG_ALLOW_RETRY for non-blocking

In reply to Kuehling, Felix

I reverted all the amdgpu HMM patches for 5.2 because they also depended on this patch:
https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-5.2-wip&id=ce05ef71564f7cbe270cd4337c36ee720ea534db
which did not have a clear line of sight for 5.2 either.

Alex
________________________________
From: amd-gfx <[email protected]> on behalf of Kuehling, Felix <[email protected]>
Sent: Monday, May 13, 2019 3:36 PM
To: Jerome Glisse
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH 2/2] mm/hmm: Only set FAULT_FLAG_ALLOW_RETRY for non-blocking

[CAUTION: External Email]

Hi Jerome,

Do you want me to push the patches to your branch? Or are you going to apply them yourself?

Is your hmm-5.2-v3 branch going to make it into Linux 5.2? If so, do you know when? I'd like to coordinate with Dave Airlie so that we can also get that update into a drm-next branch soon.

I see that Linus merged Dave's pull request for Linux 5.2, which includes the first changes in amdgpu using HMM. They're currently broken without these two patches.

Thanks,
Felix

Quoted 15 lines · Jerome Glisse

[CAUTION: External Email]

Quoted 6 lines · Felix

Don't set this flag by default in hmm_vma_do_fault. It is set conditionally just a few lines below. Setting it unconditionally can lead to handle_mm_fault doing a non-blocking fault, returning -EBUSY and unlocking mmap_sem unexpectedly.

Quoted 4 lines
---
  mm/hmm.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 16 lines
Quoted 14 lines
mm/hmm.c +1 -2
index b65c27d5c119..3c4f1d62202f 100644
@@ -339,7 +339,7 @@ struct hmm_vma_walk {
  static int hmm_vma_do_fault(struct mm_walk *walk, unsigned long addr,
                           bool write_fault, uint64_t *pfn)
  {
-     unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_REMOTE;
+     unsigned int flags = FAULT_FLAG_REMOTE;
       struct hmm_vma_walk *hmm_vma_walk = walk->private;
       struct hmm_range *range = hmm_vma_walk->range;
       struct vm_area_struct *vma = walk->vma;
--
Quoted 2 lines

2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#12 lore raw

Re: [PATCH 2/2] mm/hmm: Only set FAULT_FLAG_ALLOW_RETRY for non-blocking

Quoted 5 lines · Alexander

[CAUTION: External Email]
I reverted all the amdgpu HMM patches for 5.2 because they also depended on this patch:
https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-5.2-wip&id=ce05ef71564f7cbe270cd4337c36ee720ea534db
which did not have a clear line of sight for 5.2 either.

When was that? I saw "Use HMM for userptr" in Dave's 5.2-rc1 pull request to Linus.

Regards,
  Felix

Quoted 58 lines

Alex
------------------------------------------------------------------------
*From:* amd-gfx <[email protected]> on behalf of Kuehling, Felix <[email protected]>
*Sent:* Monday, May 13, 2019 3:36 PM
*To:* Jerome Glisse
*Cc:* [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
*Subject:* Re: [PATCH 2/2] mm/hmm: Only set FAULT_FLAG_ALLOW_RETRY for non-blocking
[CAUTION: External Email]

Hi Jerome,

Do you want me to push the patches to your branch? Or are you going to apply them yourself?

Is your hmm-5.2-v3 branch going to make it into Linux 5.2? If so, do you know when? I'd like to coordinate with Dave Airlie so that we can also get that update into a drm-next branch soon.

I see that Linus merged Dave's pull request for Linux 5.2, which includes the first changes in amdgpu using HMM. They're currently broken without these two patches.

Thanks,
   Felix

Quoted 27 lines · Jerome Glisse

[CAUTION: External Email]

Quoted 6 lines · Felix

Don't set this flag by default in hmm_vma_do_fault. It is set conditionally just a few lines below. Setting it unconditionally can lead to handle_mm_fault doing a non-blocking fault, returning -EBUSY and unlocking mmap_sem unexpectedly.

Quoted 16 lines

---
   mm/hmm.c | 2 +-

   1 file changed, 1 insertion(+), 1 deletion(-)
mm/hmm.c +1 -1
index b65c27d5c119..3c4f1d62202f 100644
@@ -339,7 +339,7 @@ struct hmm_vma_walk {
    static int hmm_vma_do_fault(struct mm_walk *walk, unsigned long addr,
                             bool write_fault, uint64_t *pfn)
    {
-     unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_REMOTE;
+     unsigned int flags = FAULT_FLAG_REMOTE;
         struct hmm_vma_walk *hmm_vma_walk = walk->private;
         struct hmm_range *range = hmm_vma_walk->range;
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
mm/hmm.c +0 -1
         struct vm_area_struct *vma = walk->vma;
--

2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#13 lore raw

Re: [PATCH 2/2] mm/hmm: Only set FAULT_FLAG_ALLOW_RETRY for non-blocking

Quoted 11 lines · Felix
Quoted 5 lines · Alexander

[CAUTION: External Email]
I reverted all the amdgpu HMM patches for 5.2 because they also depended on this patch:
https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-5.2-wip&id=ce05ef71564f7cbe270cd4337c36ee720ea534db
which did not have a clear line of sight for 5.2 either.

When was that? I saw "Use HMM for userptr" in Dave's 5.2-rc1 pull request to Linus.

https://patchwork.kernel.org/patch/10875587/

Alex

Quoted 72 lines

Regards,
Felix

Quoted 58 lines

Alex
------------------------------------------------------------------------
*From:* amd-gfx <[email protected]> on behalf of Kuehling, Felix <[email protected]>
*Sent:* Monday, May 13, 2019 3:36 PM
*To:* Jerome Glisse
*Cc:* [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
*Subject:* Re: [PATCH 2/2] mm/hmm: Only set FAULT_FLAG_ALLOW_RETRY for non-blocking
[CAUTION: External Email]

Hi Jerome,

Do you want me to push the patches to your branch? Or are you going to apply them yourself?

Is your hmm-5.2-v3 branch going to make it into Linux 5.2? If so, do you know when? I'd like to coordinate with Dave Airlie so that we can also get that update into a drm-next branch soon.

I see that Linus merged Dave's pull request for Linux 5.2, which includes the first changes in amdgpu using HMM. They're currently broken without these two patches.

Thanks,
Felix

Quoted 27 lines · Jerome Glisse

[CAUTION: External Email]

Quoted 6 lines · Felix

Don't set this flag by default in hmm_vma_do_fault. It is set conditionally just a few lines below. Setting it unconditionally can lead to handle_mm_fault doing a non-blocking fault, returning -EBUSY and unlocking mmap_sem unexpectedly.

Quoted 16 lines
---
  mm/hmm.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
mm/hmm.c +1 -1
index b65c27d5c119..3c4f1d62202f 100644
@@ -339,7 +339,7 @@ struct hmm_vma_walk {
  static int hmm_vma_do_fault(struct mm_walk *walk, unsigned long addr,
                           bool write_fault, uint64_t *pfn)
  {
-     unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_REMOTE;
+     unsigned int flags = FAULT_FLAG_REMOTE;
       struct hmm_vma_walk *hmm_vma_walk = walk->private;
       struct hmm_range *range = hmm_vma_walk->range;
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
mm/hmm.c +0 -1
       struct vm_area_struct *vma = walk->vma;
--

2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#14 lore raw
In reply to Kuehling, Felix
Quoted 5 lines · Felix

These problems were found in AMD-internal testing as we're working on adopting HMM. They are rebased against glisse/hmm-5.2-v3. We'd like to get them applied to a mainline Linux kernel as well as drm-next and amd-staging-drm-next sooner rather than later.

Quoted 8 lines

Currently the HMM in amd-staging-drm-next is quite far behind hmm-5.2-v3, but the driver changes for HMM are expected to land in 5.2 and will need to be rebased on those HMM changes.

I'd like to work out a flow between Jerome, Dave, Alex and myself that allows us to test the latest version of HMM on amd-staging-drm-next so that ideally everything comes together in master without much need for rebasing and retesting.

I think we have that now, I'm running a hmm.git that is clean and can be used for merging into DRM related trees (and RDMA). I've commited to send this tree to Linus at the start of the merge window.

See here:

https://lore.kernel.org/lkml/[email protected]/

The tree is here:

https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/log/?h=hmm

However please consult with me before making a merge commit to be co-ordinated. Thanks

I see in this thread that AMDGPU missed 5.2 beacause of the co-ordination problems this tree is intended to solve, so I'm very hopeful this will help your work move into 5.3!

Quoted 9 lines

Maybe having Jerome's latest HMM changes in drm-next. However, that may create dependencies where Jerome and Dave need to coordinate their pull- requests for master.

Felix Kuehling (1):
mm/hmm: Only set FAULT_FLAG_ALLOW_RETRY for non-blocking

Philip Yang (1):
mm/hmm: support automatic NUMA balancing

I've applied both of these patches with Jerome's Reviewed-by to hmm.git and added the missed Signed-off-by

If you test and confirm I think this branch would be ready for merging toward the AMD tree.

Regards,
Jason
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#15 lore raw
Quoted 24 lines · Jason Gunthorpe
Quoted 5 lines · Felix

These problems were found in AMD-internal testing as we're working on adopting HMM. They are rebased against glisse/hmm-5.2-v3. We'd like to get them applied to a mainline Linux kernel as well as drm-next and amd-staging-drm-next sooner rather than later.

Quoted 8 lines

Currently the HMM in amd-staging-drm-next is quite far behind hmm-5.2-v3, but the driver changes for HMM are expected to land in 5.2 and will need to be rebased on those HMM changes.

I'd like to work out a flow between Jerome, Dave, Alex and myself that allows us to test the latest version of HMM on amd-staging-drm-next so that ideally everything comes together in master without much need for rebasing and retesting.

I think we have that now, I'm running a hmm.git that is clean and can be used for merging into DRM related trees (and RDMA). I've commited to send this tree to Linus at the start of the merge window.

See here:

https://lore.kernel.org/lkml/[email protected]/

The tree is here:

Quoted 8 lines

https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/log/?h=hmm

However please consult with me before making a merge commit to be co-ordinated. Thanks

I see in this thread that AMDGPU missed 5.2 beacause of the co-ordination problems this tree is intended to solve, so I'm very hopeful this will help your work move into 5.3!

Thanks Jason. Our two patches below were already included in the MM tree
(https://ozlabs.org/~akpm/mmots/broken-out/). With your new hmm.git, does that mean HMM fixes and changes will no longer go through Andrew Morton but directly through your tree to Linus?

We have also applied the two patches to our internal tree which is currently based on 5.2-rc1 so we can make progress.

Alex, I think merging hmm would be an extra step every time you rebase amd-staging-drm-next. We could probably also merge hmm at other times as needed. Do you think this would cause trouble or confusion for upstreaming through drm-next?

Regards,
  Felix

Quoted 10 lines
Quoted 10 lines

Maybe having Jerome's latest HMM changes in drm-next. However, that may create dependencies where Jerome and Dave need to coordinate their pull- requests for master.

Felix Kuehling (1):
mm/hmm: Only set FAULT_FLAG_ALLOW_RETRY for non-blocking

Philip Yang (1):
mm/hmm: support automatic NUMA balancing

Quoted 7 lines

I've applied both of these patches with Jerome's Reviewed-by to hmm.git and added the missed Signed-off-by

If you test and confirm I think this branch would be ready for merging toward the AMD tree.
Regards,
Jason

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#16 lore raw
Quoted 30 lines · Felix
Quoted 29 lines · Jason Gunthorpe
Quoted 5 lines · Felix

These problems were found in AMD-internal testing as we're working on adopting HMM. They are rebased against glisse/hmm-5.2-v3. We'd like to get them applied to a mainline Linux kernel as well as drm-next and amd-staging-drm-next sooner rather than later.

Quoted 8 lines

Currently the HMM in amd-staging-drm-next is quite far behind hmm-5.2-v3, but the driver changes for HMM are expected to land in 5.2 and will need to be rebased on those HMM changes.

I'd like to work out a flow between Jerome, Dave, Alex and myself that allows us to test the latest version of HMM on amd-staging-drm-next so that ideally everything comes together in master without much need for rebasing and retesting.

I think we have that now, I'm running a hmm.git that is clean and can be used for merging into DRM related trees (and RDMA). I've commited to send this tree to Linus at the start of the merge window.

See here:

https://lore.kernel.org/lkml/[email protected]/

The tree is here:

https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/log/?h=hmm

However please consult with me before making a merge commit to be co-ordinated. Thanks

Quoted 8 lines
Quoted 3 lines

I see in this thread that AMDGPU missed 5.2 beacause of the co-ordination problems this tree is intended to solve, so I'm very hopeful this will help your work move into 5.3!

Thanks Jason. Our two patches below were already included in the MM tree
(https://ozlabs.org/~akpm/mmots/broken-out/). With your new hmm.git, does that mean HMM fixes and changes will no longer go through Andrew Morton but directly through your tree to Linus?

I belive so, that is what we agreed to in the RFC. At least for this cycle.

I already noticed the duplication and sent Andrew a separate note..

It will be best if most of the things touching mm/hmm.c go to hmm.git to avoid conflicts for Linus.

Quoted 2 lines

We have also applied the two patches to our internal tree which is currently based on 5.2-rc1 so we can make progress.

Makes sense, this is is also why this shared tree should be very helpful..

I intend to run it as a clean and stable non-rebasing tree, ah probably starting tomorrow since I see there is still another fixup. :)

Quoted 4 lines

Alex, I think merging hmm would be an extra step every time you rebase amd-staging-drm-next. We could probably also merge hmm at other times as needed. Do you think this would cause trouble or confusion for upstreaming through drm-next?

I'm not sure what the workflow the amd tree uses, but..

Broadly: If the AMD tree is rebasing then likely you can simply rebase your AMD tree on top of hmm.git (or maybe hmm.git merge'd into DRM).

Most likely we will want to send a PR for hmm.git to main DRM tree prior to merging AMD's tree, but I'm also rather relying on DRM folks to help build the workflow they want in their world..

There are quite a few options depending on people's preferences and workflow.

Thanks,
Jason
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#17 lore raw
In reply to Jason Gunthorpe

[resent with correct address for Alex]

Quoted 26 lines · Jason Gunthorpe
Quoted 11 lines · Felix

These problems were found in AMD-internal testing as we're working on adopting HMM. They are rebased against glisse/hmm-5.2-v3. We'd like to get
them applied to a mainline Linux kernel as well as drm-next and amd-staging-drm-next sooner rather than later.

Currently the HMM in amd-staging-drm-next is quite far behind hmm-5.2-v3, but the driver changes for HMM are expected to land in 5.2 and will need to
be rebased on those HMM changes.

Quoted 4 lines

I'd like to work out a flow between Jerome, Dave, Alex and myself that allows us to test the latest version of HMM on amd-staging-drm-next so that ideally everything comes together in master without much need for rebasing and retesting.

I think we have that now, I'm running a hmm.git that is clean and can be used for merging into DRM related trees (and RDMA). I've commited to send this tree to Linus at the start of the merge window.

See here:

https://lore.kernel.org/lkml/[email protected]/

The tree is here:

Quoted 8 lines

https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/log/?h=hmm

However please consult with me before making a merge commit to be co-ordinated. Thanks

I see in this thread that AMDGPU missed 5.2 beacause of the co-ordination problems this tree is intended to solve, so I'm very hopeful this will help your work move into 5.3!

Thanks Jason. Our two patches below were already included in the MM tree
(https://ozlabs.org/~akpm/mmots/broken-out/). With your new hmm.git, does that mean HMM fixes and changes will no longer go through Andrew Morton but directly through your tree to Linus?

We have also applied the two patches to our internal tree which is currently based on 5.2-rc1 so we can make progress.

Alex, I think merging hmm would be an extra step every time you rebase amd-staging-drm-next. We could probably also merge hmm at other times as needed. Do you think this would cause trouble or confusion for upstreaming through drm-next?

Regards,
  Felix

Quoted 10 lines
Quoted 10 lines

Maybe having Jerome's latest HMM changes in drm-next. However, that may create dependencies where Jerome and Dave need to coordinate their pull- requests for master.

Felix Kuehling (1):
mm/hmm: Only set FAULT_FLAG_ALLOW_RETRY for non-blocking

Philip Yang (1):
mm/hmm: support automatic NUMA balancing

Quoted 7 lines

I've applied both of these patches with Jerome's Reviewed-by to hmm.git and added the missed Signed-off-by

If you test and confirm I think this branch would be ready for merging toward the AMD tree.
Regards,
Jason

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx