Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp3693942ybv; Mon, 10 Feb 2020 04:50:50 -0800 (PST) X-Google-Smtp-Source: APXvYqw5jrgz3wfoqoB2FEmC8U1m4aG35R6Lvi2y0VlcfyCDD7S+Ii4fK0u41PH0NrlLyQc98yzr X-Received: by 2002:a9d:624e:: with SMTP id i14mr943774otk.371.1581339050285; Mon, 10 Feb 2020 04:50:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581339050; cv=none; d=google.com; s=arc-20160816; b=UdmSZi/RW/PcBMa3KTNMbh5wYnRdSEiHVL9E8nUJCotrzNn1q4IzadtgCB/+/acqd0 DTxXNuQJxFpjds158GoSduFYnDk2Q+qVlqMU/ijk7/o+TZVpHSQYIkLsJf2GGdEansG7 rnX5WMW7OMwQKf6uPVx4/20okViQHFnUYulmmdnaChX9fWMvoRIDa+fMHhdmgvbqqBMu 0J92M7JZMpftEJMY5aEbWUR8erVk4V/De3KvuzhWfOLNpu4+Pg1S98a1zVxo7RblfzfG zRRChu+tG9rs8z1WRgdhZ5OYLBmWAVSoVBxGMKE9YnTXSlSCOTwKXm+ioZOI7cS9UQFS WVTw== 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=+tOtQoEaz6Em5oBg00tsype54WkwVsVM1wZtWT3kHd4=; b=ieXT4eSdkvkG3CcDXF4+2xSuzfW8tMsx/PxUCkN+pbwH8IPNYemyiDtWhScUn7f5zi WgwEUA48n0JXt4D9EAi8uMXanDIszZnql6F5m3T54Dosd2OUkZaB/ExPyrlEDqEWjCMK jP8LQcY5eQW8Vlo+JAWwt2sWUsNVovI8FgMGWen7BKW4xibM41bTGfskEn5wbgXgxYo2 ynh0xixJBZGWNQVDKGN5qKLJJ+f6+orcvNFbdNgmWt0kbdRJCuz88/W0qgaBVnezSMDB xcAQNUr4Aya8ZOFjHGBhdjunXDzjTyixNcjBoXqPW1KQv4nHrFLAOfiwu3WBFYomp7wS IBtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="Y32/7GSi"; 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 i8si125329oih.206.2020.02.10.04.50.38; Mon, 10 Feb 2020 04:50:50 -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="Y32/7GSi"; 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 S1730759AbgBJMpF (ORCPT + 99 others); Mon, 10 Feb 2020 07:45:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:41692 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729804AbgBJMku (ORCPT ); Mon, 10 Feb 2020 07:40:50 -0500 Received: from localhost (unknown [209.37.97.194]) (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 35BBB20733; Mon, 10 Feb 2020 12:40:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338449; bh=b4HgXi/kmF73E2ta0DmMNsR3/6Ln/Jv6457b+UhrBsk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y32/7GSi4Svb86tndctvyPFzhqj7b2pD78da6f1xZoinsKZmxDd0MHBUSEUOAX1BH SUuadg14DpLM2QjGuboV52EgZjXt9JLMdEVR6h+VT5FwRjT2Ed3GVT950elFV3Qq4v x3/nosTzQyrqwaOBnPPMHDLa3EgmmEnZmgUhdrtI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Biggers , Theodore Tso Subject: [PATCH 5.5 193/367] ext4: fix deadlock allocating crypto bounce page from mempool Date: Mon, 10 Feb 2020 04:31:46 -0800 Message-Id: <20200210122442.412464697@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122423.695146547@linuxfoundation.org> References: <20200210122423.695146547@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 commit 547c556f4db7c09447ecf5f833ab6aaae0c5ab58 upstream. 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: Greg Kroah-Hartman --- fs/ext4/page-io.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) --- a/fs/ext4/page-io.c +++ b/fs/ext4/page-io.c @@ -512,17 +512,26 @@ int ext4_bio_write_page(struct ext4_io_s gfp_t gfp_flags = GFP_NOFS; unsigned int enc_bytes = round_up(len, i_blocksize(inode)); + /* + * 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: bounce_page = fscrypt_encrypt_pagecache_blocks(page, enc_bytes, 0, gfp_flags); if (IS_ERR(bounce_page)) { ret = PTR_ERR(bounce_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; }