* [PATCH 1/1] mm/hugetlb: Set PTE as huge in hugetlb_change_protection @ 2013-01-21 4:13 Tony Lu 2013-01-21 10:04 ` Michal Hocko 0 siblings, 1 reply; 10+ messages in thread From: Tony Lu @ 2013-01-21 4:13 UTC (permalink / raw) To: linux-kernel, linux-mm, Andrew Morton, Michal Hocko, Aneesh Kumar K.V, Hillf Danton, KAMEZAWA Hiroyuki Cc: Chris Metcalf, Tony Lu ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/1] mm/hugetlb: Set PTE as huge in hugetlb_change_protection 2013-01-21 4:13 [PATCH 1/1] mm/hugetlb: Set PTE as huge in hugetlb_change_protection Tony Lu @ 2013-01-21 10:04 ` Michal Hocko 0 siblings, 0 replies; 10+ messages in thread From: Michal Hocko @ 2013-01-21 10:04 UTC (permalink / raw) To: Tony Lu Cc: linux-kernel, linux-mm, Andrew Morton, Aneesh Kumar K.V, Hillf Danton, KAMEZAWA Hiroyuki, Chris Metcalf On Mon 21-01-13 04:13:07, Tony Lu wrote: > From da8432aafd231e7cdcda9d15484829def4663cb0 Mon Sep 17 00:00:00 2001 > From: Zhigang Lu <zlu@tilera.com> > Date: Mon, 21 Jan 2013 11:23:26 +0800 > Subject: [PATCH 1/1] mm/hugetlb: Set PTE as huge in hugetlb_change_protection > > When setting a huge PTE, besides calling pte_mkhuge(), we also need > to call arch_make_huge_pte(), which we indeed do in make_huge_pte(), > but we forget to do in hugetlb_change_protection(). I guess you also need it in remove_migration_pte. This calls for a helper which would do both pte_mkhuge() and arch_make_huge_pte. Besides that, tile seem to be the only arch which implements this arch hook (introduced by 621b1955 in 3.5) so this should be considered for stable. > > Signed-off-by: Zhigang Lu <zlu@tilera.com> > Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> > --- > mm/hugetlb.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 4f3ea0b..546db81 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -3033,6 +3033,7 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma, > if (!huge_pte_none(huge_ptep_get(ptep))) { > pte = huge_ptep_get_and_clear(mm, address, ptep); > pte = pte_mkhuge(pte_modify(pte, newprot)); > + pte = arch_make_huge_pte(pte, vma, NULL, 0); > set_huge_pte_at(mm, address, ptep, pte); > pages++; > } > -- > 1.7.10.3 -- Michal Hocko SUSE Labs ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/1] mm/hugetlb: Set PTE as huge in hugetlb_change_protection @ 2013-01-21 10:04 ` Michal Hocko 0 siblings, 0 replies; 10+ messages in thread From: Michal Hocko @ 2013-01-21 10:04 UTC (permalink / raw) To: Tony Lu Cc: linux-kernel, linux-mm, Andrew Morton, Aneesh Kumar K.V, Hillf Danton, KAMEZAWA Hiroyuki, Chris Metcalf On Mon 21-01-13 04:13:07, Tony Lu wrote: > From da8432aafd231e7cdcda9d15484829def4663cb0 Mon Sep 17 00:00:00 2001 > From: Zhigang Lu <zlu@tilera.com> > Date: Mon, 21 Jan 2013 11:23:26 +0800 > Subject: [PATCH 1/1] mm/hugetlb: Set PTE as huge in hugetlb_change_protection > > When setting a huge PTE, besides calling pte_mkhuge(), we also need > to call arch_make_huge_pte(), which we indeed do in make_huge_pte(), > but we forget to do in hugetlb_change_protection(). I guess you also need it in remove_migration_pte. This calls for a helper which would do both pte_mkhuge() and arch_make_huge_pte. Besides that, tile seem to be the only arch which implements this arch hook (introduced by 621b1955 in 3.5) so this should be considered for stable. > > Signed-off-by: Zhigang Lu <zlu@tilera.com> > Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> > --- > mm/hugetlb.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 4f3ea0b..546db81 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -3033,6 +3033,7 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma, > if (!huge_pte_none(huge_ptep_get(ptep))) { > pte = huge_ptep_get_and_clear(mm, address, ptep); > pte = pte_mkhuge(pte_modify(pte, newprot)); > + pte = arch_make_huge_pte(pte, vma, NULL, 0); > set_huge_pte_at(mm, address, ptep, pte); > pages++; > } > -- > 1.7.10.3 -- Michal Hocko SUSE Labs -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 10+ messages in thread
* RE: [PATCH 1/1] mm/hugetlb: Set PTE as huge in hugetlb_change_protection 2013-01-21 10:04 ` Michal Hocko (?) @ 2013-01-22 2:37 ` Tony Lu 2013-01-22 10:21 ` Michal Hocko 2013-01-22 13:50 ` Hillf Danton -1 siblings, 2 replies; 10+ messages in thread From: Tony Lu @ 2013-01-22 2:37 UTC (permalink / raw) To: Michal Hocko Cc: linux-kernel, linux-mm, Andrew Morton, Aneesh Kumar K.V, Hillf Danton, KAMEZAWA Hiroyuki, Chris Metcalf >-----Original Message----- >From: Michal Hocko [mailto:mhocko@suse.cz] >Sent: Monday, January 21, 2013 6:04 PM >To: Tony Lu >Cc: linux-kernel@vger.kernel.org; linux-mm@kvack.org; Andrew Morton; Aneesh >Kumar K.V; Hillf Danton; KAMEZAWA Hiroyuki; Chris Metcalf >Subject: Re: [PATCH 1/1] mm/hugetlb: Set PTE as huge in >hugetlb_change_protection > >On Mon 21-01-13 04:13:07, Tony Lu wrote: >> From da8432aafd231e7cdcda9d15484829def4663cb0 Mon Sep 17 00:00:00 2001 >> From: Zhigang Lu <zlu@tilera.com> >> Date: Mon, 21 Jan 2013 11:23:26 +0800 >> Subject: [PATCH 1/1] mm/hugetlb: Set PTE as huge in hugetlb_change_protection >> >> When setting a huge PTE, besides calling pte_mkhuge(), we also need >> to call arch_make_huge_pte(), which we indeed do in make_huge_pte(), >> but we forget to do in hugetlb_change_protection(). > >I guess you also need it in remove_migration_pte. This calls for a >helper which would do both pte_mkhuge() and arch_make_huge_pte. > >Besides that, tile seem to be the only arch which implements this arch >hook (introduced by 621b1955 in 3.5) so this should be considered for >stable. Thank you. Yes, remove_migration_pte also needs it. Here is the updated patch. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/1] mm/hugetlb: Set PTE as huge in hugetlb_change_protection 2013-01-22 2:37 ` Tony Lu @ 2013-01-22 10:21 ` Michal Hocko 2013-01-22 13:50 ` Hillf Danton 1 sibling, 0 replies; 10+ messages in thread From: Michal Hocko @ 2013-01-22 10:21 UTC (permalink / raw) To: Tony Lu Cc: linux-kernel, linux-mm, Andrew Morton, Aneesh Kumar K.V, Hillf Danton, KAMEZAWA Hiroyuki, Chris Metcalf On Tue 22-01-13 02:37:15, Tony Lu wrote: > >-----Original Message----- > >From: Michal Hocko [mailto:mhocko@suse.cz] > >Sent: Monday, January 21, 2013 6:04 PM > >To: Tony Lu > >Cc: linux-kernel@vger.kernel.org; linux-mm@kvack.org; Andrew Morton; Aneesh > >Kumar K.V; Hillf Danton; KAMEZAWA Hiroyuki; Chris Metcalf > >Subject: Re: [PATCH 1/1] mm/hugetlb: Set PTE as huge in > >hugetlb_change_protection > > > >On Mon 21-01-13 04:13:07, Tony Lu wrote: > >> From da8432aafd231e7cdcda9d15484829def4663cb0 Mon Sep 17 00:00:00 2001 > >> From: Zhigang Lu <zlu@tilera.com> > >> Date: Mon, 21 Jan 2013 11:23:26 +0800 > >> Subject: [PATCH 1/1] mm/hugetlb: Set PTE as huge in hugetlb_change_protection > >> > >> When setting a huge PTE, besides calling pte_mkhuge(), we also need > >> to call arch_make_huge_pte(), which we indeed do in make_huge_pte(), > >> but we forget to do in hugetlb_change_protection(). > > > >I guess you also need it in remove_migration_pte. This calls for a > >helper which would do both pte_mkhuge() and arch_make_huge_pte. > > > >Besides that, tile seem to be the only arch which implements this arch > >hook (introduced by 621b1955 in 3.5) so this should be considered for > >stable. > > Thank you. Yes, remove_migration_pte also needs it. Here is the updated patch. > > From 44045d672aa72eb2e76be89f95ab720952b4b09c Mon Sep 17 00:00:00 2001 > From: Zhigang Lu <zlu@tilera.com> > Date: Tue, 22 Jan 2013 09:58:58 +0800 > Subject: [PATCH 1/1] mm/hugetlb: Set PTE as huge in hugetlb_change_protection > and remove_migration_pte > > When setting a huge PTE, besides calling pte_mkhuge(), we also need > to call arch_make_huge_pte(), which we indeed do in make_huge_pte(), > but we forget to do in hugetlb_change_protection() and > remove_migration_pte(). > > Signed-off-by: Zhigang Lu <zlu@tilera.com> > Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> Reviewed-by: Michal Hocko <mhocko@suse.cz> > --- > mm/hugetlb.c | 1 + > mm/migrate.c | 4 +++- > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 4f3ea0b..546db81 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -3033,6 +3033,7 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma, > if (!huge_pte_none(huge_ptep_get(ptep))) { > pte = huge_ptep_get_and_clear(mm, address, ptep); > pte = pte_mkhuge(pte_modify(pte, newprot)); > + pte = arch_make_huge_pte(pte, vma, NULL, 0); > set_huge_pte_at(mm, address, ptep, pte); > pages++; > } > diff --git a/mm/migrate.c b/mm/migrate.c > index c387786..2fd8b4a 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -160,8 +160,10 @@ static int remove_migration_pte(struct page *new, struct vm_area_struct *vma, > if (is_write_migration_entry(entry)) > pte = pte_mkwrite(pte); > #ifdef CONFIG_HUGETLB_PAGE > - if (PageHuge(new)) > + if (PageHuge(new)) { > pte = pte_mkhuge(pte); > + pte = arch_make_huge_pte(pte, vma, new, 0); > + } > #endif > flush_cache_page(vma, addr, pte_pfn(pte)); > set_pte_at(mm, addr, ptep, pte); > -- > 1.7.10.3 -- Michal Hocko SUSE Labs ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/1] mm/hugetlb: Set PTE as huge in hugetlb_change_protection @ 2013-01-22 10:21 ` Michal Hocko 0 siblings, 0 replies; 10+ messages in thread From: Michal Hocko @ 2013-01-22 10:21 UTC (permalink / raw) To: Tony Lu Cc: linux-kernel, linux-mm, Andrew Morton, Aneesh Kumar K.V, Hillf Danton, KAMEZAWA Hiroyuki, Chris Metcalf On Tue 22-01-13 02:37:15, Tony Lu wrote: > >-----Original Message----- > >From: Michal Hocko [mailto:mhocko@suse.cz] > >Sent: Monday, January 21, 2013 6:04 PM > >To: Tony Lu > >Cc: linux-kernel@vger.kernel.org; linux-mm@kvack.org; Andrew Morton; Aneesh > >Kumar K.V; Hillf Danton; KAMEZAWA Hiroyuki; Chris Metcalf > >Subject: Re: [PATCH 1/1] mm/hugetlb: Set PTE as huge in > >hugetlb_change_protection > > > >On Mon 21-01-13 04:13:07, Tony Lu wrote: > >> From da8432aafd231e7cdcda9d15484829def4663cb0 Mon Sep 17 00:00:00 2001 > >> From: Zhigang Lu <zlu@tilera.com> > >> Date: Mon, 21 Jan 2013 11:23:26 +0800 > >> Subject: [PATCH 1/1] mm/hugetlb: Set PTE as huge in hugetlb_change_protection > >> > >> When setting a huge PTE, besides calling pte_mkhuge(), we also need > >> to call arch_make_huge_pte(), which we indeed do in make_huge_pte(), > >> but we forget to do in hugetlb_change_protection(). > > > >I guess you also need it in remove_migration_pte. This calls for a > >helper which would do both pte_mkhuge() and arch_make_huge_pte. > > > >Besides that, tile seem to be the only arch which implements this arch > >hook (introduced by 621b1955 in 3.5) so this should be considered for > >stable. > > Thank you. Yes, remove_migration_pte also needs it. Here is the updated patch. > > From 44045d672aa72eb2e76be89f95ab720952b4b09c Mon Sep 17 00:00:00 2001 > From: Zhigang Lu <zlu@tilera.com> > Date: Tue, 22 Jan 2013 09:58:58 +0800 > Subject: [PATCH 1/1] mm/hugetlb: Set PTE as huge in hugetlb_change_protection > and remove_migration_pte > > When setting a huge PTE, besides calling pte_mkhuge(), we also need > to call arch_make_huge_pte(), which we indeed do in make_huge_pte(), > but we forget to do in hugetlb_change_protection() and > remove_migration_pte(). > > Signed-off-by: Zhigang Lu <zlu@tilera.com> > Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> Reviewed-by: Michal Hocko <mhocko@suse.cz> > --- > mm/hugetlb.c | 1 + > mm/migrate.c | 4 +++- > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 4f3ea0b..546db81 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -3033,6 +3033,7 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma, > if (!huge_pte_none(huge_ptep_get(ptep))) { > pte = huge_ptep_get_and_clear(mm, address, ptep); > pte = pte_mkhuge(pte_modify(pte, newprot)); > + pte = arch_make_huge_pte(pte, vma, NULL, 0); > set_huge_pte_at(mm, address, ptep, pte); > pages++; > } > diff --git a/mm/migrate.c b/mm/migrate.c > index c387786..2fd8b4a 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -160,8 +160,10 @@ static int remove_migration_pte(struct page *new, struct vm_area_struct *vma, > if (is_write_migration_entry(entry)) > pte = pte_mkwrite(pte); > #ifdef CONFIG_HUGETLB_PAGE > - if (PageHuge(new)) > + if (PageHuge(new)) { > pte = pte_mkhuge(pte); > + pte = arch_make_huge_pte(pte, vma, new, 0); > + } > #endif > flush_cache_page(vma, addr, pte_pfn(pte)); > set_pte_at(mm, addr, ptep, pte); > -- > 1.7.10.3 -- Michal Hocko SUSE Labs -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/1] mm/hugetlb: Set PTE as huge in hugetlb_change_protection 2013-01-22 2:37 ` Tony Lu @ 2013-01-22 13:50 ` Hillf Danton 2013-01-22 13:50 ` Hillf Danton 1 sibling, 0 replies; 10+ messages in thread From: Hillf Danton @ 2013-01-22 13:50 UTC (permalink / raw) To: Tony Lu Cc: Michal Hocko, linux-kernel, linux-mm, Andrew Morton, Aneesh Kumar K.V, KAMEZAWA Hiroyuki, Chris Metcalf On Tue, Jan 22, 2013 at 10:37 AM, Tony Lu <zlu@tilera.com> wrote: > From 44045d672aa72eb2e76be89f95ab720952b4b09c Mon Sep 17 00:00:00 2001 > From: Zhigang Lu <zlu@tilera.com> > Date: Tue, 22 Jan 2013 09:58:58 +0800 > Subject: [PATCH 1/1] mm/hugetlb: Set PTE as huge in hugetlb_change_protection > and remove_migration_pte > > When setting a huge PTE, besides calling pte_mkhuge(), we also need > to call arch_make_huge_pte(), which we indeed do in make_huge_pte(), > but we forget to do in hugetlb_change_protection() and > remove_migration_pte(). > > Signed-off-by: Zhigang Lu <zlu@tilera.com> > Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> > --- Acked-by: Hillf Danton <dhillf@gmail.com> > mm/hugetlb.c | 1 + > mm/migrate.c | 4 +++- > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 4f3ea0b..546db81 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -3033,6 +3033,7 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma, > if (!huge_pte_none(huge_ptep_get(ptep))) { > pte = huge_ptep_get_and_clear(mm, address, ptep); > pte = pte_mkhuge(pte_modify(pte, newprot)); > + pte = arch_make_huge_pte(pte, vma, NULL, 0); > set_huge_pte_at(mm, address, ptep, pte); > pages++; > } > diff --git a/mm/migrate.c b/mm/migrate.c > index c387786..2fd8b4a 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -160,8 +160,10 @@ static int remove_migration_pte(struct page *new, struct vm_area_struct *vma, > if (is_write_migration_entry(entry)) > pte = pte_mkwrite(pte); > #ifdef CONFIG_HUGETLB_PAGE > - if (PageHuge(new)) > + if (PageHuge(new)) { > pte = pte_mkhuge(pte); > + pte = arch_make_huge_pte(pte, vma, new, 0); > + } > #endif > flush_cache_page(vma, addr, pte_pfn(pte)); > set_pte_at(mm, addr, ptep, pte); > -- > 1.7.10.3 ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/1] mm/hugetlb: Set PTE as huge in hugetlb_change_protection @ 2013-01-22 13:50 ` Hillf Danton 0 siblings, 0 replies; 10+ messages in thread From: Hillf Danton @ 2013-01-22 13:50 UTC (permalink / raw) To: Tony Lu Cc: Michal Hocko, linux-kernel, linux-mm, Andrew Morton, Aneesh Kumar K.V, KAMEZAWA Hiroyuki, Chris Metcalf On Tue, Jan 22, 2013 at 10:37 AM, Tony Lu <zlu@tilera.com> wrote: > From 44045d672aa72eb2e76be89f95ab720952b4b09c Mon Sep 17 00:00:00 2001 > From: Zhigang Lu <zlu@tilera.com> > Date: Tue, 22 Jan 2013 09:58:58 +0800 > Subject: [PATCH 1/1] mm/hugetlb: Set PTE as huge in hugetlb_change_protection > and remove_migration_pte > > When setting a huge PTE, besides calling pte_mkhuge(), we also need > to call arch_make_huge_pte(), which we indeed do in make_huge_pte(), > but we forget to do in hugetlb_change_protection() and > remove_migration_pte(). > > Signed-off-by: Zhigang Lu <zlu@tilera.com> > Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> > --- Acked-by: Hillf Danton <dhillf@gmail.com> > mm/hugetlb.c | 1 + > mm/migrate.c | 4 +++- > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 4f3ea0b..546db81 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -3033,6 +3033,7 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma, > if (!huge_pte_none(huge_ptep_get(ptep))) { > pte = huge_ptep_get_and_clear(mm, address, ptep); > pte = pte_mkhuge(pte_modify(pte, newprot)); > + pte = arch_make_huge_pte(pte, vma, NULL, 0); > set_huge_pte_at(mm, address, ptep, pte); > pages++; > } > diff --git a/mm/migrate.c b/mm/migrate.c > index c387786..2fd8b4a 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -160,8 +160,10 @@ static int remove_migration_pte(struct page *new, struct vm_area_struct *vma, > if (is_write_migration_entry(entry)) > pte = pte_mkwrite(pte); > #ifdef CONFIG_HUGETLB_PAGE > - if (PageHuge(new)) > + if (PageHuge(new)) { > pte = pte_mkhuge(pte); > + pte = arch_make_huge_pte(pte, vma, new, 0); > + } > #endif > flush_cache_page(vma, addr, pte_pfn(pte)); > set_pte_at(mm, addr, ptep, pte); > -- > 1.7.10.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2] mm/hugetlb: Set PTE as huge in hugetlb_change_protection 2013-01-22 13:50 ` Hillf Danton (?) @ 2013-01-23 1:56 ` Tony Lu -1 siblings, 0 replies; 10+ messages in thread From: Tony Lu @ 2013-01-23 1:56 UTC (permalink / raw) To: Hillf Danton Cc: Michal Hocko, linux-kernel, linux-mm, Andrew Morton, Aneesh Kumar K.V, KAMEZAWA Hiroyuki, Chris Metcalf, stable, Tony Lu ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2] mm/hugetlb: Set PTE as huge in hugetlb_change_protection and remove_migration_pte 2013-01-22 13:50 ` Hillf Danton (?) (?) @ 2013-01-23 4:56 ` Tony Lu -1 siblings, 0 replies; 10+ messages in thread From: Tony Lu @ 2013-01-23 4:56 UTC (permalink / raw) To: Hillf Danton Cc: Michal Hocko, linux-kernel, linux-mm, Andrew Morton, Aneesh Kumar K.V, KAMEZAWA Hiroyuki, Chris Metcalf, stable, Tony Lu When setting a huge PTE, besides calling pte_mkhuge(), we also need to call arch_make_huge_pte(), which we indeed do in make_huge_pte(), but we forget to do in hugetlb_change_protection() and remove_migration_pte(). Signed-off-by: Zhigang Lu <zlu@tilera.com> Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> Reviewed-by: Michal Hocko <mhocko@suse.cz> Acked-by: Hillf Danton <dhillf@gmail.com> Cc: stable@vger.kernel.org --- Changelog v2: Missed adding arch_make_huge_pte() in remove_migration_pte() with previous patch, so sending v2 after adding that. mm/hugetlb.c | 1 + mm/migrate.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 4f3ea0b..546db81 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3033,6 +3033,7 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma, if (!huge_pte_none(huge_ptep_get(ptep))) { pte = huge_ptep_get_and_clear(mm, address, ptep); pte = pte_mkhuge(pte_modify(pte, newprot)); + pte = arch_make_huge_pte(pte, vma, NULL, 0); set_huge_pte_at(mm, address, ptep, pte); pages++; } diff --git a/mm/migrate.c b/mm/migrate.c index c387786..2fd8b4a 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -160,8 +160,10 @@ static int remove_migration_pte(struct page *new, struct vm_area_struct *vma, if (is_write_migration_entry(entry)) pte = pte_mkwrite(pte); #ifdef CONFIG_HUGETLB_PAGE - if (PageHuge(new)) + if (PageHuge(new)) { pte = pte_mkhuge(pte); + pte = arch_make_huge_pte(pte, vma, new, 0); + } #endif flush_cache_page(vma, addr, pte_pfn(pte)); set_pte_at(mm, addr, ptep, pte); -- 1.7.10.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-01-23 4:56 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2013-01-21 4:13 [PATCH 1/1] mm/hugetlb: Set PTE as huge in hugetlb_change_protection Tony Lu 2013-01-21 10:04 ` Michal Hocko 2013-01-21 10:04 ` Michal Hocko 2013-01-22 2:37 ` Tony Lu 2013-01-22 10:21 ` Michal Hocko 2013-01-22 10:21 ` Michal Hocko 2013-01-22 13:50 ` Hillf Danton 2013-01-22 13:50 ` Hillf Danton 2013-01-23 1:56 ` [PATCH v2] " Tony Lu 2013-01-23 4:56 ` [PATCH v2] mm/hugetlb: Set PTE as huge in hugetlb_change_protection and remove_migration_pte Tony Lu
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.