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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97617ECAAD5 for ; Fri, 2 Sep 2022 19:48:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6007480108; Fri, 2 Sep 2022 15:47:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F23D580118; Fri, 2 Sep 2022 15:47:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8BB428010E; Fri, 2 Sep 2022 15:47:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 92E998010E for ; Fri, 2 Sep 2022 15:47:05 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 748E6ABC68 for ; Fri, 2 Sep 2022 19:47:05 +0000 (UTC) X-FDA: 79868178810.11.BEA927B Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf07.hostedemail.com (Postfix) with ESMTP id 270EE40044 for ; Fri, 2 Sep 2022 19:47:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=HZ8b1C8NuYghJrw/IzYZl0rPHNemrZPs9QNaQ3LLfIg=; b=PcjOCSeaTgLyk7JbKoQG7II5hN /7QfC6mSUEQ6ezSF0LOUpnrOTmL/aYZ1avlV99qip2/de+x1+wQbWop5s5s5NhvcPuMZpXx/2jqSF hOhNslGW6DZEAErbj4yrJbxWK9x5VZqj6BJ+t4LoiivuVHFI/S7tvIvBWM8MdF50DKA6U96w7s3tR Ts9UcuQsSjZIy4oSa62B+p6NB4PulW3R7IvNeThKfY7bWOtYklhAG48hNzSRJYxqP0qSO0oYaNIka uZAqYec7O8GTmsaiW1/EYSmxkpP8GRkEtSt0DyU4EA4sADLCQ4KjaF6vnxxlXFFUu170XWJKaO/Kj 8g/S2PfA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd6-007Iht-6c; Fri, 02 Sep 2022 19:47:04 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH v2 51/57] migrate: Convert unmap_and_move_huge_page() to use folios Date: Fri, 2 Sep 2022 20:46:47 +0100 Message-Id: <20220902194653.1739778-52-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220902194653.1739778-1-willy@infradead.org> References: <20220902194653.1739778-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662148025; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=HZ8b1C8NuYghJrw/IzYZl0rPHNemrZPs9QNaQ3LLfIg=; b=exn3bNerz2w+t1cAZflG1+LZe/hOYl3JXMeL3+v6RCCDVsMpSwmV22PQQsfZKnNlR7gZQ1 087aQRZisD8YCQJ3SP5OIYJVlQuz64Ka3MThtayf+GxpE/Qg7lZhxqtFme7jRQ3CIzLJTd GXObW60Oeial6vf9su9xFkcjgobAX5o= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=PcjOCSea; dmarc=none; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662148025; a=rsa-sha256; cv=none; b=j5FgD1myXql20poLm2ltqFOZLY66BvVYY+3EEuDHJWxg74c5vEeKI6dmUb/dSyC5vgbDmH rRjmexO8vjptAVWs2iUJjd7wKasxsVE7hcNamZ7c/i/HvbS/om3ecyV+HT17J7Ue2qs9Ee ss+NfAEY6JS0Zqp9+S3eJEn3C49mJGk= X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 270EE40044 Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=PcjOCSea; dmarc=none; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspam-User: X-Stat-Signature: 9u3mz47azrren7hx5cagjk15dxcomt9t X-HE-Tag: 1662148025-56560 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: Saves several calls to compound_head() and removes a couple of uses of page->lru. Signed-off-by: Matthew Wilcox (Oracle) --- mm/migrate.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index 3cd1fdb5f572..7b338ddd011a 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1244,11 +1244,11 @@ static int unmap_and_move_huge_page(new_page_t get_new_page, * kicking migration. */ if (!hugepage_migration_supported(page_hstate(hpage))) { - list_move_tail(&hpage->lru, ret); + list_move_tail(&src->lru, ret); return -ENOSYS; } - if (page_count(hpage) == 1) { + if (folio_ref_count(src) == 1) { /* page was freed from under us. So we are done. */ putback_active_hugepage(hpage); return MIGRATEPAGE_SUCCESS; @@ -1259,7 +1259,7 @@ static int unmap_and_move_huge_page(new_page_t get_new_page, return -ENOMEM; dst = page_folio(new_hpage); - if (!trylock_page(hpage)) { + if (!folio_trylock(src)) { if (!force) goto out; switch (mode) { @@ -1269,29 +1269,29 @@ static int unmap_and_move_huge_page(new_page_t get_new_page, default: goto out; } - lock_page(hpage); + folio_lock(src); } /* * Check for pages which are in the process of being freed. Without - * page_mapping() set, hugetlbfs specific move page routine will not + * folio_mapping() set, hugetlbfs specific move page routine will not * be called and we could leak usage counts for subpools. */ - if (hugetlb_page_subpool(hpage) && !page_mapping(hpage)) { + if (hugetlb_page_subpool(hpage) && !folio_mapping(src)) { rc = -EBUSY; goto out_unlock; } - if (PageAnon(hpage)) - anon_vma = page_get_anon_vma(hpage); + if (folio_test_anon(src)) + anon_vma = page_get_anon_vma(&src->page); - if (unlikely(!trylock_page(new_hpage))) + if (unlikely(!folio_trylock(dst))) goto put_anon; - if (page_mapped(hpage)) { + if (folio_mapped(src)) { enum ttu_flags ttu = 0; - if (!PageAnon(hpage)) { + if (!folio_test_anon(src)) { /* * In shared mappings, try_to_unmap could potentially * call huge_pmd_unshare. Because of this, take @@ -1312,7 +1312,7 @@ static int unmap_and_move_huge_page(new_page_t get_new_page, i_mmap_unlock_write(mapping); } - if (!page_mapped(hpage)) + if (!folio_mapped(src)) rc = move_to_new_folio(dst, src, mode); if (page_was_mapped) @@ -1320,7 +1320,7 @@ static int unmap_and_move_huge_page(new_page_t get_new_page, rc == MIGRATEPAGE_SUCCESS ? dst : src, false); unlock_put_anon: - unlock_page(new_hpage); + folio_unlock(dst); put_anon: if (anon_vma) @@ -1332,12 +1332,12 @@ static int unmap_and_move_huge_page(new_page_t get_new_page, } out_unlock: - unlock_page(hpage); + folio_unlock(src); out: if (rc == MIGRATEPAGE_SUCCESS) putback_active_hugepage(hpage); else if (rc != -EAGAIN) - list_move_tail(&hpage->lru, ret); + list_move_tail(&src->lru, ret); /* * If migration was not successful and there's a freeing callback, use -- 2.35.1