From patchwork Wed Feb 16 07:09:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 543336 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE8B0C433EF for ; Wed, 16 Feb 2022 07:11:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229732AbiBPHLb (ORCPT ); Wed, 16 Feb 2022 02:11:31 -0500 Received: from gmail-smtp-in.l.google.com ([23.128.96.19]:57164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229722AbiBPHLa (ORCPT ); Wed, 16 Feb 2022 02:11:30 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10988267; Tue, 15 Feb 2022 23:10:59 -0800 (PST) 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-out1.suse.de (Postfix) with ESMTPS id A3628212C5; Wed, 16 Feb 2022 07:09:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1644995368; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mM2dJowbf5QNHaSNgtvKbxc+Z1rNW8JEgO1Jd64FHSc=; b=ov3zxFT0HabJGB0aZnOlvfHnya/ZmxiC/dF6yegEPFM9iIWHctgOWhengLKeybOtmvq/1E uGJJ6wuc54CCl4rXnvT9JK+cg5L7Jc4TK6EBDhr2Hz126+gYTsiXQBh+DKBHQodk1G78sH 7yVWrC6mqRkxrYgktuJZPOu7Nv7BLoM= 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 87A6113A3A; Wed, 16 Feb 2022 07:09:27 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id MCyjFCejDGJ1LgAAMHmgww (envelope-from ); Wed, 16 Feb 2022 07:09:27 +0000 From: Qu Wenruo To: stable@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, David Sterba Subject: [PATCH for v5.15 1/2] btrfs: don't hold CPU for too long when defragging a file Date: Wed, 16 Feb 2022 15:09:07 +0800 Message-Id: <67dd6f0e69c59a8554d7a2977939f94221af00c1.1644994950.git.wqu@suse.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org commit 2d192fc4c1abeb0d04d1c8cd54405ff4a0b0255b upstream. There is a user report about "btrfs filesystem defrag" causing 120s timeout problem. For btrfs_defrag_file() it will iterate all file extents if called from defrag ioctl, thus it can take a long time. There is no reason not to release the CPU during such a long operation. Add cond_resched() after defragged one cluster. CC: stable@vger.kernel.org # 5.15 Link: https://lore.kernel.org/linux-btrfs/10e51417-2203-f0a4-2021-86c8511cc367@gmx.com Signed-off-by: Qu Wenruo Reviewed-by: David Sterba Signed-off-by: David Sterba --- fs/btrfs/ioctl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 6a863b3f6de0..38a1b68c7851 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -1581,6 +1581,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, last_len = 0; } } + cond_resched(); } ret = defrag_count;