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 571BDEB64DC for ; Mon, 10 Jul 2023 16:09:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 438066B0075; Mon, 10 Jul 2023 12:09:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3E7C16B0078; Mon, 10 Jul 2023 12:09:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 12AC96B007B; Mon, 10 Jul 2023 12:09:30 -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 F14A08D0001 for ; Mon, 10 Jul 2023 12:09:29 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id B5E4A80194 for ; Mon, 10 Jul 2023 16:09:29 +0000 (UTC) X-FDA: 80996187258.04.979ED93 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf10.hostedemail.com (Postfix) with ESMTP id 2180CC0002 for ; Mon, 10 Jul 2023 16:09:26 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=O638G2cP; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf10.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=1689005367; 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=wRpOvZEenjvDphBufXXJXjaJM9fWCo+EyUTVYUwsbTE=; b=fMPQLG8vrGGzvz7wMAKnKO41xS/KMbzU2Bs1gw7xXnS6D0WKK5Z8yBbbtUUspSTOy8zGZr wmJMUkh2u8uXS+MgMIj6Zi6HO/z5oRI16ATuBs/Whv2R2DYlRPUNxnFwo2zJuPdEK7/VPX a+u+ajpeXLWRCN+4FCHCtFSWD1UCgfI= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=O638G2cP; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf10.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=1689005367; a=rsa-sha256; cv=none; b=Vg1V/0rn3wb+E4XfEdpvOa181JMXFjfbiLRXVCiumdSEojIaEA0JaQd/CEfQXKYByMebfk eMoOSf6zXreqOrxfKSL/x84GT7aLTmjNzlSK7k5EW7czUO0VDZOmwmgjaKk3gH7GrxT4J6 58egl6r9jdAQ56MkcWWgV8MSWGCL+gY= Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36AFkhEI019026; Mon, 10 Jul 2023 16:09:15 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=wRpOvZEenjvDphBufXXJXjaJM9fWCo+EyUTVYUwsbTE=; b=O638G2cPIoGZnzfBQJPxTu6OkA5gVpYNqI24oa4F7EWZ9QgKnpBzrJw6MLlUlvVdIMPx Lli92okcckFlG67SeCLoYFmxD5z/wGb5yWy1bbhMRAIhuMh4tzQQZaaF6BNLC7RfqVDw +XLdhztBb5FMvX4/2JcBREmhGLFXcXDFjGwnletCw2ZVQ96iVE/kNmCiwSHovNRvmZ9T REybt/GrItqdjpoZqFnbiGwNw0A7niXKJq72IGzmFeQ38JOujsaZsQs3B9KbYP4ZXd// cfb9JJhdI1b8LwISmfZuI9dJTcGnhboE+EtngsAs2MeWsLh+iDw9frNauAc5v+QCi3fc 6A== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rrmx390d8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 10 Jul 2023 16:09:14 +0000 Received: from m0353729.ppops.net (m0353729.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 36AFkog4019835; Mon, 10 Jul 2023 16:09:14 GMT Received: from ppma04dal.us.ibm.com (7a.29.35a9.ip4.static.sl-reverse.com [169.53.41.122]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rrmx390ch-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 10 Jul 2023 16:09:14 +0000 Received: from pps.filterd (ppma04dal.us.ibm.com [127.0.0.1]) by ppma04dal.us.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 36AE3Z6S016659; Mon, 10 Jul 2023 16:09:13 GMT Received: from smtprelay06.wdc07v.mail.ibm.com ([9.208.129.118]) by ppma04dal.us.ibm.com (PPS) with ESMTPS id 3rpye60kpp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 10 Jul 2023 16:09:13 +0000 Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay06.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 36AG9B8065995100 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 10 Jul 2023 16:09:11 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7DD3958060; Mon, 10 Jul 2023 16:09:11 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 948DA5805A; Mon, 10 Jul 2023 16:09:05 +0000 (GMT) Received: from skywalker.ibmuc.com (unknown [9.43.9.86]) by smtpav03.dal12v.mail.ibm.com (Postfix) with ESMTP; Mon, 10 Jul 2023 16:09:05 +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 v4 03/13] mm/vmemmap: Improve vmemmap_can_optimize and allow architectures to override Date: Mon, 10 Jul 2023 21:38:32 +0530 Message-ID: <20230710160842.56300-4-aneesh.kumar@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230710160842.56300-1-aneesh.kumar@linux.ibm.com> References: <20230710160842.56300-1-aneesh.kumar@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: ra3Bm4wSV_iLhHplkAxn8CpPXdTq2wyR X-Proofpoint-ORIG-GUID: aT04GZjYabtywjSq7KdAhTBcwRfAWDTY 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-10_12,2023-07-06_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 mlxscore=0 bulkscore=0 impostorscore=0 mlxlogscore=918 suspectscore=0 malwarescore=0 spamscore=0 priorityscore=1501 clxscore=1015 adultscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2307100145 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 2180CC0002 X-Stat-Signature: mpkrm69epms81tr7kscu64bgoxtb3m4o X-HE-Tag: 1689005366-727313 X-HE-Meta: U2FsdGVkX1+pj7vMH0d27uyR2Ysr8wvbF2KVsqyFUxB4xL2K87Nm6Hew3zkoz+2rHsBCVu7zUngRgKcv2jIhRiT5NpPA4h5duwsrm7FllIGV3wuqnYlRSjtCF0VkwWCeQHBRfPBXjJtBjQ266+Wqir1DN/VpoAR4ZlM4jawGplIqPDpyX80TjvKOAcnPAqVbpNlVkeWUV2LFjZBACM5CkGdkFU/zJxtTA7ETCWCUOsIwB7OZVu2Z3RnO9gpVC8mtWzoV9dvhHMGjAWajBmSxYflhgHlaRWP05vxLnkFC0XeHi2JcvT/CUKUWEXHSe0KaV2wQymgK/aWazy4xvq6XidaqduSYX3i6SdE7QChJnmivQT3XwiGBs3XnLXbj/Bt4gTc6HXxoLEPZ3YCsfqsQ4uR/Tp9ywiz9XHw6IbHxpDUL0FoquNTMugmD65uGX9WbVKLFCAj/Gwkun/FpgmlBlL/Tqo7TMo6647OMJ8FOjIy4qeGynQRVB2dEzdw9AdrK/v2zqFyiNq4ITa6qPh/tfBYdbtWGzAwygUfU3jd67j1vzMemjl/OsSu2wCKOb9fI1oIqfyDj0h9ISduBSxlQLSGvmaiLOuDxwIRSmHOnXOztdlexfG/EHBNWTJM/bMMVtbusGpgi/Y4FfxIgAh8Dla1eNZgb38aXLxTj+ISQ0bSjpK49Hhm1vcMLlSGISfCwPJkr8O5F/JQSIXuATr1l9r6Nw5dQwfNIrU2bMQ/gBfMfPY39XajiLWp3cLWN+n3RPIwLWe+eKrTHs22r987+ngJXhmX1zIEAEnkMBWAhVQyZUQ7KmqjW2khtvw8PVRoV4o1I2nqZltE3R6wfmcUUlyNthTG794fXwAkmajkzYKLJiSwJV7Sr4lfkJgpdCwMzEtzxccMCagq30oUbQmmItB4glxX33CnVBRK4jwZGCaSrxP2ziy/hnPFJjUURnWyTpvoY+uLnT2vHa29Jni8 SOXd3MqP sWJY5Ou71rTik1Ca8A7WkffP2VUfBK5S5WK3NDT4iXHhWd0lWFiP0ichUM93pGHLCRnJ4631wirGnSVl2/XCzH0m4gB/JoAKS/0tAkGfgTWFRZsHLZQHDQ4kitF6GR291Ha48KewECtJT/btT7ZRWu43uYdp4dzG/UijrQ+dcpavh3w3wNu9u5Lzdn09SW8CJ/Q4h 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. 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 2dd73e4f3d8e..1a2234ee14d2 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3639,13 +3639,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 a1963c3322af..245ac69b66a5 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