From patchwork Tue Dec 11 17:21:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 10724261 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 37F07112E for ; Tue, 11 Dec 2018 17:21:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 195272B553 for ; Tue, 11 Dec 2018 17:21:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D08E2B561; Tue, 11 Dec 2018 17:21:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E46C2B553 for ; Tue, 11 Dec 2018 17:21:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ECFF08E00B6; Tue, 11 Dec 2018 12:21:51 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E1F2A8E0095; Tue, 11 Dec 2018 12:21:51 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C1F828E0095; Tue, 11 Dec 2018 12:21:51 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by kanga.kvack.org (Postfix) with ESMTP id 6EE2A8E00B4 for ; Tue, 11 Dec 2018 12:21:51 -0500 (EST) Received: by mail-pf1-f197.google.com with SMTP id n17so13120540pfk.23 for ; Tue, 11 Dec 2018 09:21:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=k+qEjUPWQaTOi2SwKwehGKb14/YuxiclPBnzQY1y55Y=; b=EMnW3aExhvKU/nZxYvFH0O6Q3citOXB6/CmkN+qpdYgluDhhNKHpOYwIIEAQZj9bpN zHZQM53l375E7srzPqFyBh8XxKGWmBfGg+RvsT7FSHi1YVmF4D8OFIPEEP+rJ82/H2I6 FQHCdqeJqbPoB+4oPI7NqJ/DyklHq4+YPLLm5Q7xFgUImPh51qw0wO/qu66Sq1SlPvqI CK3IHF69yj6scwFG71nwCHIBghk6BIhTRg0eiPWpT6wnjIp0PSwWoPue3icdcNVItGF1 z5zz/fd9aeuyXq81WnY7E6iC2Oj+F+WsP4SN84Ga2KYx8LA+qxMYPDod1W+In2vlj6r/ x8Vw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of jack@suse.cz designates 195.135.220.15 as permitted sender) smtp.mailfrom=jack@suse.cz X-Gm-Message-State: AA+aEWa8LdXz5sL4oC/gj8xfs8zKN+xFNz7XBa6Z7r2yAUNtnlbPPgxD A8SEjhOvUg8ZhJIQfkomK2qC2UqcPKpuDc6Pho7yV5qH1buFEzQQxK94ddYrf7U51LO3jRbFm7w aYM2JoB/I/UbPUUrGs37lFByusfR6AVQ7ZpzHjf0Dqup7FRZgK4MoeyXMEDnwbZes9Q== X-Received: by 2002:a62:b24a:: with SMTP id x71mr17546591pfe.148.1544548911084; Tue, 11 Dec 2018 09:21:51 -0800 (PST) X-Google-Smtp-Source: AFSGD/WwMW9HlvC47Blkf+SZCK+H67XmEp+aD9wwidmmjM1AH09hDkgikRB8/ZQkohTYwhgRbYCp X-Received: by 2002:a62:b24a:: with SMTP id x71mr17546548pfe.148.1544548910327; Tue, 11 Dec 2018 09:21:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544548910; cv=none; d=google.com; s=arc-20160816; b=Dh7MY3HpepQLVBlDb3RDr3/Wg7ItvfaalTYpNg4jbSjm8tGCaE4d3kF0KLp50iSOJm LMCniyYSB5Zrg715opeT+BAMbccFHOxc5nwVqxLMv41b4d38OlOcZbYSLk8M4ZRIWD8b ylz/O2XHsQpnf0lh1KeL25OdmoOY0K0evQ6S0c2xJucWPFu1lmFkQNfOKzhUvR/gYFg6 8alU6uP/qyd3Gq/kcV7mqCRVor8wLnAwE++6ZPR9L0E7xj3fLxmSw4ejWTPuX+5vHsIB jl4QfGW75hGeL3A2I3oRbrRDwWnB7SuOv3/02lZ2GXgM1q642Yx2Y65a26+TneOw5YEd KcmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=k+qEjUPWQaTOi2SwKwehGKb14/YuxiclPBnzQY1y55Y=; b=LBKXA5IYQNuVybEsA2txDYvQ69XO6JL9OY5950sjVJvqPZxrWw3IdEkCn+AD8BBEe5 2sK45iJTaQyMEOSXOSdH7L3wVccvDUgldxiqCiA3mNAqjwioVZl4IGPwD7f/rsFFzKvz Fhsv4fCCfKKe7SqOH5cNpbtoiqQaDa3GTeO9OVjyvo4HVy7uw/dhNLi7Rt3wc4aVvoEw U3QiQr1H4y4PDHN4V8WqPk7T2bcTEJdCZHbcnVTlSUcWK18BujEjk5vZ8mmXIGy50/ZG g2V4QvSj6eLAIfyuYjEKKegXNmBQHaoanhxlUzq1du0zZcwttOmkdbmKSRINZwQxmS4b CsBg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of jack@suse.cz designates 195.135.220.15 as permitted sender) smtp.mailfrom=jack@suse.cz Received: from mx1.suse.de (mx2.suse.de. [195.135.220.15]) by mx.google.com with ESMTPS id o11si12668575pgd.234.2018.12.11.09.21.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 09:21:50 -0800 (PST) Received-SPF: pass (google.com: domain of jack@suse.cz designates 195.135.220.15 as permitted sender) client-ip=195.135.220.15; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jack@suse.cz designates 195.135.220.15 as permitted sender) smtp.mailfrom=jack@suse.cz X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id BDD56B010 for ; Tue, 11 Dec 2018 17:21:48 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 5EE6D1E0620; Tue, 11 Dec 2018 18:21:48 +0100 (CET) From: Jan Kara To: Cc: mhocko@suse.cz, mgorman@suse.de, Jan Kara Subject: [PATCH 1/6] mm: migration: Factor out code to compute expected number of page references Date: Tue, 11 Dec 2018 18:21:38 +0100 Message-Id: <20181211172143.7358-2-jack@suse.cz> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20181211172143.7358-1-jack@suse.cz> References: <20181211172143.7358-1-jack@suse.cz> 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: X-Virus-Scanned: ClamAV using ClamSMTP Factor out function to compute number of expected page references in migrate_page_move_mapping(). Note that we move hpage_nr_pages() and page_has_private() checks from under xas_lock_irq() however this is safe since we hold page lock. Signed-off-by: Jan Kara Acked-by: Mel Gorman --- mm/migrate.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index f7e4bfdc13b7..789c7bc90a0c 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -428,6 +428,22 @@ static inline bool buffer_migrate_lock_buffers(struct buffer_head *head, } #endif /* CONFIG_BLOCK */ +static int expected_page_refs(struct page *page) +{ + int expected_count = 1; + + /* + * Device public or private pages have an extra refcount as they are + * ZONE_DEVICE pages. + */ + expected_count += is_device_private_page(page); + expected_count += is_device_public_page(page); + if (page->mapping) + expected_count += hpage_nr_pages(page) + page_has_private(page); + + return expected_count; +} + /* * Replace the page in the mapping. * @@ -444,14 +460,7 @@ int migrate_page_move_mapping(struct address_space *mapping, XA_STATE(xas, &mapping->i_pages, page_index(page)); struct zone *oldzone, *newzone; int dirty; - int expected_count = 1 + extra_count; - - /* - * Device public or private pages have an extra refcount as they are - * ZONE_DEVICE pages. - */ - expected_count += is_device_private_page(page); - expected_count += is_device_public_page(page); + int expected_count = expected_page_refs(page) + extra_count; if (!mapping) { /* Anonymous page without mapping */ @@ -471,8 +480,6 @@ int migrate_page_move_mapping(struct address_space *mapping, newzone = page_zone(newpage); xas_lock_irq(&xas); - - expected_count += hpage_nr_pages(page) + page_has_private(page); if (page_count(page) != expected_count || xas_load(&xas) != page) { xas_unlock_irq(&xas); return -EAGAIN;