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 338ECC369A4 for ; Tue, 8 Apr 2025 16:41:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8B85A6B00A6; Tue, 8 Apr 2025 12:41:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 840306B00A7; Tue, 8 Apr 2025 12:41:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 691FA6B00A8; Tue, 8 Apr 2025 12:41:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 4745A6B00A6 for ; Tue, 8 Apr 2025 12:41:26 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 14CFD12035A for ; Tue, 8 Apr 2025 16:41:27 +0000 (UTC) X-FDA: 83311442214.07.F633B9E Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) by imf02.hostedemail.com (Postfix) with ESMTP id 3066C80011 for ; Tue, 8 Apr 2025 16:41:25 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=wqqidElr; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf02.hostedemail.com: domain of fvdl@google.com designates 209.85.160.174 as permitted sender) smtp.mailfrom=fvdl@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744130485; 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=iYRcH3lLl5pRDZXnglwcCxaB3s5dgtk0PEdOP904X1c=; b=ssYlJqSRCO4Ekv+jn58uqJ0LT12BI/W0i1vz+qlmufJnfypSer13ZtGWilMz9PwTDCJsDH ZTvDxA5GZwjVAytAZWQQaIFvaPrhIxS3tOIafddTLs2Ayfg5C6nUSLQz0ODZrQRYAx/BO2 RBdmT4eMQ2GhN9plFiZFd1l5ZVdoSjM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744130485; a=rsa-sha256; cv=none; b=c+QUEXUrlhZlk5aU7gDUHdWTzsbmheJ/lugAMSaQ/desQzr9D18MNQgMZBhQx3r+aNcV4O kUxr5YcdpIJiHxpcYVc2mX+UeoQBsf4qfu6OCZgOnNStC1C/Suhrqv6lZuMfYToceHK9Su gOGJVU7iV4fRpR4PkhGgGXWYpSkSjM0= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=wqqidElr; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf02.hostedemail.com: domain of fvdl@google.com designates 209.85.160.174 as permitted sender) smtp.mailfrom=fvdl@google.com Received: by mail-qt1-f174.google.com with SMTP id d75a77b69052e-4769e30af66so409821cf.1 for ; Tue, 08 Apr 2025 09:41:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744130484; x=1744735284; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=iYRcH3lLl5pRDZXnglwcCxaB3s5dgtk0PEdOP904X1c=; b=wqqidElrluL0B8iWOm7/mseYo58wz7FT3OhejhOlMekgDmFzPhiNxINLkNvind5aVe zewD8atJWW9IFeCcW1LlNj7k+sKU4Vf5P60QaPjPJW2PKhBbvnqbNWyYr+OOIngfjJQt CrzHy3qHya6MFXVQMxVzbae/UdHCQHyPDGRVwfp9Cgx28tLsz8TUPH796eKUlWpexdwW /RvrY7flr5KsH7X07DUHP3uu7dzG2QuHO1lZ1WJQ9wvJlJ1xeXb7rWltqNAE+nLikld+ OhaWafs6rThGaWuG+GKa1JrAokdRBq9QRzGAJ3/1ty63Bs2Ov5UoGCbahJm1dinRgBu+ dxqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744130484; x=1744735284; h=content-transfer-encoding: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=iYRcH3lLl5pRDZXnglwcCxaB3s5dgtk0PEdOP904X1c=; b=p+LffB+i3MsXoxJ6MPkATzebU4dMQ0Y4e4X/chZjXib7sW8Skl86lU8hxGlMYg2Ot3 XPpyzRgZZLEaadx5FW7S0U+dIMCK5rB1eoKk+I6j9Ox+SkdLXdYa+W6TkREvCHmOuGMY YCy16tH8Q8zvtM/i4a87LfDymFkN2sFZNEurFm6VG/u6aamDIqTRZojWPQAX8HWSkHri HZp7qH66pSa3CjBWt6Q2kcbUSK58n2vd3If/VtrEto/4uFtwNxnKdrRtcV3HHfKUCnXK K7L30OHBrEQ64z2I6EUYMS7kY92s8jYnTHsKgZoQ1ZNNzhQhN/gHNtdUdKTlMYO5RI4J 982Q== X-Forwarded-Encrypted: i=1; AJvYcCWmKFAjvi067hwNf+Q4zZM2wAM/GnQdHQHDfAuOJum9F3JDI/ysl65fqexDP00K5ukTNxHD5guaZA==@kvack.org X-Gm-Message-State: AOJu0YzxQqaW9/jM2PB17GG5yhEsMtu6zg1cdapHew3xkC/PPMsCgbO5 fJ4tOT1VYywbHuUT/BpKU3ELoW/veL7QcTKkH6sk2//wfObI9RjXSGkvFzRBXVbl/PdNE0GCOjl 08oEqiFIfshE52rojbPihi6pCSaeKbSAnlDWq X-Gm-Gg: ASbGncubeJG8bUQufVyv/1TKPIq+ac3bZwt7L+RoS9ZM0JGeaRT9JmfqwbJ7mMOV37g P+SZ02CBFMPMyExulY8Oj3txcVw30+2imai6t55iMPzURZ2i+FnTJ0j+Hu/KFcejX6PcTt9bYjs yKaeMYJ5AdiIh9U4H584nWHkk= X-Google-Smtp-Source: AGHT+IG699SWsw9sjYrwWeM4sOVRWMvlyHpBHJHj5auiQO03bS+mgysoep4meUMKmncXBX4E76zuRYFM0QuRNyPMlzE= X-Received: by 2002:a05:622a:1103:b0:477:9a4:d7ea with SMTP id d75a77b69052e-47956264737mr4192611cf.13.1744130484148; Tue, 08 Apr 2025 09:41:24 -0700 (PDT) MIME-Version: 1.0 References: <20250407165435.2567898-1-fvdl@google.com> In-Reply-To: From: Frank van der Linden Date: Tue, 8 Apr 2025 09:41:11 -0700 X-Gm-Features: ATxdqUE799IJwNgPzTNGIuwf5_KGnKhCOK8_htZEHLvF_Tsz71NvBnrUJBVGzFM Message-ID: Subject: Re: [PATCH] mm/cma: report base address of single range correctly To: Geert Uytterhoeven 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" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 3066C80011 X-Stat-Signature: rw8cxdij98nxdo5ootw69bkk1b5njyh6 X-Rspam-User: X-HE-Tag: 1744130485-663559 X-HE-Meta: U2FsdGVkX18uCzHkNHhyPKEEumB/ziy53Mh76SnYZFHzk0NESOnssGyVTdDlO5jy9iYMfIWLyxB50RJ1f1kIhwWHAcn2jpNeqVnbpJKYl77NMPN9Vg/xZbZUUBXZhvekRe3iQflMuXaJi5C/k8yhZHn9loB5kTugFED0hHHHqFtevG/tAmkzmiih2d2zwsM5cn0GgHU3GZ59WTEyyI62OLIE2TbInsDzyvIib5vy4I8XwXyFJOVyGbT36Q43ws3lZpXdppjTPCRbqdyzqO/nr/ctIBx9/GrgYRnk75dYTqdCkCXOVn7pqbX2yMnfLlWpaZo2B2DaLeb86EOvrc/fI2tjhu8ugM6Ur8aMF9hE23NydRQ0SbZuid/v/CXMYvHmccr7mNNXEeI30jKnNH5iZzyJsLvl3F2ZgLG3xYsQgf6Bu1P3WgX3HcNaI4HWGD1cChrl7E2AjqnEOWaN/S/LAbf+otXRKaURLplsSWObcwIP+c2/MXazGdCN/VdpTF9tuQdmYzGsJ8nAR7sh52XW8hB3nS0XlFaYXGRUyqI9WlskrhZtJZMGXn9jTekcVt6wFDECZXmQKQ9i83M1Y9YPdbvcgvewLDE54gK14XLMHyzKiybv2d30+OFMhI89zwolzPjKwZgq6955kTJcOWjxMTnGmTUJIEXgznnJxk+qvmB/dzeQOKWw2gW04B1TR6UJowI4iwrBBc2jpOit2Q8VfupEPXXtWT1FZsUWVzyIPyl1zqZ74+0eYe6tDZxEOdokeSB57QsAs77MZdj84Ne67w02vD89XaQCk7Gk9P315hkeX0eHNSsNa3ZU96ZDVIWwIHWKplDPmkVAtZRLz0GYMc3sF3PrrqWanvppIkqzrVf3sVfveMphIi/f7w/m0W0Kim6sSjISu2Wj+o3VDBLCZ9wzFmXRawztYYvc7x8sczifYgMv8bKhDYVGj4KTsWQhxW1ZGdwLmPQhsORRBZ6 rzY2YXVk 41Q5sp9vtbSvJRKqAkrj/D+QhlNnnNFybOLGg5EFu4LG3i4NQaCKVoSn8lt8RJaX0wfBJZ/HSj5luLfezt06SYDMwDAOjAdg9SBOaR2oYyUVCULRt4qV0uu5COKwyH3Am8PrJ5vFCn/Th3XfTKvYVwQW1pk2+oF5DD6mfsKJsS3RDt6hpm2Ym6ubrF7VMxakUL1FVDqjkLmHgZBwP83mZilzaeXgKoPeK9evPHBQxrrlJBUkLMDhPvxPqazxbF2u5nKxp78Hy5uUargLw9nCgtrrUzA6t6lqYcwzmr8fHiZzf63sxI/GQxYXxYFJM8hmiEINW 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 Tue, Apr 8, 2025 at 1:06=E2=80=AFAM Geert Uytterhoeven wrote: > > 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 =3D=3D 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 r= equested") > > Reported-by: Geert Uytterhoeven > > Closes: https://lore.kernel.org/linux-mm/CAMuHMdVWviQ7O9yBFE3f=3Dev0eVb= 1CnsQvR6SKtEROBbM6z7g3w@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(phy= s_addr_t base, > > ret =3D cma_init_reserved_mem(base, size, order_per_bit, name, = res_cma); > > if (ret) > > memblock_phys_free(base, size); > > - > > - (*res_cma)->nid =3D nid; > > + else { > > + (*res_cma)->nid =3D nid; > > + *basep =3D 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 =3D nid; > *basep =3D base; > > return 0; > > > > > return ret; > > } > > Gr{oetje,eeting}s, > > Geert > Thanks for testing - I sent a v2 with the style nit fixed. Thanks again, - Frank