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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66151C43334 for ; Tue, 19 Jul 2022 03:29:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233811AbiGSD3U (ORCPT ); Mon, 18 Jul 2022 23:29:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236479AbiGSD3H (ORCPT ); Mon, 18 Jul 2022 23:29:07 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0823326F8 for ; Mon, 18 Jul 2022 20:29:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658201345; x=1689737345; h=from:to:cc:subject:references:date:in-reply-to: message-id:mime-version; bh=I6PNjtwz4C8YbgD77JXK8Oyh20yQ9FK+TnLlULfuJ7M=; b=TB8NfhzLhxwFjQloNOGLpyoxlTPlceAuU7qzhkFKcPmjoOoKBmq/xUcb AyYszRx4RP5qsDQxxcGX1ULZHrnroyv7g4p2Rw1A243hH/6WkFt96mosW Fb5rgAIvGATXHVx2yB5JklHo2zTTFD1rgvLohVVOZRpI29GGQ2H7say3v M/iyChAkIVfa099ZOr+melRXQYvtk97UbWLB6fCWuaqHG/6+C/Ed56nQf iPQK36mZZeu92bbM8V+R5xGRh8AN6BBi/g1GMhvuxzER8or92SNl8ICuX 4td9qgOwWUQ7h6FwZrR0cb0c8J5NgCGCWz/8Zcd/mVaTLZLT2wLm7YNhf Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10412"; a="312061554" X-IronPort-AV: E=Sophos;i="5.92,282,1650956400"; d="scan'208";a="312061554" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2022 20:29:05 -0700 X-IronPort-AV: E=Sophos;i="5.92,282,1650956400"; d="scan'208";a="686961933" Received: from yhuang6-desk2.sh.intel.com (HELO yhuang6-desk2.ccr.corp.intel.com) ([10.239.13.94]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2022 20:29:02 -0700 From: "Huang, Ying" To: Anshuman Khandual Cc: Barry Song <21cnbao@gmail.com>, Andrew Morton , Catalin Marinas , LAK , Linux-MM , Steven Price , "Will Deacon" , Andrea Arcangeli , =?utf-8?B?6YOt5YGl?= , hanchuanhua , Johannes Weiner , Hugh Dickins , LKML , Minchan Kim , Yang Shi , Barry Song , =?utf-8?B?5byg6K+X5piOKFNpbW9uIFpoYW5nKQ==?= Subject: Re: [RESEND PATCH v3] arm64: enable THP_SWAP for arm64 References: <20220718090050.2261-1-21cnbao@gmail.com> <87mtd62apo.fsf@yhuang6-desk2.ccr.corp.intel.com> Date: Tue, 19 Jul 2022 11:28:47 +0800 In-Reply-To: (Anshuman Khandual's message of "Tue, 19 Jul 2022 08:38:10 +0530") Message-ID: <87zgh5232o.fsf@yhuang6-desk2.ccr.corp.intel.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=ascii Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Anshuman Khandual writes: > On 7/19/22 06:53, Barry Song wrote: >> On Tue, Jul 19, 2022 at 12:44 PM Huang, Ying wrote: >>> >>> Barry Song <21cnbao@gmail.com> writes: >>> >>>> From: Barry Song >>>> >>>> THP_SWAP has been proven to improve the swap throughput significantly >>>> on x86_64 according to commit bd4c82c22c367e ("mm, THP, swap: delay >>>> splitting THP after swapped out"). >>>> As long as arm64 uses 4K page size, it is quite similar with x86_64 >>>> by having 2MB PMD THP. THP_SWAP is architecture-independent, thus, >>>> enabling it on arm64 will benefit arm64 as well. >>>> A corner case is that MTE has an assumption that only base pages >>>> can be swapped. We won't enable THP_SWAP for ARM64 hardware with >>>> MTE support until MTE is reworked to coexist with THP_SWAP. >>>> >>>> A micro-benchmark is written to measure thp swapout throughput as >>>> below, >>>> >>>> unsigned long long tv_to_ms(struct timeval tv) >>>> { >>>> return tv.tv_sec * 1000 + tv.tv_usec / 1000; >>>> } >>>> >>>> main() >>>> { >>>> struct timeval tv_b, tv_e;; >>>> #define SIZE 400*1024*1024 >>>> volatile void *p = mmap(NULL, SIZE, PROT_READ | PROT_WRITE, >>>> MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); >>>> if (!p) { >>>> perror("fail to get memory"); >>>> exit(-1); >>>> } >>>> >>>> madvise(p, SIZE, MADV_HUGEPAGE); >>>> memset(p, 0x11, SIZE); /* write to get mem */ >>>> >>>> gettimeofday(&tv_b, NULL); >>>> madvise(p, SIZE, MADV_PAGEOUT); >>>> gettimeofday(&tv_e, NULL); >>>> >>>> printf("swp out bandwidth: %ld bytes/ms\n", >>>> SIZE/(tv_to_ms(tv_e) - tv_to_ms(tv_b))); >>>> } >>>> >>>> Testing is done on rk3568 64bit quad core processor Quad Core >>>> Cortex-A55 platform - ROCK 3A. >>>> thp swp throughput w/o patch: 2734bytes/ms (mean of 10 tests) >>>> thp swp throughput w/ patch: 3331bytes/ms (mean of 10 tests) >>>> >>>> Cc: "Huang, Ying" >>>> Cc: Minchan Kim >>>> Cc: Johannes Weiner >>>> Cc: Hugh Dickins >>>> Cc: Andrea Arcangeli >>>> Cc: Anshuman Khandual >>>> Cc: Steven Price >>>> Cc: Yang Shi >>>> Signed-off-by: Barry Song >>>> --- >>>> -v3: >>>> * refine the commit log; >>>> * add a benchmark result; >>>> * refine the macro of arch_thp_swp_supported >>>> Thanks to the comments of Anshuman, Andrew, Steven >>>> >>>> arch/arm64/Kconfig | 1 + >>>> arch/arm64/include/asm/pgtable.h | 6 ++++++ >>>> include/linux/huge_mm.h | 12 ++++++++++++ >>>> mm/swap_slots.c | 2 +- >>>> 4 files changed, 20 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig >>>> index 1652a9800ebe..e1c540e80eec 100644 >>>> --- a/arch/arm64/Kconfig >>>> +++ b/arch/arm64/Kconfig >>>> @@ -101,6 +101,7 @@ config ARM64 >>>> select ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP >>>> select ARCH_WANT_LD_ORPHAN_WARN >>>> select ARCH_WANTS_NO_INSTR >>>> + select ARCH_WANTS_THP_SWAP if ARM64_4K_PAGES >>>> select ARCH_HAS_UBSAN_SANITIZE_ALL >>>> select ARM_AMBA >>>> select ARM_ARCH_TIMER >>>> diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h >>>> index 0b6632f18364..78d6f6014bfb 100644 >>>> --- a/arch/arm64/include/asm/pgtable.h >>>> +++ b/arch/arm64/include/asm/pgtable.h >>>> @@ -45,6 +45,12 @@ >>>> __flush_tlb_range(vma, addr, end, PUD_SIZE, false, 1) >>>> #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ >>>> >>>> +static inline bool arch_thp_swp_supported(void) >>>> +{ >>>> + return !system_supports_mte(); >>>> +} >>>> +#define arch_thp_swp_supported arch_thp_swp_supported >>>> + >>>> /* >>>> * Outside of a few very special situations (e.g. hibernation), we always >>>> * use broadcast TLB invalidation instructions, therefore a spurious page >>>> diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h >>>> index de29821231c9..4ddaf6ad73ef 100644 >>>> --- a/include/linux/huge_mm.h >>>> +++ b/include/linux/huge_mm.h >>>> @@ -461,4 +461,16 @@ static inline int split_folio_to_list(struct folio *folio, >>>> return split_huge_page_to_list(&folio->page, list); >>>> } >>>> >>>> +/* >>>> + * archs that select ARCH_WANTS_THP_SWAP but don't support THP_SWP due to >>>> + * limitations in the implementation like arm64 MTE can override this to >>>> + * false >>>> + */ >>>> +#ifndef arch_thp_swp_supported >>>> +static inline bool arch_thp_swp_supported(void) >>>> +{ >>>> + return true; >>>> +} >>> >>> How about the following? >>> >>> static inline bool arch_wants_thp_swap(void) >>> { >>> return IS_ENABLED(ARCH_WANTS_THP_SWAP); >>> } >> >> This looks good. then i'll need to change arm64 to >> >> +static inline bool arch_thp_swp_supported(void) >> +{ >> + return IS_ENABLED(ARCH_WANTS_THP_SWAP) && !system_supports_mte(); >> +} > > Why ? CONFIG_THP_SWAP depends on ARCH_WANTS_THP_SWAP. In folio_alloc_swap(), > IS_ENABLED(CONFIG_THP_SWAP) enabled, will also imply ARCH_WANTS_THP_SWAP too > is enabled. Hence checking for ARCH_WANTS_THP_SWAP again does not make sense > either in the generic fallback stub, or in arm64 platform override. Because > without ARCH_WANTS_THP_SWAP enabled, arch_thp_swp_supported() should never > be called in the first place. For the only caller now, the checking looks redundant. But the original proposed implementation as follows, static inline bool arch_thp_swp_supported(void) { return true; } will return true even on architectures that don't support/want THP swap. That will confuse people too. And the "redundant" checking has no run time overhead, because compiler will do the trick. Best Regards, Huang, Ying >>> >>> Best Regards, >>> Huang, Ying >>> >>>> +#endif >>>> + >>>> #endif /* _LINUX_HUGE_MM_H */ >>>> diff --git a/mm/swap_slots.c b/mm/swap_slots.c >>>> index 2a65a89b5b4d..10b94d64cc25 100644 >>>> --- a/mm/swap_slots.c >>>> +++ b/mm/swap_slots.c >>>> @@ -307,7 +307,7 @@ swp_entry_t folio_alloc_swap(struct folio *folio) >>>> entry.val = 0; >>>> >>>> if (folio_test_large(folio)) { >>>> - if (IS_ENABLED(CONFIG_THP_SWAP)) >>>> + if (IS_ENABLED(CONFIG_THP_SWAP) && arch_thp_swp_supported()) >>>> get_swap_pages(1, &entry, folio_nr_pages(folio)); >>>> goto out; >>>> } >> >> Thanks >> Barry >> 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A451DC433EF for ; Tue, 19 Jul 2022 03:30:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:In-Reply-To: Date:References:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=SdTuxxa/CwxSOfmAM1hceccd8E82p21HlnInq3MVEpw=; b=FeF1STDG8xHCzi rVny6eryBW9VIgYUHAtEOOYZiOGvH70iiUDi6A40HG74D79/IszBsqoM3GjpTFOCTsYe40HnXVfZ9 KxRSe/4LxlQRWRHRxj4h6ZCxXWbWYv6N7oGZx9xXti7SPXG2Uj3prqRS/YdK91NR8/LhNStrTXM5p Fbi8nRaJnH8gURut72nbvThgt9AS13QD0piIEhYyMoEQMwbadFRKRwJVEMlBzKT1oNHH5+h8lXI1a ai25EUpvwF63J6YObz9df90i9oZn2sXl5JHLHKCneZQ9mPZxvLeUFMEo1FUfED0vTCU1uzL3JaMCq m+ITIFVLdWHjq33rCqWA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oDdv3-004YFw-S9; Tue, 19 Jul 2022 03:29:09 +0000 Received: from mga14.intel.com ([192.55.52.115]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oDdv0-004YEv-Vx for linux-arm-kernel@lists.infradead.org; Tue, 19 Jul 2022 03:29:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658201346; x=1689737346; h=from:to:cc:subject:references:date:in-reply-to: message-id:mime-version; bh=I6PNjtwz4C8YbgD77JXK8Oyh20yQ9FK+TnLlULfuJ7M=; b=PeG6G/JmqvC+3fx9sqHG1sV4mcAiC1AYA0AmhhIltMthVRmcL4oydaxA LPG6d6NUzjScwnOzXJ55yKPoxi1x4hEXpjIYy1zANUyb94vRI+zAzKd5V +hVk1RMM/Tx7AcEBSfSUHNvDWu3hV/DnKxugVMchpqQfqM1PpLqFeLH8u phASn1oSVu4fvubQmhVgUSa4pQT1YduulaAOwlaS9kmPOHYefRPgjdOYs hun2MFTGI/LwMJaDbAz4P0CQMtZL2hR9d5PTBacxYnkeiCu/Nst10qE1s EvxPultFSZ5/N23/n2dza9v+6fyl1RdPX22SzPeh+hAcwlcxa6k7pPsU4 A==; X-IronPort-AV: E=McAfee;i="6400,9594,10412"; a="286391168" X-IronPort-AV: E=Sophos;i="5.92,282,1650956400"; d="scan'208";a="286391168" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2022 20:29:05 -0700 X-IronPort-AV: E=Sophos;i="5.92,282,1650956400"; d="scan'208";a="686961933" Received: from yhuang6-desk2.sh.intel.com (HELO yhuang6-desk2.ccr.corp.intel.com) ([10.239.13.94]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2022 20:29:02 -0700 From: "Huang, Ying" To: Anshuman Khandual Cc: Barry Song <21cnbao@gmail.com>, Andrew Morton , Catalin Marinas , LAK , Linux-MM , Steven Price , "Will Deacon" , Andrea Arcangeli , =?utf-8?B?6YOt5YGl?= , hanchuanhua , Johannes Weiner , Hugh Dickins , LKML , Minchan Kim , Yang Shi , Barry Song , =?utf-8?B?5byg6K+X5piOKFNpbW9uIFpoYW5nKQ==?= Subject: Re: [RESEND PATCH v3] arm64: enable THP_SWAP for arm64 References: <20220718090050.2261-1-21cnbao@gmail.com> <87mtd62apo.fsf@yhuang6-desk2.ccr.corp.intel.com> Date: Tue, 19 Jul 2022 11:28:47 +0800 In-Reply-To: (Anshuman Khandual's message of "Tue, 19 Jul 2022 08:38:10 +0530") Message-ID: <87zgh5232o.fsf@yhuang6-desk2.ccr.corp.intel.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220718_202907_067582_D4740C80 X-CRM114-Status: GOOD ( 19.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Anshuman Khandual writes: > On 7/19/22 06:53, Barry Song wrote: >> On Tue, Jul 19, 2022 at 12:44 PM Huang, Ying wrote: >>> >>> Barry Song <21cnbao@gmail.com> writes: >>> >>>> From: Barry Song >>>> >>>> THP_SWAP has been proven to improve the swap throughput significantly >>>> on x86_64 according to commit bd4c82c22c367e ("mm, THP, swap: delay >>>> splitting THP after swapped out"). >>>> As long as arm64 uses 4K page size, it is quite similar with x86_64 >>>> by having 2MB PMD THP. THP_SWAP is architecture-independent, thus, >>>> enabling it on arm64 will benefit arm64 as well. >>>> A corner case is that MTE has an assumption that only base pages >>>> can be swapped. We won't enable THP_SWAP for ARM64 hardware with >>>> MTE support until MTE is reworked to coexist with THP_SWAP. >>>> >>>> A micro-benchmark is written to measure thp swapout throughput as >>>> below, >>>> >>>> unsigned long long tv_to_ms(struct timeval tv) >>>> { >>>> return tv.tv_sec * 1000 + tv.tv_usec / 1000; >>>> } >>>> >>>> main() >>>> { >>>> struct timeval tv_b, tv_e;; >>>> #define SIZE 400*1024*1024 >>>> volatile void *p = mmap(NULL, SIZE, PROT_READ | PROT_WRITE, >>>> MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); >>>> if (!p) { >>>> perror("fail to get memory"); >>>> exit(-1); >>>> } >>>> >>>> madvise(p, SIZE, MADV_HUGEPAGE); >>>> memset(p, 0x11, SIZE); /* write to get mem */ >>>> >>>> gettimeofday(&tv_b, NULL); >>>> madvise(p, SIZE, MADV_PAGEOUT); >>>> gettimeofday(&tv_e, NULL); >>>> >>>> printf("swp out bandwidth: %ld bytes/ms\n", >>>> SIZE/(tv_to_ms(tv_e) - tv_to_ms(tv_b))); >>>> } >>>> >>>> Testing is done on rk3568 64bit quad core processor Quad Core >>>> Cortex-A55 platform - ROCK 3A. >>>> thp swp throughput w/o patch: 2734bytes/ms (mean of 10 tests) >>>> thp swp throughput w/ patch: 3331bytes/ms (mean of 10 tests) >>>> >>>> Cc: "Huang, Ying" >>>> Cc: Minchan Kim >>>> Cc: Johannes Weiner >>>> Cc: Hugh Dickins >>>> Cc: Andrea Arcangeli >>>> Cc: Anshuman Khandual >>>> Cc: Steven Price >>>> Cc: Yang Shi >>>> Signed-off-by: Barry Song >>>> --- >>>> -v3: >>>> * refine the commit log; >>>> * add a benchmark result; >>>> * refine the macro of arch_thp_swp_supported >>>> Thanks to the comments of Anshuman, Andrew, Steven >>>> >>>> arch/arm64/Kconfig | 1 + >>>> arch/arm64/include/asm/pgtable.h | 6 ++++++ >>>> include/linux/huge_mm.h | 12 ++++++++++++ >>>> mm/swap_slots.c | 2 +- >>>> 4 files changed, 20 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig >>>> index 1652a9800ebe..e1c540e80eec 100644 >>>> --- a/arch/arm64/Kconfig >>>> +++ b/arch/arm64/Kconfig >>>> @@ -101,6 +101,7 @@ config ARM64 >>>> select ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP >>>> select ARCH_WANT_LD_ORPHAN_WARN >>>> select ARCH_WANTS_NO_INSTR >>>> + select ARCH_WANTS_THP_SWAP if ARM64_4K_PAGES >>>> select ARCH_HAS_UBSAN_SANITIZE_ALL >>>> select ARM_AMBA >>>> select ARM_ARCH_TIMER >>>> diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h >>>> index 0b6632f18364..78d6f6014bfb 100644 >>>> --- a/arch/arm64/include/asm/pgtable.h >>>> +++ b/arch/arm64/include/asm/pgtable.h >>>> @@ -45,6 +45,12 @@ >>>> __flush_tlb_range(vma, addr, end, PUD_SIZE, false, 1) >>>> #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ >>>> >>>> +static inline bool arch_thp_swp_supported(void) >>>> +{ >>>> + return !system_supports_mte(); >>>> +} >>>> +#define arch_thp_swp_supported arch_thp_swp_supported >>>> + >>>> /* >>>> * Outside of a few very special situations (e.g. hibernation), we always >>>> * use broadcast TLB invalidation instructions, therefore a spurious page >>>> diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h >>>> index de29821231c9..4ddaf6ad73ef 100644 >>>> --- a/include/linux/huge_mm.h >>>> +++ b/include/linux/huge_mm.h >>>> @@ -461,4 +461,16 @@ static inline int split_folio_to_list(struct folio *folio, >>>> return split_huge_page_to_list(&folio->page, list); >>>> } >>>> >>>> +/* >>>> + * archs that select ARCH_WANTS_THP_SWAP but don't support THP_SWP due to >>>> + * limitations in the implementation like arm64 MTE can override this to >>>> + * false >>>> + */ >>>> +#ifndef arch_thp_swp_supported >>>> +static inline bool arch_thp_swp_supported(void) >>>> +{ >>>> + return true; >>>> +} >>> >>> How about the following? >>> >>> static inline bool arch_wants_thp_swap(void) >>> { >>> return IS_ENABLED(ARCH_WANTS_THP_SWAP); >>> } >> >> This looks good. then i'll need to change arm64 to >> >> +static inline bool arch_thp_swp_supported(void) >> +{ >> + return IS_ENABLED(ARCH_WANTS_THP_SWAP) && !system_supports_mte(); >> +} > > Why ? CONFIG_THP_SWAP depends on ARCH_WANTS_THP_SWAP. In folio_alloc_swap(), > IS_ENABLED(CONFIG_THP_SWAP) enabled, will also imply ARCH_WANTS_THP_SWAP too > is enabled. Hence checking for ARCH_WANTS_THP_SWAP again does not make sense > either in the generic fallback stub, or in arm64 platform override. Because > without ARCH_WANTS_THP_SWAP enabled, arch_thp_swp_supported() should never > be called in the first place. For the only caller now, the checking looks redundant. But the original proposed implementation as follows, static inline bool arch_thp_swp_supported(void) { return true; } will return true even on architectures that don't support/want THP swap. That will confuse people too. And the "redundant" checking has no run time overhead, because compiler will do the trick. Best Regards, Huang, Ying >>> >>> Best Regards, >>> Huang, Ying >>> >>>> +#endif >>>> + >>>> #endif /* _LINUX_HUGE_MM_H */ >>>> diff --git a/mm/swap_slots.c b/mm/swap_slots.c >>>> index 2a65a89b5b4d..10b94d64cc25 100644 >>>> --- a/mm/swap_slots.c >>>> +++ b/mm/swap_slots.c >>>> @@ -307,7 +307,7 @@ swp_entry_t folio_alloc_swap(struct folio *folio) >>>> entry.val = 0; >>>> >>>> if (folio_test_large(folio)) { >>>> - if (IS_ENABLED(CONFIG_THP_SWAP)) >>>> + if (IS_ENABLED(CONFIG_THP_SWAP) && arch_thp_swp_supported()) >>>> get_swap_pages(1, &entry, folio_nr_pages(folio)); >>>> goto out; >>>> } >> >> Thanks >> Barry >> _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel