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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 B675AC3A59F for ; Mon, 26 Aug 2019 10:10:33 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 85D6621852 for ; Mon, 26 Aug 2019 10:10:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 85D6621852 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 3211E6B054F; Mon, 26 Aug 2019 06:10:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2D0E06B0550; Mon, 26 Aug 2019 06:10:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1986B6B0551; Mon, 26 Aug 2019 06:10:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0109.hostedemail.com [216.40.44.109]) by kanga.kvack.org (Postfix) with ESMTP id EB2D96B054F for ; Mon, 26 Aug 2019 06:10:31 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with SMTP id 8B3ED3499 for ; Mon, 26 Aug 2019 10:10:31 +0000 (UTC) X-FDA: 75864159462.06.tray63_21a9ac4944a01 X-HE-Tag: tray63_21a9ac4944a01 X-Filterd-Recvd-Size: 2906 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by imf37.hostedemail.com (Postfix) with ESMTP for ; Mon, 26 Aug 2019 10:10:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5866981DF1; Mon, 26 Aug 2019 10:10:30 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-227.ams2.redhat.com [10.36.116.227]) by smtp.corp.redhat.com (Postfix) with ESMTP id 72C27608C1; Mon, 26 Aug 2019 10:10:28 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , Oscar Salvador , Michal Hocko , Pavel Tatashin , Dan Williams , Wei Yang Subject: [PATCH v2 1/6] mm/memory_hotplug: Exit early in __remove_pages() on BUGs Date: Mon, 26 Aug 2019 12:10:07 +0200 Message-Id: <20190826101012.10575-2-david@redhat.com> In-Reply-To: <20190826101012.10575-1-david@redhat.com> References: <20190826101012.10575-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 26 Aug 2019 10:10:30 +0000 (UTC) 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: The error path should never happen in practice (unless bringing up a new device driver, or on BUGs). However, it's clearer to not touch anything in case we are going to return right away. Move the check/return. Cc: Andrew Morton Cc: Oscar Salvador Cc: Michal Hocko Cc: David Hildenbrand Cc: Pavel Tatashin Cc: Dan Williams Cc: Wei Yang Signed-off-by: David Hildenbrand --- mm/memory_hotplug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 32a5386758ce..71779b7b14df 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -542,13 +542,13 @@ void __remove_pages(struct zone *zone, unsigned lon= g pfn, unsigned long map_offset =3D 0; unsigned long nr, start_sec, end_sec; =20 + if (check_pfn_span(pfn, nr_pages, "remove")) + return; + map_offset =3D vmem_altmap_offset(altmap); =20 clear_zone_contiguous(zone); =20 - if (check_pfn_span(pfn, nr_pages, "remove")) - return; - start_sec =3D pfn_to_section_nr(pfn); end_sec =3D pfn_to_section_nr(pfn + nr_pages - 1); for (nr =3D start_sec; nr <=3D end_sec; nr++) { --=20 2.21.0