Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9AA18C4338F for ; Wed, 28 Jul 2021 14:16:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7F3D061019 for ; Wed, 28 Jul 2021 14:16:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236273AbhG1OQh (ORCPT ); Wed, 28 Jul 2021 10:16:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:34789 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235425AbhG1OQg (ORCPT ); Wed, 28 Jul 2021 10:16:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627481794; 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=SBTvI7AyrQyvAwreHvMDRlU4GfJOEkkwow/YW2lcebI=; b=VkUcWDWGG2aPjCEfmk7W7XkHmtILlw8YYXfIz5TIz80I66R0gnBY9t3OFGIgzYXzJhY1NQ jJUIVY6V9IsZ5UpomCRO2FWAy4u1qbHINAvAt1d9eBxjJNKSpa1d7Fd6q3UTO99iPvXi1l W7zTQYX57awhZl7NbpC79GNFSy2GRMs= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-26-CkuQUMW4P3Wr76kxZbaiJQ-1; Wed, 28 Jul 2021 10:16:33 -0400 X-MC-Unique: CkuQUMW4P3Wr76kxZbaiJQ-1 Received: by mail-wm1-f70.google.com with SMTP id 25-20020a05600c0219b029024ebb12928cso998155wmi.3 for ; Wed, 28 Jul 2021 07:16:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:references:from:organization:subject :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=SBTvI7AyrQyvAwreHvMDRlU4GfJOEkkwow/YW2lcebI=; b=jwlxCQq5fFK+KwIUfoNlrw4Iyes+Nz1mfvYjT+iy9YP0TwuwlEGXFMW+RLCaS5j1HF xpMMO6lF+7jcu8VQu/+HoCb6uFuFAItQQkh18WTVCZAXUEyTAkJWI4EnEqDy38k5oOBb BTu7oH/NQ0SC1rH5dYfMBVv6pDPfTErqEcNk/VNTfStxHtlDDuI5LjlcKU7FKFdfrqRQ V44EpBHf6V+GQyWKEwtNoX8CIvzzPPeQxXUzXGP105GCOhjubdTdKo29M6fJn0r/1IRG bYONWSdbeN4JRdLcxUAIvyWkLBK8PlAPxM6/inJUKDqsfIA81cqZir/B/U9W8WQUNooU WKAw== X-Gm-Message-State: AOAM53187ubdkKZRrS9ocB3waXu4DlG1TTuUwk4GXyfzBEAmkUPEenuw nW8hGW6gP2d0cOxZtprup7CJNrPP+IzPWeUWcA23dbyg70MCI2re+6OH+EufW+O2ogdll2BQxw1 s239GZu6EakZOH6L3vVd0Nee4Iwj6AofBjGGNADqERw358wfEyh6QeSJQMzoWUHcOvPNMCg== X-Received: by 2002:a5d:4751:: with SMTP id o17mr23882218wrs.252.1627481792369; Wed, 28 Jul 2021 07:16:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzp/VmSZ6MuqzGZoTa2wRKFNJXZiRxCOsLy7Zc304MtYust9qBmcciWmXmZwOF3zqp8wUvvWw== X-Received: by 2002:a5d:4751:: with SMTP id o17mr23882179wrs.252.1627481792086; Wed, 28 Jul 2021 07:16:32 -0700 (PDT) Received: from ?IPv6:2003:d8:2f0a:7f00:fad7:3bc9:69d:31f? (p200300d82f0a7f00fad73bc9069d031f.dip0.t-ipconnect.de. [2003:d8:2f0a:7f00:fad7:3bc9:69d:31f]) by smtp.gmail.com with ESMTPSA id f194sm6232701wmf.23.2021.07.28.07.16.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 28 Jul 2021 07:16:31 -0700 (PDT) To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrew Morton , Vitaly Kuznetsov , "Michael S. Tsirkin" , Jason Wang , Marek Kedzierski , Hui Zhu , Pankaj Gupta , Wei Yang , Oscar Salvador , Michal Hocko , Dan Williams , Anshuman Khandual , Dave Hansen , Vlastimil Babka , Mike Rapoport , "Rafael J. Wysocki" , Len Brown , Pavel Tatashin , virtualization@lists.linux-foundation.org, linux-acpi@vger.kernel.org References: <20210723125210.29987-1-david@redhat.com> <20210723125210.29987-4-david@redhat.com> From: David Hildenbrand Organization: Red Hat Subject: Re: [PATCH v2 3/9] drivers/base/memory: introduce "memory groups" to logically group memory blocks Message-ID: <2eaa8ac5-9eaf-bd2a-ace6-3f1ac38c85ff@redhat.com> Date: Wed, 28 Jul 2021 16:16:30 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Hi Greg, >> >> static void unregister_memory(struct memory_block *memory) >> @@ -681,6 +692,11 @@ static void unregister_memory(struct memory_block *memory) >> >> WARN_ON(xa_erase(&memory_blocks, memory->dev.id) == NULL); >> >> + if (memory->group) { >> + refcount_dec(&memory->group->refcount); >> + memory->group = NULL; > > Who freed the memory for the group? try_remove_memory() will end up calling remove_memory_block_devices()->unregister_memory(). try_remove_memory() will get called by drivers that added memory previously and registered the memory groups. >> +static int register_memory_group(struct memory_group group) >> +{ >> + struct memory_group *new_group; >> + uint32_t mgid; >> + int ret; >> + >> + if (!node_possible(group.nid)) >> + return -EINVAL; >> + >> + new_group = kzalloc(sizeof(group), GFP_KERNEL); >> + if (!new_group) >> + return -ENOMEM; >> + *new_group = group; > > You burried a memcpy here, why? Please be explicit as this is now a > dynamic structure. To make the two callers directly below nicer. This is a pure helper for initialization. Suggestions welcome. > >> + refcount_set(&new_group->refcount, 1); > > Why not just use a kref? You seem to be treating it as a kref would > work, right? I shall have a look, thanks! > >> + >> + ret = xa_alloc(&memory_groups, &mgid, new_group, xa_limit_31b, >> + GFP_KERNEL); >> + if (ret) >> + kfree(new_group); >> + return ret ? ret : mgid; > > I hate ?: please spell this out: > if (ret) > return ret; > return mgid; I can avoid it in this case, but it feels kind of wrong to stick to the personal preference of individuals if it's getting used all over the code base and there is no clear coding style recommendation. > > There, more obvious and you can read it in 10 years when you have to go > fix it up... > Fair enough. > > >> +} >> + >> +int register_static_memory_group(int nid, unsigned long max_pages) >> +{ >> + struct memory_group group = { >> + .nid = nid, >> + .s = { >> + .max_pages = max_pages, >> + }, >> + }; >> + >> + if (!max_pages) >> + return -EINVAL; >> + return register_memory_group(group); >> +} >> +EXPORT_SYMBOL_GPL(register_static_memory_group); > > Let's make our global namespace a bit nicer: > memory_group_register_static() > memory_group_register_dynamic() > > and so on. Use prefixes please, not suffixes. Sure, no strong opinion, can do. > > >> + >> +int register_dynamic_memory_group(int nid, unsigned long unit_pages) >> +{ >> + struct memory_group group = { >> + .nid = nid, >> + .is_dynamic = true, >> + .d = { >> + .unit_pages = unit_pages, >> + }, >> + }; >> + >> + if (!unit_pages || !is_power_of_2(unit_pages) || >> + unit_pages < PHYS_PFN(memory_block_size_bytes())) >> + return -EINVAL; >> + return register_memory_group(group); >> +} >> +EXPORT_SYMBOL_GPL(register_dynamic_memory_group); >> + >> +int unregister_memory_group(int mgid) >> +{ >> + struct memory_group *group; >> + >> + if (mgid < 0) >> + return -EINVAL; >> + >> + group = xa_load(&memory_groups, mgid); >> + if (!group || refcount_read(&group->refcount) > 1) >> + return -EINVAL; >> + >> + xa_erase(&memory_groups, mgid); >> + kfree(group); >> + return 0; >> +} >> +EXPORT_SYMBOL_GPL(unregister_memory_group); > > memory_group_unregister() Sure. > > >> + >> +struct memory_group *get_memory_group(int mgid) >> +{ >> + return xa_load(&memory_groups, mgid); >> +} > > Global function? Called from mm/memory_hotplug.c:add_memory_resource(). Note that we do not want to export that function to random modules. Any suggestion? > > >> diff --git a/include/linux/memory.h b/include/linux/memory.h >> index 97e92e8b556a..6e20a6174fe5 100644 >> --- a/include/linux/memory.h >> +++ b/include/linux/memory.h >> @@ -23,6 +23,42 @@ >> >> #define MIN_MEMORY_BLOCK_SIZE (1UL << SECTION_SIZE_BITS) >> >> +struct memory_group { >> + /* Nid the whole group belongs to. */ >> + int nid; > > What is a "nid"? "Node id". Will clarify. > >> + /* References from memory blocks + 1. */ > > Blank line above this? Sure. > > And put the structure comments in proper kernel doc so that others can > read them and we can verify it is correct over time. Can do. > >> + refcount_t refcount; >> + /* >> + * Memory group type: static vs. dynamic. >> + * >> + * Static: All memory in the group belongs to a single unit, such as, >> + * a DIMM. All memory belonging to the group will be added in >> + * one go and removed in one go -- it's static. >> + * >> + * Dynamic: Memory within the group is added/removed dynamically in >> + * units of the specified granularity of at least one memory block. >> + */ >> + bool is_dynamic; >> + >> + union { >> + struct { >> + /* >> + * Maximum number of pages we'll have in this static >> + * memory group. >> + */ >> + unsigned long max_pages; >> + } s; >> + struct { >> + /* >> + * Unit in pages in which memory is added/removed in >> + * this dynamic memory group. This granularity defines >> + * the alignment of a unit in physical address space. >> + */ >> + unsigned long unit_pages; >> + } d; > > so is_dynamic determines which to use here? Please be explicit. Sure, can make that more explicit. Thanks for the feedback! -- Thanks, David / dhildenb