From patchwork Tue Dec 11 17:21:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 10724267 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 BF34A13BF for ; Tue, 11 Dec 2018 17:22:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A16232B553 for ; Tue, 11 Dec 2018 17:22:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 95F152B561; Tue, 11 Dec 2018 17:22:03 +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 279D32B553 for ; Tue, 11 Dec 2018 17:22:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9BC618E00B4; Tue, 11 Dec 2018 12:21:52 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5C3E88E00B5; Tue, 11 Dec 2018 12:21:52 -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 0385A8E00BA; 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-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by kanga.kvack.org (Postfix) with ESMTP id 9AB808E00B8 for ; Tue, 11 Dec 2018 12:21:51 -0500 (EST) Received: by mail-pl1-f199.google.com with SMTP id b24so6931357pls.11 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=mPWGpmOK7whuIEeXcPbpeRb1vJRiyG4ocRe4rWqTPSk=; b=t5282N6gPc0qsqBrR0Hn05bnM2YxMVT/N4mHRO4zmdP/YneZnRAbD6kd4cgF7qVkng ZMBr3QCLAsa3FPoF0jT+Qld5E9PQthdnQlYQrkQD+9zFv5M8TQX31VRKs/n8rtMut0ti 0nfW9cL28/83VMi62mFQwyPzZMp9rYvCX6KKj1kZyWoLimyO8Uh19ZwhTPThWdPuhnR+ VzCLy2T/j9ASvsRyyY4I1XbxgeHM/cdPui8VVfKGPLVnlxlKEtj47DmQFDGAEvyvFp/i G+81Ck2s+apYp/8zDW7YXGsnh8tgRu0jIRE8zDu+T0Ev3a61ZERm62MbJXaF8OfDJT44 ohrw== 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+aEWZbUKj6pq/nCkYZAK3qhmyoo1gETYgUCfpUgnQJ9uVmk64wxd6y bHSMK0mOj8BNSzY1SRwQNbtN0cRnpqzc/Rv2htRcS5guNPBnWBHfabnYEatWYvTgEZYNUNtKm4Z LQUI1fAGfm2lF5xsyVk1XKNe5t7ZMMcP0lrtwOazU5jM2e2uidKb/rtYwqELqqjPPbQ== X-Received: by 2002:a62:6204:: with SMTP id w4mr17284252pfb.5.1544548911298; Tue, 11 Dec 2018 09:21:51 -0800 (PST) X-Google-Smtp-Source: AFSGD/WIor4Z/nUGqkaJeLvY+M0QuoDJ7mdu0n6gY9DM2j8U5GTBhTE3XLC6+/SseMrkKJ1z7Vd1 X-Received: by 2002:a62:6204:: with SMTP id w4mr17284214pfb.5.1544548910543; 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=ZZOoyDoLBLMOhQVYMYFjQjwAa4cLZ8LYahxm2mNFNP1i4RLIr/fUWF4P0EelPOc0zv PXHo2PAw9fCkqWCp1P4rJ88MQwONFfCPRrc1bJSsNINsAOPOKIEuFX3aEd3SaYko22kL 151qrSJxjN7Hnex0fJgBCTvPUX7hb9RjdtT00uR9esJZzhtWiH/6keaBCJDJzADrC1Wv 9COC1Fx3g5ZZ9BJytqLR2miTvV/c9AGWKmOz/yad9380OB0MiTH92akA0oKV+uozJPr9 C5qX8/rlnwMC9KtSkqQuFyH0WjMAt9eU2TmjSngpmr2e18c5cxfi8hWZyooL2ZJ03wj7 foRA== 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=mPWGpmOK7whuIEeXcPbpeRb1vJRiyG4ocRe4rWqTPSk=; b=JQLjmJDzJ2rkNLDcNQolql5FtAIVNSc4fq/IoIkz5IarmSakpsZVqNxXDZ9hhjhg3W Ixe8vuR+jUIBT/11fgCwhmraksOMcpVPXs77aCDDYD6n2Y51HTa5LIpD/qdQaZ29AY27 ElP0e6B300cX4vOpaGqiCi7zZ3RUJdKRhNHGBi00FQBpVTKe3DZOCe66ulmmUeMU6/bR 6phXGQ5T5mlp82UE7aGnCg6wefqwnj7ZRE0Dm/aOshhk2OYzYwXZcfUd3eFElN3FQuVZ JkGbsSCiVMLMaPQj913sED0oS4UekgAzlSWoO+/FIG0sV7YUeg5qH258qaDnw+uA7bh7 khLA== 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 a17si13329103pfn.213.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 relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id D6DF5B029 for ; Tue, 11 Dec 2018 17:21:48 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 6AB161E141C; Tue, 11 Dec 2018 18:21:48 +0100 (CET) From: Jan Kara To: Cc: mhocko@suse.cz, mgorman@suse.de, Jan Kara Subject: [PATCH 4/6] mm: migrate: Provide buffer_migrate_page_norefs() Date: Tue, 11 Dec 2018 18:21:41 +0100 Message-Id: <20181211172143.7358-5-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 Provide a variant of buffer_migrate_page() that also checks whether there are no unexpected references to buffer heads. This function will then be safe to use for block device pages. Signed-off-by: Jan Kara Acked-by: Mel Gorman --- include/linux/fs.h | 4 ++++ mm/migrate.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index c95c0807471f..4bb1a8b65474 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3264,8 +3264,12 @@ extern int generic_check_addressable(unsigned, u64); extern int buffer_migrate_page(struct address_space *, struct page *, struct page *, enum migrate_mode); +extern int buffer_migrate_page_norefs(struct address_space *, + struct page *, struct page *, + enum migrate_mode); #else #define buffer_migrate_page NULL +#define buffer_migrate_page_norefs NULL #endif extern int setattr_prepare(struct dentry *, struct iattr *); diff --git a/mm/migrate.c b/mm/migrate.c index f8df1ad6e7cf..c4075d5ec073 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -747,13 +747,9 @@ static bool buffer_migrate_lock_buffers(struct buffer_head *head, return true; } -/* - * Migration function for pages with buffers. This function can only be used - * if the underlying filesystem guarantees that no other references to "page" - * exist. - */ -int buffer_migrate_page(struct address_space *mapping, - struct page *newpage, struct page *page, enum migrate_mode mode) +static int __buffer_migrate_page(struct address_space *mapping, + struct page *newpage, struct page *page, enum migrate_mode mode, + bool check_refs) { struct buffer_head *bh, *head; int rc; @@ -771,6 +767,33 @@ int buffer_migrate_page(struct address_space *mapping, if (!buffer_migrate_lock_buffers(head, mode)) return -EAGAIN; + if (check_refs) { + bool busy; + bool invalidated = false; + +recheck_buffers: + busy = false; + spin_lock(&mapping->private_lock); + bh = head; + do { + if (atomic_read(&bh->b_count)) { + busy = true; + break; + } + bh = bh->b_this_page; + } while (bh != head); + spin_unlock(&mapping->private_lock); + if (busy) { + if (invalidated) { + rc = -EAGAIN; + goto unlock_buffers; + } + invalidate_bh_lrus(); + invalidated = true; + goto recheck_buffers; + } + } + rc = migrate_page_move_mapping(mapping, newpage, page, NULL, mode, 0); if (rc != MIGRATEPAGE_SUCCESS) goto unlock_buffers; @@ -807,7 +830,31 @@ int buffer_migrate_page(struct address_space *mapping, return rc; } + +/* + * Migration function for pages with buffers. This function can only be used + * if the underlying filesystem guarantees that no other references to "page" + * exist. For example attached buffer heads are accessed only under page lock. + */ +int buffer_migrate_page(struct address_space *mapping, + struct page *newpage, struct page *page, enum migrate_mode mode) +{ + return __buffer_migrate_page(mapping, newpage, page, mode, false); +} EXPORT_SYMBOL(buffer_migrate_page); + +/* + * Same as above except that this variant is more careful and checks that there + * are also no buffer head references. This function is the right one for + * mappings where buffer heads are directly looked up and referenced (such as + * block device mappings). + */ +int buffer_migrate_page_norefs(struct address_space *mapping, + struct page *newpage, struct page *page, enum migrate_mode mode) +{ + return __buffer_migrate_page(mapping, newpage, page, mode, true); +} +EXPORT_SYMBOL(buffer_migrate_page_norefs); #endif /*