[PATCH] x86/tlb: correct vmflag test for checking VM_HUGETLB

[PATCH] x86/tlb: correct vmflag test for checking VM_HUGETLB

[Joonsoo Kim]

commit 611ae8e3f5204f7480b3b405993b3352cfa16662('enable tlb flush range
support for x86') change flush_tlb_mm_range() considerably. After this,
we test whether vmflag equal to VM_HUGETLB and it may be always failed,
because vmflag usually has other flags simultaneously.
Our intention is to check whether this vma is for hughtlb, so correct it
according to this purpose.

Cc: Alex Shi <alex.shi@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Joonsoo Kim <js1304@gmail.com>

diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index 0777f04..60f926c 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -197,7 +197,7 @@ void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start,
 	}
 
 	if (end == TLB_FLUSH_ALL || tlb_flushall_shift == -1
-					|| vmflag == VM_HUGETLB) {
+					|| vmflag & VM_HUGETLB) {
 		local_flush_tlb();
 		goto flush_all;
 	}
-- 
1.7.9.5

Re: [PATCH] x86/tlb: correct vmflag test for checking VM_HUGETLB

[Alex Shi]

On 11/13/2012 01:17 AM, Joonsoo Kim wrote:
> commit 611ae8e3f5204f7480b3b405993b3352cfa16662('enable tlb flush range
> support for x86') change flush_tlb_mm_range() considerably. After this,
> we test whether vmflag equal to VM_HUGETLB and it may be always failed,
> because vmflag usually has other flags simultaneously.
> Our intention is to check whether this vma is for hughtlb, so correct it
> according to this purpose.
> 
> Cc: Alex Shi <alex.shi@intel.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Signed-off-by: Joonsoo Kim <js1304@gmail.com>
> 

Acked-by: Alex Shi <alex.shi@intel.com>

> diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
> index 0777f04..60f926c 100644
> --- a/arch/x86/mm/tlb.c
> +++ b/arch/x86/mm/tlb.c
> @@ -197,7 +197,7 @@ void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start,
>  	}
>  
>  	if (end == TLB_FLUSH_ALL || tlb_flushall_shift == -1
> -					|| vmflag == VM_HUGETLB) {
> +					|| vmflag & VM_HUGETLB) {
>  		local_flush_tlb();
>  		goto flush_all;
>  	}
> 

[tip:x86/urgent] x86, mm: Correct vmflag test for checking VM_HUGETLB

[tip-bot for Joonsoo Kim]

Commit-ID:  ddd32b4289a6feda9ad9e68b0d85641c389a72ba
Gitweb:     http://git.kernel.org/tip/ddd32b4289a6feda9ad9e68b0d85641c389a72ba
Author:     Joonsoo Kim <js1304@gmail.com>
AuthorDate: Tue, 13 Nov 2012 02:17:36 +0900
Committer:  H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Wed, 14 Nov 2012 15:03:20 -0800

x86, mm: Correct vmflag test for checking VM_HUGETLB

commit 611ae8e3f5204f7480b3b405993b3352cfa16662('enable tlb flush range
support for x86') change flush_tlb_mm_range() considerably. After this,
we test whether vmflag equal to VM_HUGETLB and it may be always failed,
because vmflag usually has other flags simultaneously.
Our intention is to check whether this vma is for hughtlb, so correct it
according to this purpose.

Signed-off-by: Joonsoo Kim <js1304@gmail.com>
Acked-by: Alex Shi <alex.shi@intel.com>
Link: http://lkml.kernel.org/r/1352740656-19417-1-git-send-email-js1304@gmail.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
 arch/x86/mm/tlb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index 0777f04..60f926c 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -197,7 +197,7 @@ void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start,
 	}
 
 	if (end == TLB_FLUSH_ALL || tlb_flushall_shift == -1
-					|| vmflag == VM_HUGETLB) {
+					|| vmflag & VM_HUGETLB) {
 		local_flush_tlb();
 		goto flush_all;
 	}