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.8 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 4B492C433E1 for ; Thu, 30 Jul 2020 09:34:54 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 11F4C2082E for ; Thu, 30 Jul 2020 09:34:54 +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="GuVS5QIk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 11F4C2082E 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 CB2706B000E; Thu, 30 Jul 2020 05:34:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B23FF6B0023; Thu, 30 Jul 2020 05:34:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7E8576B0010; Thu, 30 Jul 2020 05:34:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0188.hostedemail.com [216.40.44.188]) by kanga.kvack.org (Postfix) with ESMTP id 62BF76B000E for ; Thu, 30 Jul 2020 05:34:50 -0400 (EDT) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 1F842181AEF09 for ; Thu, 30 Jul 2020 09:34:50 +0000 (UTC) X-FDA: 77094232740.05.land59_4f0315426f7a Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin05.hostedemail.com (Postfix) with ESMTP id EC5DF180318E7 for ; Thu, 30 Jul 2020 09:34:49 +0000 (UTC) X-HE-Tag: land59_4f0315426f7a X-Filterd-Recvd-Size: 4191 Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by imf16.hostedemail.com (Postfix) with ESMTP for ; Thu, 30 Jul 2020 09:34:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596101688; 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=yNmXR+u9IzTxR95YCO3PnwRTTSVw3K+hGsEdO4nA3OU=; b=GuVS5QIksudhTXJiMkR2KCLpcaamCKbMJTum+jmJUbiMA3qmbL7gK9AXcZvI9cGkbD1qqZ lr4bLhUFp0SMS8KHfBbyzux6/k5hY16deVQhPHOFqUUc47MKMoMhacTAvwGvFBs9MG4Fss bIovfQfuqmkQyEeNI3xPQsTy3EHQDaA= 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-299-5eV1rBhrMvu-wfNEUcfJTQ-1; Thu, 30 Jul 2020 05:34:44 -0400 X-MC-Unique: 5eV1rBhrMvu-wfNEUcfJTQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 779781015179; Thu, 30 Jul 2020 09:34:29 +0000 (UTC) Received: from t480s.redhat.com (ovpn-113-185.ams2.redhat.com [10.36.113.185]) by smtp.corp.redhat.com (Postfix) with ESMTP id 82BCE69324; Thu, 30 Jul 2020 09:34:27 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: virtualization@lists.linux-foundation.org, linux-mm@kvack.org, David Hildenbrand , Baoquan He , Pankaj Gupta , Andrew Morton , Michal Hocko , "Michael S . Tsirkin" , Mike Kravetz Subject: [PATCH v2 4/6] mm/page_isolation: cleanup set_migratetype_isolate() Date: Thu, 30 Jul 2020 11:34:14 +0200 Message-Id: <20200730093416.36210-5-david@redhat.com> In-Reply-To: <20200730093416.36210-1-david@redhat.com> References: <20200730093416.36210-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Rspamd-Queue-Id: EC5DF180318E7 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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. Reviewed-by: Baoquan He Reviewed-by: Pankaj Gupta Cc: Andrew Morton Cc: Michal Hocko Cc: Michael S. Tsirkin Cc: Mike Kravetz Signed-off-by: David Hildenbrand --- mm/page_isolation.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/mm/page_isolation.c b/mm/page_isolation.c index d099aac479601..e65fe5d770849 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,13 +48,13 @@ 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 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. @@ -65,7 +62,7 @@ static int set_migratetype_isolate(struct page *page, i= nt migratetype, int isol_ 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