Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   "Zhang, Shile (NSB - CN/Hangzhou)" <shile.zhang@nokia-sbell.com>
To:     Russell King <linux@armlinux.org.uk>
CC:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linux-arm-kernel@lists.infradead.org" 
        <linux-arm-kernel@lists.infradead.org>
Subject: RE: [PATCH] mm/hugetlb: Implement ASLR and topdown for hugetlb
 mappings
Thread-Topic: [PATCH] mm/hugetlb: Implement ASLR and topdown for hugetlb
 mappings
Thread-Index: AQHTVIT81tf+ySpvtUyIfKL/J47BkaMR1yPA
Date:   Mon, 13 Nov 2017 05:32:26 +0000
Message-ID: <VI1PR0701MB2846C892037A515D0B3F4EF8A12B0@VI1PR0701MB2846.eurprd07.prod.outlook.com>
References: <1509700757-34420-1-git-send-email-shile.zhang@nokia-sbell.com>
In-Reply-To: <1509700757-34420-1-git-send-email-shile.zhang@nokia-sbell.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: nokia-sbell.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 69990bca-27f7-4c71-4545-08d52a57ecf8
X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Nov 2017 05:32:26.7289
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 5d471751-9675-428d-917b-70f44f9630b0
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0701MB2847
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi, Russell,

Have you any time to check this patch?
I found this issue/missing in my works, the application cannot mmap big hug=
epage (about 360MB) due to no more contiguous vm from the default "TASK_UNM=
MAPPED_AREA" by legacy bottom-up.
We need this patch to fix this issue.

Could you please help check this patch?

Thanks!

BR, Shile

-----Original Message-----
From: Shile Zhang [mailto:shile.zhang@nokia-sbell.com]=20
Sent: Friday, November 03, 2017 5:19 PM
To: Russell King <linux@armlinux.org.uk>
Cc: linux-kernel@vger.kernel.org; Zhang, Shile (NSB - CN/Hangzhou) <shile.z=
hang@nokia-sbell.com>
Subject: [PATCH] mm/hugetlb: Implement ASLR and topdown for hugetlb mapping=
s

merge from arch/x86

Signed-off-by: Shile Zhang <shile.zhang@nokia-sbell.com>
---
 arch/arm/include/asm/page.h |  1 +
 arch/arm/mm/hugetlbpage.c   | 85 +++++++++++++++++++++++++++++++++++++++++=
++++
 2 files changed, 86 insertions(+)

diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
index 4355f0e..994630f 100644
--- a/arch/arm/include/asm/page.h
+++ b/arch/arm/include/asm/page.h
@@ -144,6 +144,7 @@ extern void copy_page(void *to, const void *from);
=20
 #ifdef CONFIG_KUSER_HELPERS
 #define __HAVE_ARCH_GATE_AREA 1
+#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
 #endif
=20
 #ifdef CONFIG_ARM_LPAE
diff --git a/arch/arm/mm/hugetlbpage.c b/arch/arm/mm/hugetlbpage.c
index fcafb52..46ed0c8 100644
--- a/arch/arm/mm/hugetlbpage.c
+++ b/arch/arm/mm/hugetlbpage.c
@@ -45,3 +45,88 @@ int pmd_huge(pmd_t pmd)
 {
 	return pmd_val(pmd) && !(pmd_val(pmd) & PMD_TABLE_BIT);
 }
+
+#ifdef CONFIG_HUGETLB_PAGE
+static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
+		unsigned long addr, unsigned long len,
+		unsigned long pgoff, unsigned long flags)
+{
+	struct hstate *h =3D hstate_file(file);
+	struct vm_unmapped_area_info info;
+
+	info.flags =3D 0;
+	info.length =3D len;
+	info.low_limit =3D current->mm->mmap_legacy_base;
+	info.high_limit =3D TASK_SIZE;
+	info.align_mask =3D PAGE_MASK & ~huge_page_mask(h);
+	info.align_offset =3D 0;
+	return vm_unmapped_area(&info);
+}
+
+static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
+		unsigned long addr0, unsigned long len,
+		unsigned long pgoff, unsigned long flags)
+{
+	struct hstate *h =3D hstate_file(file);
+	struct vm_unmapped_area_info info;
+	unsigned long addr;
+
+	info.flags =3D VM_UNMAPPED_AREA_TOPDOWN;
+	info.length =3D len;
+	info.low_limit =3D PAGE_SIZE;
+	info.high_limit =3D current->mm->mmap_base;
+	info.align_mask =3D PAGE_MASK & ~huge_page_mask(h);
+	info.align_offset =3D 0;
+	addr =3D vm_unmapped_area(&info);
+
+	/*
+	 * A failed mmap() very likely causes application failure,
+	 * so fall back to the bottom-up function here. This scenario
+	 * can happen with large stack limits and large mmap()
+	 * allocations.
+	 */
+	if (addr & ~PAGE_MASK) {
+		VM_BUG_ON(addr !=3D -ENOMEM);
+		info.flags =3D 0;
+		info.low_limit =3D TASK_UNMAPPED_BASE;
+		info.high_limit =3D TASK_SIZE;
+		addr =3D vm_unmapped_area(&info);
+	}
+
+	return addr;
+}
+
+unsigned long
+hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+		unsigned long len, unsigned long pgoff, unsigned long flags)
+{
+	struct hstate *h =3D hstate_file(file);
+	struct mm_struct *mm =3D current->mm;
+	struct vm_area_struct *vma;
+
+	if (len & ~huge_page_mask(h))
+		return -EINVAL;
+	if (len > TASK_SIZE)
+		return -ENOMEM;
+
+	if (flags & MAP_FIXED) {
+		if (prepare_hugepage_range(file, addr, len))
+			return -EINVAL;
+		return addr;
+	}
+
+	if (addr) {
+		addr =3D ALIGN(addr, huge_page_size(h));
+		vma =3D find_vma(mm, addr);
+		if (TASK_SIZE - len >=3D addr &&
+		    (!vma || addr + len <=3D vma->vm_start))
+			return addr;
+	}
+	if (mm->get_unmapped_area =3D=3D arch_get_unmapped_area)
+		return hugetlb_get_unmapped_area_bottomup(file, addr, len,
+				pgoff, flags);
+	else
+		return hugetlb_get_unmapped_area_topdown(file, addr, len,
+				pgoff, flags);
+}
+#endif /* CONFIG_HUGETLB_PAGE */
--=20
2.6.2


From 1583036110466151975@xxx Fri Nov 03 09:21:20 +0000 2017
X-GM-THRID: 1583036110466151975
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread