From patchwork Fri Jul 5 07:11:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Donet Tom X-Patchwork-Id: 13724455 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6261C30658 for ; Fri, 5 Jul 2024 07:12:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 459036B009C; Fri, 5 Jul 2024 03:12:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3E12B6B009D; Fri, 5 Jul 2024 03:12:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 25AB76B009E; Fri, 5 Jul 2024 03:12:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 063656B009C for ; Fri, 5 Jul 2024 03:12:22 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D019614138C for ; Fri, 5 Jul 2024 07:12:21 +0000 (UTC) X-FDA: 82304830482.10.8498AFE Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf22.hostedemail.com (Postfix) with ESMTP id 82CF7C0007 for ; Fri, 5 Jul 2024 07:12:19 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=J0HDYNGL; spf=pass (imf22.hostedemail.com: domain of donettom@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=donettom@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720163505; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=pRQBcVVboMVQutaQ1jmQY6cco5Sa2Hjod70KHYWESSw=; b=qEnuS+/Uj0VGyZXT6+AUWvhgyLWS/dDwCLJ6eZpKvm0tERqVEtnfebhwhWKtBXHmevumYA tt6hMX6bIo3ZLnEtS+ZsImj6AA5N/4qza+av1yuTAnIqzXVreW7gxc32iM+PlUFCmG39dX /ZjKeONIeVZgeTpOH/I4n6ypeeQ5Nq4= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=J0HDYNGL; spf=pass (imf22.hostedemail.com: domain of donettom@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=donettom@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720163505; a=rsa-sha256; cv=none; b=KLsnzNLSh8MiMZLc1F8qJCXb3DWiIHthBeOluWJOxRrj1Bmk4QUGHMFX5xQE8ZkEi5fjll Tf1vNE2s+JvKRKpTIFkZozfsSK0eLm1aBi0jhbQlQX6jzRU+j5jxcvepvCTocoLWVUMH1k 8I9KFtUvJDkdaCXvEToKLF6tdCZaURM= Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4656QikE000604; Fri, 5 Jul 2024 07:12:03 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from :to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=pp1; bh=pRQBcVVboMVQutaQ1jmQY6cco5 Sa2Hjod70KHYWESSw=; b=J0HDYNGLdYgASyYnofttTTN8hRjbug0aIYwFp5s9hg cvN5iBleliBjFbwBSkFfu4VFluap2o/LbF3EJ03v016k8TQm6dDAMO8HmUSOdI7C nUsbPffJpiJ+g41h26qE+VexxdMzxCcTTVUzCYiHxH8Znbp9t5BlkWnZTG7TamCW 4hhb0WBykEU4Fczi0FGxoJMx05yAmMsLk7priZHog+bU2MZ2XL9q5/LXuq7tEY8c MipBuGqSjiQ0c6L5L+osb5cR8hXZ4SmmgXfm29f+QgVBMuSJT5OgMVqfkb/gFmad CNjhvHPDWtwVkjwWht/m5VzxWl764+gAFLiiwOnLeyFA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 406b5ag53c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 Jul 2024 07:12:02 +0000 (GMT) Received: from m0360083.ppops.net (m0360083.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 4657C1Cs003717; Fri, 5 Jul 2024 07:12:02 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 406b5ag538-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 Jul 2024 07:12:01 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 4653XFdw029195; Fri, 5 Jul 2024 07:12:00 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 402x3nc66v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 05 Jul 2024 07:12:00 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 4657BunC21234118 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 5 Jul 2024 07:11:58 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6F28A2004B; Fri, 5 Jul 2024 07:11:56 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1E26E20043; Fri, 5 Jul 2024 07:11:54 +0000 (GMT) Received: from ltczz402-lp1.aus.stglabs.ibm.com (unknown [9.40.194.31]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 5 Jul 2024 07:11:53 +0000 (GMT) From: Donet Tom To: Andrew Morton , Muchun Song Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Ritesh Harjani , Mike Rapoport , David Hildenbrand , Matthew Wilcox , Tony Battersby , "Aneesh Kumar K . V" , Nicholas Piggin , "Kirill A . Shutemov" , Alexei Starovoitov , Andy Lutomirski , Donet Tom Subject: [PATCH] fs/hugetlbfs/inode.c: Ensure generic_hugetlb_get_unmapped_area() returns higher address than mmap_min_addr Date: Fri, 5 Jul 2024 02:11:50 -0500 Message-ID: <20240705071150.84972-1-donettom@linux.ibm.com> X-Mailer: git-send-email 2.43.5 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 7xL22XUaxd0RtczpMHp9W9I0o08bZ7zO X-Proofpoint-ORIG-GUID: dwdz3dUsdfw1_XqqRJX1qMvD6o-kHuMl X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-05_03,2024-07-03_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 bulkscore=0 spamscore=0 phishscore=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 mlxscore=0 suspectscore=0 impostorscore=0 mlxlogscore=921 clxscore=1011 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2406140001 definitions=main-2407050049 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 82CF7C0007 X-Stat-Signature: nq4wa43zqfo7ib71x8ngfrykibm6ntxg X-Rspam-User: X-HE-Tag: 1720163539-320428 X-HE-Meta: U2FsdGVkX1/HiYPDWG52bbeoGkE4YAhI1xEbuprfDAMZnD0fXLAIirO4j7XgyDSIIebIKsK5x/BhSY9ZdFo/9brd1WtuLsnj7GC956Cab2D9zXrSC16ZBZNIUTg9C5dWo52wRnzWCYd2mrFQt5yHC2X8ohwodoqfmncXdjylfJX/wrqTYBpToW3t+lFwkvrRvWMZ7ssk31YXRLKFExBw0uEIXFetSfORmaZnw9fG7hk21vYbR7fFMfBYQ+3/dDaRIkC078oyE6uBNK3YfoEeJBzS+1r7H5GHqbgr0SLcfTg0yTFC93rWKUmVlBvZSOyVfOSrm4jqQ9cTDlq+tqm2IXBIh4Rj1WjjiwJRroH9y0qf97EqgBsQwBR18hiCQIq7+oo/+s0IhnqJp17SgIfo74LAM4bTUZuBKrT87Ty0YUTiwGZ4eqSSnbv1oUjy4G6uKMK5pCrFwPcmZhBCBMq/r5MW/5uD6tMkj//WwltiHcYQrXhaUDBGi+tgi4H0btV1nA5rtFO/NvUzHUpDUJpofPDYh4y0h1WUNmxcpnJsuV03fJjEs1IpR7e+6QWQdoduYYGWpk9JmUz6db2CI1/1Np5pRF/pWeC5KLPcOrO1edGtTOqYDsYWGpUDtoyYypMuk2DvFGbyKaB9sn0DiCN3SPpXCA7pgS9qycd7jlRy1rcIrPEW/1oECwAenAVD0O3RsCWZCM7ulLCOgw1DJChegQNE93s6iEqjuuGJy7pmYcLxTORfQNtBw52JlRTo6Rv8LcY5WR94sitILn1M6mMe2Wr8qTEzIXcngYwu35Dfx4jFoAWIhG5wqqqkrBHsWjQRG6X60+q+ScotQ1iJbQPjOqHuhdeDaJbfMWHVjNYOia4fXOH/8vIB4ud+qTAJBqd8ESnU1LDuzAPsArlS6hhp1soXSsyqxvIFjoonZ5KqJBy4U2UsEZHhrHu3nDR4YLibbrrmtiukzK75KwUn/3A F1vir8dp Q4PeEnwCm4pCBh5YoF3c4o51GazJqRd+zgr4fG5ZcnjB+ZCSPjvvM6OuzPT7CZOiNjRPja0Z4KqJFRw/7HcDJoxYoOU2QxWHJiK/c7qJYsc/oPDJl2cgowMWvr0kgaBBhVdRf4dx4LDaIiRFAYb3jWC1bPBDSIbQmB+PlnKRefbaVYNaFmtlKMQyS6PqSb0UeVl8Cn62kAf2bzOiqCMt9M3ym0iGPE6/c9LGXvprT3ubrRfPsuyfUWpp4Mutx64mlkqcWUh+he619R6bIEoz012bgMgyouVK7ZWJJnZfPvX5+lqc= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: generic_hugetlb_get_unmapped_area() was returning an address less than mmap_min_addr if the mmap argument addr, after alignment, was less than mmap_min_addr, causing mmap to fail. This is because current generic_hugetlb_get_unmapped_area() code does not take into account mmap_min_addr. This patch ensures that generic_hugetlb_get_unmapped_area() always returns an address that is greater than mmap_min_addr. How to reproduce ================ #include #include #include #include #define HUGEPAGE_SIZE (16 * 1024 * 1024) int main() { void *addr = mmap((void *)-1, HUGEPAGE_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS | MAP_HUGETLB, -1, 0); if (addr == MAP_FAILED) { perror("mmap"); exit(EXIT_FAILURE); } snprintf((char *)addr, HUGEPAGE_SIZE, "Hello, Huge Pages!"); printf("%s\n", (char *)addr); if (munmap(addr, HUGEPAGE_SIZE) == -1) { perror("munmap"); exit(EXIT_FAILURE); } return 0; } Result without fix ================== # cat /proc/meminfo |grep -i HugePages_Free HugePages_Free: 20 # ./test mmap: Permission denied # Result with fix =============== # cat /proc/meminfo |grep -i HugePages_Free HugePages_Free: 20 # ./test Hello, Huge Pages! # Reported-by Pavithra Prakash Signed-off-by: Donet Tom --- fs/hugetlbfs/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 412f295acebe..428fd2f0e4c4 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -228,7 +228,7 @@ generic_hugetlb_get_unmapped_area(struct file *file, unsigned long addr, if (len & ~huge_page_mask(h)) return -EINVAL; - if (len > TASK_SIZE) + if (len > mmap_end - mmap_min_addr) return -ENOMEM; if (flags & MAP_FIXED) { @@ -240,7 +240,7 @@ generic_hugetlb_get_unmapped_area(struct file *file, unsigned long addr, if (addr) { addr = ALIGN(addr, huge_page_size(h)); vma = find_vma(mm, addr); - if (mmap_end - len >= addr && + if (mmap_end - len >= addr && addr >= mmap_min_addr && (!vma || addr + len <= vm_start_gap(vma))) return addr; }