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 1A069C4332F for ; Tue, 31 Oct 2023 10:13:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 90DD16B02C8; Tue, 31 Oct 2023 06:13:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8BE096B02C9; Tue, 31 Oct 2023 06:13:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 75E096B02CB; Tue, 31 Oct 2023 06:13:22 -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 672986B02C8 for ; Tue, 31 Oct 2023 06:13:22 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 3BA0C1CAE2B for ; Tue, 31 Oct 2023 10:13:22 +0000 (UTC) X-FDA: 81405344244.14.5EF71AF Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf13.hostedemail.com (Postfix) with ESMTP id D7F8D2001F for ; Tue, 31 Oct 2023 10:13:19 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=hk2W83bI; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf13.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=1698747200; 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=pAQbrfQoIJNOhnUYvPhPLxk1gl1ZWcaKec9dUXNoa30=; b=DkLxQXkJXLpmlAFS+xTa2EIXph9QfB6PX1xF9GJxXQZIP4cmkwCuW04j8BXdAEVd+OQhPJ Vhg/YYu8eRU9dga/vW2tLGPdqn53671ulI54g8+GxQSs5FSJCXVw9HotCxJjWhPjotiEcz bDtxDL3L+ec5XWby4xxr5zatxzmUxhA= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=hk2W83bI; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf13.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=1698747200; a=rsa-sha256; cv=none; b=e1sPuuVVqYahVfOrTiLJPfgvUiSrftMhOMtlZzdAp6tRo4c0mzHcAb2b6AtYQT4KWzoGHV rjzeFiKDlAYqC6gvde9vjfAbbd00oZ5+P+hzTuDAZO8uNfUqLQ5gdlg4IwXi/vV6+RbS61 EPgd+T6io4y+Jm7BrS55lafSBTKTFCc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698747199; 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:autocrypt:autocrypt; bh=pAQbrfQoIJNOhnUYvPhPLxk1gl1ZWcaKec9dUXNoa30=; b=hk2W83bI/qnflL+5MNQMs+7zjJpp4veTjLC+jiJVvrmhusfSoQyBwkSyMdOnNvq4vRqi5+ MDd376Mxa22EYz7mM1R+fHy4sAjVmR8xHWC+/vpC+nB0YFI8LVCNF1pS4sOLNNMq7WfbKb Dn1tkF6fr6pkD0QS4PJGGtotQ1+C1Mg= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-320-J_v3EY0SOIypQoio1MmBgA-1; Tue, 31 Oct 2023 06:13:17 -0400 X-MC-Unique: J_v3EY0SOIypQoio1MmBgA-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4092164ed09so38219845e9.2 for ; Tue, 31 Oct 2023 03:13:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698747196; x=1699351996; h=content-transfer-encoding:in-reply-to:organization:autocrypt: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=pAQbrfQoIJNOhnUYvPhPLxk1gl1ZWcaKec9dUXNoa30=; b=EYLWagjRJCvkOcPkYkTtzYZUe6jCkb+yX6KLVPW8AjYTCFprAcI7k8Ejfzq77ncXXx xPikDU6LC7UzKldcW8y2ZxEPVRep4aTtp9Owh39Pbq849oX/L+4FogfkXGl6/5RnTttO RWsy64PwYPgmpW7IaVdCwGqYWVh60vbbxC92Rn22JDzrMA/2nyeFLaD2CiHgwyLo3JQX 8RT1Wt+e08idh9mt4iZ9hEYg3AYNM2p7dO/lh7RUCidKe3sqyrICZYdPFeN5qHqeGEBj tWq4MTkMoLdRHBj6fQra8O7RGUEPpQjtckmJ+yJLp0QyW9+LkvNH2wKyBXYvmy9T4d00 QVfQ== X-Gm-Message-State: AOJu0Yzhgy5Mx4MkYQ/zkNODCJijLqyXRoS5VL+NetshYY+ca11yYdaL zBaVls23zQeingGrQRkCC+r/IIzqJ+sWqXsn/GWG4worgpyltU01MggErVYo9R9in27F4oTUipA PaxM20Bdzpgo= X-Received: by 2002:a05:600c:4449:b0:408:4120:bab7 with SMTP id v9-20020a05600c444900b004084120bab7mr10499388wmn.15.1698747196429; Tue, 31 Oct 2023 03:13:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHevO5e8NbNMxyxVt2qma4vR7VuBnZ4MDfKV72pDE/YGANv/bYJg45/F0IcpscecHYnjWYxuQ== X-Received: by 2002:a05:600c:4449:b0:408:4120:bab7 with SMTP id v9-20020a05600c444900b004084120bab7mr10499373wmn.15.1698747195965; Tue, 31 Oct 2023 03:13:15 -0700 (PDT) Received: from ?IPV6:2003:cb:c707:8f00:43b0:1107:57d2:28ee? (p200300cbc7078f0043b0110757d228ee.dip0.t-ipconnect.de. [2003:cb:c707:8f00:43b0:1107:57d2:28ee]) by smtp.gmail.com with ESMTPSA id fb12-20020a05600c520c00b00405d9a950a2sm1281801wmb.28.2023.10.31.03.13.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 31 Oct 2023 03:13:15 -0700 (PDT) Message-ID: Date: Tue, 31 Oct 2023 11:13:14 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v7 2/3] mm/memory_hotplug: split memmap_on_memory requests across memblocks To: "Verma, Vishal L" , "Williams, Dan J" , "Jiang, Dave" , "osalvador@suse.de" , "akpm@linux-foundation.org" Cc: "dave.hansen@linux.intel.com" , "Huang, Ying" , "linux-mm@kvack.org" , "aneesh.kumar@linux.ibm.com" , "linux-kernel@vger.kernel.org" , "linux-cxl@vger.kernel.org" , "Hocko, Michal" , "nvdimm@lists.linux.dev" , "jmoyer@redhat.com" , "Jonathan.Cameron@Huawei.com" References: <20231025-vv-kmem_memmap-v7-0-4a76d7652df5@intel.com> <20231025-vv-kmem_memmap-v7-2-4a76d7652df5@intel.com> <4df63333-de57-4a58-a110-77b4fdfa6a9e@redhat.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: 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-Rspam-User: X-Stat-Signature: atieyzeeiutew1gadgqc9pqhe4ezitun X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: D7F8D2001F X-HE-Tag: 1698747199-352754 X-HE-Meta: U2FsdGVkX1+hTzKpuBYGuHz/ZTg2X8v7xmaM/gzTdHrOjCrqyJON9dCRh7vzfGrCl+7QxZDx+LhwkQjNwe+97K42UQ5jzRTligeR59Gb8SO/OscMDcuz7kOvgE4iQpJu+ASUgJQ4J3GxpDKtGwznlygsBy9Rz9bXBKSC4iHBctUpKOenYG0A4+4twsgtp407HE082KDC5wPTTjO7rSO+Xo5bmHn7rKsu5+M85FM6WYdN0LiEfcelPlzmQsBjuMm6gPbTYvdchCKonRhosszYNtjlezMdJ2Rhgh6hMHOhdLpZamd+T07aJ65AaG4VxwRo8OfsJzV35A9qT1RhTByTHx8I9bszY8PrOMROd47j7WqyPZlGjO2yKTqEFgvLRPl9BzcbzG6Uji7bs6kK41XS82/BYxu13FYHcRUKydNGnAVrMHhg+h0Zk5YStZFLLQnyAP/YCkn7MnUxFV9v15VH9NktGEkAYBzCPLF04fIi4F2SBmdS17j/knjdfVdBde1iB8dTkGqruzT5rbnzFuU4ITwVxyqrt/9MupVGF/HNxgfpRYCvm95MCjS/a6MIJy3U+m8soRMLdw6V5ga8uR41QiPpLN1MXe64vQjZr+G/CCzp0DWHkKnNOnmSW4a+qz6GOg+rQslsbv/cUypb1OnuqYfrwkhNTUAENKZ1m2moAs5aEsOV79zpetDNXAINgHHdCOZvJf1SqCf5p9VQPLH8EhU8LbQzq9v2mN9blvM65EM++Yu/sTxsC6CZfvhQyVP0AjkegkbfS1IRLXclPUmqA/6POaTvXFCmuUNHU0YMWp/zQ1O4E5pHgTJa+7NyoVjjSub/4QP0VFyG4W4cqFUxV/lxZYAOMD47v86RRITIhAb4ZuTHaXDmKp498U84+hpByuPyavc46X6xoJWA+ZD4x4namqxvzQcRpoSEITKhfS518KxrUxm6c/1wiVOrnjebv2TkXSeEkvfSlOxeEsg MnpXIEiM yCOTRsQ92SuXmEKtcoWeKS6ZGUNOIdiIcGPqF52Oxx3ZQL5A+s/HzI3+iETZ7pzjvqRCpBOq1ogggO0zKzVev7XOFmLx7wHKqOMYDxyck4EE73+3Ad6gyPzYT+NCxmOHspINtr7KF6okprBrKp3A7vbDyJCnM5mRsowp24DboFPwdeXFoJZjJKmmY4LvSNH5NgwT3QNjnsSL2+cX4VFJl0KGdawjtEynTeh3nWzGoGd19AjQQ3jfiEZ4FCSzfP89kFmyRdPmnmuc3JmjIqxYh7mzd4IM4VgWSqFbG29CSOh3v2qxUXaqKXhlWwbCoveBEFYjGgGFOw4XjFRAqrB4QFRj41m1/Q6iBGYgNKw/uedcfW1+HCjJ6Wvng0XXWeBAQYHT8ExDSKC8Zkc1oN9cyYwvU7a6gSIjcrPXBvfWaOXO8wHyuwYlGHSzUfI7mK6CbKX/CK3Ra36moXa0wSnvgqq8xRjzyV8mat6EbJi5Mis2jYjQuldL78tNA+htGIXHWg1Ta 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: List-Subscribe: List-Unsubscribe: On 31.10.23 03:14, Verma, Vishal L wrote: > On Mon, 2023-10-30 at 11:20 +0100, David Hildenbrand wrote: >> On 26.10.23 00:44, Vishal Verma wrote: >>> > [..] > >>> @@ -2146,11 +2186,69 @@ void try_offline_node(int nid) >>>   } >>>   EXPORT_SYMBOL(try_offline_node); >>> >>> -static int __ref try_remove_memory(u64 start, u64 size) >>> +static void __ref remove_memory_blocks_and_altmaps(u64 start, u64 size) >>>   { >>> -       struct memory_block *mem; >>> -       int rc = 0, nid = NUMA_NO_NODE; >>> +       unsigned long memblock_size = memory_block_size_bytes(); >>>         struct vmem_altmap *altmap = NULL; >>> +       struct memory_block *mem; >>> +       u64 cur_start; >>> +       int rc; >>> + >>> +       /* >>> +        * For memmap_on_memory, the altmaps could have been added on >>> +        * a per-memblock basis. Loop through the entire range if so, >>> +        * and remove each memblock and its altmap. >>> +        */ >> >> /* >>   * altmaps where added on a per-memblock basis; we have to process >>   * each individual memory block. >>   */ >> >>> +       for (cur_start = start; cur_start < start + size; >>> +            cur_start += memblock_size) { >>> +               rc = walk_memory_blocks(cur_start, memblock_size, &mem, >>> +                                       test_has_altmap_cb); >>> +               if (rc) { >>> +                       altmap = mem->altmap; >>> +                       /* >>> +                        * Mark altmap NULL so that we can add a debug >>> +                        * check on memblock free. >>> +                        */ >>> +                       mem->altmap = NULL; >>> +               } >> >> Simpler (especially, we know that there must be an altmap): >> >> mem = find_memory_block(pfn_to_section_nr(cur_start)); >> altmap = mem->altmap; >> mem->altmap = NULL; >> >> I think we might be able to remove test_has_altmap_cb() then. >> >>> + >>> +               remove_memory_block_devices(cur_start, memblock_size); >>> + >>> +               arch_remove_memory(cur_start, memblock_size, altmap); >>> + >>> +               /* Verify that all vmemmap pages have actually been freed. */ >>> +               if (altmap) { >> >> There must be an altmap, so this can be done unconditionally. > > Hi David, Hi! > > All other comments make sense, making those changes now. > > However for this one, does the WARN() below go away then? > > I was wondering if maybe arch_remove_memory() is responsible for > freeing the altmap here, and at this stage we're just checking if that > happened. If it didn't WARN and then free it. I think that has to stay, to make sure arch_remove_memory() did the right thing and we don't -- by BUG -- still have some altmap pages in use after they should have been completely freed. > > I drilled down the path, and I don't see altmap actually getting freed > in vmem_altmap_free(), but I wasn't sure if was meant > to free it as altmap->alloc went down to 0. vmem_altmap_free() does the "altmap->alloc -= nr_pfns", which is called when arch_remove_memory() frees the vmemmap pages and detects that they actually come from the altmap reserve and not from the buddy/earlyboot allocator. Freeing an altmap is just unaccounting it in the altmap structure; and here we make sure that we are actually back down to 0 and don't have some weird altmap freeing BUG in arch_remove_memory(). -- Cheers, David / dhildenb