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 A47F9C25B08 for ; Mon, 8 Aug 2022 19:36:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B89D4940027; Mon, 8 Aug 2022 15:35:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AE95D940023; Mon, 8 Aug 2022 15:35:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 91C7B940028; Mon, 8 Aug 2022 15:35:55 -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 573E3940027 for ; Mon, 8 Aug 2022 15:35:55 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 0F4201A0B61 for ; Mon, 8 Aug 2022 19:35:55 +0000 (UTC) X-FDA: 79777430670.04.083FE29 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf04.hostedemail.com (Postfix) with ESMTP id 924D64016F for ; Mon, 8 Aug 2022 19:35:54 +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=eftnJqU0jWeWiL+O1chLeJkF+G WxhYyjJf3BvEzFo7wXpaVLt6qZI8MmXmCPYEJigckj4zJJBQ6TnDgQ0zMgB6wbVoD9lhKMxlLebDB MZbhI4jr/Ki/wHLP2+06PLDPotysWK5j0b/YhXXyoIMYnJ9jrmrN0zVZ6odYjoQo3WQIYuAfet5VI F3fzEjEuhy1vAmZ7pnP/OgL3VitVeQqVqoLJQmrDe6qq1nVO/Llg5oa3eDMlwXU2RyWgDEtIXllSi BwhtiDbMIIVaV2fFgkYmsxWBJ6FO+EZWPZXp3iSTN5YWhi8jV9vbPDwKV9GPOEoWJOp1Ig40Q0aPL 2gM1T2oQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oL8XT-00EB2V-7o; Mon, 08 Aug 2022 19:35:49 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , hughd@google.com Subject: [PATCH 54/59] migrate: Convert unmap_and_move_huge_page() to use folios Date: Mon, 8 Aug 2022 20:34:22 +0100 Message-Id: <20220808193430.3378317-55-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220808193430.3378317-1-willy@infradead.org> References: <20220808193430.3378317-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659987354; a=rsa-sha256; cv=none; b=CkCVbwIq6JjkHaCjin9/VcSjyFkRNR7dqyeV0P3ZNfJjBf5DZkvi4Q6damaMPPOGI1zROg UQv+CxjgB2ej5sq/JwFMjmT6/jR5NyyQZXM3yqfimoZcXI1myHkWfHFJhfR0RgXU36NzR3 4V5YHBHWr0CVuqjp1qowmCMvMGX2UGo= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=eftnJqU0; spf=none (imf04.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659987354; 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=coxjdFCRiqCt0MxuJPdvGPjhf0p7D6yp1XMrYlVLjkzDX0lUbzngIvIuH+wWPbcN/2rGi9 yHjQULkRHy8mNZbRQLvO9mtC0wHLiVbJycjE6vUjgHJVyQYRuaSr8DimYS9fP2n2iGxyjt pPz8gKlRCdTP4Hvewe6YcQfR0ZHU/2U= X-Rspamd-Server: rspam06 X-Rspam-User: X-Stat-Signature: imo36qah9b15umcmtqdk88kp87oxsp8x X-Rspamd-Queue-Id: 924D64016F Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=eftnJqU0; spf=none (imf04.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-HE-Tag: 1659987354-347712 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