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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 0789BC433E0 for ; Wed, 20 Jan 2021 01:44:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 975642245C for ; Wed, 20 Jan 2021 01:44:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 975642245C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=soleen.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 061966B0025; Tue, 19 Jan 2021 20:43:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F2B7C6B0026; Tue, 19 Jan 2021 20:43:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D7DF66B0027; Tue, 19 Jan 2021 20:43:56 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0177.hostedemail.com [216.40.44.177]) by kanga.kvack.org (Postfix) with ESMTP id B418C6B0025 for ; Tue, 19 Jan 2021 20:43:56 -0500 (EST) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 81435181AF5C3 for ; Wed, 20 Jan 2021 01:43:56 +0000 (UTC) X-FDA: 77724457272.02.kitty35_1b0fb1827556 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin02.hostedemail.com (Postfix) with ESMTP id 54A8E10097AA0 for ; Wed, 20 Jan 2021 01:43:56 +0000 (UTC) X-HE-Tag: kitty35_1b0fb1827556 X-Filterd-Recvd-Size: 7829 Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) by imf40.hostedemail.com (Postfix) with ESMTP for ; Wed, 20 Jan 2021 01:43:55 +0000 (UTC) Received: by mail-qt1-f177.google.com with SMTP id z9so5346924qtv.6 for ; Tue, 19 Jan 2021 17:43:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=miix9lKxirRpOuNX4BdilWnaWDaFk+PU2/sgOkhxLNo=; b=lYygOTA+KAHv7NtuPasDaGIt71xKOlxiAoa1WxrVQXEnYPhkUH7EGQdiHLeyjEhif8 8c3ZsxCMtPrWMU/ov6L8u3O0mCXPorqVQaLdE0tPMcczfP/whu0vPYoavEs8FKWtL2F8 uGrzV+JkSCnF5lHyx2c8vP25Rg1vNmhWmPKkHAQAhfgfuJv3XpJOTzAYsGT9E8fzLTPW rW+u2bVRr+uDSYin4PVdV2Y4cIzuesc9qrBaEbW5dJEArv7y05eBZmgY/12DZYnfODdv GVitEbFgwqZnNAQTA82UrkKpYTRLustCzwaOFiegcmxfIujE1OXL95C54K37jFzmodoC 4y2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=miix9lKxirRpOuNX4BdilWnaWDaFk+PU2/sgOkhxLNo=; b=nJ6ZagKuu1C93RGYjHR9orzjrpl2DVfY2cC9+tVIIaZnvSW0BQL+hpkGIJ/wd9HBWM DExzsKOkZodf42bH3yyvkJttMyvi3owCJ8B/pYd2brq3WPg+yO6WApJrlzHq5Wv7/5UR hxtSW0xezduNhMeXZKGkie0PzxY94WqBcLQVJhEnFerYVo1BRIfWDaxCDOupNYdNMjmi rpYTtk4kCIyAWUR2o1npRaipUDfsOY7ntWbZoSs8e/PqBu6eqZFksPDKaZdj3zwqXnv8 cYP+XXf1Tt71/XMd8T0O1EaKE6OmXZ9zKHM9caQ4qi5FJ3ATXUbC9nq9Q7wxC/aGpWSS BeYA== X-Gm-Message-State: AOAM533oOgQMB5eev9AmAWtIaspEzMfFaYvydC63o6m75vLAsPzHydX3 UTKb86XKlgUe/50AC18h3LWEIA== X-Google-Smtp-Source: ABdhPJx0A29eKX1CWM9z/+Tj6EXcNW9tArI6zSakcVOtB6N+0Bp3baDoPWdXy51U+8aLV3SnasMPkw== X-Received: by 2002:ac8:6a06:: with SMTP id t6mr6840603qtr.155.1611107035309; Tue, 19 Jan 2021 17:43:55 -0800 (PST) Received: from localhost.localdomain (c-73-69-118-222.hsd1.nh.comcast.net. [73.69.118.222]) by smtp.gmail.com with ESMTPSA id a9sm391871qkk.39.2021.01.19.17.43.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 17:43:54 -0800 (PST) From: Pavel Tatashin To: pasha.tatashin@soleen.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org, vbabka@suse.cz, mhocko@suse.com, david@redhat.com, osalvador@suse.de, dan.j.williams@intel.com, sashal@kernel.org, tyhicks@linux.microsoft.com, iamjoonsoo.kim@lge.com, mike.kravetz@oracle.com, rostedt@goodmis.org, mingo@redhat.com, jgg@ziepe.ca, peterz@infradead.org, mgorman@suse.de, willy@infradead.org, rientjes@google.com, jhubbard@nvidia.com, linux-doc@vger.kernel.org, ira.weiny@intel.com, linux-kselftest@vger.kernel.org Subject: [PATCH v6 12/14] mm/gup: longterm pin migration cleaup Date: Tue, 19 Jan 2021 20:43:31 -0500 Message-Id: <20210120014333.222547-13-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210120014333.222547-1-pasha.tatashin@soleen.com> References: <20210120014333.222547-1-pasha.tatashin@soleen.com> MIME-Version: 1.0 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: When pages are longterm pinned, we must migrated them out of movable zone= . The function that migrates them has a hidden loop with goto. The loop is to retry on isolation failures, and after successful migration. Make this code better by moving this loop to the caller. Signed-off-by: Pavel Tatashin --- mm/gup.c | 88 +++++++++++++++++++++++--------------------------------- 1 file changed, 36 insertions(+), 52 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index c7abd5b37150..9a5d474b39c2 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -1548,27 +1548,28 @@ struct page *get_dump_page(unsigned long addr) } #endif /* CONFIG_ELF_CORE */ =20 -static long check_and_migrate_movable_pages(struct mm_struct *mm, - unsigned long start, - unsigned long nr_pages, +/* + * Check whether all pages are pinnable, if so return number of pages. = If some + * pages are not pinnable, migrate them, and unpin all pages. Return zer= o if + * pages were migrated, or if some pages were not successfully isolated. + * Return negative error if migration fails. + */ +static long check_and_migrate_movable_pages(unsigned long nr_pages, struct page **pages, - struct vm_area_struct **vmas, unsigned int gup_flags) { - unsigned long i, isolation_error_count; - bool drain_allow; + unsigned long i; + unsigned long isolation_error_count =3D 0; + bool drain_allow =3D true; LIST_HEAD(movable_page_list); - long ret =3D nr_pages; - struct page *prev_head, *head; + long ret =3D 0; + struct page *prev_head =3D NULL; + struct page *head; struct migration_target_control mtc =3D { .nid =3D NUMA_NO_NODE, .gfp_mask =3D GFP_USER | __GFP_NOWARN, }; =20 -check_again: - prev_head =3D NULL; - isolation_error_count =3D 0; - drain_allow =3D true; for (i =3D 0; i < nr_pages; i++) { head =3D compound_head(pages[i]); if (head =3D=3D prev_head) @@ -1608,40 +1609,23 @@ static long check_and_migrate_movable_pages(struc= t mm_struct *mm, * in the correct zone. */ if (list_empty(&movable_page_list) && !isolation_error_count) - return ret; + return nr_pages; =20 + if (gup_flags & FOLL_PIN) { + unpin_user_pages(pages, nr_pages); + } else { + for (i =3D 0; i < nr_pages; i++) + put_page(pages[i]); + } if (!list_empty(&movable_page_list)) { - /* - * drop the above get_user_pages reference. - */ - if (gup_flags & FOLL_PIN) - unpin_user_pages(pages, nr_pages); - else - for (i =3D 0; i < nr_pages; i++) - put_page(pages[i]); - ret =3D migrate_pages(&movable_page_list, alloc_migration_target, NULL, (unsigned long)&mtc, MIGRATE_SYNC, MR_LONGTERM_PIN); - if (ret) { - if (!list_empty(&movable_page_list)) - putback_movable_pages(&movable_page_list); - return ret > 0 ? -ENOMEM : ret; - } - - /* We unpinned pages before migration, pin them again */ - ret =3D __get_user_pages_locked(mm, start, nr_pages, pages, vmas, - NULL, gup_flags); - if (ret <=3D 0) - return ret; - nr_pages =3D ret; + if (ret && !list_empty(&movable_page_list)) + putback_movable_pages(&movable_page_list); } =20 - /* - * check again because pages were unpinned, and we also might have - * had isolation errors and need more pages to migrate. - */ - goto check_again; + return ret > 0 ? -ENOMEM : ret; } =20 /* @@ -1655,22 +1639,22 @@ static long __gup_longterm_locked(struct mm_struc= t *mm, struct vm_area_struct **vmas, unsigned int gup_flags) { - unsigned long flags =3D 0; + unsigned int flags; long rc; =20 - if (gup_flags & FOLL_LONGTERM) - flags =3D memalloc_pin_save(); - - rc =3D __get_user_pages_locked(mm, start, nr_pages, pages, vmas, NULL, - gup_flags); + if (!(gup_flags & FOLL_LONGTERM)) + return __get_user_pages_locked(mm, start, nr_pages, pages, vmas, + NULL, gup_flags); + flags =3D memalloc_pin_save(); + do { + rc =3D __get_user_pages_locked(mm, start, nr_pages, pages, vmas, + NULL, gup_flags); + if (rc <=3D 0) + break; + rc =3D check_and_migrate_movable_pages(rc, pages, gup_flags); + } while (!rc); + memalloc_pin_restore(flags); =20 - if (gup_flags & FOLL_LONGTERM) { - if (rc > 0) - rc =3D check_and_migrate_movable_pages(mm, start, rc, - pages, vmas, - gup_flags); - memalloc_pin_restore(flags); - } return rc; } =20 --=20 2.25.1