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 X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFD1CC433E1 for ; Wed, 19 Aug 2020 18:00:29 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7A44120658 for ; Wed, 19 Aug 2020 18:00:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="C43H67C6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7A44120658 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id CBA2D8D0051; Wed, 19 Aug 2020 14:00:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C69358D0002; Wed, 19 Aug 2020 14:00:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B812B8D0051; Wed, 19 Aug 2020 14:00:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0176.hostedemail.com [216.40.44.176]) by kanga.kvack.org (Postfix) with ESMTP id 9FF188D0002 for ; Wed, 19 Aug 2020 14:00:28 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 68D312DFD for ; Wed, 19 Aug 2020 18:00:28 +0000 (UTC) X-FDA: 77168082936.21.stamp37_4812c142702a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id D8C86180442E2 for ; Wed, 19 Aug 2020 18:00:23 +0000 (UTC) X-HE-Tag: stamp37_4812c142702a X-Filterd-Recvd-Size: 5056 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Wed, 19 Aug 2020 18:00:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597860022; 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=OOExuJXVTjdqU9mIwAI96S5SS5cAxGCrzKqOGV5r8Ks=; b=C43H67C6BiSFNI7kGbgqiIRD2QoAl/el75FympF88RM/BfD6el+DxKRscpI1c7c+/2gdX7 6QTvu2d2X7iAzKIiuJZM0cGMUD/eE3X+jha+tx3FpIK6dZhqUngeX3slQw91SNW7EHBDSN I1UY0T93SPoUs/ugzgIwiO6pC45i550= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-542-7aTDCCXwMpe_2xpoq45v4g-1; Wed, 19 Aug 2020 14:00:18 -0400 X-MC-Unique: 7aTDCCXwMpe_2xpoq45v4g-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5AE59807330; Wed, 19 Aug 2020 18:00:17 +0000 (UTC) Received: from t480s.redhat.com (ovpn-114-11.ams2.redhat.com [10.36.114.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7FFFF10013C4; Wed, 19 Aug 2020 18:00:15 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Michal Hocko , Andrew Morton , Wei Yang , Baoquan He , Pankaj Gupta , Oscar Salvador Subject: [PATCH v2 06/10] mm/page_isolation: simplify return value of start_isolate_page_range() Date: Wed, 19 Aug 2020 19:59:53 +0200 Message-Id: <20200819175957.28465-7-david@redhat.com> In-Reply-To: <20200819175957.28465-1-david@redhat.com> References: <20200819175957.28465-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Rspamd-Queue-Id: D8C86180442E2 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 Content-Transfer-Encoding: quoted-printable 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: Callers no longer need the number of isolated pageblocks. Let's simplify. Acked-by: Michal Hocko Cc: Andrew Morton Cc: Michal Hocko Cc: Wei Yang Cc: Baoquan He Cc: Pankaj Gupta Cc: Oscar Salvador Signed-off-by: David Hildenbrand --- mm/memory_hotplug.c | 2 +- mm/page_alloc.c | 2 +- mm/page_isolation.c | 7 ++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 098361fcb4504..0011a1115381c 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1503,7 +1503,7 @@ int __ref offline_pages(unsigned long start_pfn, un= signed long nr_pages) ret =3D start_isolate_page_range(start_pfn, end_pfn, MIGRATE_MOVABLE, MEMORY_OFFLINE | REPORT_FAILURE); - if (ret < 0) { + if (ret) { reason =3D "failure to isolate range"; goto failed_removal; } diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 03f585f95dc60..848664352dfe2 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -8456,7 +8456,7 @@ int alloc_contig_range(unsigned long start, unsigne= d long end, =20 ret =3D start_isolate_page_range(pfn_max_align_down(start), pfn_max_align_up(end), migratetype, 0); - if (ret < 0) + if (ret) return ret; =20 /* diff --git a/mm/page_isolation.c b/mm/page_isolation.c index 242c03121d731..b066c860e606e 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -170,8 +170,7 @@ __first_valid_page(unsigned long pfn, unsigned long n= r_pages) * pageblocks we may have modified and return -EBUSY to caller. This * prevents two threads from simultaneously working on overlapping range= s. * - * Return: the number of isolated pageblocks on success and -EBUSY if an= y part - * of range cannot be isolated. + * Return: 0 on success and -EBUSY if any part of range cannot be isolat= ed. */ int start_isolate_page_range(unsigned long start_pfn, unsigned long end_= pfn, unsigned migratetype, int flags) @@ -179,7 +178,6 @@ int start_isolate_page_range(unsigned long start_pfn,= unsigned long end_pfn, unsigned long pfn; unsigned long undo_pfn; struct page *page; - int nr_isolate_pageblock =3D 0; =20 BUG_ON(!IS_ALIGNED(start_pfn, pageblock_nr_pages)); BUG_ON(!IS_ALIGNED(end_pfn, pageblock_nr_pages)); @@ -193,10 +191,9 @@ int start_isolate_page_range(unsigned long start_pfn= , unsigned long end_pfn, undo_pfn =3D pfn; goto undo; } - nr_isolate_pageblock++; } } - return nr_isolate_pageblock; + return 0; undo: for (pfn =3D start_pfn; pfn < undo_pfn; --=20 2.26.2