From nobody Wed Apr 29 02:00:57 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3EF71C433EF for ; Wed, 25 May 2022 03:39:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241115AbiEYDjh (ORCPT ); Tue, 24 May 2022 23:39:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235282AbiEYDje (ORCPT ); Tue, 24 May 2022 23:39:34 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 5FDB068FA8 for ; Tue, 24 May 2022 20:39:31 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BB9851FB; Tue, 24 May 2022 20:39:30 -0700 (PDT) Received: from a077893.arm.com (unknown [10.163.37.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C7BDE3F70D; Tue, 24 May 2022 20:39:27 -0700 (PDT) From: Anshuman Khandual To: linux-mm@kvack.org Cc: Anshuman Khandual , David Hildenbrand , Andrew Morton , linux-kernel@vger.kernel.org Subject: [PATCH] mm/memory_hotplug: Drop 'reason' argument from check_pfn_span() Date: Wed, 25 May 2022 09:09:09 +0530 Message-Id: <20220525033910.3781764-1-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In check_pfn_span(), a 'reason' string is being used to recreate the caller function name, while printing the warning message. It is really unnecessary as the warning message could just be printed inside the caller depending on the return code. Currentlyy there are just two callers for check_pfn_span() i.e __add_pages() and __remove_pages(). Let's clean this up. Cc: David Hildenbrand Cc: Andrew Morton Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Anshuman Khandual --- mm/memory_hotplug.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 416b38ca8def..9b3d7295ef93 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -220,8 +220,7 @@ static void release_memory_resource(struct resource *re= s) kfree(res); } =20 -static int check_pfn_span(unsigned long pfn, unsigned long nr_pages, - const char *reason) +static int check_pfn_span(unsigned long pfn, unsigned long nr_pages) { /* * Disallow all operations smaller than a sub-section and only @@ -238,12 +237,8 @@ static int check_pfn_span(unsigned long pfn, unsigned = long nr_pages, min_align =3D PAGES_PER_SUBSECTION; else min_align =3D PAGES_PER_SECTION; - if (!IS_ALIGNED(pfn, min_align) - || !IS_ALIGNED(nr_pages, min_align)) { - WARN(1, "Misaligned __%s_pages start: %#lx end: #%lx\n", - reason, pfn, pfn + nr_pages - 1); + if (!IS_ALIGNED(pfn, min_align) || !IS_ALIGNED(nr_pages, min_align)) return -EINVAL; - } return 0; } =20 @@ -320,9 +315,11 @@ int __ref __add_pages(int nid, unsigned long pfn, unsi= gned long nr_pages, altmap->alloc =3D 0; } =20 - err =3D check_pfn_span(pfn, nr_pages, "add"); - if (err) + err =3D check_pfn_span(pfn, nr_pages); + if (err) { + WARN(1, "Misaligned %s start: %#lx end: #%lx\n", __func__, pfn, pfn + nr= _pages - 1); return err; + } =20 for (; pfn < end_pfn; pfn +=3D cur_nr_pages) { /* Select all remaining pages up to the next section boundary */ @@ -518,8 +515,10 @@ void __remove_pages(unsigned long pfn, unsigned long n= r_pages, =20 map_offset =3D vmem_altmap_offset(altmap); =20 - if (check_pfn_span(pfn, nr_pages, "remove")) + if (check_pfn_span(pfn, nr_pages)) { + WARN(1, "Misaligned %s start: %#lx end: #%lx\n", __func__, pfn, pfn + nr= _pages - 1); return; + } =20 for (; pfn < end_pfn; pfn +=3D cur_nr_pages) { cond_resched(); --=20 2.20.1