From patchwork Mon Dec 2 12:58:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13895592 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 0CF9CE7716C for ; Thu, 5 Dec 2024 15:34:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7F5C46B00F2; Thu, 5 Dec 2024 10:19:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D21B06B0115; Thu, 5 Dec 2024 10:19:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 88A936B0129; 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 DC2176B0082 for ; Mon, 2 Dec 2024 07:58:36 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 873A41A1AAC for ; Mon, 2 Dec 2024 12:58:36 +0000 (UTC) X-FDA: 82850022570.06.E58D6B7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf10.hostedemail.com (Postfix) with ESMTP id 87EF6C0011 for ; Mon, 2 Dec 2024 12:58:29 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dU9OuixG; spf=pass (imf10.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=1733144302; 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=PXUMaNNR7Vq6MIOYC8hJbP2dJElyfdgC2J/3Ji8PmA0=; b=OmpNy4EHU4pwxL8Q9Z7PnOYXKGwm+FmK2HSw8QC2aSp5Oo9qUmuZpoR6SmkSFf6LQEcnu4 apRN7bx1nMSc/kryotLN+P8XjSce2K7LARnR0RFnWoYyK9oWJH6ONGqsuN+z9yJQQAoMn4 nkHZ+BJ5jTa6IbdyAUMB0FRqJ5ElcUY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733144302; a=rsa-sha256; cv=none; b=iOS+WRI5SBZX31aUgnG2xI+3TuKQoNAdiPBPo0pxZBTs/rjW/QngnjO22I721giri3BmGs eEwsYxOLUw4Ifp7dVrI4uBFJwL++8RS2L9PF7dbY+Etzyw+TGzr/n6iCdsIrjhjtI3IFkR vrR5j651MmxezDYsF7A1XpWaI9UIEJA= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dU9OuixG; spf=pass (imf10.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=1733144314; 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=PXUMaNNR7Vq6MIOYC8hJbP2dJElyfdgC2J/3Ji8PmA0=; b=dU9OuixGlD079rWwehHIc7PpNzYNwsxe+Fi/kQAAjiigTJ1qp7hq5yg4xlrmurqs/5vUll RZf+tbkWtjGcSF4FgvZKwdXypui31dU5MvX/n7l7qUG1WjyBQUsK98ppgbb183H39XnHZ7 smnj/PgI8o0YsrkXL742piT2rky3Y/A= 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-628-OSMYzBRLMp-I564LqkqeBg-1; Mon, 02 Dec 2024 07:58:32 -0500 X-MC-Unique: OSMYzBRLMp-I564LqkqeBg-1 X-Mimecast-MFC-AGG-ID: OSMYzBRLMp-I564LqkqeBg Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 E680A18DA5D1; Mon, 2 Dec 2024 12:58:29 +0000 (UTC) Received: from t14s.cit.tum.de (unknown [10.39.194.150]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C1BDE195605A; Mon, 2 Dec 2024 12:58:24 +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 v1 2/6] mm/page_isolation: don't pass gfp flags to start_isolate_page_range() Date: Mon, 2 Dec 2024 13:58:08 +0100 Message-ID: <20241202125812.561028-3-david@redhat.com> In-Reply-To: <20241202125812.561028-1-david@redhat.com> References: <20241202125812.561028-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Rspamd-Queue-Id: 87EF6C0011 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: qc3mwzdx5mo8xq95rgxk9yj7oi1gye4s X-HE-Tag: 1733144309-929432 X-HE-Meta: U2FsdGVkX1+4WqYQQJkQI44eq1e+BkzoTZOIRG6/CJoTu/7BqP+2oL2nPyTkU7nNR+2+BAgfQ5eSj+NLL780JXltkRt+/QuLtTc1pMzd0kd1wITxJpfomA3gLzqxp7ZDTyy7TCd52QHZZw/xxLz8YIqevj1bgWPz+d+TH8UuZiosKesARt+Xn3y6cgZClqYDCJxtvmsyEfDEQJMburu4DVCvSyvXTAGRlXcjOf6S+IushghBuh2jOgBEaHSnrAMm/fXNAnOzsG7MMYMkURXqE9vKZoBU9lEpZPOBvKpzb3XJWnLHIeuzCW8oEKbNptcgwceGeVjweBqL+j5LW8BmjIYvuq0DQuhoHA6K/d126sWpZkIVcEnrYOpReKBoyLrLhNJEUwdCKCyr7pAmoIUidb9i70ThH3xqhQgYiiT91oFscENEhIdNQAL/Toa3+VzaYKuYPiRTQQcUBbKBsiU2XNJS7CoFMTp1cYADrjk5lZRiQiuZ7dYtMhjMCGpGtCHJdqcablchxA2VRLpXYIo2zJBpVexsFn8W2bb5ldOwnKYAWy4gcrbHgBxEQEZxNRBw5VJho9zCz3sKyTUmNdhmHGhzqexix4nb1CaOfdg7HKBcCr914WVxv2UEDlz3NgqeFGsYq12vXzz30DVx3iTae9VyjpW5dczNC3UtftXu7H8K2dfrsukjajl/9H63T2fvovoRWm+ar0XWGhhQ++77zaYOkR28XKmDwb6RM5ftHOLIdnIogtUHNgZ5utULy+iivny9QEB67QW86Vd4gmJ+7AdTsjVE1JRSIn+P+s4LxJFnq/0H7jZzK/kEMBwX8vDrXdsRWjv0PHoLxNLfsUzuUCi+1Voi0bVwjlFY/NPSKTDJGTU34V1FNS31tdN8IbZzqoRdKjw/Xqf/XOFvwKpmA45k3J07tU1HkwyIxmnPLlVUsxZCgrl7HnEo1xvCcFLZo0jUtngCuFA6lnQwlu2 h7qooeTG bD/sKIpiXKC29x6pW0j2Q0nG2TNXyT33No5NM1LL4SmSOuOJD/JxK6Gj2zdMjdxN/lptFiF+7t5YGlQ5mthXRgnEH4mAzzN+iDsvWJTRtGBVejlOtRkcH/opyuf2/DDTcoQyLTn1DXET3jPw2Bl2f4RflYamT95tn45diXhI/F+vxNDKWk85P2L2pxjwDf+j59xkiAU5qxstxT7pShSkcXBWuVElADFvp0bb08coOL22o8g0SepM5rhmu4CXRRBaB7dyewhJIPbAPjIquHAZkFtxk+i5VBizcZ5kfQwD/TAfYFLfgKL2Q1eYn+cwAxY6JKAGvGVN75oGuwisaMDSCq78lzjuNUCk2RI8dD+OPe0vSs3jpuQbQ1IIAqPfytyU3ctxApFsJC78x4g8KmPEM5+6HxQ== 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. 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;