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 42F55CFB440 for ; Mon, 7 Oct 2024 07:51:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E27B76B00FF; Mon, 7 Oct 2024 03:51:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DABE96B0101; Mon, 7 Oct 2024 03:51:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BB10D6B0102; Mon, 7 Oct 2024 03:51:01 -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 91DB16B00FF for ; Mon, 7 Oct 2024 03:51:01 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 5005F41587 for ; Mon, 7 Oct 2024 07:51:01 +0000 (UTC) X-FDA: 82646035122.02.7ACDED1 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf16.hostedemail.com (Postfix) with ESMTP id 2F842180006 for ; Mon, 7 Oct 2024 07:50:58 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1728287282; 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:in-reply-to:references:references; bh=kq2RdgQb0mKyeaOHfiwxxd77dxocKDNXtjk1ZFwjev0=; b=BkUMSHJL/Y15AlCJlUep9JrS6GU37NzwymNtvBfDzJVHEzkvzJYXAiLt5AlIKphdAFdADI J90YJlGoeyIpCxWz8b9990jFxOgSSJQt40uAqh3uHT25GqjssNnaLbQhRPB/44vx5BDkM1 9dN4NBFsmhTBDX5AF/o5uJ9+XwNpAT4= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728287282; a=rsa-sha256; cv=none; b=JQ1/hIaMIxHfYxw31DM8so7KoH3z0JvTF9rV8gNnmPhjLEVPNUR2TcY5fTOqs6RNWQOgmu 2M1XgnMC0YztgkklNrMGqaZ1wz3K+Gy87TBlzVv4Gxibv8DYYAV09ag29UJAASEdddJ5QW 0kFt1/kuBY/hiMA08pndlRvZOoCKQYI= Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id DF4751FD26; Mon, 7 Oct 2024 07:50:57 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 3FF8C132BD; Mon, 7 Oct 2024 07:50:57 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id cObODOGSA2d6cQAAD6G6ig (envelope-from ); Mon, 07 Oct 2024 07:50:57 +0000 From: Oscar Salvador To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Peter Xu , Muchun Song , David Hildenbrand , Donet Tom , Vlastimil Babka , Michal Hocko , Lorenzo Stoakes , Oscar Salvador Subject: [PATCH v4 9/9] mm: Consolidate common checks in hugetlb_get_unmapped_area Date: Mon, 7 Oct 2024 09:50:37 +0200 Message-ID: <20241007075037.267650-10-osalvador@suse.de> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241007075037.267650-1-osalvador@suse.de> References: <20241007075037.267650-1-osalvador@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Action: no action X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 2F842180006 X-Stat-Signature: nj53kqfaufu1zap6ir8har5m9wesq5m1 X-Rspam-User: X-HE-Tag: 1728287458-965155 X-HE-Meta: U2FsdGVkX185qVj0Lhd3exX7uEZRG5FPgEjzI+YYWce/30U26wxWboCpxQw3MqRwldpUhGFqSJm0cKpbuZx3YF0/x7v/FY+1XqqNssvNjOv4Q4MYfFBopSpXCNvWMTCyXJZt0lLB6lHqhCRRMobcb9NC7EisebYx7zN0VnLRTgUp+CiUYIN0e/OOUcaQZSaIUgSHaAF3Ov5q2Y53oilgd/8LJ5+EuGmQ1rMmnxU7YnHCvG3PmKcWzbtPW/9ccDGqV3fPvcUisT8INSfFUN8GekvBabvHikWU2lERM3og9hWLq1MW+tu1GhftUjNywfDP8mamqKeKnPAw9MoaV/IuVnArMpEev9t8k/bbnJHGl63jziKRsdPg3y4Q3G4+03kUb0dbBe9TwX2yj7byBIKtpYhXBrk2/NF07AwSlTn+3L8DV/WS6M0zy7/OLabLaCKLmFzMsjpG/rCcruC20ZHnBeufsPKWvlxTeUvSVAntJ2bjfud3rdO2TmDfGruTQu4U5kshoY6aVdDuMi5p04GD71FDZTXQLPwPLHUZ0p8Lupu36P7N0Wfypx1AP6fJVKrf8DedZ++HXZi4CJOgcQCsXOi/uueNYBbzO061awJVKSXtP+1hTfQvFqV8tbYZ1L4RIaGjYbvX9KYXRBfRMOj2dSOKqURCvWMHqMrMb/4CRBdMwH6VITykyeA9qK9+//FcQEq+6aMHC8D/Ctq0XqHn3n4u67zXRfExhBUPq82HJ7rEdw1zEoITENtLP7Z6Q1vRXF/c6aYXt5wb35H5gJqDDyKocKHWehaKqSK5S4xeETD3sC+6A16hjHIdSwULcMU/zHY7b3iMF76u5ulu8je5ctch+r4C/mzt/vgBSTbDqY5ajEuf04jiRF2LPxK4q71MDhZTRa48yyiaXMxof51bxSVCDmxEJPp3sFuWXbOAVJQhvRj44Re5gpVrWKVvqH1J0khlUSOtl6T1+JPkFxl DO7zjsD/ axcXjK737HMDDYGtuv2NqTQG3ulfhmAeD4IyqTIsONpaJg+AbLoEMT4sOCCWwXQFrJnxTpWUw5s/+ZS8fNZzKXlWvMuTrbzJ14kpiW1MKOP6X5EYOGwuAmNOr8yWiepkHJjWu92y66x+k/pRdx2NQmXny3rg9OZD8dEzlzvrUY5b/4GY= 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: prepare_hugepage_range() performs almost the same checks for all architectures that define it, with the exception of mips and loongarch that also check for overflows. The rest checks for the addr and len to be properly aligned, so we can move that to hugetlb_get_unmapped_area() and get rid of a fair amount of duplicated code. Signed-off-by: Oscar Salvador --- arch/loongarch/include/asm/hugetlb.h | 5 ----- arch/mips/include/asm/hugetlb.h | 4 ---- arch/parisc/include/asm/hugetlb.h | 15 --------------- arch/s390/include/asm/hugetlb.h | 17 ----------------- arch/sh/include/asm/hugetlb.h | 15 --------------- fs/hugetlbfs/inode.c | 8 ++++++-- include/asm-generic/hugetlb.h | 7 ------- 7 files changed, 6 insertions(+), 65 deletions(-) diff --git a/arch/loongarch/include/asm/hugetlb.h b/arch/loongarch/include/asm/hugetlb.h index 5da32c00d483..b837c65a4894 100644 --- a/arch/loongarch/include/asm/hugetlb.h +++ b/arch/loongarch/include/asm/hugetlb.h @@ -16,12 +16,7 @@ static inline int prepare_hugepage_range(struct file *file, unsigned long len) { unsigned long task_size = STACK_TOP; - struct hstate *h = hstate_file(file); - if (len & ~huge_page_mask(h)) - return -EINVAL; - if (addr & ~huge_page_mask(h)) - return -EINVAL; if (len > task_size) return -ENOMEM; if (task_size - len < addr) diff --git a/arch/mips/include/asm/hugetlb.h b/arch/mips/include/asm/hugetlb.h index fd69c8808554..6a63d82a8ab3 100644 --- a/arch/mips/include/asm/hugetlb.h +++ b/arch/mips/include/asm/hugetlb.h @@ -19,10 +19,6 @@ static inline int prepare_hugepage_range(struct file *file, unsigned long task_size = STACK_TOP; struct hstate *h = hstate_file(file); - if (len & ~huge_page_mask(h)) - return -EINVAL; - if (addr & ~huge_page_mask(h)) - return -EINVAL; if (len > task_size) return -ENOMEM; if (task_size - len < addr) diff --git a/arch/parisc/include/asm/hugetlb.h b/arch/parisc/include/asm/hugetlb.h index 72daacc472a0..5b3a5429f71b 100644 --- a/arch/parisc/include/asm/hugetlb.h +++ b/arch/parisc/include/asm/hugetlb.h @@ -12,21 +12,6 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep); -/* - * If the arch doesn't supply something else, assume that hugepage - * size aligned regions are ok without further preparation. - */ -#define __HAVE_ARCH_PREPARE_HUGEPAGE_RANGE -static inline int prepare_hugepage_range(struct file *file, - unsigned long addr, unsigned long len) -{ - if (len & ~HPAGE_MASK) - return -EINVAL; - if (addr & ~HPAGE_MASK) - return -EINVAL; - return 0; -} - #define __HAVE_ARCH_HUGE_PTEP_CLEAR_FLUSH static inline pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep) diff --git a/arch/s390/include/asm/hugetlb.h b/arch/s390/include/asm/hugetlb.h index 37e80a32623a..6f815d4ba0ca 100644 --- a/arch/s390/include/asm/hugetlb.h +++ b/arch/s390/include/asm/hugetlb.h @@ -25,23 +25,6 @@ extern pte_t huge_ptep_get(struct mm_struct *mm, unsigned long addr, pte_t *ptep extern pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep); -/* - * If the arch doesn't supply something else, assume that hugepage - * size aligned regions are ok without further preparation. - */ -#define __HAVE_ARCH_PREPARE_HUGEPAGE_RANGE -static inline int prepare_hugepage_range(struct file *file, - unsigned long addr, unsigned long len) -{ - struct hstate *h = hstate_file(file); - - if (len & ~huge_page_mask(h)) - return -EINVAL; - if (addr & ~huge_page_mask(h)) - return -EINVAL; - return 0; -} - static inline void arch_clear_hugetlb_flags(struct folio *folio) { clear_bit(PG_arch_1, &folio->flags); diff --git a/arch/sh/include/asm/hugetlb.h b/arch/sh/include/asm/hugetlb.h index 75028bd568ba..4a92e6e4d627 100644 --- a/arch/sh/include/asm/hugetlb.h +++ b/arch/sh/include/asm/hugetlb.h @@ -5,21 +5,6 @@ #include #include -/* - * If the arch doesn't supply something else, assume that hugepage - * size aligned regions are ok without further preparation. - */ -#define __HAVE_ARCH_PREPARE_HUGEPAGE_RANGE -static inline int prepare_hugepage_range(struct file *file, - unsigned long addr, unsigned long len) -{ - if (len & ~HPAGE_MASK) - return -EINVAL; - if (addr & ~HPAGE_MASK) - return -EINVAL; - return 0; -} - #define __HAVE_ARCH_HUGE_PTEP_CLEAR_FLUSH static inline pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 935c0ed3aa1e..c6191a6118b8 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -181,8 +181,12 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, if (len & ~huge_page_mask(h)) return -EINVAL; - if ((flags & MAP_FIXED) && prepare_hugepage_range(file, addr, len)) - return -EINVAL; + if (flags & MAP_FIXED) { + if (addr & ~huge_page_mask(h)) + return -EINVAL; + if (prepare_hugepage_range(file, addr, len)) + 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 67bbdafcfc22..f42133dae68e 100644 --- a/include/asm-generic/hugetlb.h +++ b/include/asm-generic/hugetlb.h @@ -123,13 +123,6 @@ static inline int huge_pte_none_mostly(pte_t pte) static inline int prepare_hugepage_range(struct file *file, unsigned long addr, unsigned long len) { - struct hstate *h = hstate_file(file); - - if (len & ~huge_page_mask(h)) - return -EINVAL; - if (addr & ~huge_page_mask(h)) - return -EINVAL; - return 0; } #endif -- 2.46.1