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 1CED0C001B0 for ; Mon, 24 Jul 2023 19:10:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A47356B0074; Mon, 24 Jul 2023 15:10:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9F7986B0078; Mon, 24 Jul 2023 15:10:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8986B6B007B; Mon, 24 Jul 2023 15:10:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 7A5A06B0074 for ; Mon, 24 Jul 2023 15:10:04 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 4FD6580746 for ; Mon, 24 Jul 2023 19:10:04 +0000 (UTC) X-FDA: 81047445528.02.940E25A Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf08.hostedemail.com (Postfix) with ESMTP id D378B160011 for ; Mon, 24 Jul 2023 19:10:01 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=lHdXpj+y; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf08.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690225802; 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=gCnHgXezPpuk6sMKSzDIWp04p03Sk4YUXXkML+wstSQ=; b=bK0nJO/rKxYQru6wwESTGc9plORW3C3qjoQfwvuHLiyNM6mZsHQSan8z3RNBq98UUO0+Lr jAW42d0n7++SUqeSzFJIPOCGHvgnHliBLRGYDGuQevBN4rexb8YHR+8ophqT4E++vcWgrS 30qB02oOYAma9KQxrPeogps4cqGflsE= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=lHdXpj+y; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf08.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690225802; a=rsa-sha256; cv=none; b=vPwyMkHw6ZAgunm1lVVsx/A9C5xMERVCmobp1A5PrZHqZZEicmHBqupV7qRTAGYBSD2DJJ /rl4mi3IGD47P0BUTWvSy7H7adUK/nGbeo4XmoESgr/Iky3S0I7OPM7YnkYxlhML5csHCV b2u8++GdHpLzjrlLPXXHCfZ3u6O/mhc= Received: from pps.filterd (m0353727.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36OIbGNt032728; Mon, 24 Jul 2023 19:09:49 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=gCnHgXezPpuk6sMKSzDIWp04p03Sk4YUXXkML+wstSQ=; b=lHdXpj+yWdleWVdb9X4WrxNQulmfyHmaqtmnD5rDOLVSIZT24xTpN6KBD1zasYB5bKNG twitQUfYf+kUPAPlHFne1/PiNugsxzt+vKtJ1kLc+NMHcgX58LEx+I6d5MD8TC6ti7en oxRWvC/w9uvySm7pdd+CPJU5jY7f/+B1l6dMMuWvaSjl1+qYF8xwnddUD4modftWIWFH FhFWyP4x4ZB6RT1j+rNDsoNtH+4PT9GPSuiMcSK2dJFiTkxTn2l6RdhEwkARTjznejMH RMt7eI9zYhUdDY/vBzc4E33ivMr0l6q6nsp875/8QAZHPILtonhdCcqEhIdKjpt5RtPo Ew== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3s1wxa1ud0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Jul 2023 19:09:49 +0000 Received: from m0353727.ppops.net (m0353727.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 36OIrBS1010766; Mon, 24 Jul 2023 19:09:48 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3s1wxa1uck-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Jul 2023 19:09:48 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 36OH9f0O014373; Mon, 24 Jul 2023 19:09:47 GMT Received: from smtprelay06.dal12v.mail.ibm.com ([172.16.1.8]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3s0stxp1da-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Jul 2023 19:09:47 +0000 Received: from smtpav01.wdc07v.mail.ibm.com (smtpav01.wdc07v.mail.ibm.com [10.39.53.228]) by smtprelay06.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 36OJ9kCR1376968 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 24 Jul 2023 19:09:46 GMT Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6EB3F58063; Mon, 24 Jul 2023 19:09:46 +0000 (GMT) Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 88B4D5805B; Mon, 24 Jul 2023 19:09:41 +0000 (GMT) Received: from skywalker.ibmuc.com (unknown [9.177.66.22]) by smtpav01.wdc07v.mail.ibm.com (Postfix) with ESMTP; Mon, 24 Jul 2023 19:09:41 +0000 (GMT) From: "Aneesh Kumar K.V" To: linux-mm@kvack.org, akpm@linux-foundation.org, mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org, npiggin@gmail.com, christophe.leroy@csgroup.eu Cc: Oscar Salvador , Mike Kravetz , Dan Williams , Joao Martins , Catalin Marinas , Muchun Song , Will Deacon , "Aneesh Kumar K.V" Subject: [PATCH v6 03/13] mm/vmemmap: Improve vmemmap_can_optimize and allow architectures to override Date: Tue, 25 Jul 2023 00:37:49 +0530 Message-ID: <20230724190759.483013-4-aneesh.kumar@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230724190759.483013-1-aneesh.kumar@linux.ibm.com> References: <20230724190759.483013-1-aneesh.kumar@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: Dl3h_6RDGc0Vl7C4TUK_Ipy-m4OGf9uR X-Proofpoint-GUID: oytDnj1Mg_SSWRUS5_Ex18PfGl4mdKtP X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-24_14,2023-07-24_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 mlxscore=0 malwarescore=0 suspectscore=0 mlxlogscore=999 priorityscore=1501 impostorscore=0 lowpriorityscore=0 phishscore=0 bulkscore=0 adultscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307240168 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: D378B160011 X-Stat-Signature: 333ib17wsns34fkwax47qh9mmxxfyu6i X-Rspam-User: X-HE-Tag: 1690225801-776584 X-HE-Meta: U2FsdGVkX18gNc+l+LILkDMsS+UfVcw4zzNfVvh2tyIuHNd+And8e/FkImK5/fDvEHsnfqDHa+Fx3zX4Hgx1Zr0TWe7fnc8c345FGdHJTrx7ep4YBcG/fACQyne3REIGnUFZs0h/wPN92Ssc0xxxhgDPIkF0UydGULiDTCINJITPwtNcHA8igo6nn5IxCkKfi8hgmQiMas/RR5bxAz0V3tpzKmwCLXPyMwuyQ6QsBCY5/HgnhHsmY3u4BiHD1veC1PoaCpywdCP/bIigdxASGPNmfDWWxCtFapmtvGGZh3D1NSb0ipAgl6V4aIWLbFGCXV8y9drAYstCj90CN/6h81jnyYpi4d5RaFrbyP14KcwEcSwxIsVTtWRTZSS4fVmdLeyYU2m0i8W5CRi2TR3QqbpQ3qatxltHdUSKTksZPUrYylFMXA2fJ/0T8XBfKXxuZXuDpsvrqJs82SIjmLTo3KiqKxBPKRqKH8+7i/vfYJTe88FVRbzho3ZdFgYixaIE9r3xcXE0xa00aKh+vZdWyh1yhJGhaPHd9CVZJwN4twZXGpyx0hyBVObH0BJoZNoYA75fDuuwx/VASMxRV/WDO8w8HNrZxz4ZjL9W6+0PP9cc+IVpR9O/b9o/sP7WHHaakS3ePP3ddAoeTZKlhjszahrhyUGERdfRgeweI40LudPMSBj/UTV27hluNlf7gYMdaIRsglsCR0ehUsp9SxZqPnC+gkCPSXfrKHfjLyEuEtEP+8RO3DKztWSMarzg7REbzKCEf1x8HEP1ymijtHi2GKkkee6rirPQMhNcXYsvOL/8SJonA1ClO4IMo/JENJkrxvr+SJJ1Jo1aNQBacTGolfuicRLv0gzRDUaWOBsAwrP2AxbG68ipOlSqvgnCn3hrS0kvImD23fpChhFVbNAazDEUhZ3jyoCjA3xGEJepz+szWD8xDPJzFuvC1XV5cKdCsgZJwHRva6uHdKm8t8s XoPQdbfD Ka02truwoZbyEnNIjr5Mh51FBB2Di1mG/US6Ju+9HON7xLnzF5CbcJMbLOq98T3ZZgHtIzkLvBSHA+r8gSm8v9zc/DCSUS4EHGkPPh4vFq1GLPIKRSimHneDr/Mk7GRURqy7+mAdJCybighoEweTqXd++uLZnJHJtfhIUCYU2utGkYx3KAAAVx2ADHOXDH2gictMd9LmSm6UoXN4X2e1Ao4DmGbtwBDE0HgWvWO82B42DkRkKH1f5HRUCbQ== 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: dax vmemmap optimization requires a minimum of 2 PAGE_SIZE area within vmemmap such that tail page mapping can point to the second PAGE_SIZE area. Enforce that in vmemmap_can_optimize() function. Architectures like powerpc also want to enable vmemmap optimization conditionally (only with radix MMU translation). Hence allow architecture override. Reviewed-by: Christophe Leroy Signed-off-by: Aneesh Kumar K.V --- include/linux/mm.h | 27 +++++++++++++++++++++++---- mm/mm_init.c | 2 +- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index a5d68baea231..fe6741539740 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3649,13 +3649,32 @@ void vmemmap_free(unsigned long start, unsigned long end, struct vmem_altmap *altmap); #endif +#define VMEMMAP_RESERVE_NR 2 #ifdef CONFIG_ARCH_WANT_OPTIMIZE_VMEMMAP -static inline bool vmemmap_can_optimize(struct vmem_altmap *altmap, - struct dev_pagemap *pgmap) +static inline bool __vmemmap_can_optimize(struct vmem_altmap *altmap, + struct dev_pagemap *pgmap) { - return is_power_of_2(sizeof(struct page)) && - pgmap && (pgmap_vmemmap_nr(pgmap) > 1) && !altmap; + unsigned long nr_pages; + unsigned long nr_vmemmap_pages; + + if (!pgmap || !is_power_of_2(sizeof(struct page))) + return false; + + nr_pages = pgmap_vmemmap_nr(pgmap); + nr_vmemmap_pages = ((nr_pages * sizeof(struct page)) >> PAGE_SHIFT); + /* + * For vmemmap optimization with DAX we need minimum 2 vmemmap + * pages. See layout diagram in Documentation/mm/vmemmap_dedup.rst + */ + return !altmap && (nr_vmemmap_pages > VMEMMAP_RESERVE_NR); } +/* + * If we don't have an architecture override, use the generic rule + */ +#ifndef vmemmap_can_optimize +#define vmemmap_can_optimize __vmemmap_can_optimize +#endif + #else static inline bool vmemmap_can_optimize(struct vmem_altmap *altmap, struct dev_pagemap *pgmap) diff --git a/mm/mm_init.c b/mm/mm_init.c index acb0ac194672..641c56fd08a2 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1020,7 +1020,7 @@ static inline unsigned long compound_nr_pages(struct vmem_altmap *altmap, if (!vmemmap_can_optimize(altmap, pgmap)) return pgmap_vmemmap_nr(pgmap); - return 2 * (PAGE_SIZE / sizeof(struct page)); + return VMEMMAP_RESERVE_NR * (PAGE_SIZE / sizeof(struct page)); } static void __ref memmap_init_compound(struct page *head, -- 2.41.0