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=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 DCFA7C433DF for ; Tue, 30 Jun 2020 14:27:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9EEAF20672 for ; Tue, 30 Jun 2020 14:27:16 +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="MYd2d5kj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9EEAF20672 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 F34426B002A; Tue, 30 Jun 2020 10:27:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EBDD76B002B; Tue, 30 Jun 2020 10:27:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D85C56B002C; Tue, 30 Jun 2020 10:27:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0150.hostedemail.com [216.40.44.150]) by kanga.kvack.org (Postfix) with ESMTP id BE05E6B002A for ; Tue, 30 Jun 2020 10:27:15 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 597652DFA for ; Tue, 30 Jun 2020 14:27:15 +0000 (UTC) X-FDA: 76986105630.24.ship76_480d1a326e78 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin24.hostedemail.com (Postfix) with ESMTP id 8466E1A4BA for ; Tue, 30 Jun 2020 14:27:08 +0000 (UTC) X-HE-Tag: ship76_480d1a326e78 X-Filterd-Recvd-Size: 3832 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf01.hostedemail.com (Postfix) with ESMTP for ; Tue, 30 Jun 2020 14:27:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593527227; 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=e2FJIAcStXa5OuoHid7xOFhinbjPPYHi3TDo9UjfZyk=; b=MYd2d5kjfY1NIE5wXfcD7q8kP3ZPP2zXlLJ11xWfGXihbjdj+98G7QIHrp/Asnx/glXmx+ NHV0i2g6k/urYJfMj4LD1+f2YsKFq5eiMyLEXXDEcaddxni5dPZiHoLyZAOISXgu+fRTm2 59mBzXjUJzDikrAcOBf5wole36V0krk= 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-235-GAp8vo-6NeC4SIj0QW7yNQ-1; Tue, 30 Jun 2020 10:27:02 -0400 X-MC-Unique: GAp8vo-6NeC4SIj0QW7yNQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D3B82107ACF6; Tue, 30 Jun 2020 14:26:55 +0000 (UTC) Received: from t480s.redhat.com (ovpn-114-56.ams2.redhat.com [10.36.114.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 57DBF19C4F; Tue, 30 Jun 2020 14:26:54 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: virtualization@lists.linux-foundation.org, linux-mm@kvack.org, David Hildenbrand , Andrew Morton , Michal Hocko , "Michael S . Tsirkin" Subject: [PATCH v1 4/6] mm/page_isolation: cleanup set_migratetype_isolate() Date: Tue, 30 Jun 2020 16:26:37 +0200 Message-Id: <20200630142639.22770-5-david@redhat.com> In-Reply-To: <20200630142639.22770-1-david@redhat.com> References: <20200630142639.22770-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Rspamd-Queue-Id: 8466E1A4BA X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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: Let's clean it up a bit, simplifying error handling and getting rid of the label. Cc: Andrew Morton Cc: Michal Hocko Cc: Michael S. Tsirkin Signed-off-by: David Hildenbrand --- mm/page_isolation.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/mm/page_isolation.c b/mm/page_isolation.c index 02a01bff6b219..5f869bef23fa4 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -17,12 +17,9 @@ =20 static int set_migratetype_isolate(struct page *page, int migratetype, i= nt isol_flags) { - struct page *unmovable =3D NULL; - struct zone *zone; + struct zone *zone =3D page_zone(page); + struct page *unmovable; unsigned long flags; - int ret =3D -EBUSY; - - zone =3D page_zone(page); =20 spin_lock_irqsave(&zone->lock, flags); =20 @@ -51,21 +48,20 @@ static int set_migratetype_isolate(struct page *page,= int migratetype, int isol_ NULL); =20 __mod_zone_freepage_state(zone, -nr_pages, mt); - ret =3D 0; + spin_unlock_irqrestore(&zone->lock, flags); + drain_all_pages(zone); + return 0; } =20 -out: spin_unlock_irqrestore(&zone->lock, flags); - if (!ret) { - drain_all_pages(zone); - } else if ((isol_flags & REPORT_FAILURE) && unmovable) + if (isol_flags & REPORT_FAILURE) /* * printk() with zone->lock held will likely trigger a * lockdep splat, so defer it here. */ dump_page(unmovable, "unmovable page"); =20 - return ret; + return -EBUSY; } =20 static void unset_migratetype_isolate(struct page *page, unsigned migrat= etype) --=20 2.26.2