From patchwork Tue Jul 2 23:35:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henry Burns X-Patchwork-Id: 11028725 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 5B7861510 for ; Tue, 2 Jul 2019 23:35:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C1B22855D for ; Tue, 2 Jul 2019 23:35:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D0C9286D0; Tue, 2 Jul 2019 23:35: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=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL 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 01EF52855D for ; Tue, 2 Jul 2019 23:35:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0B4686B0003; Tue, 2 Jul 2019 19:35:53 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 065F98E0003; Tue, 2 Jul 2019 19:35:53 -0400 (EDT) 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 E6FA68E0001; Tue, 2 Jul 2019 19:35:52 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by kanga.kvack.org (Postfix) with ESMTP id B02E16B0003 for ; Tue, 2 Jul 2019 19:35:52 -0400 (EDT) Received: by mail-pf1-f199.google.com with SMTP id z1so245727pfb.7 for ; Tue, 02 Jul 2019 16:35:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:date:message-id:mime-version :subject:from:to:cc; bh=MklO/nCO3vTONhpU2/Xc+PDQxZ8geoXuw22CpQ4sZO8=; b=MYTKkXxUEeyPnsKvymY4kkIPJNHnpCx7OhlmnJHdarM+Qd/nr41TsDEIIgAZ/5lbWH ikg9ZG/YbbPBw+KJ+J/qP+HSDvwXK0qsGWCplqIps+OrWvzg9x4jQ0Tsa844A3qYxfSf 52Y496e6n5iOOPYH5dBPX7EaxnmHkmHn8ZgNQ5WwHRxuO7MI+aZZF6/HIPU+CV5H6sRc CxpOZDV7CE8/WyN0NxmDENfgsXS8qLXlOE9YDn38f16oiUWt5+J4f2QyQplz4E2wAYEi 7g9Nv1xXbHO9Hjk9/cO2zuvmU2Aypkjenragh0MMBWizWhYhgCbA+jmOYCYaEY+wnNTi BkhQ== X-Gm-Message-State: APjAAAVQIgV0Bmfmn+ZEdSa/+ak2IcXg1HtHLS4feIbEVk4sazgajhxf L14MYu2oQQd3OK/ML4S6AIEzGbu9hlakpSEOKIr8WNgNloL0wgg708J6/xfdlpJ1U1e9AXgiB9t qUoLDjHOxioskIOdyQx1UlzNdtnD96AJlXKvf6sj4UvirEKytKbx3Dd9iuO5I6a5/SQ== X-Received: by 2002:a63:2985:: with SMTP id p127mr9585088pgp.400.1562110552245; Tue, 02 Jul 2019 16:35:52 -0700 (PDT) X-Received: by 2002:a63:2985:: with SMTP id p127mr9585015pgp.400.1562110550937; Tue, 02 Jul 2019 16:35:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562110550; cv=none; d=google.com; s=arc-20160816; b=b4UJ7OFp/G79xy+3rraVVqvcJTNAG9+wxgQZvx676Cvw62NtgD35cTAxxwvc2Jn79g GfPVigKgcGjP6F/ZVNVqXBRqzYQp1kcapAFO716cMnwWrFkf/Y2FbbYAn7F9cJOQ1hjE T+YeRC/PygCqGSsIlCfsI0xMtQttNqbrHhz8YwLaCJbfyTt4PabvS5pzpC3j7zbJ+igh RtJfcR06X0hLZbRgVZsJitCvNP0B/MzuAGukAqB8t3UGxLkQ57OT9wAMs9m7CKICCc2F Rztv2s4cAqKaJgdHUal+6ePfMj8rQhjPQCPD56Yayc2ZfwaIkURDKKe8MxwtnRCEjIBk EO/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:mime-version:message-id:date:dkim-signature; bh=MklO/nCO3vTONhpU2/Xc+PDQxZ8geoXuw22CpQ4sZO8=; b=ZzAlLlgw/g6VtL8djUODwr5TWm4aPS0TTsYPlzFKHVqUgq1Q4Y7wS5yCwILj4wjS8b 32iNRa9wWm44xTCO3ulEAhbKdksqwRSQhLdU+daaZSSOlpqWIgPQaAV03jQqT6EZZ3jV ITI2L421POah2Xp7bO4j6fzeJFHwdyiwaS5DOBmwpTaIEjb+amRYHxlGXTtmxv6G8PEz hsQE4CBzNWQT3WM1YeIXzot+sdl7QWbEzFgjsvYyB3qcjklROSgi7AgBuFhH0WUOyYfZ 5ugKzjli9JGyqFJyV9a2a0IgQjY5bRuTnv5lQsqFWB0kVqx02pf9IwwOWBDo7szc010t 0YwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=qKiWSMCy; spf=pass (google.com: domain of 3vuobxqokcikur04bo7405t11tyr.p1zyv07a-zzx8npx.14t@flex--henryburns.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3VuobXQoKCIkur04Bo7405t11tyr.p1zyv07A-zzx8npx.14t@flex--henryburns.bounces.google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f73.google.com (mail-sor-f73.google.com. [209.85.220.73]) by mx.google.com with SMTPS id f3sor80716pgj.41.2019.07.02.16.35.50 for (Google Transport Security); Tue, 02 Jul 2019 16:35:50 -0700 (PDT) Received-SPF: pass (google.com: domain of 3vuobxqokcikur04bo7405t11tyr.p1zyv07a-zzx8npx.14t@flex--henryburns.bounces.google.com designates 209.85.220.73 as permitted sender) client-ip=209.85.220.73; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=qKiWSMCy; spf=pass (google.com: domain of 3vuobxqokcikur04bo7405t11tyr.p1zyv07a-zzx8npx.14t@flex--henryburns.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3VuobXQoKCIkur04Bo7405t11tyr.p1zyv07A-zzx8npx.14t@flex--henryburns.bounces.google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=MklO/nCO3vTONhpU2/Xc+PDQxZ8geoXuw22CpQ4sZO8=; b=qKiWSMCySfNKdrYjXhmrf6cfPbbz+oWEXvqnz1cpm0Z7vknJMNKnxJ+lQlVEm0E3hG RB9MJVn2xxeW/3haHy4B43l9sOPJSz9tekq/KPZSWh1be1FAzolI0qebmS2oJK4IXslI E1L/+HV1EWoRH9KnyHD4xeVzCWprAVojb7MrOxidOZ8BROzux7QmYFoYmx/+uLK1SX2D 58G/T2wFKuZgk4DoXdfPCyK4TGp42G+xC48rMy1I7hzqFMoEyzh+cb+CIkDARyYfI1h1 T5urZELFI4Fv+PnARlvjBvJrNSrFCRqIrsztsO3BARX88+dqkQv2cu5IH+wuoQj1vloo wACA== X-Google-Smtp-Source: APXvYqwxWC5LdWcl2/XKPgh1zut3SpHgJ3FIJ714nB1MgOY6lhh76l/rN5P/M8Kednj/Tx9T/ZAwDQyC84jyWjts X-Received: by 2002:a65:6106:: with SMTP id z6mr20033643pgu.250.1562110550143; Tue, 02 Jul 2019 16:35:50 -0700 (PDT) Date: Tue, 2 Jul 2019 16:35:38 -0700 Message-Id: <20190702233538.52793-1-henryburns@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog Subject: [PATCH v3] mm/z3fold.c: Lock z3fold page before __SetPageMovable() From: Henry Burns To: Vitaly Wool , Andrew Morton Cc: Vitaly Vul , Mike Rapoport , Xidong Wang , Shakeel Butt , Jonathan Adams , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Henry Burns , David Rientjes , stable@vger.kernel.org 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 Following zsmalloc.c's example we call trylock_page() and unlock_page(). Also make z3fold_page_migrate() assert that newpage is passed in locked, as per the documentation. Link: http://lkml.kernel.org/r/20190702005122.41036-1-henryburns@google.com Signed-off-by: Henry Burns Suggested-by: Vitaly Wool Acked-by: Vitaly Wool Acked-by: David Rientjes Cc: Shakeel Butt Cc: Vitaly Vul Cc: Mike Rapoport Cc: Xidong Wang Cc: Jonathan Adams Cc: Signed-off-by: Andrew Morton Reviewed-by: Shakeel Butt --- Changelog since v2: - Removed the WARN_ON entirely, as it is an expected code path. Changelog since v1: - Added an if statement around WARN_ON(trylock_page(page)) to avoid unlocking a page locked by a someone else. mm/z3fold.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/mm/z3fold.c b/mm/z3fold.c index e174d1549734..eeb3fe7f5ca3 100644 --- a/mm/z3fold.c +++ b/mm/z3fold.c @@ -918,7 +918,16 @@ static int z3fold_alloc(struct z3fold_pool *pool, size_t size, gfp_t gfp, set_bit(PAGE_HEADLESS, &page->private); goto headless; } - __SetPageMovable(page, pool->inode->i_mapping); + if (can_sleep) { + lock_page(page); + __SetPageMovable(page, pool->inode->i_mapping); + unlock_page(page); + } else { + if (!trylock_page(page)) { + __SetPageMovable(page, pool->inode->i_mapping); + unlock_page(page); + } + } z3fold_page_lock(zhdr); found: @@ -1325,6 +1334,7 @@ static int z3fold_page_migrate(struct address_space *mapping, struct page *newpa VM_BUG_ON_PAGE(!PageMovable(page), page); VM_BUG_ON_PAGE(!PageIsolated(page), page); + VM_BUG_ON_PAGE(!PageLocked(newpage), newpage); zhdr = page_address(page); pool = zhdr_to_pool(zhdr);