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 X-Spam-Level: X-Spam-Status: No, score=-10.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 4A71FC4338F for ; Mon, 26 Jul 2021 07:14:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CCE9560C51 for ; Mon, 26 Jul 2021 07:14:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CCE9560C51 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 4E2626B0033; Mon, 26 Jul 2021 03:14:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 46B918D0002; Mon, 26 Jul 2021 03:14:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 30BFE8D0001; Mon, 26 Jul 2021 03:14:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0077.hostedemail.com [216.40.44.77]) by kanga.kvack.org (Postfix) with ESMTP id 143D86B0033 for ; Mon, 26 Jul 2021 03:14:35 -0400 (EDT) Received: from smtpin37.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id BA880181AEF30 for ; Mon, 26 Jul 2021 07:14:34 +0000 (UTC) X-FDA: 78403876068.37.61CB7FC Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf10.hostedemail.com (Postfix) with ESMTP id 1BEB16024496 for ; Mon, 26 Jul 2021 07:14:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627283673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=um4df6F+Tcs1NedbhaEs9ICFL4JEkb2ohkfDmaRpXVs=; b=GFwGhg5WkX2wETMy6a/UWZZ7PsDxakqdi+XG+IJwaIx4+uPtqXkm5IkQsT5ii8nAtCxesb KW82b6tudXxYSUPxEVQ5YrEc4FcTQl2MWLBi02eRaWCTzxWJvSrjb9fk6iV9yOCt9/lLao SJlzrXLB/WHotXQGxOJgkgcTSpwm80o= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-199-2rdFDZk1M7CV9FRtXRy5HQ-1; Mon, 26 Jul 2021 03:14:28 -0400 X-MC-Unique: 2rdFDZk1M7CV9FRtXRy5HQ-1 Received: by mail-wr1-f71.google.com with SMTP id s8-20020a5d42480000b02901404c442853so4340504wrr.12 for ; Mon, 26 Jul 2021 00:14:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=um4df6F+Tcs1NedbhaEs9ICFL4JEkb2ohkfDmaRpXVs=; b=mSpLUnhwwHjJsbeGJY7g9JQZ3As4LDIl9a9aKMt2F3csCS0+MxizJq0SpDNuRA0B4M NPojzFdy8WHg38w1izvFPt6SrtWWibwHopK+kCLB3WIi2r4wP0zC3bZfARyMmSfJWdCs 3+v/2BqFj9K+CW35ZlCNDNCQ7vhjvGJRQbQ2hDrrp10UXKtKzupcrm11OzfavN4ZiSYb qqspejWPO79Ibwgl+VSzphz8LVUykODNqagarLZgz5rFW3aylAKbCRdrAzmRNSAc6pWt cJbHi4ahieeCmBxoL22rnbQB9B5XkGbEZcUymRiozLa4VYZiM3JZP7zgNdnts6frCntE HwTw== X-Gm-Message-State: AOAM531az9SCVD4906frAJXu9h2hteNweh2mVQuGPUdImdExaC39WU+D Tt/KjF2uY08XhFpqX7g9/FHN+aZPKou8yA/XnvCs5jcHg3etkUP0n6n8d0EIFM9aX0RPT3F54KX mTSUY5PUdS0w= X-Received: by 2002:a05:600c:a08:: with SMTP id z8mr11306685wmp.52.1627283667217; Mon, 26 Jul 2021 00:14:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyrJ5ioNqCfkDgUWTA7YxeWf82kzHlJSCsGt9E8hJ1xGP6IhEO9RD5CtVqgDVl+ePM/lAAEqw== X-Received: by 2002:a05:600c:a08:: with SMTP id z8mr11306664wmp.52.1627283667006; Mon, 26 Jul 2021 00:14:27 -0700 (PDT) Received: from [192.168.3.132] (p4ff23b33.dip0.t-ipconnect.de. [79.242.59.51]) by smtp.gmail.com with ESMTPSA id d203sm7830431wmd.38.2021.07.26.00.14.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 26 Jul 2021 00:14:26 -0700 (PDT) Subject: Re: mmotm 2021-07-23-15-03 uploaded (mm/memory_hotplug.c) To: Randy Dunlap , akpm@linux-foundation.org, broonie@kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-next@vger.kernel.org, mhocko@suse.cz, mm-commits@vger.kernel.org, sfr@canb.auug.org.au References: <20210723220400.w5iKInKaC%akpm@linux-foundation.org> <5966f6a2-bdba-3a54-c6cb-d21aaeb8f534@infradead.org> From: David Hildenbrand Organization: Red Hat Message-ID: <5394da5e-29f0-ff7d-e614-e2805400a8bb@redhat.com> Date: Mon, 26 Jul 2021 09:14:25 +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: <5966f6a2-bdba-3a54-c6cb-d21aaeb8f534@infradead.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GFwGhg5W; spf=none (imf10.hostedemail.com: domain of david@redhat.com has no SPF policy when checking 216.205.24.124) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Rspamd-Server: rspam02 X-Stat-Signature: nkg6ffxtcmzw63u67f51mhegyb8ex6nb X-Rspamd-Queue-Id: 1BEB16024496 X-HE-Tag: 1627283673-293049 Content-Transfer-Encoding: quoted-printable 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 24.07.21 20:49, Randy Dunlap wrote: > On 7/23/21 3:04 PM, akpm@linux-foundation.org wrote: >> The mm-of-the-moment snapshot 2021-07-23-15-03 has been uploaded to >> >> https://www.ozlabs.org/~akpm/mmotm/ >> >> mmotm-readme.txt says >> >> README for mm-of-the-moment: >> >> https://www.ozlabs.org/~akpm/mmotm/ >> >> This is a snapshot of my -mm patch queue. Uploaded at random hopefull= y >> more than once a week. >> >> You will need quilt to apply these patches to the latest Linus release= (5.x >> or 5.x-rcY). The series file is in broken-out.tar.gz and is duplicate= d in >> https://ozlabs.org/~akpm/mmotm/series >> >> The file broken-out.tar.gz contains two datestamp files: .DATE and >> .DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-s= s, >> followed by the base kernel version against which this patch series is= to >> be applied. >> >=20 > on x86_64: > # CONFIG_CMA is not set >=20 > mm-memory_hotplug-memory-group-aware-auto-movable-online-policy.patch >=20 >=20 >=20 > ../mm/memory_hotplug.c: In function =E2=80=98auto_movable_stats_account= _zone=E2=80=99: > ../mm/memory_hotplug.c:748:33: error: =E2=80=98struct zone=E2=80=99 has= no member named =E2=80=98cma_pages=E2=80=99; did you mean =E2=80=98manag= ed_pages=E2=80=99? > stats->movable_pages +=3D zone->cma_pages; > ^~~~~~~~~ > managed_pages > ../mm/memory_hotplug.c:750:38: error: =E2=80=98struct zone=E2=80=99 has= no member named =E2=80=98cma_pages=E2=80=99; did you mean =E2=80=98manag= ed_pages=E2=80=99? > stats->kernel_early_pages -=3D zone->cma_pages; > ^~~~~~~~~ > managed_pages >=20 >=20 Thanks Randy, the following on top should make it fly: diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index bfdaa28eb86f..fa1a0afd32ba 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -741,13 +741,15 @@ static void auto_movable_stats_account_zone(struct = auto_movable_stats *stats, if (zone_idx(zone) =3D=3D ZONE_MOVABLE) { stats->movable_pages +=3D zone->present_pages; } else { + stats->kernel_early_pages +=3D zone->present_early_pages; +#ifdef CONFIG_CMA /* * CMA pages (never on hotplugged memory) behave like * ZONE_MOVABLE. */ stats->movable_pages +=3D zone->cma_pages; - stats->kernel_early_pages +=3D zone->present_early_pages; stats->kernel_early_pages -=3D zone->cma_pages; +#endif /* CONFIG_CMA */ } } struct auto_movable_group_stats { --=20 Thanks, David / dhildenb