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 5168DEB64DD for ; Tue, 11 Jul 2023 15:45:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B9E106B0074; Tue, 11 Jul 2023 11:45:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B4ECB6B0075; Tue, 11 Jul 2023 11:45:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A168A6B0078; Tue, 11 Jul 2023 11:45:00 -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 8FBB56B0074 for ; Tue, 11 Jul 2023 11:45:00 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 669B9402F7 for ; Tue, 11 Jul 2023 15:45:00 +0000 (UTC) X-FDA: 80999754360.08.51BD084 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf26.hostedemail.com (Postfix) with ESMTP id 1866C140027 for ; Tue, 11 Jul 2023 15:44:57 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=X3YH6vC9; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf26.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689090298; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=CTkg9s0iWcbfFgL9SSLNDg8Sjekn535Q+HAoBWAYbEM=; b=3fpf5a+gSa8dTRS+ZwN7QbTq2Vof1CiuG2RAXwmLSsX+hvorNKnozIIzlkQCZ5WSLaWW4c rMFnu63CtDEVFtAU4zkeLXetUKFu1VNBsQJO2jQBqpStDgmJ3uzGwHXVOPx8XB5lIHjEfL SXgA2k99pbbw0awe81W0+mKQLqEjK18= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=X3YH6vC9; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf26.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689090298; a=rsa-sha256; cv=none; b=7JZ2KhLnPv/5E2JPVljqwGgRsdeSbVrshf+Pl9jimnGMmfk+APuu6hT5FCKbjR09XOEJUr PGNVDeEryj3LIBPPDIoCqWYLIhRy/hVrJsE9T5QmNRgFd1hHH2MeBzQKCylU9pYgf8/WGR Ser1T7LR1ki2WOwmxkdmOeEYSvb4Ctc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689090297; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CTkg9s0iWcbfFgL9SSLNDg8Sjekn535Q+HAoBWAYbEM=; b=X3YH6vC90akqJoPRc6xa1pdp9ZQH8HpjN538iwMVjVJlpGc+KfMmB7ihAslQseZq6e+sSj KNfCI+/6DkyDhD6H2sr05wAXjwQZpPbUtBNLd5qTbtilETkSM0B5BMwlOKVlMc8apDvggn U6FCDWGuBjc0UKFrfyxjMeDKyUhOELs= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-83-PA0YXo2KNOK5jhVmOkA4HA-1; Tue, 11 Jul 2023 11:44:55 -0400 X-MC-Unique: PA0YXo2KNOK5jhVmOkA4HA-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-3fc0094c1bdso29763525e9.2 for ; Tue, 11 Jul 2023 08:44:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689090294; x=1691682294; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=CTkg9s0iWcbfFgL9SSLNDg8Sjekn535Q+HAoBWAYbEM=; b=X1THabrMiMYgiMZa4pZ34T1sbNjjJ2XSzDsVYQqubB1AAeFww5cS1ABijxW8z9nlfy DVqU3EnvBfixZysYdTfopug5QZh9CjZqEDaURhP0nlvF9uRECF+tRyFUBIOib6xFMTdn L3U17jmNrJYvkomlIB/666YBs0dIAyZRHFa1dekEUrwpS3I20Q/xx3sudekhcSGRoZBw tq3nc+w3aM5ABleFuu9vz2KXVAKgBobZpkiWeVNU1QCPvx+Yjc6Bc2L4CMUpPjMja8Ew zySa0pe5fl9Z5cMJFdcoYjtKQUwOFxbiwEAgcAE8MsBwWtMGzThy6TV1QgDBSS8whHml IDEg== X-Gm-Message-State: ABy/qLYfBF0mKz8wqXzje1wZo0A6xzz2A5UF6byl95fTVDd64fujwj4O feu+2VOwC6kXZwhLZI5PoKlLyG7z6ZXQaB8bwLCRSt4az6b1U+AAtb1pwvjfkrkkL76ikaxTZnU 0o6b2Ra6pivI= X-Received: by 2002:a05:6000:545:b0:314:3344:72f6 with SMTP id b5-20020a056000054500b00314334472f6mr14650270wrf.32.1689090294483; Tue, 11 Jul 2023 08:44:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlHFpPSfAiISpVurSJyI/hKeOFmPWL02N1P55IJ91jovnrrBjvuApbRDH1+rdxg2E2VoyCAKKA== X-Received: by 2002:a05:6000:545:b0:314:3344:72f6 with SMTP id b5-20020a056000054500b00314334472f6mr14650250wrf.32.1689090294092; Tue, 11 Jul 2023 08:44:54 -0700 (PDT) Received: from ?IPV6:2003:cb:c745:4000:13ad:ed64:37e6:115d? (p200300cbc745400013aded6437e6115d.dip0.t-ipconnect.de. [2003:cb:c745:4000:13ad:ed64:37e6:115d]) by smtp.gmail.com with ESMTPSA id g23-20020a7bc4d7000000b003fc0505be19sm2844720wmk.37.2023.07.11.08.44.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 11 Jul 2023 08:44:53 -0700 (PDT) Message-ID: Date: Tue, 11 Jul 2023 17:44:52 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH v3 5/7] powerpc/book3s64/memhotplug: Enable memmap on memory for radix To: Aneesh Kumar K V , 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 , Michal Hocko , Vishal Verma References: <20230711044834.72809-1-aneesh.kumar@linux.ibm.com> <20230711044834.72809-6-aneesh.kumar@linux.ibm.com> <98285185-170f-10fb-67a7-09e35ab47650@redhat.com> <006e24f1-1261-1018-4125-02dd354da519@linux.ibm.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <006e24f1-1261-1018-4125-02dd354da519@linux.ibm.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1866C140027 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: wc8yi73x9qsnaw7rmq7kxh4y3ooz914j X-HE-Tag: 1689090297-305116 X-HE-Meta: U2FsdGVkX1+pAJ5L5GCxlKhZzza/t/ropA9I94zjfyNW6pszSBdmZz70SxuJ1y2NWQzv2fVlr8U2a23YiCjqsZIbuNgeTdwQTdYa68bOUVEAxFwbTatBMDhnkyppdi1bXlVRADagJfMuY6kqlAiiAcDZIerqtk/6SIgfWcfaUlEr+Fa5A7vikkjX5z7GpnUVkStiVpR1g/fWMQ1y0dJ9jrYlTbby3cIHL4K5x+dZjX6gR+wSstlrku2qlYh4wEBhv0wY0Hz6ICXyrLo/M1kaz1fFeZtGuDd3xJNKo0spG7/tWBdEJsREI3yfYii2HxgXVpm9UQ3BEJdBakdN6fu/Xk/1Ra+GTEmBM5reAtIVtSatrabX9LDShszz5iQtr6dKomMDjxSDJqSWtGLAw9JE7uCmCY4hnXvJ3gkK6m88A4v+m/+j7iKDQII9HApvLFyIYA3eZgPR43rMNSeSZT7NS47PXfFx9LHb4ams0SOO0xBzkSVzkXoCc8pmJDdKsWgSGemhaUEuO9QaB+mMERegu4WMErZVrjXnH4KOuG/vL4j3+LbIRwpGoOdQgmb1lbn8pTc4Z595jB6HW73X3LtU0WU5wGlYNIiVSicfbFLEuIX8kM9zJoHPX+7jZcCpIxUe1CD6UfPCxla2cOTaXK2s6Qx8SB+fvGrM7s0B1el+a37E9Ltnz2Zn6CQVP2aHFL7fn9g13x5ql+c7KJ+pioD+GvW2/FVQaeiQ5vGfS4sZ8bqj+ChZRcEQTce4EtpkFc0FvFE5bIENLnvMY5cRc/m/uFUSeBKQIPd54//ecvyNqgfmThdHJcf6zsqzdA6To5rnc5cNCTOCs/r7J3nzB69AXzXIrflaJPPH/71YX3dVtn9G/iEzgZA0iY111gz4Ts1sYVV50sa/fdulLzxpFUouKwPigKt/TR8qJluvSRzRiR1GcUTj0gpowY2/KBMakuoK8qHcZAcuNS5hQNkQb6p ghjY7x3t ytS2iLQwfkWwGenShnhA8lQsJbUdf/q4zGjKuMQiBmpEMZJqpJOOpyQa1dhpw912wdjPJjQC+se2MGV5mVQF11BkNydWOEl/x1rRQF49g1WjxIHIPmkpr0ktedV2t9M3ZXTXc2Np5sCDL7IyO0gI7oUWe713t+Ml009f717XuBQmU/Et+lmpZGttYYueYH6HtH6GMhcKo0hG+0Xl8OvC+MSulQpkdxnok++/wyYvty0J8XBFTLJ8BaTgI9RXPTUHT7ggvZayar+MeFyHTFZ4P1maKnw8xIdoi+15buivDJVwNfpVjSofjIAfBj3ATdDlNN20//kqCim2FdbEbv94Yu7jhskt7DURewJI/ZkguU7hqthi12RWTpoDs5bCklLvoJKsZ47ALRaeb5nT32w1vO4AIlcJlaDf3eRbN 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 11.07.23 17:40, Aneesh Kumar K V wrote: > On 7/11/23 8:56 PM, David Hildenbrand wrote: >> On 11.07.23 06:48, Aneesh Kumar K.V wrote: >>> Radix vmemmap mapping can map things correctly at the PMD level or PTE >>> level based on different device boundary checks. Hence we skip the >>> restrictions w.r.t vmemmap size to be multiple of PMD_SIZE. This also >>> makes the feature widely useful because to use PMD_SIZE vmemmap area we >>> require a memory block size of 2GiB >>> >>> We can also use MHP_RESERVE_PAGES_MEMMAP_ON_MEMORY to that the feature >>> can work with a memory block size of 256MB. Using altmap.reserve feature >>> to align things correctly at pageblock granularity. We can end up >>> losing some pages in memory with this. For ex: with a 256MiB memory block >>> size, we require 4 pages to map vmemmap pages, In order to align things >>> correctly we end up adding a reserve of 28 pages. ie, for every 4096 >>> pages 28 pages get reserved. >>> >>> Signed-off-by: Aneesh Kumar K.V >>> --- >>>   arch/powerpc/Kconfig                          |  1 + >>>   arch/powerpc/include/asm/pgtable.h            | 28 +++++++++++++++++++ >>>   .../platforms/pseries/hotplug-memory.c        |  3 +- >>>   mm/memory_hotplug.c                           |  2 ++ >>>   4 files changed, 33 insertions(+), 1 deletion(-) >>> >>> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig >>> index 116d6add0bb0..f890907e5bbf 100644 >>> --- a/arch/powerpc/Kconfig >>> +++ b/arch/powerpc/Kconfig >>> @@ -157,6 +157,7 @@ config PPC >>>       select ARCH_HAS_UBSAN_SANITIZE_ALL >>>       select ARCH_HAVE_NMI_SAFE_CMPXCHG >>>       select ARCH_KEEP_MEMBLOCK >>> +    select ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE    if PPC_RADIX_MMU >>>       select ARCH_MIGHT_HAVE_PC_PARPORT >>>       select ARCH_MIGHT_HAVE_PC_SERIO >>>       select ARCH_OPTIONAL_KERNEL_RWX        if ARCH_HAS_STRICT_KERNEL_RWX >>> diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h >>> index 68817ea7f994..8e6c92dde6ad 100644 >>> --- a/arch/powerpc/include/asm/pgtable.h >>> +++ b/arch/powerpc/include/asm/pgtable.h >>> @@ -169,6 +169,34 @@ static inline bool is_ioremap_addr(const void *x) >>>   int __meminit vmemmap_populated(unsigned long vmemmap_addr, int vmemmap_map_size); >>>   bool altmap_cross_boundary(struct vmem_altmap *altmap, unsigned long start, >>>                  unsigned long page_size); >>> +/* >>> + * mm/memory_hotplug.c:mhp_supports_memmap_on_memory goes into details >>> + * some of the restrictions. We don't check for PMD_SIZE because our >>> + * vmemmap allocation code can fallback correctly. The pageblock >>> + * alignment requirement is met using altmap->reserve blocks. >>> + */ >>> +#define arch_supports_memmap_on_memory arch_supports_memmap_on_memory >>> +static inline bool arch_supports_memmap_on_memory(unsigned long size) >>> +{ >>> +    unsigned long nr_pages = size >> PAGE_SHIFT; >>> +    unsigned long vmemmap_size = nr_pages * sizeof(struct page); >>> + >>> +    if (!radix_enabled()) >>> +        return false; >>> + >>> +#ifdef CONFIG_PPC_4K_PAGES >>> +    return IS_ALIGNED(vmemmap_size, PMD_SIZE); >>> +#else >>> +    /* >>> +     * Make sure the vmemmap allocation is fully contianed >>> +     * so that we always allocate vmemmap memory from altmap area. >>> +     * The pageblock alignment requirement is met by using >>> +     * reserve blocks in altmap. >>> +     */ >>> +    return IS_ALIGNED(vmemmap_size,  PAGE_SIZE); >> >> Can we move that check into common code as well? >> >> If our (original) vmemmap size would not fit into a single page, we would be in trouble on any architecture. Did not check if it would be an issue for arm64 as well in case we would allow eventually wasting memory. >> > > > For x86 and arm we already do IS_ALIGNED(vmemmap_size, PMD_SIZE); in arch_supports_memmap_on_memory(). That should imply PAGE_SIZE alignment. > If arm64 allow the usage of altmap.reserve, I would expect the arch_supports_memmap_on_memory to have the PAGE_SIZE check. > > Adding the PAGE_SIZE check in mhp_supports_memmap_on_memory() makes it redundant check for x86 and arm currently? IMHO not an issue. The common code check is a bit weaker and the arch check a bit stronger. > > modified mm/memory_hotplug.c > @@ -1293,6 +1293,13 @@ static bool mhp_supports_memmap_on_memory(unsigned long size) > */ > if (!mhp_memmap_on_memory() || size != memory_block_size_bytes()) > return false; > + > + /* > + * Make sure the vmemmap allocation is fully contianed s/contianed/contained/ > + * so that we always allocate vmemmap memory from altmap area. In theory, it's not only the vmemmap size, but also the vmemmap start (that it doesn't start somewhere in between a page, crossing a page). I suspect the start is always guaranteed to be aligned (of the vmemmap size is aligned), correct? > + */ > + if (!IS_ALIGNED(vmemmap_size, PAGE_SIZE)) > + return false; > /* > * Without page reservation remaining pages should be pageblock aligned. > */ > > -- Cheers, David / dhildenb