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 80506C433E3 for ; Wed, 19 Aug 2020 18:00:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 38C3720658 for ; Wed, 19 Aug 2020 18:00:35 +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="LDPEWl6a" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 38C3720658 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 C6BFC8D0055; Wed, 19 Aug 2020 14:00:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BF7558D0002; Wed, 19 Aug 2020 14:00:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AE5248D0055; Wed, 19 Aug 2020 14:00:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0223.hostedemail.com [216.40.44.223]) by kanga.kvack.org (Postfix) with ESMTP id 959B68D0002 for ; Wed, 19 Aug 2020 14:00:34 -0400 (EDT) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 529018248047 for ; Wed, 19 Aug 2020 18:00:34 +0000 (UTC) X-FDA: 77168083188.03.soda76_6002e762702a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin03.hostedemail.com (Postfix) with ESMTP id CD65228A04B for ; Wed, 19 Aug 2020 18:00:19 +0000 (UTC) X-HE-Tag: soda76_6002e762702a X-Filterd-Recvd-Size: 4261 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf40.hostedemail.com (Postfix) with ESMTP for ; Wed, 19 Aug 2020 18:00:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597860018; 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=MZKGgLwnrdaAkJVW/KINBUaSS2x46Iq1d00/GYBaqU0=; b=LDPEWl6ajtFolB+h4xUos9vogSaNiF8XIAQq5tPLUs0IH8lt05adq9GmWPdvy6E/7EHC2A zRvfjJREbdLQQMkyhOcB9qlXB+KLAjNbCFLSy8/ZgkCIYIPmb+gmkU9aVocIVVtiQB8iAk uvtk4QxAAFE/3zWHd5lyR4rCxo9bTPs= 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-73-9gNmvcgoNUu979CaBVgtQQ-1; Wed, 19 Aug 2020 14:00:16 -0400 X-MC-Unique: 9gNmvcgoNUu979CaBVgtQQ-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 332528030AB; Wed, 19 Aug 2020 18:00:15 +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 5C79B100238E; Wed, 19 Aug 2020 18:00:13 +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 05/10] mm/memory_hotplug: drop nr_isolate_pageblock in offline_pages() Date: Wed, 19 Aug 2020 19:59:52 +0200 Message-Id: <20200819175957.28465-6-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: CD65228A04B X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 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: We make sure that we cannot have any memory holes right at the beginning of offline_pages() and we only support to online/offline full sections. Both, sections and pageblocks are a power of two in size, and sections always span full pageblocks. We can directly calculate the number of isolated pageblocks from nr_pages= . 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 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 50aa5df696e9d..098361fcb4504 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1460,10 +1460,10 @@ int __ref offline_pages(unsigned long start_pfn, = unsigned long nr_pages) { const unsigned long end_pfn =3D start_pfn + nr_pages; unsigned long pfn, system_ram_pages =3D 0; - int ret, node, nr_isolate_pageblock; unsigned long flags; struct zone *zone; struct memory_notify arg; + int ret, node; char *reason; =20 /* We can only offline full sections (e.g., SECTION_IS_ONLINE) */ @@ -1507,7 +1507,6 @@ int __ref offline_pages(unsigned long start_pfn, un= signed long nr_pages) reason =3D "failure to isolate range"; goto failed_removal; } - nr_isolate_pageblock =3D ret; =20 arg.start_pfn =3D start_pfn; arg.nr_pages =3D nr_pages; @@ -1569,7 +1568,7 @@ int __ref offline_pages(unsigned long start_pfn, un= signed long nr_pages) * pageblocks zone counter here. */ spin_lock_irqsave(&zone->lock, flags); - zone->nr_isolate_pageblock -=3D nr_isolate_pageblock; + zone->nr_isolate_pageblock -=3D nr_pages / pageblock_nr_pages; spin_unlock_irqrestore(&zone->lock, flags); =20 /* removal success */ --=20 2.26.2