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 05877EDE984 for ; Thu, 14 Sep 2023 06:13:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 476CB8D0015; Thu, 14 Sep 2023 02:13:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4266B8D0001; Thu, 14 Sep 2023 02:13:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 315398D0015; Thu, 14 Sep 2023 02:13:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 1F5408D0001 for ; Thu, 14 Sep 2023 02:13:38 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id E7A4DB447E for ; Thu, 14 Sep 2023 06:13:37 +0000 (UTC) X-FDA: 81234186474.30.3117164 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf11.hostedemail.com (Postfix) with ESMTP id 82C794000D for ; Thu, 14 Sep 2023 06:13:35 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=JMZ42zVu; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf11.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694672016; a=rsa-sha256; cv=none; b=VyC6CncZlxtXYT8mRgnBEp6p3nCWSO+PbFwoYtyCuOoa1jRhRDEp7WfYyFls++Dol/75gv gwpIOkcvaK4hCTRBdLZsHYZgLzN6wAMwO3Qf1jw8ZN7EbAIhYEvYuRxP68rffYcZjctwYI Bpokrj/5KnwtD8cQ8iBcxufbsnOP4NY= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=JMZ42zVu; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf11.hostedemail.com: domain of rppt@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1694672016; 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=5lLrsLtBLz8MmJE+6Lhxzbn1pcFOnXuuhQwf5bfixtg=; b=GEcpx6/gQMF25eHQNn3N/wN07rN51WtO6dYyf/ux/4oFZNSLlA5n59rX7YN64S7yqZ/ag/ nSHbO4bJXmK7/ZBJRTKaEyUTrP044NQvtq3Eby8kdq83Wx0+B9Fu+1EEkD/f71kXj6oI3S Andkk0L8Pg06Q9RHJI1r8x9UOm+dsGU= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 21D05CE216F; Thu, 14 Sep 2023 06:13:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85377C433C8; Thu, 14 Sep 2023 06:13:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694672009; bh=hxjVQjecSSBe4DgtU67qykRXre0HLHIWQ7IopGfkXIM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=JMZ42zVuZeVBPvF/ovSnME9MEwonKV0Q8UIOkcNbr3tfciVQbjrR4AkwdJeT4gTxe xAHTUJGLWfpECZvE5RC6RTKQkZxWi3Jyq8SAUnb5IFTiw3+sVapzz0DNEJBmq0A81E OV6wLOsAtH2exc5S2F2VmxKlyOJ+CddmobuQpEmKuN8iSRbFOe4AApDxkFpJ2RpERU Wz3uaszxFyEPyAVBEARffhTgwURrUHL8F8bfk83wLtZ46sDU02Y077crT1DL9Y9Zrx PHA+vEhOuHpaemgoV8q2AjasocHfOlVWkjxEz/+S4C5BSSVoGxpcwxrzSEv6WTc2AD 8kUYtQbb9D7pw== Date: Thu, 14 Sep 2023 09:12:54 +0300 From: Mike Rapoport To: Rong Tao Cc: rongtao@cestc.cn, open list , "open list:MEMBLOCK AND MEMORY MANAGEMENT INITIALIZATION" Subject: Re: [PATCH] memblock tests: Fix compilation errors. Message-ID: <20230914061254.GB3303@kernel.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 82C794000D X-Stat-Signature: m5cb5cgfcmh6ko9oigz3omsias4dbo1u X-HE-Tag: 1694672015-595912 X-HE-Meta: U2FsdGVkX1/1fqDPva755en2ZCfW+dWMnVZmBJU+ARJoaFZLVVuQeYOmcQbM1bvWxnl8jMzwSayqwFX1dnLQzY6hphU3b++l/j7eg38xQ4bd+egMALTRsyMLq0eW7ni7KeWzqHbpmTCYso0MC2KztiYaJHfblqEZr9eN8YkRhY4IC9XHnaj3b7b0tPKkV+PGPPm+y3ussb4LwLMIVLl3RORKt6pjn1gnpDCI8WKsdJo+raYCXAqVPEGr0ZQWrMZh9rQrsG0kV16QkisvIxsXUSElN3IILzeJgT1OCXaYZnPxi8c8puDGgMBQthvADq+mQvxcgsfa5ug5yRz5rbjOvbyTbYNoPsAvyVFQRsRHDlOSgmTthMNvIKtIGR6CQl7x/S5KSbRjdqlY9W2rgvA2np1GSTCy445whg8qLLUu6W7vRW26jsIj81K4e659Rs8YEO2KZB6rTWBe4+34amuSkbiIc/WnQw8WRjTmPnnVN3ig9DpjpJUea6gCOlKPW5wTuGP5d0regAMvMMo4ZK4Om+vOOLPu7Ix/HyVGrYA+WrCuQMbxnZRauqcqLoltoeYhQLjhGmkoPVEAokRMVK125ojZgiUrCdArGbI+BLiDIgNwQkXnD1dWI6fZdqfIGAasR1iKULlOFNpsVmavq9m90P6GpZkpRz13OOZBmQtrRkXv2JagfxdREQFm7BzKXFFyqNw8DprQChTy+E/ILVOyv0jVIDzJAqvJLVX+u3ky6UvSsK/+GxnAsrqtGm1uHWfB7KZj5gQ0j6aYAUtmCLDEmkXlyh4fLExkk0fe9W4W1lYWGfTm9g3gIUuqAZaKb3jnJ8VwoaGu6TRbLGLNd+vYU8LMt/ytxWSPlsclsWezJpFyOe7e87mS44KC1YkOUyb87+fReNkvn75N4oWMQoS7vqMuZPHyH3zSmP3ycX4wrl0ZEGCOa9U6/LD52VSHL8Btj9ksb+Jx65iZ7OVwAoH mGtbfN8j qcwm6JjVCRKKd4HisNwFpNHb9wxjGvCxc/DCbB9eJQNIRqFzjMzSDFG1WFOFdXfa594wDTUryMVVbog4em7M/uh0G1Pj7IgFD/MaTHMHQLAv0vplN747tUoLgATlyupLBlLtDyCkzrRhOugQbYCEcWLzi/h7zNhvegkkqn2UpuiRyt6SAQqBMpVPsjSgzZgtPTPpnMMVIoBcKFvjZrhiv/8EymF+Bs/aoQWqaUfVe1xJxCP1JhF7TL2txVPGLeyUziPyLDoRbczItmSv1ceh12/W32zNtAsjANudq 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 Mon, Sep 11, 2023 at 10:32:56PM +0800, Rong Tao wrote: > From: Rong Tao > > This patch fix the follow errors. > > commit 61167ad5fecd("mm: pass nid to reserve_bootmem_region()") pass nid > parameter to reserve_bootmem_region(), > > $ make -C tools/testing/memblock/ > ... > memblock.c: In function ‘memmap_init_reserved_pages’: > memblock.c:2111:25: error: too many arguments to function ‘reserve_bootmem_region’ > 2111 | reserve_bootmem_region(start, end, nid); > | ^~~~~~~~~~~~~~~~~~~~~~ > ../../include/linux/mm.h:32:6: note: declared here > 32 | void reserve_bootmem_region(phys_addr_t start, phys_addr_t end); > | ^~~~~~~~~~~~~~~~~~~~~~ > memblock.c:2122:17: error: too many arguments to function ‘reserve_bootmem_region’ > 2122 | reserve_bootmem_region(start, end, nid); > | ^~~~~~~~~~~~~~~~~~~~~~ > > commit dcdfdd40fa82("mm: Add support for unaccepted memory") call > accept_memory() in memblock.c > > $ make -C tools/testing/memblock/ > ... > cc -fsanitize=address -fsanitize=undefined main.o memblock.o \ > lib/slab.o mmzone.o slab.o tests/alloc_nid_api.o \ > tests/alloc_helpers_api.o tests/alloc_api.o tests/basic_api.o \ > tests/common.o tests/alloc_exact_nid_api.o -o main > /usr/bin/ld: memblock.o: in function `memblock_alloc_range_nid': > memblock.c:(.text+0x7ae4): undefined reference to `accept_memory' > > Signed-off-by: Rong Tao Applied, thanks! > --- > tools/include/linux/mm.h | 2 +- > tools/testing/memblock/internal.h | 4 ++++ > tools/testing/memblock/mmzone.c | 2 +- > 3 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/tools/include/linux/mm.h b/tools/include/linux/mm.h > index a03d9bba5151..2bc94079d616 100644 > --- a/tools/include/linux/mm.h > +++ b/tools/include/linux/mm.h > @@ -29,7 +29,7 @@ static inline void *phys_to_virt(unsigned long address) > return __va(address); > } > > -void reserve_bootmem_region(phys_addr_t start, phys_addr_t end); > +void reserve_bootmem_region(phys_addr_t start, phys_addr_t end, int nid); > > static inline void totalram_pages_inc(void) > { > diff --git a/tools/testing/memblock/internal.h b/tools/testing/memblock/internal.h > index fdb7f5db7308..f6c6e5474c3a 100644 > --- a/tools/testing/memblock/internal.h > +++ b/tools/testing/memblock/internal.h > @@ -20,4 +20,8 @@ void memblock_free_pages(struct page *page, unsigned long pfn, > { > } > > +static inline void accept_memory(phys_addr_t start, phys_addr_t end) > +{ > +} > + > #endif > diff --git a/tools/testing/memblock/mmzone.c b/tools/testing/memblock/mmzone.c > index 7b0909e8b759..d3d58851864e 100644 > --- a/tools/testing/memblock/mmzone.c > +++ b/tools/testing/memblock/mmzone.c > @@ -11,7 +11,7 @@ struct pglist_data *next_online_pgdat(struct pglist_data *pgdat) > return NULL; > } > > -void reserve_bootmem_region(phys_addr_t start, phys_addr_t end) > +void reserve_bootmem_region(phys_addr_t start, phys_addr_t end, int nid) > { > } > > -- > 2.41.0 > -- Sincerely yours, Mike.