From patchwork Mon Jul 29 09:10:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 13744632 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 222BDC3DA61 for ; Mon, 29 Jul 2024 09:10:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2C6FD6B0098; Mon, 29 Jul 2024 05:10:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 24EF66B0099; Mon, 29 Jul 2024 05:10:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0A18C6B009A; Mon, 29 Jul 2024 05:10:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id DD17D6B0098 for ; Mon, 29 Jul 2024 05:10:48 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 97869C01EF for ; Mon, 29 Jul 2024 09:10:48 +0000 (UTC) X-FDA: 82392220176.17.CFA1DAE Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf10.hostedemail.com (Postfix) with ESMTP id 70F17C0022 for ; Mon, 29 Jul 2024 09:10:46 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="volHx/Xn"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=knVJwYfi; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="volHx/Xn"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=knVJwYfi; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf10.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722244243; a=rsa-sha256; cv=none; b=NdlspAlkaxdG1D5kg+H5hFZL+1q4OdGVI3SjmvIlbiZ55SiOOETvyfOYXUUODJsErEMGj6 6Oem7WcxCFe1nHugHQK/Lh1A/oDkdH4yIad2GHeGe8sDnsp3aHYb0DtC0JWKwV7j8F6JTR XjAu14UNAZR+4f0XHXXkUUOOCwfGfI4= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="volHx/Xn"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=knVJwYfi; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="volHx/Xn"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=knVJwYfi; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf10.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1722244243; 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:dkim-signature; bh=JABgt96y6DRapGbl7s1JS+H2Wcm/YvsqoufOGq2+3+w=; b=jGdsnON0z+YckjkIr8kAY8VxhRxXphckylg2cASQEfdQQMeaXZHo3hkz48PP0t9Fv3s0Js 6ts20zaexjFX0laHaOQg/BNfxpZpicwp27lSD4smTnb2ts3b3/NgAGOv8jYqkuU+sQqfW0 l9+rHJAJkgQBY0uUcIQj59W5R18Do0M= Received: from imap1.dmz-prg2.suse.org (unknown [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 258031F793; Mon, 29 Jul 2024 09:10:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1722244245; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JABgt96y6DRapGbl7s1JS+H2Wcm/YvsqoufOGq2+3+w=; b=volHx/XnPqMA5RFciXwgbwhjRFqMgyRXT4+kbJpga0ccIN8LhNl3ops1qKrZkwIAwGqnD4 B1A6WZEyCFCAak3QmYguTubIpnY2H2K/wyb4b4N/3HfYZ/ZsDcly7oL1N5D2P/FTPWFv5v tKhgYrSOZ+J9hxQ+zN7o/2YcyQVYKc8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1722244245; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JABgt96y6DRapGbl7s1JS+H2Wcm/YvsqoufOGq2+3+w=; b=knVJwYfiadUdI5HIXe4e8AZ6S+VUmm7xE/xmqdsqxRUJ+CsFVcNU1YW9RneEdovsyeiL2V i9lLuNjU7s0+WpCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1722244245; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JABgt96y6DRapGbl7s1JS+H2Wcm/YvsqoufOGq2+3+w=; b=volHx/XnPqMA5RFciXwgbwhjRFqMgyRXT4+kbJpga0ccIN8LhNl3ops1qKrZkwIAwGqnD4 B1A6WZEyCFCAak3QmYguTubIpnY2H2K/wyb4b4N/3HfYZ/ZsDcly7oL1N5D2P/FTPWFv5v tKhgYrSOZ+J9hxQ+zN7o/2YcyQVYKc8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1722244245; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JABgt96y6DRapGbl7s1JS+H2Wcm/YvsqoufOGq2+3+w=; b=knVJwYfiadUdI5HIXe4e8AZ6S+VUmm7xE/xmqdsqxRUJ+CsFVcNU1YW9RneEdovsyeiL2V i9lLuNjU7s0+WpCg== 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 89CA11368A; Mon, 29 Jul 2024 09:10:43 +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 MMqyG5Ncp2Z4BgAAD6G6ig (envelope-from ); Mon, 29 Jul 2024 09:10:43 +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 , Matthew Wilcox , Vlastimil Babka , Michal Hocko , Oscar Salvador Subject: [PATCH v2 8/9] arch/s390: Clean up hugetlb definitions Date: Mon, 29 Jul 2024 11:10:17 +0200 Message-ID: <20240729091018.2152-9-osalvador@suse.de> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240729091018.2152-1-osalvador@suse.de> References: <20240729091018.2152-1-osalvador@suse.de> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 70F17C0022 X-Rspamd-Server: rspam01 X-Stat-Signature: emas1aocnrd5hcep8cry3qm8t4hb9uxp X-HE-Tag: 1722244246-842967 X-HE-Meta: U2FsdGVkX18w291VUk4RfOk53ngn22+xcITshR2O8y09BtExzUufwCj2THTorRCNyDMgLfInvTaN5f+7U/mqWmQlIxXtDA4V7oKgWOb2OEzztxjSaQ+f84722FK8ihrA40pQrH+ZA387vTjrNe4bt+grmYQlacbE9nU00w79a0WdpXBwG52V0EmeAzYeFE1QIOuAW9PbclQL577gXOMNgynNhMbUK5wVeXWdXTx0hIfSrSY+LcWDKIBFiaA8/V3Mb9H3T2y0hyVUr5cWryClApkyr0NKe+iVLEzVFfWLFhVN4sYRSKKoaA4+8/5NAG4fXfbOVXUmVJy/chUquQ+FO0e7n5jVj58nPKUFyniOu73pxcwmJ43UM3jKfLBDDnQPQv/79miKq8BQ0bCGoudNGjoUOsAzgeVzyhOPv7/LhYSjnDnLlj4FHIJaKNbt51cUwDuC0Vk+j9CNsBuIVRhQnFkyVwvhwEI6Dg2QgAD2hXL0efx2AykCWp3u0knDnVQaoRAZUTfDO5nsdCtOd7jCGN5fvRCay4jM5h5larO108fSctDs/7kdgOLwV7X97Js26oOaH00pXhUP77NojZ9EPX/cPY9kglYvfF4fZiHfVfRUUkSQEXhgiKhycWnSH9Yte7R9dH4ilyKLAy82ACofD9jYFcsV/LxvwYB746j8tbCDKKMUOsjvp2J7VpEz1qtsAVJMm4cdMRy/2UOE696CVW3kgTxGvRnPhXyJs3AkBZV6AVlPTmckMeymuMHxISNiEPAX0ZVV3Qutmh9FBshmlhbRcT9+Zv1nUFGDlWMBm1r6oy7VyJBCb2/1goA0alJCzLuzvh5el4Q/Eof2e9DDa0KonA2hnUiKxMfv+y+GAlkBJQYTA60WsbpDwUoU568ov7nYSfcQHGLrcK2l3mtDQ49HbuehtEWgGvNERg52s6r+KnZdippEQapTVlatBm72+mYZ2+EGLdjksarcWcR c7INBWep 4UJ0FJCMLi4bgnBR7D2I2Y0Sp3D3kx8KWm/PeoxLCSObdbmTotAAt07kAEz3EbAvT3588YpbDqlXdaqcosAn6Ij6jn7gffzP5pxiXJrMm/CBAjYiYFhpbzeBx55UtFHp4WAf8R01aXinFNnU3xR2audbSn88L6AEPpAQLyP24dmg5SkRwlmfUy3aD5a96RtiE5hMJHfWBOrQucCGdR92DZAWLNzTvf9Ipdm0HURA0KQ7C3D4= 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: s390 redefines functions that are already defined (and the same) in include/asm-generic/hugetlb.h. Do as the other architectures: 1) include include/asm-generic/hugetlb.h 2) drop the already defined functions in the generic hugetlb.h and 3) use the __HAVE_ARCH_HUGE_* macros to define our own. This gets rid of quite some code. Signed-off-by: Oscar Salvador --- arch/s390/include/asm/hugetlb.h | 58 +++++++++------------------------ include/asm-generic/hugetlb.h | 8 +++++ 2 files changed, 24 insertions(+), 42 deletions(-) diff --git a/arch/s390/include/asm/hugetlb.h b/arch/s390/include/asm/hugetlb.h index cf1b5d6fb1a6..37e80a32623a 100644 --- a/arch/s390/include/asm/hugetlb.h +++ b/arch/s390/include/asm/hugetlb.h @@ -12,21 +12,24 @@ #include #include -#define hugetlb_free_pgd_range free_pgd_range #define hugepages_supported() (MACHINE_HAS_EDAT1) +#define __HAVE_ARCH_HUGE_SET_HUGE_PTE_AT void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte, unsigned long sz); void __set_huge_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte); -pte_t huge_ptep_get(struct mm_struct *mm, unsigned long addr, pte_t *ptep); -pte_t huge_ptep_get_and_clear(struct mm_struct *mm, +#define __HAVE_ARCH_HUGE_PTEP_GET +extern pte_t huge_ptep_get(struct mm_struct *mm, unsigned long addr, pte_t *ptep); +#define __HAVE_ARCH_HUGE_PTEP_GET_AND_CLEAR +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) { @@ -45,6 +48,7 @@ static inline void arch_clear_hugetlb_flags(struct folio *folio) } #define arch_clear_hugetlb_flags arch_clear_hugetlb_flags +#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) { @@ -54,12 +58,14 @@ static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr, set_pte(ptep, __pte(_SEGMENT_ENTRY_EMPTY)); } +#define __HAVE_ARCH_HUGE_PTEP_CLEAR_FLUSH static inline pte_t huge_ptep_clear_flush(struct vm_area_struct *vma, unsigned long address, pte_t *ptep) { return huge_ptep_get_and_clear(vma->vm_mm, address, ptep); } +#define __HAVE_ARCH_HUGE_PTEP_SET_ACCESS_FLAGS static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, pte_t pte, int dirty) @@ -72,6 +78,7 @@ static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma, return changed; } +#define __HAVE_ARCH_HUGE_PTEP_SET_WRPROTECT static inline void huge_ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep) { @@ -79,69 +86,36 @@ static inline void huge_ptep_set_wrprotect(struct mm_struct *mm, __set_huge_pte_at(mm, addr, ptep, pte_wrprotect(pte)); } -static inline pte_t mk_huge_pte(struct page *page, pgprot_t pgprot) -{ - return mk_pte(page, pgprot); -} - +#define __HAVE_ARCH_HUGE_PTE_NONE static inline int huge_pte_none(pte_t pte) { return pte_none(pte); } +#define __HAVE_ARCH_HUGE_PTE_NONE_MOSTLY static inline int huge_pte_none_mostly(pte_t pte) { return huge_pte_none(pte); } -static inline int huge_pte_write(pte_t pte) -{ - return pte_write(pte); -} - -static inline int huge_pte_dirty(pte_t pte) -{ - return pte_dirty(pte); -} - -static inline pte_t huge_pte_mkwrite(pte_t pte) -{ - return pte_mkwrite_novma(pte); -} - -static inline pte_t huge_pte_mkdirty(pte_t pte) -{ - return pte_mkdirty(pte); -} - -static inline pte_t huge_pte_wrprotect(pte_t pte) -{ - return pte_wrprotect(pte); -} - -static inline pte_t huge_pte_modify(pte_t pte, pgprot_t newprot) -{ - return pte_modify(pte, newprot); -} - +#define __HAVE_ARCH_HUGE_PTE_MKUFFD_WP static inline pte_t huge_pte_mkuffd_wp(pte_t pte) { return pte; } +#define __HAVE_ARCH_HUGE_PTE_CLEAR_UFFD_WP static inline pte_t huge_pte_clear_uffd_wp(pte_t pte) { return pte; } +#define __HAVE_ARCH_HUGE_PTE_UFFD_WP static inline int huge_pte_uffd_wp(pte_t pte) { return 0; } -static inline bool gigantic_page_runtime_supported(void) -{ - return true; -} +#include #endif /* _ASM_S390_HUGETLB_H */ diff --git a/include/asm-generic/hugetlb.h b/include/asm-generic/hugetlb.h index 594d5905f615..67bbdafcfc22 100644 --- a/include/asm-generic/hugetlb.h +++ b/include/asm-generic/hugetlb.h @@ -42,20 +42,26 @@ static inline pte_t huge_pte_modify(pte_t pte, pgprot_t newprot) return pte_modify(pte, newprot); } +#ifndef __HAVE_ARCH_HUGE_PTE_MKUFFD_WP static inline pte_t huge_pte_mkuffd_wp(pte_t pte) { return huge_pte_wrprotect(pte_mkuffd_wp(pte)); } +#endif +#ifndef __HAVE_ARCH_HUGE_PTE_CLEAR_UFFD_WP static inline pte_t huge_pte_clear_uffd_wp(pte_t pte) { return pte_clear_uffd_wp(pte); } +#endif +#ifndef __HAVE_ARCH_HUGE_PTE_UFFD_WP static inline int huge_pte_uffd_wp(pte_t pte) { return pte_uffd_wp(pte); } +#endif #ifndef __HAVE_ARCH_HUGE_PTE_CLEAR static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr, @@ -106,10 +112,12 @@ static inline int huge_pte_none(pte_t pte) #endif /* Please refer to comments above pte_none_mostly() for the usage */ +#ifndef __HAVE_ARCH_HUGE_PTE_NONE_MOSTLY static inline int huge_pte_none_mostly(pte_t pte) { return huge_pte_none(pte) || is_pte_marker(pte); } +#endif #ifndef __HAVE_ARCH_PREPARE_HUGEPAGE_RANGE static inline int prepare_hugepage_range(struct file *file,