Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp254328pxb; Mon, 13 Sep 2021 18:29:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxToFRHrKIWtf6R3BBck2jC/5ND6jyUYj9P24RlaMMwWLfgI220+7/P386DiIXWVfbB/U+ X-Received: by 2002:a92:dc85:: with SMTP id c5mr10197901iln.104.1631582952218; Mon, 13 Sep 2021 18:29:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631582952; cv=none; d=google.com; s=arc-20160816; b=pI/VOp8dVFMYrJJlJP6TC0XfcS5X2Hk+hz8t6niajLoF26zJb82TRgHb8MVQOvsYpV Ve3qQ7fLUHJ40FID8AnmiH1KBmyMlkNoLcg1n0HoYVGwHhyxhjONaqH3HVh1Wm5NXerW CpbDnrd3hXD52XWzagYeP5n6f4QyPwibP9CpLWE+nGdkRtkAOIMQMOs6CL9bhsY6Cuf9 KgNH66uco6LoYnPYRWuUQ8i/spWghcS726WP/cvuxHkGoVzjQxAvjvgnf655PZOgBLJk jmerIFuyH+YZBFsPV4DD/NoJREL/cvfrGNhMRegf4/hXozjuZ4i4Uwo+2ZZEAVj1sL0l JjCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:cc:subject:date:to :from:dkim-signature:dkim-signature; bh=K2Rgi41wxZueRRJfJ3e7t139IMXGOwOFm/IW/86sxa8=; b=TJ75YNHQN6dQOZWn+xzeVPSJcL7/EHKIUslBbiVjgL/JMj6Tii0hSOCUgPMg68zaOA XiB0+E5AvZ6Lcz71S3usIOebm4G6D6BfnjWqXlK0toYh2mdI7ETf3UB1K0tYmngveOTK 8qp2EVlSNSjZM7uPKhGWRoUhTTz7eTjY1MMvEG/vw2f7Y4V7SQ8s/fAWDmH2F9i//U44 u911JPbF8DwinpGOAWThI8fC0WyJBPc3yny6GhSRt1Q1Bd14LI8S+eKyYt2N0cxIMfKz qmyaRH8PpcwbyOZb1pgB6Al3SB3A+lDAw8Nmtu3miBuOIzYDcI4TFUqbqNClHasJx17x Ch1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=lyzjdxtY; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="QEL/DIW6"; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m10si10105446ilu.53.2021.09.13.18.29.00; Mon, 13 Sep 2021 18:29:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=lyzjdxtY; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="QEL/DIW6"; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238631AbhINA3s (ORCPT + 99 others); Mon, 13 Sep 2021 20:29:48 -0400 Received: from smtp-out2.suse.de ([195.135.220.29]:55106 "EHLO smtp-out2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238425AbhINA3k (ORCPT ); Mon, 13 Sep 2021 20:29:40 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 8E60D200AA; Tue, 14 Sep 2021 00:28:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1631579301; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=K2Rgi41wxZueRRJfJ3e7t139IMXGOwOFm/IW/86sxa8=; b=lyzjdxtY3SnzCwzK/kuZJUC9SY4Xs7ZXRw+PP/oAiwssdGGvZuytAC5YDSWdV3wkeEbVUN eyns/Vbu/tlvelFBIDmgZ5FHtcnjomj2R4y823Hws1tCEgwJKhsPS/c5wzVgfdDw/cMM2W VDrSFwyOEF2ta5PPGMVNOKXvEhEr0jw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1631579301; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=K2Rgi41wxZueRRJfJ3e7t139IMXGOwOFm/IW/86sxa8=; b=QEL/DIW6vsNM7xl0L40jcqiiJLi/KiVfzJJKmTMtPziFOdCdB0wIt8hA78gAu/sb81FJoL 0TOAkRCT3w8YOPDQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 29D6613ADE; Tue, 14 Sep 2021 00:28:17 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id KmZZNqHsP2FCawAAMHmgww (envelope-from ); Tue, 14 Sep 2021 00:28:17 +0000 From: NeilBrown To: Andrew Morton , Theodore Ts'o , Andreas Dilger , "Darrick J. Wong" , Matthew Wilcox , Mel Gorman Date: Tue, 14 Sep 2021 10:13:04 +1000 Subject: [PATCH 4/6] EXT4: remove congestion_wait from ext4_bio_write_page, and simplify Cc: linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Message-ID: <163157838439.13293.3505783933403734827.stgit@noble.brown> In-Reply-To: <163157808321.13293.486682642188075090.stgit@noble.brown> References: <163157808321.13293.486682642188075090.stgit@noble.brown> User-Agent: StGit/0.23 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org congestion_wait() is indistinguishable from schedule_timeout_uninterruptible(). It is best avoided and should be deprecated. It is not needed in ext4_bio_write_page(). There are two cases. If there are no ->io_bio yet, then it is appropriate to use __GFP_NOFAIL which does the waiting in a better place. The code already uses this flag on the second attempt. This patch changes to it always use that flag for this case. If there *are* ->io_bio (in which case the allocation was non-blocking) we submit the io and return the first case. No waiting is needed in this case. So remove the congestion_wait() call, and simplify the code so that the two cases are somewhat clearer. Remove the "if (io->io_bio)" before calling ext4_io_submit() as that test is performed internally by that function. Signed-off-by: NeilBrown --- fs/ext4/page-io.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c index f038d578d8d8..3b6ece0d3ad6 100644 --- a/fs/ext4/page-io.c +++ b/fs/ext4/page-io.c @@ -506,7 +506,7 @@ int ext4_bio_write_page(struct ext4_io_submit *io, * can't happen in the common case of blocksize == PAGE_SIZE. */ if (fscrypt_inode_uses_fs_layer_crypto(inode) && nr_to_submit) { - gfp_t gfp_flags = GFP_NOFS; + gfp_t gfp_flags; unsigned int enc_bytes = round_up(len, i_blocksize(inode)); /* @@ -514,21 +514,18 @@ int ext4_bio_write_page(struct ext4_io_submit *io, * a waiting mask (i.e. request guaranteed allocation) on the * first page of the bio. Otherwise it can deadlock. */ + retry_encrypt: if (io->io_bio) gfp_flags = GFP_NOWAIT | __GFP_NOWARN; - retry_encrypt: + else + gfp_flags = GFP_NOFS | __GFP_NOFAIL; 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 && (io->io_bio || wbc->sync_mode == WB_SYNC_ALL)) { - gfp_flags = GFP_NOFS; - if (io->io_bio) - ext4_io_submit(io); - else - gfp_flags |= __GFP_NOFAIL; - congestion_wait(BLK_RW_ASYNC, HZ/50); + ext4_io_submit(io); goto retry_encrypt; }