From patchwork Mon Sep 11 14:32:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rong Tao X-Patchwork-Id: 13379396 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 6B45BEE7FF4 for ; Mon, 11 Sep 2023 14:33:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CA47D6B02A3; Mon, 11 Sep 2023 10:33:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C538B6B02A4; Mon, 11 Sep 2023 10:33:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B1B216B02A5; Mon, 11 Sep 2023 10:33:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id A13316B02A3 for ; Mon, 11 Sep 2023 10:33:34 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 771DB1408FB for ; Mon, 11 Sep 2023 14:33:34 +0000 (UTC) X-FDA: 81224559948.20.CCE4E69 Received: from out203-205-221-190.mail.qq.com (out203-205-221-190.mail.qq.com [203.205.221.190]) by imf06.hostedemail.com (Postfix) with ESMTP id EF404180013 for ; Mon, 11 Sep 2023 14:33:31 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=foxmail.com header.s=s201512 header.b=muOOdcIO; dmarc=pass (policy=none) header.from=foxmail.com; spf=pass (imf06.hostedemail.com: domain of rtoax@foxmail.com designates 203.205.221.190 as permitted sender) smtp.mailfrom=rtoax@foxmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1694442812; 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: references:dkim-signature; bh=coVrW6z+muUJnLu9pKLdcX7o9brQ4PBU1PRO9046yTs=; b=Ln8P1aw/Xes7PHyUvAEN8IETVsZgp7/bFidxlbBq03vQkhX5cg7s9FXxjmknAGtlUEteKI Gsh1anlfrrCe6CY4aMz+z7pMuC0Nr3Ru6i9TU/7JANkQ7SFxcBL2BWuyRxQKmeME4woQ1K OTjUwa2pObibceOTrjBp5TBxYd9dHr8= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=foxmail.com header.s=s201512 header.b=muOOdcIO; dmarc=pass (policy=none) header.from=foxmail.com; spf=pass (imf06.hostedemail.com: domain of rtoax@foxmail.com designates 203.205.221.190 as permitted sender) smtp.mailfrom=rtoax@foxmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694442812; a=rsa-sha256; cv=none; b=xUgi8rZKqsMXocW9PHgvcwQfxtfnfDTapXEKQ4ATHNsqUS5aGl/svqlghzglNFjAdPZpQr EkoEqv3+z1OrK91SBnBR0SX4kE4b0l0prteomOggVbHrafmc3/u3N1A/kimQvdm1mDnfi2 THX294fouxbZF33La3C7xPzkDiEt+gw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1694442786; bh=coVrW6z+muUJnLu9pKLdcX7o9brQ4PBU1PRO9046yTs=; h=From:To:Cc:Subject:Date; b=muOOdcIOavuhgV6V6/1aNW9+fZQel/y5ExHPhjvLBeBrZkob9pRMTs/Rn8S9vnueN 1WL/KQl7A6cjGMJOK04fkKb+tcpETFZb8E18Khi/ZeE5ZiZP0RmtB7aEYcBhsuD35t B9gZ5IbrjKWG1ITLff1rk27hRHRertoAz/zWL994= Received: from rtoax.lan ([120.245.114.155]) by newxmesmtplogicsvrszc2-0.qq.com (NewEsmtp) with SMTP id 83B9C8B0; Mon, 11 Sep 2023 22:32:59 +0800 X-QQ-mid: xmsmtpt1694442779t2yq1rmqj Message-ID: X-QQ-XMAILINFO: NafziRg7Bx69AedwavA3u8otDWALLItPCt/iDqyXUyy3aYGQDjM5CeLfnl7JMO +YnwejpeqISpxpiZ1LdrpRv3Oc097nZc0VgmXPvlmswxgN/kv7TQoxbJ6sDiLZ+ccilaaOywYUyr +HyfKEl3Kf7/atW/VUXqRXZFmje82mWt+w6JFWYL1lz8+JHyVfiREIxvcij5Qb0H3Z/sFU50rd8k PNu9S76lvkCT18VZygiSdUtppbBeC2/boPkqcyv/gYgDk4qoayNm8xH4Wvl6Xw/tVvHfivUOjkRB 0UByJ6qH5EWNxrJbtNXyLdcMqP8TorQE5B5xJuEnPVtS8oLNfA/RLuiIprxswTmcyKi+leMn4YPf jFO9Vn11GqpG3fVyj6YviE55WoIBq0IAdYB1Z5HDArW6lzQP8ZThyFbO0DJtYxpwy91yTY2vQ/VN tkfYXZeUlSzbdrbv/Blg+DDxFmSWSMepDSH8smAlpFAEOfsfbS0PdHET3JjofSqcjUOMvMyhrfqh MO8b/rTksKV80hU3gUQjQZz/br/GHDi03fP8vsQZkdCy/BtBxHcpd9P6OKIK+TqEv3U1ICejaym4 JjC2AlaOKqDQld/R+VCeedv6CzPXXGCitUUC9sTZZdBWH6mrbQURyS6yQuZ5Ajq/WuEcfVA0+YKf pi0eLrdm6zRDhFa2kITRu2AKRn3xjGgLsHbz04Mfv4xGwY6athce8Gks+yWdo0Qsh6T25fJ3C0mU 4+JP73EpbqwgpKp3E6py4I/rNM1WlGTVGw/2wXTwk5vfR3d8Up2h7Z8fNOOMl8jPuOknKXBPN2f+ d5aq3Q52TTtBKi/WT6IwWpnJjy3atLoVSJmCcUE5fz/lGu0H2EMTVhWEHqAWHSz9oNQM1PKSBjX9 nUMc5BevkgYJp43u4poNTUkXaxOv+UBvb4PBSGktYMonZAWnNbKgIl/Fa4X6L+srWdPXh904e8nG xIfDnWIy4ae9uhT1E1apP6gwzQpNssquY1XWLkl/nNjOMFUfKngsZWc1d3WIeiN9sRKB/AxPqjQC 1n577wrZTRd2ccXnBA X-QQ-XMRINFO: OWPUhxQsoeAVDbp3OJHYyFg= From: Rong Tao To: rppt@kernel.org, rongtao@cestc.cn Cc: rtoax@foxmail.com, linux-kernel@vger.kernel.org (open list), linux-mm@kvack.org (open list:MEMBLOCK AND MEMORY MANAGEMENT INITIALIZATION) Subject: [PATCH] memblock tests: Fix compilation errors. Date: Mon, 11 Sep 2023 22:32:56 +0800 X-OQ-MSGID: <20230911143257.26949-1-rtoax@foxmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Rspamd-Queue-Id: EF404180013 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: nnfed3fpxy1ndiwqmc18ry41t3foz9yd X-HE-Tag: 1694442811-930319 X-HE-Meta: U2FsdGVkX1+21MY1kuGf1QqJdsAqvxcCK1mS02rsuiRjWAgzvntZJ8vcRjL3ZbosLCGVaxyaRarNgfs2iFXNhvKBMOdGnb+KEKRDbLNKsnVoDcjsGNPYr7fB4XH7D7NZ+qdyjQsOzdhoyRLAif2xy1tTaYrn2dEoi/Q9/IRVyzAP/BW19oxozII2dbKNX/EEfRvLO85ENIeLNub1IUQ3r8+Cm4de4hgyvtG4JiR7eVBt2hQVhRWyQkQNO5OJFzQlo/r0lQ/umfQtF6CehBmQDjmW2BfxN5zyYujyr2rwhgw0ktlDbwucW27dw3oxGd0CVApf8kcOZeJ60WqWapWwIkx7dg5nAjuo0PLVJa9RvOywJAveEoYFNLsPuNNDX6Kpakeb4U9dguKCK3RYPee9ioiEuy00dEVl0Fg4fvZheA66+gNkn3utScGac/9MxiGsNdeRy2pAh9CpKvgcIBWezfRla1F90y9t/rg+m45tN21vczSThnoB3KRUEbKw1PtIHqxZ+efJJRQ/XomKdKWpxuOwweDY/mdrAURR+WmTLXTgKVNDLUDTDgbBXzrd0DgnrmnRcnIzNf5Mvf2W7yDGTP139BeeW/OzFvUlvxo2+rxcRF00J/8HPj3pN0geK/cjtZSBUkJzw1d4qn3Lr3zBSZpQW3FK+hsxvlRUqXyOoTyCEFVUDzprgmYLqhP1OMGHxBie0NB5zSp8Zqhj4cd6ii4HzXhQpGUXWtH2Z4r7xwQDUMECSKAU0kAsVniDdUz8Kjgnw04nHwo7xd8MH45q1l75HqxCRg7NGHeg8UPQ94/VWqMF24lDMDIhpOAAkwz3M0KcsV7neaaqy7yoklhr3iv+MrNYpyXqV55OnjvO7EgS9QyuXqtbX7o7u3GgaJSpoQ5OR6Ppaclr3y/ufdp5hqM3iwub88C9qXAJ/zTFvNN41XExHcCxjBoZE91CnYiaHMg3NXbmh8f8H7Hsfsj IwOzlNVS urC96z/DVjypBYc9j3Z8Ie+4sDKh+U5i6e3BfC12tRUHgZyc9J+0EWqzktn8yKh7f8trqMX3ARVg1LFT+H6DOz1c9BXpLbEfbrZo9sowQB07asiCome0FV6F+euYtm8st4XjPk2ogclidDOtUW34WrskbHAnRvI4VH5E5 X-Bogosity: Ham, tests=bogofilter, spamicity=0.027728, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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 --- 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) { }