From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161485AbXDLCXD (ORCPT ); Wed, 11 Apr 2007 22:23:03 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161483AbXDLCVG (ORCPT ); Wed, 11 Apr 2007 22:21:06 -0400 Received: from ozlabs.org ([203.10.76.45]:55497 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161479AbXDLCUd (ORCPT ); Wed, 11 Apr 2007 22:20:33 -0400 To: Andrew Morton CC: Linux Memory Management , From: Benjamin Herrenschmidt Date: Thu, 12 Apr 2007 12:20:30 +1000 Subject: [PATCH 6/12] get_unmapped_area handles MAP_FIXED on ia64 In-Reply-To: <1176344427.242579.337989891532.qpush@grosgo> Message-Id: <20070412022032.2CDA1DDF2D@ozlabs.org> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Handle MAP_FIXED in ia64 arch_get_unmapped_area and hugetlb_get_unmapped_area(), just call prepare_hugepage_range in the later and is_hugepage_only_range() in the former. Signed-off-by: Benjamin Herrenschmidt arch/ia64/kernel/sys_ia64.c | 7 +++++++ arch/ia64/mm/hugetlbpage.c | 8 ++++++++ 2 files changed, 15 insertions(+) Index: linux-cell/arch/ia64/kernel/sys_ia64.c =================================================================== --- linux-cell.orig/arch/ia64/kernel/sys_ia64.c 2007-03-22 15:10:45.000000000 +1100 +++ linux-cell/arch/ia64/kernel/sys_ia64.c 2007-03-22 15:10:47.000000000 +1100 @@ -33,6 +33,13 @@ arch_get_unmapped_area (struct file *fil if (len > RGN_MAP_LIMIT) return -ENOMEM; + /* handle fixed mapping: prevent overlap with huge pages */ + if (flags & MAP_FIXED) { + if (is_hugepage_only_range(mm, addr, len)) + return -EINVAL; + return addr; + } + #ifdef CONFIG_HUGETLB_PAGE if (REGION_NUMBER(addr) == RGN_HPAGE) addr = 0; Index: linux-cell/arch/ia64/mm/hugetlbpage.c =================================================================== --- linux-cell.orig/arch/ia64/mm/hugetlbpage.c 2007-03-22 15:12:32.000000000 +1100 +++ linux-cell/arch/ia64/mm/hugetlbpage.c 2007-03-22 15:12:39.000000000 +1100 @@ -148,6 +148,14 @@ unsigned long hugetlb_get_unmapped_area( return -ENOMEM; if (len & ~HPAGE_MASK) return -EINVAL; + + /* Handle MAP_FIXED */ + if (flags & MAP_FIXED) { + if (prepare_hugepage_range(addr, len, pgoff)) + return -EINVAL; + return addr; + } + /* This code assumes that RGN_HPAGE != 0. */ if ((REGION_NUMBER(addr) != RGN_HPAGE) || (addr & (HPAGE_SIZE - 1))) addr = HPAGE_REGION_BASE;