From patchwork Tue Dec 3 08:37:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13895579 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 170D0E7716C for ; Thu, 5 Dec 2024 15:30:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A1C7C6B011B; Thu, 5 Dec 2024 10:19:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 816696B0131; Thu, 5 Dec 2024 10:19:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C0F0B6B0124; Thu, 5 Dec 2024 10:19:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D69006B007B for ; Tue, 3 Dec 2024 03:38:23 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 91E781607C2 for ; Tue, 3 Dec 2024 08:38:23 +0000 (UTC) X-FDA: 82852995666.21.C74D5FE Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf02.hostedemail.com (Postfix) with ESMTP id 3BEFB8000E for ; Tue, 3 Dec 2024 08:37:57 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LknuN6Z9; spf=pass (imf02.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733215093; 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:in-reply-to:references:references:dkim-signature; bh=WPPCObfnf5xw33aPmiPyCg8m61901qLXiqhqw8UMgIQ=; b=pHEvGCq8IN4aXT8GVa6Fm57qytNxLtrv141AdUvvPH/DbH5gpFDQ78uYl8JinQGgqak3dL oRwFXShXGXSjnKdR+b0EUkxHlbQTsQSOAuL7WWh45379K2Tdebj9Nuh/cpW8rlRQU252D7 7WEeGEWvVbwadPLIjd4UD/L/9jERwbU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733215093; a=rsa-sha256; cv=none; b=FuAFHH6lOsubd661TPaoB9XbO/9vjJIhLm8UD15oD14Uf8zVeUCYzwc+s+sWh+UA3Yh7Gk J3xG78ySf0N3jWT26cw0GQhd+yfmPY3jb/Vn9xgmG3wqPvey+IzQWIJICBz+vY8XkLt8ak BaXJ69LD3QCm9IklK2r1OF9TIU137f4= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LknuN6Z9; spf=pass (imf02.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1733215101; 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: in-reply-to:in-reply-to:references:references; bh=WPPCObfnf5xw33aPmiPyCg8m61901qLXiqhqw8UMgIQ=; b=LknuN6Z9cz58PsamGVF4gsKRW7PWYLORFop6P2jTnyrk1kPwVjl8vlZqEHFdhU+Hr42n9p bAaapdq4L9hZ3GJ1tYODKs6w2wucojePE6BdcDp/9RHgvtje9EFWl6eYS/XHNSm0+ppW+M m3ln4SHkyr/nLC5+0xkKzyJneN2FYeg= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-450-mLrc1REJMyeszWWKgLAW6A-1; Tue, 03 Dec 2024 03:38:16 -0500 X-MC-Unique: mLrc1REJMyeszWWKgLAW6A-1 X-Mimecast-MFC-AGG-ID: mLrc1REJMyeszWWKgLAW6A Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1F43F1955DCA; Tue, 3 Dec 2024 08:38:14 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.22.88.109]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9127830001A0; Tue, 3 Dec 2024 08:38:08 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, David Hildenbrand , Andrew Morton , Oscar Salvador , Zi Yan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Naveen N Rao , Madhavan Srinivasan Subject: [PATCH v2 2/6] mm/page_isolation: don't pass gfp flags to start_isolate_page_range() Date: Tue, 3 Dec 2024 09:37:52 +0100 Message-ID: <20241203083756.112975-3-david@redhat.com> In-Reply-To: <20241203083756.112975-1-david@redhat.com> References: <20241203083756.112975-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 3BEFB8000E X-Stat-Signature: bgkhpatonr8o8wapq5cfo7jdnwjsdymq X-Rspam-User: X-HE-Tag: 1733215077-612526 X-HE-Meta: U2FsdGVkX1+AS1HOOtQ5vNOA7/Qtd3+Xwlz4qNUqyBAtPo01lZjst8hGlrIud6HR+L/6dMKCIYainqwZuwjnz6cgQHcZu151rZUWb4ac2+XEagty/fVYk7c/7pyEo2jhqs0vyLXffUmksQ02t1vOy/UYsTrff/7grTbL03+KMzaVOkhMltxYRHdiAKuRTpCZUxLSDHVNn26qZDPyfkU0+mMBa+m0mIqUDqTwpIT32TeBbjcCgO4XicxUJTApYkpGq3u5AOhKhTDdCqYWDf/e8FlRzaE2O46Ydskjc3mnUDt/76W8jvNRPL41iZ3ZNLjZkPzGJhhF3dGNqUnbU0ShVHGRDfjfvweK5feEMqqeUXL/zvDQg+/dGIGgkyq/mMFmPyqk9bPMk1WffLcJbxX4evMmq4992BTM4PDR5X1V9nutD+E1bkfNxGH1CWGhR23V3Mc3YLcd+E0sOGaONj3eIuF2HsT/WX71hBsoyvfsocpaWLnT/qoyhOTAFsI4QLHSxzNLKyHLYsFR5xN7kbAhy4n1T3U0trZ6iP0yzJJuc2lqrvSlNQBFTYJ+UMB8IKiUU6rM+NxF31vNRo48E3daN3JTBopJKMNXgJgEu3qoPsNa5GxfPJXju4SZflBMqbFv5HuIbdJBQlj4M9ygTpuIA3ouaMIPU9RQQql84/i2nIf53X+vchWLsrXy4yIbmLbcGbrwjvyV0+fgDaJUO5Np1faiuewp5dGW4zUcB31i9nUylbTTG9YGAWPyjDN/tTJfiy1JKe93F/FbZOrwwpfAMYS1SW+PuZ1H8niw+ZsfsUCfiE2vnuoYjPQin7ghZQ3ll6FyeZkxzc/JYneSVG1nhm/wsIofp/rs77PkBoozP43s+2TpGPQue/F3Onekl3ESXnqmcS2TWo7hu9go+y9A0B3Y6ZrVRYYWt2PanTVR8T+2/SsQu/w0A7842wASr7KMrwdkusEZY79h/Hsq2xJ nE5ipCWR fHbX86+IBZ2QJqfjLq9HlXJGqzWpGh5VC2maMUzjci8qXFJ3CDJn7yJhd97rYeJJm37lvIKs+cioK//gD4wA8lQguHxnBJB7zqPCyViJCuIUcweDhYrwky0ZbgqDmxGjKLNJ4N5PfwYBxJy0yjoocH7JGqJSJw/D/3yiu3EaveI25ivmZ4W+dVahyQtPi1glFOR0gCq+EWMCOEyJlMvknLSD648rjbHBUgH4JVAouA+mZ740MSg4DmgXMY0+Y7rCNLrBfcwTBbYjlnxX11b62KKpyxXIwhap5Uh8GNxNBuiDCcX1qMef+FqLIsmWprSnA+JLHsrDWJhEnwhZjV1YRLB+xwLkloN6O7xxQOf6HTfVEcvNM6opd177G0moniViyKxG9O/+TyUGtu0S5munkPsidyO23+W3jPeKZ7351O1tlqEU= 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: The parameter is unused, so let's stop passing it. Reviewed-by: Zi Yan Signed-off-by: David Hildenbrand --- include/linux/page-isolation.h | 2 +- mm/memory_hotplug.c | 3 +-- mm/page_alloc.c | 2 +- mm/page_isolation.c | 4 +--- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h index 73dc2c1841ec..898bb788243b 100644 --- a/include/linux/page-isolation.h +++ b/include/linux/page-isolation.h @@ -31,7 +31,7 @@ bool move_freepages_block_isolate(struct zone *zone, struct page *page, int migratetype); int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn, - int migratetype, int flags, gfp_t gfp_flags); + int migratetype, int flags); void undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn, int migratetype); diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index c43b4e7fb298..9b184ba064a0 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1992,8 +1992,7 @@ int offline_pages(unsigned long start_pfn, unsigned long nr_pages, /* set above range as isolated */ ret = start_isolate_page_range(start_pfn, end_pfn, MIGRATE_MOVABLE, - MEMORY_OFFLINE | REPORT_FAILURE, - GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL); + MEMORY_OFFLINE | REPORT_FAILURE); if (ret) { reason = "failure to isolate range"; goto failed_removal_pcplists_disabled; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index cc3296cf8c95..f371fbf2145b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6451,7 +6451,7 @@ int alloc_contig_range_noprof(unsigned long start, unsigned long end, * put back to page allocator so that buddy can use them. */ - ret = start_isolate_page_range(start, end, migratetype, 0, gfp_mask); + ret = start_isolate_page_range(start, end, migratetype, 0); if (ret) goto done; diff --git a/mm/page_isolation.c b/mm/page_isolation.c index e680d40d96de..c608e9d72865 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -442,8 +442,6 @@ static int isolate_single_pageblock(unsigned long boundary_pfn, int flags, * and PageOffline() pages. * REPORT_FAILURE - report details about the failure to * isolate the range - * @gfp_flags: GFP flags used for migrating pages that sit across the - * range boundaries. * * Making page-allocation-type to be MIGRATE_ISOLATE means free pages in * the range will never be allocated. Any free pages and pages freed in the @@ -476,7 +474,7 @@ static int isolate_single_pageblock(unsigned long boundary_pfn, int flags, * Return: 0 on success and -EBUSY if any part of range cannot be isolated. */ int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn, - int migratetype, int flags, gfp_t gfp_flags) + int migratetype, int flags) { unsigned long pfn; struct page *page;