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 C8CF3C3600C for ; Tue, 8 Apr 2025 08:06:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 284C56B0007; Tue, 8 Apr 2025 04:06:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 232B96B0008; Tue, 8 Apr 2025 04:06:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0FC816B000C; Tue, 8 Apr 2025 04:06:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id E0BD16B0007 for ; Tue, 8 Apr 2025 04:06:04 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 79770C0797 for ; Tue, 8 Apr 2025 08:06:05 +0000 (UTC) X-FDA: 83310143490.11.3BADCCB Received: from mail-ua1-f53.google.com (mail-ua1-f53.google.com [209.85.222.53]) by imf19.hostedemail.com (Postfix) with ESMTP id 697701A000A for ; Tue, 8 Apr 2025 08:06:03 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf19.hostedemail.com: domain of geert.uytterhoeven@gmail.com designates 209.85.222.53 as permitted sender) smtp.mailfrom=geert.uytterhoeven@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744099563; a=rsa-sha256; cv=none; b=HSFAJHzv+laNDdkHSWjpGTF9gZe2JI0cJa6s8+cHEX2SZSXF40Z9hfeexsQ4JX5SQgfk9C Btt43kCayflGJyIaSsomOhJyLsGj52VZPsAgMKNZ+w93+hmThREXz9oefxF7ebtvaeV025 lTEjgmqf/5Be0NlrAAxe63BqsA2qgqE= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf19.hostedemail.com: domain of geert.uytterhoeven@gmail.com designates 209.85.222.53 as permitted sender) smtp.mailfrom=geert.uytterhoeven@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744099563; 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: in-reply-to:in-reply-to:references:references; bh=xlxvcoEn9hOCN5sqYCqBrFIWD2+u4/+JFIB32cw1JOI=; b=Pp7L9Hj5w2zdTrFonm1TmmLBYc9m4bkSLiycjkV16kp32LvFmcv+RgobbfhiYmpo0gboYa QQT8dQh2wmpwncJFM/YLIdqMFKVgN35lrSPp9xsQccgiXJA3TyYA3zy+EuyN32KAS4ESib eqUdex6ey7U6Aphv/zWWbAulbv1zW1Q= Received: by mail-ua1-f53.google.com with SMTP id a1e0cc1a2514c-86d3805a551so2279474241.3 for ; Tue, 08 Apr 2025 01:06:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744099561; x=1744704361; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xlxvcoEn9hOCN5sqYCqBrFIWD2+u4/+JFIB32cw1JOI=; b=TrUvzVwenKvUfh2/qF1ZT0t8P1Qt+lPC+fpcmwlizJ5Oq/q15bGhXKOaHNOu3bA6XQ Ps45nluFx7igeCD/xTN3+io+nD48q8Vrp7fA4Bbkt/IaffEqCKATzKw8mTwNHuBJxa89 woZmU/br7/BGNW7rcOMpYmE6uT9dTqGt0049k4aIJi+rcoxrnpnkU0pHz4b1j4hogzUj ZOlEpKLdyjBgo0pw6E8pWdvn01vz3/9HH43DE14z/A13HyRmeA6XftIeSmobsD5uZEmy zlA/j5S+k1v11QZzg0ED/WYtZfqilVw5Zf+88jI2xyvA3HIiUF9aaM12a1xGFRzp6ETJ 1TNA== X-Forwarded-Encrypted: i=1; AJvYcCXI0XyuKIJ0uP+uVtDuwPULKm6Pr5R6RdtdoWGJDLYhAx4i8XcPtL4XlEH+iXiyIgtniItweLw59w==@kvack.org X-Gm-Message-State: AOJu0YzUAmwFnfNOPk0Zz9LbCjpFdalVIbjTv+D+5rQJ1sl4B8ETNxbA iyX29xIob+oeb4FWB+lmNbA3bb3fDU3R1URDYI9CxUU45myfmgvfcNK1Mc9i X-Gm-Gg: ASbGncuzi1rCM+Zi5/Uxj10gkUjSLz1S0u861htJOrYSnpV0mEBon1uu9ZRHTw7JgyN I7SAToV6tWsor8y+DS8YdcFx6XqVJQt0X31w8QmLp+1iQv1kaMbXLgI7UPMSi04RaRdOWd1weY/ 9NOZUNUiENp8t8zqTCz8jIK6SZkcncBgbAO4RX8XPjYupuMyuJpnyxPfrE8/L5qxgBhbKUMguIM 8QsnDEjvjbiAog+tMw+qpJgB/ORqGDVH59B+2s48d8m+8u/jwmaoAPYLEYL7wOAivxjnexwryV+ uAwBo9FiD0SCjChMBFCTpZB+j0LyInlPemouLcmf3NZ16kRW/4XhiITi8j6O1iXuHTfzY7uzFGS iscHHzbiZ7C8= X-Google-Smtp-Source: AGHT+IEjc682cPWRHII8Qo/9wp7+EacjWxG8ajxVMhdgUfplwyYolepALPBmnvBXcMHqMPUb/aHNMA== X-Received: by 2002:a05:6102:162c:b0:4ba:95f1:cc83 with SMTP id ada2fe7eead31-4c855482292mr11407241137.16.1744099561055; Tue, 08 Apr 2025 01:06:01 -0700 (PDT) Received: from mail-vk1-f177.google.com (mail-vk1-f177.google.com. [209.85.221.177]) by smtp.gmail.com with ESMTPSA id ada2fe7eead31-4c9b448e8afsm263346137.15.2025.04.08.01.06.00 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Apr 2025 01:06:00 -0700 (PDT) Received: by mail-vk1-f177.google.com with SMTP id 71dfb90a1353d-523de538206so2310629e0c.2 for ; Tue, 08 Apr 2025 01:06:00 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCVGERoo1DMhOqBwHbn/hd8zYlbMfmS/h7mik4DYMGf863qhQ6J3lcW3C38qXT+FQPxVHv/W+kl3uQ==@kvack.org X-Received: by 2002:a05:6102:38c7:b0:4c3:43e:5227 with SMTP id ada2fe7eead31-4c8553ae67cmr11934847137.9.1744099560424; Tue, 08 Apr 2025 01:06:00 -0700 (PDT) MIME-Version: 1.0 References: <20250407165435.2567898-1-fvdl@google.com> In-Reply-To: <20250407165435.2567898-1-fvdl@google.com> From: Geert Uytterhoeven Date: Tue, 8 Apr 2025 10:05:48 +0200 X-Gmail-Original-Message-ID: X-Gm-Features: ATxdqUHUDHQ6BUTLIhfVUZYR288fq3PDbDXvs9_PB1P4cdsqCrKbe4BPzg0kiFI Message-ID: Subject: Re: [PATCH] mm/cma: report base address of single range correctly To: Frank van der Linden Cc: akpm@linux-foundation.org, muchun.song@linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org, gushchin@linux.dev Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 697701A000A X-Stat-Signature: n1owzbprtini5fp75jhn3ad73gcg6wrq X-HE-Tag: 1744099563-913868 X-HE-Meta: U2FsdGVkX19nz41ycljVuNltkBj2zCfz0cJHeaZg99tfDK5V+T5Z1ksg+cE78YkxtL41qp5ld/7f8UdOPMmhv/zToP+bOeCuqMKP+Kdb9X087TjQSMnm3LMNnAWw9xNZf2hD2WSo57hHDySH5BARmIrX1xfz/kg3w1O1HsqvFa9eYMxBMdw2SSH8tBZtzZ/4mYz+2quFNAxqkHhhUJtdqusM+qUuyPY841iPdkAwBB0CbD5/VhLrQ/bGY4Vg8N9xnZiGHrkjZbV5VBzmF2QkTCvtN/Ct+KLO92Xd7hUI63zaSQXqaPAZrbzNSFWZhlRtewQds9EAs+tRUGw9uHciTmy4NCMRSyHyh7QuCgng5LH87eROjjjpd+5c5cRw/gDIyp24J9bMczlLV1GEfoVvgfvf0dGr/z6Hjt3fzqhmeMQ/uUVEBnbPQovpDDsQPl2fLlhFFkHEML9zCTWvwztRIwmxA4qhmTxHVWSi9s7sW6+osv5iVKZmhINnhBtwCCRR/2FJm3tGYYElzAb7bW1fVnb3i+jzWh+jvHxYJt62fpjeYvVZ3irqq8X5SBm444VqrdlIEe/oILCV1d/AbZvbCY9OwIHU1JKyof6FaM8Bs5B0B5t8JnBCoB3shjRysRO6PlMA6QI53lKOPjzzInc0eTheoaYj0lKCp351VdC3OcGAzzq6KCJfubAzt+n3kaaXK1u+J149Kwe++npwRHUcnyPnZDRYUAltuAdFlHmanMtiXISl8/682Ni7C+X2EqFpne8xzSYyOXKF3MpvkhVY4hyq1InCl3xbePeCiBI6yU+SJyoBeni0g9qN8M7D39D9kdaSpBDtAVfelWpFbZaREYtFD8/WwH6VRUDDf25Rxr0kTFfsZbCWo2D/y6xsFZE1pI1QqpzUBO8uCgiy6cG7Gk0/1cuq5s7NkH+Cv7cjFmjUAfrr7cBYKdNi4FB//Ta5GLA/usac6UcVitQlhW2 SwITh/Nv +I6BTGCxEJYtCmN1lvq7D02fYRrN6jPRgbEvRBnsDh9u5TcKOs7HY1Hw8opHILEkl2lqSw1eTyPBMIvJFqDbJvdLhnhA/VqVO4M9lClYJEMQr/o00vmFV5juU5o+9raG0qoZs4+l4yvdBkZBrt0JWhMG5KOLD+D7Jbu854g1LYWoEMZlD/YMx5RANjF9v+iXMuhqV2qzl3SQBYyc/RM1ou4IS7WHYa+APR5GGJC3gdEcvVbBU4BK2AVG6JnOeJ6Ttk8t1zMtAz1Z+rm5NLGsCo+C+bw4pzKEksoWnB2v2CX5j2ScZKwOwU03zJtpgU0socrTjVjaDuuRYvKAd9dQoAsAjf97C5+QjWWPlRAAdfpwDA6YHDTsySg7fWFkeVB7/sbdEyPuKsVRnpwjiuuwpnOykJlgWiFYuPKJeXP6bK+rDdmaUXiUeGv6Kjw== 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 Mon, 7 Apr 2025 at 18:54, Frank van der Linden wrote: > The cma_declare_contiguous_nid code was refactored by > commit c009da4258f9 ("mm, cma: support multiple contiguous > ranges, if requested"), so that it could use an internal > function to attempt a single range area first, and then > try a multi-range one. > > However, that meant that the actual base address used for > the !fixed case (base == 0) wasn't available one level up > to be printed in the informational message, and it would > always end up printing a base address of 0 in the boot > message. > > Make the internal function take a phys_addr_t pointer to > the base address, so that the value is available to the > caller. > > Fixes: c009da4258f9 ("mm, cma: support multiple contiguous ranges, if requested") > Reported-by: Geert Uytterhoeven > Closes: https://lore.kernel.org/linux-mm/CAMuHMdVWviQ7O9yBFE3f=ev0eVb1CnsQvR6SKtEROBbM6z7g3w@mail.gmail.com/ > Signed-off-by: Frank van der Linden Thanks, this fixes the issue! Tested-by: Geert Uytterhoeven > --- a/mm/cma.c > +++ b/mm/cma.c > @@ -724,8 +724,10 @@ static int __init __cma_declare_contiguous_nid(phys_addr_t base, > ret = cma_init_reserved_mem(base, size, order_per_bit, name, res_cma); > if (ret) > memblock_phys_free(base, size); > - > - (*res_cma)->nid = nid; > + else { > + (*res_cma)->nid = nid; > + *basep = base; > + } Please add curly braces to the other branch, too. Or perhaps restructure as: if (ret) { memblock_phys_free(base, size); return ret; } (*res_cma)->nid = nid; *basep = base; return 0; > > return ret; > } Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds