Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp705647ybv; Thu, 13 Feb 2020 08:05:06 -0800 (PST) X-Google-Smtp-Source: APXvYqwIbSp8V4LP06BdRFqGi/1QaYbobMyB88YttAhq2OlJO0+5p1KnmMMNAxD5q+FU8vo3ACCN X-Received: by 2002:a9d:1928:: with SMTP id j40mr14031013ota.68.1581609906218; Thu, 13 Feb 2020 08:05:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581609906; cv=none; d=google.com; s=arc-20160816; b=TS1N0Fmy09uCugP3lOPpMLG9/WsUF1baaaZlfnqSqwLGquTWmBRMOd5epssa+G4omd 24GdrAp/PoYBFoA3Yo5vsAOXqDog05xIJWZozaIVnRDkEOoibmVTzj8rf6J061lY66Yd Viv8LcANz2Gn1KDywHmftKPeELSWsytwfa5D0VZs9FmoaSE03O5IJAeTbJeZn/UXyrCT Hr6NZz0BP858OOYaGYq8ORRLVszV67cccRO1Aa7ExFLHl3ufPi5djI2Fnyu+axponzZL IWHbVYBvO+K3PEjlqcNp2lARFRyWEHm54PFmJWO5WmqifXKti2ja46CKdJKBfBdKMWcy Mb1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gQ8Tfk/xwG2MvQYotgaJihvMcMhEhXz0Q94DADWmx/w=; b=wmw34VRpnZN+HmHYRRT7Eh+o3CclauvcB0iXYyb7EVq0utE4Bg+t4RIwxk7QMg6ELS /0dgSP2oQOM+iACLPFuKItuAJFGUKUbILBHJyAhVhdHPG5lucggn5yF7yfL5zA6sFpFV F8tc5aFcuY06iujHWLrBpxHUyYc7D9mwntvfeafOS94QDTH1nulAOJxmKUUyCGFPjDd5 O7TYeyiTGViVh4nTCgo/IWW5vSMOVqnGj4v/uT2xmUZxGWXD7XRcnvqS9TDx28XwmqC5 AzdVr3Sg2zZY7XrE4In2c8mKZBU145c25TilFF+/mrMiqxkB9IYyAzzQb+JZTsvYnS/h EHhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pQKGmneA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b3si351otf.141.2020.02.13.08.04.52; Thu, 13 Feb 2020 08:05:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pQKGmneA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388361AbgBMQDx (ORCPT + 99 others); Thu, 13 Feb 2020 11:03:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:37116 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728627AbgBMPYN (ORCPT ); Thu, 13 Feb 2020 10:24:13 -0500 Received: from localhost (unknown [104.132.1.104]) (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 6952024691; Thu, 13 Feb 2020 15:24:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581607452; bh=O6ewSjpdqXaXHXN1T6gYNrn5uIY08E3PEni/mjKuYKI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pQKGmneAVXGkxaGaNczN/YOnfV6qxJIx2QQPSDQQgAYQKGyF3NDxQMKW50ksXEXq4 9N1Oi2xV1yChmzn/g7coet6MkRtrothRBo7CS5Pp4CXf8BJSQL4lHpOQUyin1Mtau2 2Pdl+h1fdCjBVo4WPfhoi4Pk6l9D+azO2d988Weg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Biggers , Theodore Tso , Sasha Levin Subject: [PATCH 4.9 080/116] ext4: fix deadlock allocating crypto bounce page from mempool Date: Thu, 13 Feb 2020 07:20:24 -0800 Message-Id: <20200213151913.930182058@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200213151842.259660170@linuxfoundation.org> References: <20200213151842.259660170@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Biggers [ Upstream commit 547c556f4db7c09447ecf5f833ab6aaae0c5ab58 ] ext4_writepages() on an encrypted file has to encrypt the data, but it can't modify the pagecache pages in-place, so it encrypts the data into bounce pages and writes those instead. All bounce pages are allocated from a mempool using GFP_NOFS. This is not correct use of a mempool, and it can deadlock. This is because GFP_NOFS includes __GFP_DIRECT_RECLAIM, which enables the "never fail" mode for mempool_alloc() where a failed allocation will fall back to waiting for one of the preallocated elements in the pool. But since this mode is used for all a bio's pages and not just the first, it can deadlock waiting for pages already in the bio to be freed. This deadlock can be reproduced by patching mempool_alloc() to pretend that pool->alloc() always fails (so that it always falls back to the preallocations), and then creating an encrypted file of size > 128 KiB. Fix it by only using GFP_NOFS for the first page in the bio. For subsequent pages just use GFP_NOWAIT, and if any of those fail, just submit the bio and start a new one. This will need to be fixed in f2fs too, but that's less straightforward. Fixes: c9af28fdd449 ("ext4 crypto: don't let data integrity writebacks fail with ENOMEM") Cc: stable@vger.kernel.org Signed-off-by: Eric Biggers Link: https://lore.kernel.org/r/20191231181149.47619-1-ebiggers@kernel.org Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/page-io.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c index 0094923e5ebf5..94f60f9d57fd1 100644 --- a/fs/ext4/page-io.c +++ b/fs/ext4/page-io.c @@ -469,16 +469,25 @@ int ext4_bio_write_page(struct ext4_io_submit *io, nr_to_submit) { gfp_t gfp_flags = GFP_NOFS; + /* + * Since bounce page allocation uses a mempool, we can only use + * a waiting mask (i.e. request guaranteed allocation) on the + * first page of the bio. Otherwise it can deadlock. + */ + if (io->io_bio) + gfp_flags = GFP_NOWAIT | __GFP_NOWARN; retry_encrypt: data_page = fscrypt_encrypt_page(inode, page, gfp_flags); if (IS_ERR(data_page)) { ret = PTR_ERR(data_page); - if (ret == -ENOMEM && wbc->sync_mode == WB_SYNC_ALL) { - if (io->io_bio) { + if (ret == -ENOMEM && + (io->io_bio || wbc->sync_mode == WB_SYNC_ALL)) { + gfp_flags = GFP_NOFS; + if (io->io_bio) ext4_io_submit(io); - congestion_wait(BLK_RW_ASYNC, HZ/50); - } - gfp_flags |= __GFP_NOFAIL; + else + gfp_flags |= __GFP_NOFAIL; + congestion_wait(BLK_RW_ASYNC, HZ/50); goto retry_encrypt; } data_page = NULL; -- 2.20.1