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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C064C76186 for ; Wed, 24 Jul 2019 19:41:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F89E22ADA for ; Wed, 24 Jul 2019 19:41:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997280; bh=m/TcuuKzU220TiJSgXTGr3A15gmnjrA9g4FvnmRYxz8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kLnztzGjthKMRTKQJIDd9oWCpgP0BycZlht4gFdX1XlNYE/dogeVSx6MTMOcHuD02 QjkmRlJfFEVVtJhLmXzeNY0giZV9XyrF6lD80BDyi6UXiYPcv3YVRk5zTMsH8fhLrp 1denQG93WtYfQe2c5qKiujN2fz7zx9YkmWAldOsI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390160AbfGXTlR (ORCPT ); Wed, 24 Jul 2019 15:41:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:42580 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390138AbfGXTlR (ORCPT ); Wed, 24 Jul 2019 15:41:17 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0544622BEA; Wed, 24 Jul 2019 19:41:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997276; bh=m/TcuuKzU220TiJSgXTGr3A15gmnjrA9g4FvnmRYxz8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2V4ridoekXOhTGSKjsvYAwZJGDpX7cZplLs4hH85a2U8ugo6g4jrio25vqVU0AANH 8pb5WHHGL758h5QVBsLQhsMRt2WlNAbkwkCWEASjl8Dz3qpCcZVWg0CBpU9GIaLcqx Jc0bEGMWyi3M2cevXbIJ6y5O1hzWVu1VFV85v6X0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Henry Burns , Vitaly Wool , David Rientjes , Shakeel Butt , Vitaly Vul , Mike Rapoport , Xidong Wang , Jonathan Adams , Andrew Morton , Linus Torvalds Subject: [PATCH 5.2 379/413] mm/z3fold.c: lock z3fold page before __SetPageMovable() Date: Wed, 24 Jul 2019 21:21:10 +0200 Message-Id: <20190724191802.255562204@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191735.096702571@linuxfoundation.org> References: <20190724191735.096702571@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Henry Burns commit 810481a246089117d98e3373a3cb735c3efc1f90 upstream. 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. [akpm@linux-foundation.org: fix trylock_page return value test, per Shakeel] Link: http://lkml.kernel.org/r/20190702005122.41036-1-henryburns@google.com Link: http://lkml.kernel.org/r/20190702233538.52793-1-henryburns@google.com Signed-off-by: Henry Burns Suggested-by: Vitaly Wool Acked-by: Vitaly Wool Acked-by: David Rientjes Reviewed-by: Shakeel Butt Cc: Vitaly Vul Cc: Mike Rapoport Cc: Xidong Wang Cc: Jonathan Adams Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/z3fold.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) --- a/mm/z3fold.c +++ b/mm/z3fold.c @@ -924,7 +924,16 @@ retry: 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: @@ -1331,6 +1340,7 @@ static int z3fold_page_migrate(struct ad 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);