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 0E106C43334 for ; Mon, 18 Jul 2022 20:14:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A02866B0074; Mon, 18 Jul 2022 16:14:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9B2A18E0001; Mon, 18 Jul 2022 16:14:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8A0F76B0078; Mon, 18 Jul 2022 16:14:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 7BCE76B0074 for ; Mon, 18 Jul 2022 16:14:54 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 2EE9734BFD for ; Mon, 18 Jul 2022 20:14:54 +0000 (UTC) X-FDA: 79701324108.18.8235E27 Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by imf08.hostedemail.com (Postfix) with ESMTP id C678A16004E for ; Mon, 18 Jul 2022 20:14:53 +0000 (UTC) Received: by mail-ed1-f52.google.com with SMTP id z22so3887640edd.6 for ; Mon, 18 Jul 2022 13:14:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=mRyn3MyNya4veUrOXgtJFR/zBUEHQj0h1AhfGm3iIco=; b=IvCsntT+j1o8ydquNf78ux6p0FEWCxes4Vy/KghbteDCngVUn4KGoDBYG0IZhJ9bID qZuve7mxNdJwTBZDLVBmi8QC3hIbNkvj1Gd973nydY8GnmGJmz4FVs7ZpPEtNJorGML7 p1KmgXRb2qh5nwyei8Qi+xY/FKD4aUMqFk+FavBoqYx3iImvrxpUzprvnWID76ucPfhb 559nnaC73OOTg8dGV+RpB9d62tZ3NGKIPlgZ/as/2SJH0fVczLBkyONCzUxPhowGMjYo 53KOcK+QeWENhg+mt68F5X9vGJ3KtFKSBwBnSs5/dqSGTLsDNtbA2lyZmPh3xV/q2SiR 451g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=mRyn3MyNya4veUrOXgtJFR/zBUEHQj0h1AhfGm3iIco=; b=A8Hg+Pr4cMFVQv+oCEMW1CAuhpKdWDqOkF74kfngemTMCtQ426R6WzMetOSCJP1y6O kJlaTBRBr5e7OnMGmJoDs0OiTpUdPcDyjlltjs/4IbdgCQPDU1MiyfCJMKIyVPxA3ipm QM5Cuuf2goYzcXcwVmeoee7IF+DxE5t0zMSTSxMPq7B8ef2IHRSlB7sCIrNZp2achE/2 qc50NKUT/9XieIdAYWJE2YC63T+vahoojfQpqQ6CXZ6cCt3FAQJJ0NeVxBDumzsWN7gZ yCMyLtVRRvSb92Y2GAOaMqAs+bweq0+2TlPc7K7Ah9uH9h1/FvaCb4n+SEKzh890dshq kq2Q== X-Gm-Message-State: AJIora9ngYAoxuYm7H9PAuyP4oz9fSNca0g/6QPQMc06yUq9D+Xgxq4t oyk0SezKqNWpFEGEWwQ7O+4J9tlUru9cS5fE2AE= X-Google-Smtp-Source: AGRyM1ujH4q9O+GFp2uWJAq/DyFBbuRu/KGVUdEc1NNoa8rx3EWtW/29PG+u3BLLLD9Vp0I0fc2/Sw0OD3rPIgvKJew= X-Received: by 2002:a05:6402:c47:b0:437:ce2d:c30d with SMTP id cs7-20020a0564020c4700b00437ce2dc30dmr38710042edb.395.1658175292390; Mon, 18 Jul 2022 13:14:52 -0700 (PDT) MIME-Version: 1.0 References: <20220718090050.2261-1-21cnbao@gmail.com> In-Reply-To: From: Barry Song <21cnbao@gmail.com> Date: Tue, 19 Jul 2022 08:14:41 +1200 Message-ID: Subject: Re: [RESEND PATCH v3] arm64: enable THP_SWAP for arm64 To: Matthew Wilcox Cc: Andrew Morton , Anshuman Khandual , 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 , Ying Huang , =?UTF-8?B?5byg6K+X5piOKFNpbW9uIFpoYW5nKQ==?= Content-Type: text/plain; charset="UTF-8" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1658175293; a=rsa-sha256; cv=none; b=Oz8his8YFnN2w0cbDZwicAj5B1FRZlJtOGx4ntiDOu3/042dJr0RhWP4IMVXoSPtGoUaAK iTeZEtKqFaL8Ydo9OWbY9krnjw9ut1JxKYaA2XOCCSSOstH8TjOEbh+z3WEkZHkgrp3y86 aKEZ9Da0YLQPceQupN3cGmxiwmXf13c= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=IvCsntT+; spf=pass (imf08.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.208.52 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1658175293; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=mRyn3MyNya4veUrOXgtJFR/zBUEHQj0h1AhfGm3iIco=; b=om0SGG/R9UwNa2SNftU9EZN/pIDoRneLwvGuUPsinKu6Pg48O5EAcO+0pVoKAOd4dvHt1q Tls/YgMbQT1VZCY+9Yv7aYfxlrMbbo8t3vSAIM3sHHbw1GYd80HMv8YuKM0ze9nuQJDaD1 CntXdFTyHJfewdzC3YdRI+AvNqOGcDQ= X-Rspamd-Queue-Id: C678A16004E Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=IvCsntT+; spf=pass (imf08.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.208.52 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspam-User: X-Rspamd-Server: rspam06 X-Stat-Signature: xbikmnfh8hc5m11s4fywefborexxtqfc X-HE-Tag: 1658175293-45191 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: On Tue, Jul 19, 2022 at 4:06 AM Matthew Wilcox wrote: > > On Mon, Jul 18, 2022 at 09:00:50PM +1200, Barry Song wrote: > > 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 > > Can't you avoid all the other changes by simply doing: > > select ARCH_WANTS_THP_SWAP if ARM64_4K_PAGES && !ARM64_MTE > > > select ARCH_HAS_UBSAN_SANITIZE_ALL > > select ARM_AMBA > > select ARM_ARCH_TIMER Nope. as we also enable ARM64_MTE on platforms without mte. ARMv8.5 based processors introduce the Memory Tagging Extension (MTE) feature but the Kconfig is default Y for platforms before 8.5. arm64 usually detects the cpufeature rather than depending on static build configuration. > > 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; > > +} > > +#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; > > } > > -- > > 2.25.1 > > > > Thanks Barry