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 0E3D4C0015E for ; Mon, 24 Jul 2023 12:30:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6D2C5900004; Mon, 24 Jul 2023 08:30:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 683108E0002; Mon, 24 Jul 2023 08:30:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4FCD7900005; Mon, 24 Jul 2023 08:30:55 -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 410CC8E0002 for ; Mon, 24 Jul 2023 08:30:55 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id F2ABE140A06 for ; Mon, 24 Jul 2023 12:30:54 +0000 (UTC) X-FDA: 81046439670.25.906973B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf21.hostedemail.com (Postfix) with ESMTP id EB8521C0005 for ; Mon, 24 Jul 2023 12:30:51 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EyqH02ZM; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf21.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1690201852; 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=VSKoQEP2EDnL6kJfqxqzODZFeF9lR49lBqcSAz/K+nQ=; b=EYRTfOTxvLfVVPmkm8HhbFGU91KuxTYsPm1g1CqRa7//ON7X0YhZhgDYQXhUs5zXyLY03E Pr++6lFZvMtxmFLJbdpZrMn7abNqNM6DH0dqA6vSYcc/6ne1gya0bwOtD4QNkFww6OYFBQ I94zjSamA+kgosQif5t+DSbgjzU5zto= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EyqH02ZM; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf21.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690201852; a=rsa-sha256; cv=none; b=HQRcwmBj07YQssfLEOOldZEaHjtsatTMoWHim/9TN0iUB40wJZRoxVRzUqVs5bJ4UWT3bT xhigKeBMBqwJ3o41DVp0oyeD9OE5Vekr1DUCiefzUzHtkPn3rzQk2R4c1wgb/51q7LB3BD +FWoFoEbDo9a8eBm8+YK3f08KiYabI8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690201851; 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=VSKoQEP2EDnL6kJfqxqzODZFeF9lR49lBqcSAz/K+nQ=; b=EyqH02ZMmIf0oB1SokaaPePxTj/nY1ktAPYoBGWbTt/o3dxrUIuFjkKL5Wz/OyU73EAPL6 gfSUEjUaTF9IpZ+yXxDfL0B004RYIB0gbOw3BP4XnT6R2gbbcSkoXE0SAthsGXA1p7Xz64 IsK4Z95YvEwDGJ87BiCAkrhZR+bRXK8= Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-306-N0h9C72YO7ObZOTWJ_XHpw-1; Mon, 24 Jul 2023 08:30:47 -0400 X-MC-Unique: N0h9C72YO7ObZOTWJ_XHpw-1 Received: by mail-lf1-f71.google.com with SMTP id 2adb3069b0e04-4f76712f950so3658133e87.0 for ; Mon, 24 Jul 2023 05:30:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690201846; x=1690806646; 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=VSKoQEP2EDnL6kJfqxqzODZFeF9lR49lBqcSAz/K+nQ=; b=AtRN0dF0vT4Gm/4L2YwtsQ4DmtVMm5K4rhRKJYHpN2lGT4yfV/0Ox0xjll4/qm5QEh sj+YJho4CXaWfX2hjBAOQ/5sUIEx8XwcUVkj/YfHYeP49bYYt6yyHsEnLnsZo4/5EkhR qlXh/d+t5dkiK7rR5T0VjP2v71QZAwX7evGhkSLy4mOvDeiQsIdFm0u5jMoFsOoJo1bf IvnY9SvvLlPdjIVBGh4w7y5MLbW1sCD7cIv2NKTVev7cgdX4eqq/XduCuXYEZdA71CvL SBsPlLspy9lCMtCh2r5dxFqGY2rCz9Buh1w0z0rBPSuToP5HgpJfguQxus3Om5uxfWAm YSeQ== X-Gm-Message-State: ABy/qLZFUos2d81r++uYYLkIu9yp6A48ES+Se3ZcXgXy0H3jlP1P3I6B NrDSa/7KkcAgCZ5muxZesiGnp6hep65YC/MgefQuggSFogYNrjB8W9sJMQQlA+22MI8xOobF1i8 P0nkpmPH+JAQ= X-Received: by 2002:ac2:4ec6:0:b0:4fd:c923:db5e with SMTP id p6-20020ac24ec6000000b004fdc923db5emr4314738lfr.21.1690201846425; Mon, 24 Jul 2023 05:30:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlHg111kHN8tF7r6WNzgjtK5ISBSRjkXuBIfdVHLMEx/BxkeOZq0VLRuHYj9anom7QpNRx/Mzg== X-Received: by 2002:ac2:4ec6:0:b0:4fd:c923:db5e with SMTP id p6-20020ac24ec6000000b004fdc923db5emr4314718lfr.21.1690201846063; Mon, 24 Jul 2023 05:30:46 -0700 (PDT) Received: from ?IPV6:2003:cb:c73d:bb00:91a5:d1c:3a7e:4c77? (p200300cbc73dbb0091a50d1c3a7e4c77.dip0.t-ipconnect.de. [2003:cb:c73d:bb00:91a5:d1c:3a7e:4c77]) by smtp.gmail.com with ESMTPSA id x8-20020a1c7c08000000b003f90b9b2c31sm12816583wmc.28.2023.07.24.05.30.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Jul 2023 05:30:45 -0700 (PDT) Message-ID: <6dc3c82f-c732-79bf-b678-d6484d1b7f76@redhat.com> Date: Mon, 24 Jul 2023 14:30:44 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH v4 3/6] mm/hotplug: Allow architecture to override memmap on memory support check 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: <20230718024409.95742-1-aneesh.kumar@linux.ibm.com> <20230718024409.95742-4-aneesh.kumar@linux.ibm.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20230718024409.95742-4-aneesh.kumar@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: 7bit X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: EB8521C0005 X-Stat-Signature: biuj9cdtmzzk3cikezfndxgbb1m4o3ku X-HE-Tag: 1690201851-525021 X-HE-Meta: U2FsdGVkX1/10Z28PyS3/lEJ4aA+ox1nznyO6GPSrixp8Bfp9wlaTVEpjKadQlX6SoJX2RMbtguwBU+bEO4gnlxdNHLMY3cEEj0SXdWs9ihsnZ7R7pnO5Vw0rfLafjvc+hdp8w7Vy4V2xGHXhN7aNxA05/DznaJ8BUOxPTDVVaSWAWrx8mKDE1m043tX06ns0S5sHMrnfPZHyFsTX3M9Sg0ZGVBopVider3UjbRuSLk9101xBWG/r/W0X6O8O/+DpGra+jFNlRvIt61ipA1zHYln1gbI92qfNU69ICBArg7t8DNqFp6W4zlZfZ3+UQZExI4JhNebsiLlxXUo8j2jttuaRaqxV2bjn4JZtXTI4cuger6fOqgZ9erTgDtVplsTNz6dffPhMkD5gBQ82lIOmGFcSprL+wLfrMvCmvaZOsLubK9j8Ol7fT3UkCjI7n45K8z3hBO8kS3h1qZekzsNX8E6E5hkzjcu/i1ohHZf9lbPd8FyX8BM7CBjC2Pr/Dg/KqlJGavzh0ALPI4TbtulWRaUjrO6FHP+hwwgxkSMU6JowLU4aPzfForkgaExe2JdOyi7HRG0zVRgFpd08WhrQte07TCzpAOwgXM8/klOv4xZmQS1sQYvh2pKWB7HoL7+DQZWU/XhEwwFn9Z42BvQQfz36fRTwiqLrcS6EYOd6dA9w31GYK9u1SMmq/lL+RqnfhfkSTel/Cp+baHbg+kgmrc8VE1it4Cmz2i/+DYS99K3N2WdGUbhbvLRq7N0LbRHm7J6pCRwNN+NSquEvRcKhqdZojpozyq10Oh4EHvftZ8DNmcnC0wVJjO5+lVm9dKMWws1GOxDmHUGgrrTeYn2oMXceQZf0t8+i/zjTOzm7KHK6RyjzLU9FgKQRHYtdb9o+bezzdP8hmoiJ5Z9Hth8XN4eToIYYiFIkmhzYi9Qv2T7ikWARQkYLN4GOozzws8CxEOYu/ZHMopgRZ9wTCt tTV+8vIv OKImlSl12Wf+r6VlwitHSMagNWSriIFQwLv1pc+MBwzMqleaXb8VusEpchDvKWcKB5UC83XktD5ivsK6WjNdXyONn++rBOLDEhoNnXH1OzNnfCIvb6Ku8zrLz7BVu8D4pRXOfvnggSZ0tiMGfQs2FHJ7uhKLVmGsd0EOby9Masm7Pn5ARGkDAnKhmfNs4t0j+f5cFPq3mEXCG8MXM40mrjeHZOeOREqvqW8vVwbJ2o7DPz8Ep0f/yZOR1n843uf2aBER1DiZXghtF2aqRvLmEkrFJYox3TwJFThXxL34rHXDxI6dTj5RtsHe9xMjKEAR0m88hBWajOFHWQOVqPsxAezGKxzd61MowUiFIIw2E5ba4//8C/Rl9HPX8UzY+pk5tek1DlHw+tI4KAeWgsilA4Te3VtNDDABtJ4QkVsVWlj2JbMwrHneP2W00aw== 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 18.07.23 04:44, Aneesh Kumar K.V wrote: > Some architectures would want different restrictions. Hence add an > architecture-specific override. > > Both the PMD_SIZE check and pageblock alignment check are moved there. No :) > > Signed-off-by: Aneesh Kumar K.V > --- > mm/memory_hotplug.c | 22 +++++++++++++++++++--- > 1 file changed, 19 insertions(+), 3 deletions(-) > > diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c > index 1b19462f4e72..5921c81fcb70 100644 > --- a/mm/memory_hotplug.c > +++ b/mm/memory_hotplug.c > @@ -1247,9 +1247,25 @@ static int online_memory_block(struct memory_block *mem, void *arg) > return device_online(&mem->dev); > } > > +#ifndef arch_supports_memmap_on_memory > +static inline bool arch_supports_memmap_on_memory(unsigned long size) > +{ > + unsigned long nr_vmemmap_pages = size >> PAGE_SHIFT; > + unsigned long vmemmap_size = nr_vmemmap_pages * sizeof(struct page); > + > + /* > + * As default, we want the vmemmap to span a complete PMD such that we > + * can map the vmemmap using a single PMD if supported by the > + * architecture. > + */ > + return IS_ALIGNED(vmemmap_size, PMD_SIZE); > +} > +#endif > + > static bool mhp_supports_memmap_on_memory(unsigned long size) > { > - unsigned long nr_vmemmap_pages = size / PAGE_SIZE; > + > + unsigned long nr_vmemmap_pages = size >> PAGE_SHIFT; > unsigned long vmemmap_size = nr_vmemmap_pages * sizeof(struct page); > unsigned long remaining_size = size - vmemmap_size; > > @@ -1281,8 +1297,8 @@ static bool mhp_supports_memmap_on_memory(unsigned long size) > */ > return mhp_memmap_on_memory() && > size == memory_block_size_bytes() && > - IS_ALIGNED(vmemmap_size, PMD_SIZE) && > - IS_ALIGNED(remaining_size, (pageblock_nr_pages << PAGE_SHIFT)); > + IS_ALIGNED(remaining_size, (pageblock_nr_pages << PAGE_SHIFT)) && > + arch_supports_memmap_on_memory(size); > } > > /* Acked-by: David Hildenbrand -- Cheers, David / dhildenb