From mboxrd@z Thu Jan 1 00:00:00 1970 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 04257C71136 for ; Fri, 13 Jun 2025 13:41:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 66E306B0096; Fri, 13 Jun 2025 09:41:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 61EBB6B0098; Fri, 13 Jun 2025 09:41:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4E8446B0099; Fri, 13 Jun 2025 09:41:24 -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 2914B6B0096 for ; Fri, 13 Jun 2025 09:41:24 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id BE35B5B7A7 for ; Fri, 13 Jun 2025 13:41:23 +0000 (UTC) X-FDA: 83550489246.27.03B9C58 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf25.hostedemail.com (Postfix) with ESMTP id 688ECA000E for ; Fri, 13 Jun 2025 13:41:21 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Zli1rZb7; spf=pass (imf25.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749822081; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=CurRk13BLi453FdNUVmvRv3/1kchAf7liLqepSAurz8=; b=SDd6hjXKHz9l7wVHriu2JsLXu6Y2IK4EN5U4GC6fyl1tGfAUkLdHZ1HM6rFrfdoBObXSMh eNVr6yWQZSa422eSygUri9v0izSexqRSsmgdp2i3YEU73iSgVj308gFu0yi/ZBZitp83ri EdklED+8up5teziihxDKJoVUoLZ470k= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749822081; a=rsa-sha256; cv=none; b=bIfdYPr2hl1ZTkp8sWPPdXoQC7eD3CLC1815h1cbseZh4AcSRecSr0/RwjzOaWWf8qD50r w1/sf5MngD09afAhIkarZr1ahvTQ/oqAzLWYpm9UXB4aqF+ZFm16ROQlnXZ2AfUjAlAEFU 4UF5m2esYUn3z9UXIKlXF2q8i7EVygk= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Zli1rZb7; spf=pass (imf25.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749822080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CurRk13BLi453FdNUVmvRv3/1kchAf7liLqepSAurz8=; b=Zli1rZb7r9Zv1n80XeyN9fMKVpFuxwAttH3qhRwjyA1cYE9TrduVKmI8Wfg3+Ve8A3nhC+ RmAuo2HU7/syx6IJMkKSKIMtSnF4mqz/W5lhLBuRxYxbyV4JsDosXMGPaxLgMQEvMLEVTs xhTn/26389hNzMC8qYgUdUTEMN4zlfM= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-121-G6JBOGdlOyi9oFpm-F8tUA-1; Fri, 13 Jun 2025 09:41:19 -0400 X-MC-Unique: G6JBOGdlOyi9oFpm-F8tUA-1 X-Mimecast-MFC-AGG-ID: G6JBOGdlOyi9oFpm-F8tUA_1749822079 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7c791987cf6so476042685a.0 for ; Fri, 13 Jun 2025 06:41:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749822079; x=1750426879; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CurRk13BLi453FdNUVmvRv3/1kchAf7liLqepSAurz8=; b=HmXyAYKooN8Qunc6jAaSUBmefaV/fzwO7n3BRsQCMJOEdeBQDWBnAwqhBnquoNt+wF ST2eVfF2hdVzJ/pavX7Fi6j7Pbe7jdRZNAFwwcCNkcnxBUqdxFfKKHofhLHr+2lYBZKY HvSurlCaIffLeNR/yCiE/6qgHyEj8jUxFasa7OZuzXTYVO3kXWiFLLwSSZCrpqTZdItF B/8TWpnITG5PPJRPhrwNIMuLZQ3owYHiYK12dpsdy4SSBx2xV8HJm8kwdvaDlG5zVh8q 2+DB2Tee6CHiIFQg3S/E0X8wWQVsHmqfTKTIkSAxJPOqE5UEfuS8rK9h3nWkHl0d+YEj a3+A== X-Forwarded-Encrypted: i=1; AJvYcCWuu/iq5wrk+ZEegYiUKxIvOz/YHvqdZyD04YOG766Ojbe3gtbOkWwXAcVlQJ5yEW7+4i/LK7rwIA==@kvack.org X-Gm-Message-State: AOJu0Yw0E0S5lzPLvZ4B1UFwfSDL1HL47rMgtXmBqK3EjP7lyr76RrQZ Oz4rS9v7ICKutOj2gynkWRDUlwtNsaRp0rWXz2mRdSMoILBaSBf5f+zYn79BVxOpHYMlDOiW0ua zBpOtLdtLXB7zI5cQHUZeAnTHrw4d5a+CL1iJNkbwwkT64bg/vpjN X-Gm-Gg: ASbGncvy3PhP4ZATmuvzlsG+5SY++zQd3RyyM9lrY6lqKuAz7XVwn486VvJk8LKAr9Y a30AhdXlb5sjdUNFWAPNieZb4EcBIziQXe9VQ0+d6YwWtQ35IkS4ibHo8eLUe7+I8tz/VPPVMEH rQRG/JcwgzlDFkbAgl9D2iwYYAADdla6TNNzlxwOzLn8WbOvl9wPi4sfa7H5w4+Xe0qfn28eySG 6vfY6afMxjxqSgO4BayFNC1qcsOueWAUwCLiD7/h+oY4F9w8D7xEOwdfDv8iJ+mxZPvdBLU4gw3 WKzqdT7JizM= X-Received: by 2002:a05:620a:44d0:b0:7d2:27ff:2133 with SMTP id af79cd13be357-7d3bc3b0704mr463528185a.1.1749822079290; Fri, 13 Jun 2025 06:41:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGmKoTuxvL7ffTQWjIUtdV/ylXkzGCctDnDjUG//mfabF7LSk4R8g8f8pkMatkvnCJNdWJBNQ== X-Received: by 2002:a05:620a:44d0:b0:7d2:27ff:2133 with SMTP id af79cd13be357-7d3bc3b0704mr463525385a.1.1749822078879; Fri, 13 Jun 2025 06:41:18 -0700 (PDT) Received: from x1.com ([85.131.185.92]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7d3b8ee3f72sm171519285a.94.2025.06.13.06.41.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jun 2025 06:41:18 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, kvm@vger.kernel.org Cc: Andrew Morton , Alex Williamson , Zi Yan , Jason Gunthorpe , Alex Mastro , David Hildenbrand , Nico Pache , peterx@redhat.com, Huacai Chen , Thomas Bogendoerfer , Muchun Song , Oscar Salvador , loongarch@lists.linux.dev, linux-mips@vger.kernel.org Subject: [PATCH 2/5] mm/hugetlb: Remove prepare_hugepage_range() Date: Fri, 13 Jun 2025 09:41:08 -0400 Message-ID: <20250613134111.469884-3-peterx@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250613134111.469884-1-peterx@redhat.com> References: <20250613134111.469884-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: a_tzSg6N7y7fTPG-4JE7OnZrEibmt0vSA8o5Kq1LJVA_1749822079 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 688ECA000E X-Stat-Signature: 5errxie4gwwxwrdy1ytjoznp78ntq36e X-HE-Tag: 1749822081-950389 X-HE-Meta: U2FsdGVkX18HJeW18iiQRJUKHLKOnPYBvmVmkVFvwTTdSOo8GRypkH+fdOAKRawyHC0T5NrEIAhiopl+es6Qnj8jIDJF4H2uHoTxbPVwmzHSIuwbK5ricO4F89WelhJ05YZZ7PqQuN4LGwQjA1GkfoIhXj5FDqXPwQzwbvhMKKh0a0wSxaRAM/Vl2BjeDyjiyMPuidHTz6vG0wWpwSP+sCUqyli8clbXxiFjyiAGjCafllB2xb+DqV9e417vzoDZAWUI2hiVXO5zKYHhZGbJt9cl9eDUqksfmVOEsM6udftW5saSTFcmup12t6DnrSSXbQ6FzZKLl3DckS9FEk6Dj03WeExpP8jrcCzoTiQPY+InA4llBEEZCJcUXCtFa4/2FBtdzL91CC/mBIwM1j0eafETDpaEUnbWd4xTjEAImNp6VqnH2BvKn1RO1VQW82ZWe7Ex80N7pbWhI5nsYmEH3Fb8u4wPPaHCk0j9OCQDxGKa5ji2q9ry73dyOU2Erv6SzzKyt0IMPEfKd9hY6EqJ0MnMWiRcKOghV3m70+DcVGlsOBXKRSaultu1MhsaS+5qEKVCD5LlgRpaOHWeoe/vfvOC/zmYaiJHimmQVeWIUAlKEiIGg7XbL41953qMisia6gGe1ZZEuD5cUKGNejA5gqs2M6mz8jZmCU9JQLfcpJgeF/ip3TSN/waQHDV+8DoLwvQuiAeR+ltQKPxgu7RJPvDPzUwlS9a16/b2gk/1Gpn5OmNVtMjB1h+P388Ow2WDGxNZyAH0oczPIJvAr1Zr5MQOs0r193fEp5tPD+jJW9QwGygvttzD35/ch6m46Fi7zGAMNWq3E/gbcTgHAqbN2IQz7De//tTdnbRRNh7yZVD/tZgnJ14m8TqglFjXfwuhZm/p5ag3lFFKWrnxjm7fUKh10WNxmddYnwp/ezXLlb1xMLMRyYyhI4ec7QeRzyMoIDMtvW+gtIbbtdWZShL 0/+raWr+ S/hXCyMMinkB0cnAJabiZIriq9Atc3WHHDgQEiG8QRDckhHXOFcLrTgVUYcsZiFbSljTRqFBFb+PTJ0QateBmfRBVaxAx5uW3seUrkCb4z54Ltt5UDjo5L042Ky8FuNN5rHvw+9gydzgTUNS9W7TFLHMpslawnIbfuBottx3h8CAmwhyLtk2mkUy5ZwGjTZTIcepME6gjcFKaopoyGURS9sYuDkNhoIY9/UOyygPNr3aCSbKeUGQP+WAV71w5Ys5y0NlcZWLnkebSdxz5ceMczAQq8r1rzALnI+uZpSp65M8qvcaozwFuMuqqv2Uh413gGrV5akHPGhs6VWAibsduOw28b7AFh+HEEs97TrrJ1tncaf8vU7EDwi7btMOJzIyl4YkWR+Z5iRI+vLwd6R+kPokcqkkJPe9ktXrmJJtkIzY/oNjCg8rZ2KFdCqpGYj9m78tS 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: Only mips and loongarch implemented this API, however what it does was checking against stack overflow for either len or addr. That's already done in arch's arch_get_unmapped_area*() functions, hence not needed. It means the whole API is pretty much obsolete at least now, remove it completely. Cc: Huacai Chen Cc: Thomas Bogendoerfer Cc: Muchun Song Cc: Oscar Salvador Cc: loongarch@lists.linux.dev Cc: linux-mips@vger.kernel.org Signed-off-by: Peter Xu --- arch/loongarch/include/asm/hugetlb.h | 14 -------------- arch/mips/include/asm/hugetlb.h | 14 -------------- fs/hugetlbfs/inode.c | 8 ++------ include/asm-generic/hugetlb.h | 8 -------- include/linux/hugetlb.h | 6 ------ 5 files changed, 2 insertions(+), 48 deletions(-) diff --git a/arch/loongarch/include/asm/hugetlb.h b/arch/loongarch/include/asm/hugetlb.h index 4dc4b3e04225..ab68b594f889 100644 --- a/arch/loongarch/include/asm/hugetlb.h +++ b/arch/loongarch/include/asm/hugetlb.h @@ -10,20 +10,6 @@ uint64_t pmd_to_entrylo(unsigned long pmd_val); -#define __HAVE_ARCH_PREPARE_HUGEPAGE_RANGE -static inline int prepare_hugepage_range(struct file *file, - unsigned long addr, - unsigned long len) -{ - unsigned long task_size = STACK_TOP; - - if (len > task_size) - return -ENOMEM; - if (task_size - len < addr) - return -EINVAL; - return 0; -} - #define __HAVE_ARCH_HUGE_PTE_CLEAR static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep, unsigned long sz) diff --git a/arch/mips/include/asm/hugetlb.h b/arch/mips/include/asm/hugetlb.h index fbc71ddcf0f6..8c460ce01ffe 100644 --- a/arch/mips/include/asm/hugetlb.h +++ b/arch/mips/include/asm/hugetlb.h @@ -11,20 +11,6 @@ #include -#define __HAVE_ARCH_PREPARE_HUGEPAGE_RANGE -static inline int prepare_hugepage_range(struct file *file, - unsigned long addr, - unsigned long len) -{ - unsigned long task_size = STACK_TOP; - - if (len > task_size) - return -ENOMEM; - if (task_size - len < addr) - return -EINVAL; - return 0; -} - #define __HAVE_ARCH_HUGE_PTEP_GET_AND_CLEAR static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep, diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index fc03dd541b4d..32dff13463d2 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -179,12 +179,8 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, if (len & ~huge_page_mask(h)) return -EINVAL; - if (flags & MAP_FIXED) { - if (addr & ~huge_page_mask(h)) - return -EINVAL; - if (prepare_hugepage_range(file, addr, len)) - return -EINVAL; - } + if ((flags & MAP_FIXED) && (addr & ~huge_page_mask(h))) + return -EINVAL; if (addr) addr0 = ALIGN(addr, huge_page_size(h)); diff --git a/include/asm-generic/hugetlb.h b/include/asm-generic/hugetlb.h index 3e0a8fe9b108..4bce4f07f44f 100644 --- a/include/asm-generic/hugetlb.h +++ b/include/asm-generic/hugetlb.h @@ -114,14 +114,6 @@ static inline int huge_pte_none_mostly(pte_t pte) } #endif -#ifndef __HAVE_ARCH_PREPARE_HUGEPAGE_RANGE -static inline int prepare_hugepage_range(struct file *file, - unsigned long addr, unsigned long len) -{ - return 0; -} -#endif - #ifndef __HAVE_ARCH_HUGE_PTEP_SET_WRPROTECT static inline void huge_ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 42f374e828a2..85acdfdbe9f0 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -359,12 +359,6 @@ static inline void hugetlb_show_meminfo_node(int nid) { } -static inline int prepare_hugepage_range(struct file *file, - unsigned long addr, unsigned long len) -{ - return -EINVAL; -} - static inline void hugetlb_vma_lock_read(struct vm_area_struct *vma) { } -- 2.49.0