From patchwork Tue Sep 10 08:00:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 13798087 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 03581ECE564 for ; Tue, 10 Sep 2024 08:01:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 575388D002D; Tue, 10 Sep 2024 04:00:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 526838D002B; Tue, 10 Sep 2024 04:00:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 350628D002D; Tue, 10 Sep 2024 04:00:59 -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 13B3D8D002B for ; Tue, 10 Sep 2024 04:00:59 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id C35FEA0591 for ; Tue, 10 Sep 2024 08:00:58 +0000 (UTC) X-FDA: 82548082596.14.FA443FC Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf01.hostedemail.com (Postfix) with ESMTP id 953474000F for ; Tue, 10 Sep 2024 08:00:56 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=2GspKjyB; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=46XjDi1L; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=2GspKjyB; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=46XjDi1L; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf01.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=1725955142; 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=cZehZ4EsXNdPsp2SmJYWqrY7IQ/nAPk4m8G2oQEC7r0=; b=6Zt2cSf2AHT7rGFoNfCF1Z+mlfiigUBXRdVEdNfhdUkOFGwDqo4ZWuIiHP6MduWI4qbilR vZXPTVZHro102TJe+UJmIC29++4jHutH1d8aFMz5Kd/bmr3CGBDsN2esFuhtjmtV8szcTG k6einvE6sPu9JgMlW00hSWiGwNBr2OA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725955142; a=rsa-sha256; cv=none; b=V5Dgsg1bwjem6mYTb6U6/OHihXM7zQghSuRc5ktrRZpjyYPvVgfF3VUmLkhaNfVKjOuGFG ZxDhm3gX0vD2tXuMJLQ/sxvYIf78TELSmMZT/2XYQPa5lA3QNn8/pcnFnhFLeztlnLO448 c58hl3j72cNKySRkUCjtjsIqjUMf1og= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=2GspKjyB; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=46XjDi1L; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=2GspKjyB; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=46XjDi1L; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf01.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de 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 105471FCA1; Tue, 10 Sep 2024 08:00:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1725955255; 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=cZehZ4EsXNdPsp2SmJYWqrY7IQ/nAPk4m8G2oQEC7r0=; b=2GspKjyBKqqFxe6J1DYZgUt7DvA7nltJMalzuIJ7xo3JXKZ39gNXv7eWrs/2QvTNiNZY49 5eRX9WUghLbidkUb3XHIm1D3OMiXLlAzSjMSb4Z49ix/nZDyce7k/kQH2nU3scgZpt0IIa /0cQ/1e2GBzgHJJIXhBx+3Oe/gPJKJ0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1725955255; 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=cZehZ4EsXNdPsp2SmJYWqrY7IQ/nAPk4m8G2oQEC7r0=; b=46XjDi1Lyre8kIN5sYwUhsQrOs7xzmFJ2yXJZJdy64AF0WAM/YchqBkCReDZkjmbc5zsSe Tzh/ayIQQ2G32kBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1725955255; 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=cZehZ4EsXNdPsp2SmJYWqrY7IQ/nAPk4m8G2oQEC7r0=; b=2GspKjyBKqqFxe6J1DYZgUt7DvA7nltJMalzuIJ7xo3JXKZ39gNXv7eWrs/2QvTNiNZY49 5eRX9WUghLbidkUb3XHIm1D3OMiXLlAzSjMSb4Z49ix/nZDyce7k/kQH2nU3scgZpt0IIa /0cQ/1e2GBzgHJJIXhBx+3Oe/gPJKJ0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1725955255; 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=cZehZ4EsXNdPsp2SmJYWqrY7IQ/nAPk4m8G2oQEC7r0=; b=46XjDi1Lyre8kIN5sYwUhsQrOs7xzmFJ2yXJZJdy64AF0WAM/YchqBkCReDZkjmbc5zsSe Tzh/ayIQQ2G32kBQ== 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 5736713A8F; Tue, 10 Sep 2024 08:00:54 +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 0IV5Erb832Y2MQAAD6G6ig (envelope-from ); Tue, 10 Sep 2024 08:00:54 +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 , "Liam R . Howlett" , Oscar Salvador Subject: [PATCH v3 8/9] arch/s390: Clean up hugetlb definitions Date: Tue, 10 Sep 2024 10:00:29 +0200 Message-ID: <20240910080030.1272373-9-osalvador@suse.de> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240910080030.1272373-1-osalvador@suse.de> References: <20240910080030.1272373-1-osalvador@suse.de> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 953474000F X-Stat-Signature: n35xqau7fpxafakdijkqtawbh7maxa4i X-Rspam-User: X-HE-Tag: 1725955256-503067 X-HE-Meta: U2FsdGVkX1/d3wWQD7FpyCqkA94uwVj+jg6GXdtoCksFDRIwlCsU/BPagfUa/JNVBQ32Up81bYy1nuGo6z0K+kgxtKB8SBr+ieisAZmRUJnGfPxHchXv120ccVzokg6J2HZhq68T3o3hDhNkI1qT14teInlpYEyM0Lq/d5HF1M5UuAliCcS2U1ZZgaNlMoCWs6xSadzOoRJyHNH9i8knlKH31zSdk3g0369bWebLfXL8UfKOe/hw5hvbQ7Kyln3XOfc8WfAdxzQ9cXJQvF1WjPNTzUK/hSzrzJ9RNnKjA6N+V/OYLQHNOBmbkVv288M+qHebpCBp+bZlS0mbzLVpMgSOpPHl/CZtZtXQaotYHxjQTNGvcETocxOQps1Wc/DsE3nhiod25/w38p4la7tc8bZCt44cdyG8aKY1k3Alxs9a6c6PWnNAzAr0NshSD+9Z8xKSCS/iNsKn5hXkB+KiQiveNnA0wTkrn7YzVpOTCjxkBQalOyBXpzNKXIdii0meJO2Hd4gHxQjfqvjDHomzA2jg+Hfc1iYNJxJyUQFabt1ci7BrAzp5WpB9hM0q932usv3eSavwVAXPrDsHb3uuzM/DK20x9UAULJlZg0nHtH1KfrsXglDcOLrwoHYJvNdEe5Ab9lVlNn0XoL2Iqt4vUbuA+7qoStsI6KbFT8wN2K8uF+UTcFbGAY6TML8lSAQmq4KW88AhVtPBp7TghEA7AdZSD/Xhi0cyUGs2k2xU1BDs1hlwUN/23h39urBKWW76r58uI8mG4h07kSmYm8irLLc7Qbjz5x1XAZFYyrSKmnxkmQeRcJO0/MFH38vKOykS/OyyW7CugV6PItr0WfZIDOCM7Pbu2igJXc9CjhS5H09XunsKkQfPtST1moaOw7zcVTJxMcAc59Qn+2JuPl5LosPoHXw7Juh96cE2heZAjpTOlWE50To5HqxvPYce2BfYpp7uhhbCcK9Ufh8nWlY lIffnwfm B4eqyBBGBOoEjFmfZz7fBJBG8sqAwaFTvPk2lFVTw8Ew3ZdJpmdoRspPnPL2x7gABWu3eElRoDqCsezI1O8IuKHpQ8ry2TQMEwOGd+m6WCzHpJzeslQM9zNJ8aLUKKzfyTwWae5gM4gdenjEaCLHft03RlzIBBY+AL5JbA+fhxeUcnwB9fL5CyiXnEvvA8zTo5tFTtJpcJZl393vibHkap+ofHo9w5Dy/aBsXEeKaEm+HCS3sZQjFNTe5unnedUdVP9VK256z7spjI0g= 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,