From patchwork Tue Dec 3 09:47:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13892060 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 6374EE67493 for ; Tue, 3 Dec 2024 09:47:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EB1206B0089; Tue, 3 Dec 2024 04:47:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E61596B008A; Tue, 3 Dec 2024 04:47:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CD97E6B008C; Tue, 3 Dec 2024 04:47:47 -0500 (EST) 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 AC68F6B0089 for ; Tue, 3 Dec 2024 04:47:47 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 6022D8080B for ; Tue, 3 Dec 2024 09:47:47 +0000 (UTC) X-FDA: 82853170344.27.D547F29 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 0041B180015 for ; Tue, 3 Dec 2024 09:47:31 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cHEJR49I; spf=pass (imf16.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@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=1733219259; 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:in-reply-to:references:references:dkim-signature; bh=WPPCObfnf5xw33aPmiPyCg8m61901qLXiqhqw8UMgIQ=; b=XqTpgcf68a9XxnCxs+VHDhwt0LBO4f36EzUKkEYnNUiTqCnaFqhYLlC2vPnFKLIrao78Zc mo/aJmeAdDeKbLeoF9lfhF8Jsq6jk3d99yvrhl5tTk74emXFn2JFhyrXCzBUfWnqvLgX11 uTnp2KDnCDF3QgP561NnVdlwFCDwYmk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733219259; a=rsa-sha256; cv=none; b=ww8/zIhP2rHV8t2TMa8WdSOO1YnEkMtBBJKcKX0HK80G1ZJnThsj20yLamW9ECZ4eHXkR2 tIg+aagJetLeTV1wudDF7HCFGMZ9saDxpDcppENcFgp6dNfxOpFo0ZlZpMUnre24/ml9MB M7qRJQK7uC/Rhq8l2BLbIVB5rn0tMXw= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cHEJR49I; spf=pass (imf16.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhildenb@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=1733219264; h=from:from: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:in-reply-to:references:references; bh=WPPCObfnf5xw33aPmiPyCg8m61901qLXiqhqw8UMgIQ=; b=cHEJR49IR6AOdJxBICHpuQzunEQoI1wqTl9t6u4EQ2tmjr7whKFih1BEvxArYLGB7w+l1r neJcO9lqqy63geLyprSM1fzb5AmSSPA5qJZqUFMxl+98zL2oC2xNOpl+WeoeR/iVieVVJL Nr8mCRKzpCyR1c7Le5zjw766Ti1wycY= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-106-c9BuG_XCOBukWqPQXHwEAQ-1; Tue, 03 Dec 2024 04:47:43 -0500 X-MC-Unique: c9BuG_XCOBukWqPQXHwEAQ-1 X-Mimecast-MFC-AGG-ID: c9BuG_XCOBukWqPQXHwEAQ Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4349d895ef8so49979805e9.0 for ; Tue, 03 Dec 2024 01:47:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733219262; x=1733824062; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WPPCObfnf5xw33aPmiPyCg8m61901qLXiqhqw8UMgIQ=; b=Nm3BSON5DYOM9limW2vS04EeE7uLHDj8x2t5674jr7h1As0R42u2v3l7idYjc9geMY PSL3V7Hzsc4lSPSNAI77UlduXTNfoDIqQYjAtwMK0EsLQZY1tw0Xxnpcnnrd/pBUCUx6 KLRICiQZjzROP5d+t9rXlfH0kJJlqHxlV21eloZm4/HBM15JRC5/VU50NUlihFhVyOW4 eQ5/5Tz6AVzgbnXFOoZDh8eWwbLbZ/LmL5WafgM0xebDCN0nvr6lXai5kd3n8oy6jdMa H+u1lUbZLfvWS0kSOjjGXEiuqTxefM1sL7MqK9KqGNI2BTBr3NhyIKHMkOeK/2bPG1mz AE4Q== X-Gm-Message-State: AOJu0YxpCoMkNjz4P7OYqTlxuXlyILA2CSM86X10XuheXyAxMpHslfRR WkPoKKl6oVERCNiWYResIpfVtkpCZPol0XNaQgopXX71Fg+fYBTw2R8pOctt6q7f4w1CjBFPQmF T4eqSCY2Sn05fC3ToVlBKAJ1unIB/QLTNb523CvdR1Aun9P/p X-Gm-Gg: ASbGncudcdOFvTCTGYzHaDrrEOrUxfjzXvNpSVRtOGlQEwUdDounBi6v/VmoT9m06xA XG68rmgPEy8YKjqwYcVqHPAtQlEwHdkEUQXVjsFbWeuNwTQccu6lGbLJey3phki59/avU/A/8sX +IPSIQpf7FAFrn9l8nIj83VeU5yJT9p3RKiKkebEDUN/SH/gSrJs/Q78UNHIdQJUP7xF0XN5laL k07S9+ihxKZKZuwqqI6OSOmYgodIKVDCxEbDNsgb+hs8fmFE4tZggAXXi2cpu+Quxjcv68hJDN2 DjDZbwemRXP0XnGlY3gVDa6lV5Y9UT70CKE= X-Received: by 2002:a05:600c:5491:b0:431:5c3d:1700 with SMTP id 5b1f17b1804b1-434d0a0e312mr13336195e9.21.1733219262415; Tue, 03 Dec 2024 01:47:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IGNQApWxNUm3SxdrUec7I7codm1+2ABsn7OxpSKkkoTEG3/Y5H+HiqJe5tT8Yop4NW8Dk8lkg== X-Received: by 2002:a05:600c:5491:b0:431:5c3d:1700 with SMTP id 5b1f17b1804b1-434d0a0e312mr13336025e9.21.1733219262074; Tue, 03 Dec 2024 01:47:42 -0800 (PST) Received: from localhost (p200300cbc7461b00fd9ec26cc5521de7.dip0.t-ipconnect.de. [2003:cb:c746:1b00:fd9e:c26c:c552:1de7]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-434b0dbe2e7sm183143505e9.11.2024.12.03.01.47.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 03 Dec 2024 01:47:40 -0800 (PST) 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 RESEND v2 2/6] mm/page_isolation: don't pass gfp flags to start_isolate_page_range() Date: Tue, 3 Dec 2024 10:47:28 +0100 Message-ID: <20241203094732.200195-3-david@redhat.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203094732.200195-1-david@redhat.com> References: <20241203094732.200195-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: lT4K-S61hCpOLzMDWt_hgnNBnrlSXgdV4Vs-0D-oTSs_1733219262 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 0041B180015 X-Stat-Signature: iimjohbzs1utf8omsetjmg7rpkjkkpoi X-Rspam-User: X-HE-Tag: 1733219251-836610 X-HE-Meta: U2FsdGVkX1+m/jktUEliIDRwKvy0CuW98cz/mYhOj3TxP2gxRu39f3jre0qAn1XsihAhzDldHuPY+4gI8s4wznYHFJ7q5M7Kf0YjvHKpxvb4lMX2JTUhbtvvP6WPuexZSmo4w1kE/AU5u48QAqiBxAngN2oKU6MsT9vDEIsDRbIkU4sPQpgdLQecUo8OB907ql2hNRCO8BVqAVBCMyAijog9y2PSXtvhvIPc7L0kNOy4Kw5RlcrEKwwZty3QDi/bw8rJWuGK0fDBHestVwcJY5ukZddTPQ/oxPQHuDnts0FJ0C5uPSalHqtYEr5PWANFA19fZiIyIFtznVYheJ/frnTlZ2P38shp76Dw6sSUa5Evck5SfWS/G4ZcVhWm0ahyOXeFSaG57yIgD+FKcyGQatrFPMCXO032DfwNEI4RVZAtxtV0X6AantH28kTj1F/1Zv76CqgFSuFf9vYTtyFbMBMr6q1ZqF7M5y4syj46BoAhEbFnL5xcZim7cRW/MaPnTBIFV2pP9nP8n2muENijM7mwCzlzfqK9aEQKv4trv5NynW6Mmm+oFxLfCOB+E7wfzT2Vaw5ErFEMJ3j/xC3eg3LMZOPxmF2pdKOhqcnpCRyQRdDfhq9SaETvYFfU7C+Bqm4cN44EH3+XiBxUMVL3d+5aGH2kgbUDY6f8Ut6+z1xI25MWAxvdKbiMOP9y+gRCaWhT7tyGFvOScsYkXWITkmqobmNhATDGglfNiShc2SW27S2idNIUJzwKnPhUCfJ4//SOFPcRj79QGOoil7/bYRblcfUYxab2cFaRNP5Bja6e/C6l3ckj9nsamlxpiLS22+gyCOpXnK16OkoYyt8WDG94H/S8TkIVTap977YMtlSo7xNaryiQACxzNrcT+o3IC2KSGKJzu+eBefXgfFM1GtpjiktxfHJ9sbr4PFtKF66oxPKSI04DMvYq35ORnYCA1McKaJyZ5Kp3y1I2KwK OxGIGyfM L54sddHbWJ9DWadoOBLMeVpfC+N2Hjo6o2uBsYVkccAvk7u3bxdX+rbWJELSgCHG5H2M62Zl/gLCrhvtx7kdJnSOuoiuToxsFoqzuN+PV3B9o2OkC0/CNnN8eGLdcOpnfqVtJvlW91vAQumfSmtyt4XGZ4whSybmW4D3yY7UnfC2K6NLdGoVJujbsyeFXZbVDL9UFcJSwC/t6/mIGoNOYsjxGB0e/9qCiCfocbyXn7xT3GWZCUEDMXC725w9TuQ7abO/RpNJl4zsAumhIxzzS1pVpoYBZQ42i+d0Vm/WIep+IExHOPqPtk77UZ+RPmmOyDgBzjYzo+jeJ/SDCknvkjbSa49Jg5mj5HNbobFeuXos6qdA114wYuvm4JBFV40S7ypA88X7K0X04qZ1IN1e4pA5JbJ+SI9vuMAgEnLOv23JMEz8e+rc9hpVmk1SdJvybZPt+7OYeGQ56ElpMtfElyKKA6GRUpNIaPOxDnI5dOeT1NQY61uDfol8DmVZv/oapncVT 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 Reviewed-by: Vlastimil Babka Reviewed-by: Oscar Salvador Reviewed-by: Vishal Moola (Oracle) --- 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;