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 35DDFC77B7A for ; Wed, 7 Jun 2023 02:40:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2D7D66B0071; Tue, 6 Jun 2023 22:40:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2881B6B0072; Tue, 6 Jun 2023 22:40:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1785A8E0001; Tue, 6 Jun 2023 22:40:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 053C76B0071 for ; Tue, 6 Jun 2023 22:40:13 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BD2051A0889 for ; Wed, 7 Jun 2023 02:40:12 +0000 (UTC) X-FDA: 80874397464.05.1375234 Received: from out-49.mta0.migadu.com (out-49.mta0.migadu.com [91.218.175.49]) by imf02.hostedemail.com (Postfix) with ESMTP id D45F98001A for ; Wed, 7 Jun 2023 02:40:10 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=vwIe7yWn; spf=pass (imf02.hostedemail.com: domain of yajun.deng@linux.dev designates 91.218.175.49 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686105611; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=sqUILCp46Jj47kiEIO7DRVGvfhl8JWDw877OJqEVvRU=; b=8MJa835IEn2CgbgMB9RXisNpelY1ZlHNKAfmfKZoXVQsE5XzZ1EwZxmGCzGRM/Utl5jcQb 1WLZDZYEqhXlsWrUwdD3QIa2Cj56UDh408ks7T0U8J82Q7U0lB31/i6gpFRqiPp3FR+ViO xlKyg1vHZlupzB7ym+tStImO2DdZAy8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686105611; a=rsa-sha256; cv=none; b=PtlUrVOUdz+XvZ7UQfoB53krcRetnBzughlpHhXbYTGjSLH03YGn8Iy7GZ+gbcDIqyxAxF Op3p60QnSEonaw/d2asJC2vVvhNqyIDPTz3RAjAcwKnHCaC/rKGP1zMU2TiByKz2Ng0AR3 BMdT11GIN8x0rQvEJ5CB5WLXxUc/q7I= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=vwIe7yWn; spf=pass (imf02.hostedemail.com: domain of yajun.deng@linux.dev designates 91.218.175.49 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1686105608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=sqUILCp46Jj47kiEIO7DRVGvfhl8JWDw877OJqEVvRU=; b=vwIe7yWn2mHkbKvWsHxQjHndMddY6TdIFGCmdPfxJ6Sz2JzzNt4B8wik8kvRuMZd9J/H3u 23Xp4QxF5UC1pTejMotjmvMDZNQXtziAaEMybqPV8N91l6zY8qlxt1ZOVv8WueKLQ+5Hho FhoqHpyRtf4loEK+nIT8Z6+vfqDrcxE= From: Yajun Deng To: akpm@linux-foundation.org, david@redhat.com, osalvador@suse.de Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH] mm/sparse: remove unused parameters in sparse_remove_section() Date: Wed, 7 Jun 2023 10:39:52 +0800 Message-Id: <20230607023952.2247489-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: D45F98001A X-Rspam-User: X-Stat-Signature: tcsmx9uyhzq6b9yiaudx77nuyphy5889 X-Rspamd-Server: rspam03 X-HE-Tag: 1686105610-315170 X-HE-Meta: U2FsdGVkX18YREHV9n73KmPrnQOgZueqnStVNT48ilTaeeXZtH3RBNx+jlu8rbLKdbtDva+OTLHVlNk9PNvu+e+TuIfjnML7/80fxlsuYAF6gpYQSTMK+rAoEeRbEMBIEkCLj6viboCkRtCm+VeiMDRpgPkEVO2U/GeYuVOm9vO+BTAtBNHAsJDKemcCotWEZQYiFQZHCFX6FAkwj5uDdDSqbsLkL/6zoeF+ot91fZ26Llps2xVUL4+QwXXrsqMxM+6aSfOUJGiZLh/mdsdQaY5nAWjTM3Mc4pqo1KGplZexTOFVrSivbgDlE35C8FumfXkjxhVRQ6/0LebjoDkW5HWfvERB/mql+nngOstoWoAgzlPHlq4j/0y9osdc1qjORwcZhDxMxmZPPFH/9iZdaxABV8+iuMgc7JvpVszeqwQ7Dl8vxx1/d5zbxbXMip6yzRPqz5bOBOwSC61FYieAvMMwjwqirfpxwERHpkE9qfoQ2axd6S5AAGp+jOkpdJX/B0yXG6G0ApRsoR76iPEvA1jBDbYSNLSPYbwF1FWNcR0UF7apvFnCBf7pdle1HTDUkJyyl1DXpG08n/8L49rZppx2ZgdAd7oZNXv7yJPdJav4E7oD/l+6kL663G/A4q8kc5Y4qCuV74qd/iZqxhOzj1cadZJC3fmf5aOktTzD0wtY0DiMoIv6nIPfAcM0i2qCVr0Mvsg37dPTYCP+zal98kK7+hzazS1tNCkmo4W6ikKOhwpHQLIkl3dGT9do2kKTDOPDzyQ+JSQgfmGxyqNA2nl9RHw2CzHFadKVwLoTxyGODUp+hRx6UF9iLgri0Y4ERZuq2hhoGSFAVgaEtkqc3AqL+6k7hA5+Yh8/DX9wOWeVbGDAmK7MpXMy3vFuHOMYaaLMEx221iKbgsizrrrl3ibnHHDjpCuID+l5GLAhxgz22XQKsD28aq9bupmpqZYzq7aG1k5OY57PcLxwXvF bpztKbOF qG7t0pLuHyaKkmJ+4wIP63YJ5Qp+TXGTBoaPZZrXnZ5XUT3d7q6kEqJqQywtzGCW03nDlbqfYUE8QyNguh50NngoKMeUmP2g0HJcQEeCZ9xDbPmKgFcaG20Aum/e2j2T4OQ73 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: These parameters ms and map_offset are not used in sparse_remove_section(), so remove them. The __remove_section() is only called by __remove_pages(), remove it. And put the WARN_ON_ONCE() in sparse_remove_section(). Signed-off-by: Yajun Deng --- include/linux/memory_hotplug.h | 5 ++--- mm/memory_hotplug.c | 18 +----------------- mm/sparse.c | 10 +++++++--- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 04bc286eed42..013c69753c91 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -344,9 +344,8 @@ extern void remove_pfn_range_from_zone(struct zone *zone, extern int sparse_add_section(int nid, unsigned long pfn, unsigned long nr_pages, struct vmem_altmap *altmap, struct dev_pagemap *pgmap); -extern void sparse_remove_section(struct mem_section *ms, - unsigned long pfn, unsigned long nr_pages, - unsigned long map_offset, struct vmem_altmap *altmap); +extern void sparse_remove_section(unsigned long pfn, unsigned long nr_pages, + struct vmem_altmap *altmap); extern struct page *sparse_decode_mem_map(unsigned long coded_mem_map, unsigned long pnum); extern struct zone *zone_for_pfn_range(int online_type, int nid, diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 9061ac69b1b6..8877734b5f2f 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -492,18 +492,6 @@ void __ref remove_pfn_range_from_zone(struct zone *zone, set_zone_contiguous(zone); } -static void __remove_section(unsigned long pfn, unsigned long nr_pages, - unsigned long map_offset, - struct vmem_altmap *altmap) -{ - struct mem_section *ms = __pfn_to_section(pfn); - - if (WARN_ON_ONCE(!valid_section(ms))) - return; - - sparse_remove_section(ms, pfn, nr_pages, map_offset, altmap); -} - /** * __remove_pages() - remove sections of pages * @pfn: starting pageframe (must be aligned to start of a section) @@ -520,9 +508,6 @@ void __remove_pages(unsigned long pfn, unsigned long nr_pages, { const unsigned long end_pfn = pfn + nr_pages; unsigned long cur_nr_pages; - unsigned long map_offset = 0; - - map_offset = vmem_altmap_offset(altmap); if (check_pfn_span(pfn, nr_pages)) { WARN(1, "Misaligned %s start: %#lx end: %#lx\n", __func__, pfn, pfn + nr_pages - 1); @@ -534,8 +519,7 @@ void __remove_pages(unsigned long pfn, unsigned long nr_pages, /* Select all remaining pages up to the next section boundary */ cur_nr_pages = min(end_pfn - pfn, SECTION_ALIGN_UP(pfn + 1) - pfn); - __remove_section(pfn, cur_nr_pages, map_offset, altmap); - map_offset = 0; + sparse_remove_section(pfn, cur_nr_pages, altmap); } } diff --git a/mm/sparse.c b/mm/sparse.c index b8d5d58fe240..297a8b772e8d 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -922,10 +922,14 @@ int __meminit sparse_add_section(int nid, unsigned long start_pfn, return 0; } -void sparse_remove_section(struct mem_section *ms, unsigned long pfn, - unsigned long nr_pages, unsigned long map_offset, - struct vmem_altmap *altmap) +void sparse_remove_section(unsigned long pfn, unsigned long nr_pages, + struct vmem_altmap *altmap) { + struct mem_section *ms = __pfn_to_section(pfn); + + if (WARN_ON_ONCE(!valid_section(ms))) + return; + section_deactivate(pfn, nr_pages, altmap); } #endif /* CONFIG_MEMORY_HOTPLUG */ -- 2.25.1