From patchwork Mon Feb 26 01:32:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 206159 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1816172dyb; Sun, 25 Feb 2024 17:32:38 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUKDTqxEzd+w/vBhTn8gQnNe2SqAzN+YxSldS0vLic+8kZ59041JHBoO2cV66p//GpJKBE845uV1Hqj6orbMw+6eDPriw== X-Google-Smtp-Source: AGHT+IFT8JtI/FgcqVNwtT3fo5Ngv/04Pki8msR5BvVrDYEghQoKawAK2UtS9Jl9/fP9qqbYQOZF X-Received: by 2002:a2e:910f:0:b0:2d2:4def:a7bd with SMTP id m15-20020a2e910f000000b002d24defa7bdmr2978002ljg.24.1708911158346; Sun, 25 Feb 2024 17:32:38 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708911158; cv=pass; d=google.com; s=arc-20160816; b=ASbjJZr0FFCOIb60dXjGn7HY6hR8FhHEkHfeY/8q49Kd/MiDeg+4KPEXUbjfflf35K uv9OSujCv3zGUuwKpX6fkmQKdJmpzvXEIedsMZE9K48KonJpWTnSXddbiWCgrur9A62i AW5bnJea/h2rC502IKLF2E40aWK846gaK2IeJR8MgKLS+Ni8MvTbSMJn0kcz10etrrta kSG64zFOx8mVrfr8F/vx+uKQa9bZxHgV9AIRSxBwZJW+N1wt8+nDPmg/SO8P29YkfvbN 8VODXGziewnPVxrj6dUxMeP4WV+cHE2Jp4p/dKqVHSKa1EZebp3mHv5U3X4P8a2dAeeG Ub7g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=uIDhPLNiisO8kLje9+ppC9Q2Qs4N6ZNlTlkoeo5OPkw=; fh=X1/oBJvTGJUQ0YtRp03u+3tPfRw/dXXALWynfOSlfQQ=; b=sc/R3E2T5pI7NnC8yxTlKaADWbifsxCoMM3lF5iHW9sdCFOEhKju8a5Rxiv3Ef4Nbc tPh3O2iWyeTGEmw3PMCyxpMKVlGouBgSyG9ZwNArVY92jIOVAFhQ8VXrdsBeo/b7z+/f tcXyLfBrz238xkeGod96P57mkcxLyjZuyRvt90qdU8FwNxnFpa+6b9VLW2SB/G60+IiY rxOP/Aq0my1yllrrcmdkjaAi5ZYW7dtVqzD37WnjJVSXbJGCm67E8VRvdPFO/QMVohSX ECoiUXa8VHaI14+aDE8Kat4iOrXgwT63sllrM+qlegOUQTGyUAT5gfRB7SSHwQKLM7e9 Gjkg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Sz8sjKAE; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-80377-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80377-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id 28-20020a508e5c000000b005660464aa50si149824edx.685.2024.02.25.17.32.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 17:32:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80377-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Sz8sjKAE; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-80377-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80377-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id EBAC71F219A8 for ; Mon, 26 Feb 2024 01:32:37 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 44420FBEF; Mon, 26 Feb 2024 01:32:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Sz8sjKAE" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 99B8F4C91 for ; Mon, 26 Feb 2024 01:32:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708911140; cv=none; b=DdfKZFRpIvm++ivQYVy6OsXsfOqSgwrL3Z4Cz5FetwKyNyywZ9cEW2xIcH2DHDY3Vrgwoasxab7Khnp4+TLbHK4x48iA1l7uN5nfSW7cOvtW1Wt5GZG8Mpmb48gEYprwfIlJOdwyYeOcYRyqRuw69ia4QtbvJXJumaeWgoqIJVc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708911140; c=relaxed/simple; bh=JC2tKZVI/N9NKXwRhcw37ItMYVdb46EEQNkTvwv2vU0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=p9EhI/S2+KAhhiyBYUm4SSMDD6ZQBg/pPfigi8n4AkZhkUc/ucm+QEVBxPzWr8wK7pcj37IJ55qMbVZ4966ImIDBd4qKIOu9BlYKeaGW0sdlMuEZitQ/rbrmtKj43EQWJtWd08OtCpFqzEkyF6BpAMULku6Z8rIoFjWyNMqxx4M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Sz8sjKAE; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9E958C433C7; Mon, 26 Feb 2024 01:32:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708911140; bh=JC2tKZVI/N9NKXwRhcw37ItMYVdb46EEQNkTvwv2vU0=; h=From:To:Cc:Subject:Date:From; b=Sz8sjKAET+isPNL/4a4fFdhhgcMkhiNGh9nDOKbXa6M+bIqIqS/gJVLGUZt6kfd7U SM6tD2+qQrobZhW2CxqSvTkKSogfCArlGO5sLq10ZoNJ4ftQcU3PHCNZkcdMUjQRLT Rt5u70cfST75BOH4CAKDNkOdDeWq35f8VPOcUS8UMFQoi4eI+Xto7tlwLPA7XaS9qF qrt/yiu4dFYNzVNu1+2LcnQ7WFDzX1zUzcnE76vkZV4XPaNvyV1A9Ki0dJZqU0Bvzh hJKKTjm9B3Ol/u/2KtJPswTuPIFu6dGqdsdIO7zNpPTumy2iHJ7pj+zQVSZvE0tL81 LogR/jchMm3Wg== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH 1/4] f2fs: fix blkofs_end correctly in f2fs_migrate_blocks() Date: Mon, 26 Feb 2024 09:32:05 +0800 Message-Id: <20240226013208.2389246-1-chao@kernel.org> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791923227143554789 X-GMAIL-MSGID: 1791923227143554789 In f2fs_migrate_blocks(), when traversing blocks in last section, blkofs_end should be (start_blk + blkcnt - 1) % blk_per_sec, fix it. Signed-off-by: Chao Yu Reviewed-by: Daeho Jeong --- fs/f2fs/data.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index c21b92f18463..0c728e82d936 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -3841,13 +3841,14 @@ static int f2fs_migrate_blocks(struct inode *inode, block_t start_blk, struct f2fs_sb_info *sbi = F2FS_I_SB(inode); unsigned int blkofs; unsigned int blk_per_sec = BLKS_PER_SEC(sbi); + unsigned int end_blk = start_blk + blkcnt - 1; unsigned int secidx = start_blk / blk_per_sec; unsigned int end_sec; int ret = 0; if (!blkcnt) return 0; - end_sec = secidx + (blkcnt - 1) / blk_per_sec; + end_sec = end_blk / blk_per_sec; f2fs_down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); filemap_invalidate_lock(inode->i_mapping); @@ -3857,7 +3858,7 @@ static int f2fs_migrate_blocks(struct inode *inode, block_t start_blk, for (; secidx <= end_sec; secidx++) { unsigned int blkofs_end = secidx == end_sec ? - (blkcnt - 1) % blk_per_sec : blk_per_sec - 1; + end_blk % blk_per_sec : blk_per_sec - 1; f2fs_down_write(&sbi->pin_sem); From patchwork Mon Feb 26 01:32:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 206160 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1816202dyb; Sun, 25 Feb 2024 17:32:45 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVe5n/1y+XZLgXZpiVeLr5lnCp06HFMeP0Ox2jIaX+90fChtdo2ujvoqGDBlGrdSb7nlGqQPAPo/dwvXL4aVjothKlLCw== X-Google-Smtp-Source: AGHT+IGMdYm6gwy/h6S0gNzN0yJOOpfJEMueoU5QTHKVHfAwYfeqksIDG3ttYoyguE1OcmlYoB30 X-Received: by 2002:a05:622a:347:b0:42e:32d5:dd17 with SMTP id r7-20020a05622a034700b0042e32d5dd17mr7854027qtw.24.1708911164707; Sun, 25 Feb 2024 17:32:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708911164; cv=pass; d=google.com; s=arc-20160816; b=tkAdJ7dSA8EFRmVWtA0qG8SNFUH0CLIXaz8W/TgSTjyQOnSBPIdeqkdGXWoWhKlL9F 9072IjMH/NKh+peggsl44fhGR3u159bJU65V8KEH+QEV/uYNbTQXR0ehP/5EgS0F47UC EbuMBdYMYKgxpgFjK7RAAWP/zMKEvXBWLVqrjGgch8M2eJZUgqRcr0VJyA/bO9GjtPIN WOJtv3JZxm/uAvWB+nxCWwrLBbYmLtYgINg+jTIp7lxoXejuCnh7ZQDw7c1g97L5mxme TAKI1Ex+uj2/pss/DrcaL8Do65xJZw3POD6pzsaqP7QdOE5yuP2hPHlAVEK9MHDiiciS Y4lA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=MKYXI1Ap5bdO4ffnGtEFZhoB6Xx2YGZvvZEWMh9zBBU=; fh=X1/oBJvTGJUQ0YtRp03u+3tPfRw/dXXALWynfOSlfQQ=; b=YowwGS6sdAhOow0UltoSnKiL9l9AtZURnKKa7uHPpXOoVXkCbZNziXFjWtR5V1fvtV lVbAxGAMgl5vq7hqMH7tTD0vpQdWs/hPB0nVe+jzBMTDhg58HhwiX5/yuFk9lN4do/yn SEe7RaGu7twooZTbRNygxaTQWZm2cTSM2uB8o0kcj6NQLGHRXq1UI1JH7e2RASCJqBJP NYUAK7L2TP54KG8Z4Uku1MT1peOd68Hp9Pn+YvjJR3E62aPudl6+tbOoU/g5ZxQ35Hw/ 2DjsRme/Elpn31MR3gzPB+5JPifT1kD/D/GpvjVwFk2QO2DBpOVOVEXQookDCmRpaC9L nJbw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Kba7Cjwy; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-80378-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80378-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id b4-20020ac85404000000b0042e626a8435si4038612qtq.743.2024.02.25.17.32.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 17:32:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80378-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Kba7Cjwy; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-80378-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80378-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 7BFB81C2125B for ; Mon, 26 Feb 2024 01:32:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AB9D114273; Mon, 26 Feb 2024 01:32:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Kba7Cjwy" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 10FB2D53C for ; Mon, 26 Feb 2024 01:32:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708911142; cv=none; b=qTUEGNAfOT8Wz+nSeSZK4hUzWPH24ynltqww4ba4OJJBrLHYSb1uT/aHfsRIL21SJPd+ygDYwjcq3+Y6V75QnaiGW0RwjgaXttPtdyLX+vc+Nky9NJG2AqfCZO84xddyQc0JxEcVXV7kFVLlFLpdibdBwjJmyGEkz50OX7+FE5g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708911142; c=relaxed/simple; bh=A4yz3LRTSvapt9o8FbzBxwIf+iiKoUhwLj0hcQkJ+Wk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AcOUjMEK+H2z8cLKASBv+XUzRdgany/QCVPUsb17BD5IPB0S5zcWlVgasK2SL2s6G0jnFmfpcHlbll8bfc6S9/8vDXzW5FKwu+UbvLHtVOhNxrA/63hsIVguGKXqADzmPg5uW1RH7EZn5D+fG6DnFdS8AQBmJHWRXnTAaqvI0+o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Kba7Cjwy; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87233C433F1; Mon, 26 Feb 2024 01:32:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708911141; bh=A4yz3LRTSvapt9o8FbzBxwIf+iiKoUhwLj0hcQkJ+Wk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kba7CjwyvYHZYqaueT48znUox1iICesihe//v1MzldqInj0Axh8uIvIfBjn+h6T/6 TCqvnsiB0U6qFKtp0I7a2S7tBvyRGZoGO0kXG2dw1ERyFzI3+bOctLMqV2Ri/LbDIV XtFDkbFXIpHuv+baKXjHLX/KsG+0uyTmNtt4/2h/FlAAzfaNPqL/HQU7ZgQ5ffPzDv XEp7AniLEMBQsfyArGdqI8+sQy0D7i1NVN9HcLjwmJwIXH2BkdIrModkOfqGQ0b18E 9Zpb4EtqwTcKyakW2QPyKkX9BLFTdkYizPcvgCpU4q8VlRi9K6ZpEmX+X4VYYzcmhA odIiTNwigmV1g== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH 2/4] f2fs: relocate f2fs_precache_extents() in f2fs_swap_activate() Date: Mon, 26 Feb 2024 09:32:06 +0800 Message-Id: <20240226013208.2389246-2-chao@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240226013208.2389246-1-chao@kernel.org> References: <20240226013208.2389246-1-chao@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791923233671106243 X-GMAIL-MSGID: 1791923233671106243 This patch exchangs position of f2fs_precache_extents() and filemap_fdatawrite(), so that f2fs_precache_extents() can load extent info after physical addresses of all data are fixed. Signed-off-by: Chao Yu Reviewed-by: Daeho Jeong --- fs/f2fs/data.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 0c728e82d936..bd8674bf1d84 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -4045,12 +4045,12 @@ static int f2fs_swap_activate(struct swap_info_struct *sis, struct file *file, if (!f2fs_disable_compressed_file(inode)) return -EINVAL; - f2fs_precache_extents(inode); - ret = filemap_fdatawrite(inode->i_mapping); if (ret < 0) return ret; + f2fs_precache_extents(inode); + ret = check_swap_activate(sis, file, span); if (ret < 0) return ret; From patchwork Mon Feb 26 01:32:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 206161 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1816264dyb; Sun, 25 Feb 2024 17:32:57 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVX9DQ7SyEPSoZJK6CBD5cDRcI/tNPXpDi1/CZiHYdyb685Uz0T6nO5VQ5VEwtMQz0HD0I6Olx/ZWRwz1vGZJYtDE/Qbg== X-Google-Smtp-Source: AGHT+IGj/0RZZ8pbLe5TajcQDVTTRkLKq4F+fdttnASOJLuadmY+v7va2RfGeHBm1kMqbwv5uzXm X-Received: by 2002:a05:622a:1893:b0:42e:8808:7f1f with SMTP id v19-20020a05622a189300b0042e88087f1fmr1058567qtc.44.1708911177203; Sun, 25 Feb 2024 17:32:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708911177; cv=pass; d=google.com; s=arc-20160816; b=JESclcZMf6KBFJiB9WOC3Ptse68L9XyZlju0+df0JWq9WTyKD3+0lw7AeYwwXJCxrc mg7JDciHbERTCMXT/Eht8ezKYUqr7tEdvEnhQ9zPi79tvWNJYFSx9KZt3nQQ47QoZR1s l6ou/r+otZHSJ2WCdFe4vq3jhkEVFshh8LGtuWvGzfn1KX/QRpkyeEMhq3NuAimbPQzy y3YMArLS4BVUdCY93zAZrBfjbV9Tl6iU5CO4COLv0zbmFCcjMVtabJfgx9zOR/HMIHTG /p3QawX2qA1UgvOyaV+krT7sgV/xVDrenwp2JKSCd0lLfrKEIhlAh1N9rgmM+ddLUjSh G50A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=03glMeje/iLpaIb+B6GH7CT34zGmE/V0Lp7YdCIZMbw=; fh=X1/oBJvTGJUQ0YtRp03u+3tPfRw/dXXALWynfOSlfQQ=; b=nXb8nzrsvR3C4H2csm1gHd9KILqTlwFUWM7l+0ZDkxK58Zg15jqI2HIpo8tp7uA3eI dQF+jI11oFDam396tU8CGroUu2ahMl8tcRmusLb+akJgp6+q50BrFubZOe+zv5iwwqAg cxUcc510FncNTvt/Zx/m2mTOBJKudjVf27ayFR03aSn5HbmyWnP2JQu4dFAqOVVGNLmN ql8z0Q8MFO2fDLsp0ANx8AvJZjvjtP6f8jKVfZPuVYgMEYhBq6K8OUmYizySFppyqDgg DPqy3o3vrLj9DOus58vQCLl3qIGUxeuV7EA8O4/B61U1gd3bec7HT7eTXBFJ71hO/MUv DEtg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=lWyg8I8P; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-80379-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80379-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id h9-20020a05622a170900b0042e8a5a1916si199430qtk.417.2024.02.25.17.32.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 17:32:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80379-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=lWyg8I8P; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-80379-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80379-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 03DEE1C2120F for ; Mon, 26 Feb 2024 01:32:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6F157199B8; Mon, 26 Feb 2024 01:32:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="lWyg8I8P" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C16521427E for ; Mon, 26 Feb 2024 01:32:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708911144; cv=none; b=oHgtEZJdq6mc123ASCLXx5SGVy9c8aXNXPKei+GmgFKeNpNUl5UkEAODeMdI+UqPmfE2hJKQD2JmYe1KNFHRRl+MLS50fVLCInB68g1eCrVaoj1v3seVKYoYz/4w4BStJbgK5vkaOnlh9hVTGhovDzzCy4+c2tc1Sn1BDUSX2ws= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708911144; c=relaxed/simple; bh=7/djeaK+/NFoE++1IozOSNTPK98LJgs6sV030L2n1tw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gWpuCvS0FiVV1Qall2a8H1QaaWzVfl4Pb4oxJ1zamS0OFmV2uqz0Wqd0yhZwMdvKCN0Yb6B6pkXqv34gzu2gtLKLOKLi5EJ7qzNvbS5VQLaAHRgL2z3Acwj3NvH0/n0DkjZuhid6dF5VXT5AbCTQeGLAQU2GszHYp0VXWXxV/Dk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lWyg8I8P; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id DFF2EC43390; Mon, 26 Feb 2024 01:32:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708911144; bh=7/djeaK+/NFoE++1IozOSNTPK98LJgs6sV030L2n1tw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lWyg8I8Pg2PCw71IP12fMFIHDuAm3fqRKfnA9rFN0gPFb6kcT91MwHqEJyIji0ByZ auPFCDznLaELDhRTAee29UojTw8lGc0gSWWUwbM43K+ynZSMCVn8pfAm6Fnt666s9v WFtPKn33AySGF6bufcBV1R/JrxZ4byX2hcHeTc36cWy0f2/DchrnpFDMQMuUR74sNQ z4SyUf0KxzHEXY/nVkxr4yxn7qgqW+MgIhbBFgMGdZVQHitGMza+yN2BZvYGkBi5Wr AGywWzms+as6pTBJiK3IpXo7sP6DDPozZm4aelQZVqSxw63U2G5YcuovxNwFwZp62v EdypU4okNf3AA== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH 3/4] f2fs: clean up new_curseg() Date: Mon, 26 Feb 2024 09:32:07 +0800 Message-Id: <20240226013208.2389246-3-chao@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240226013208.2389246-1-chao@kernel.org> References: <20240226013208.2389246-1-chao@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791923246067252834 X-GMAIL-MSGID: 1791923246067252834 Move f2fs_valid_pinned_area() check logic from new_curseg() to get_new_segment(), it can avoid calling __set_free() if it fails to find free segment in conventional zone for pinned file. Signed-off-by: Chao Yu Reviewed-by: Daeho Jeong --- fs/f2fs/segment.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 847fe0b7f29f..c159b0985596 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -2715,12 +2715,19 @@ static int get_new_segment(struct f2fs_sb_info *sbi, got_it: /* set it as dirty segment in free segmap */ f2fs_bug_on(sbi, test_bit(segno, free_i->free_segmap)); + + /* no free section in conventional zone */ + if (new_sec && pinning && + !f2fs_valid_pinned_area(sbi, START_BLOCK(sbi, segno))) { + ret = -EAGAIN; + goto out_unlock; + } __set_inuse(sbi, segno); *newseg = segno; out_unlock: spin_unlock(&free_i->segmap_lock); - if (ret) { + if (ret == -ENOSPC) { f2fs_stop_checkpoint(sbi, false, STOP_CP_REASON_NO_SEGMENT); f2fs_bug_on(sbi, 1); } @@ -2796,19 +2803,17 @@ static int new_curseg(struct f2fs_sb_info *sbi, int type, bool new_sec) struct curseg_info *curseg = CURSEG_I(sbi, type); unsigned int segno = curseg->segno; bool pinning = type == CURSEG_COLD_DATA_PINNED; + int ret; if (curseg->inited) write_sum_page(sbi, curseg->sum_blk, GET_SUM_BLOCK(sbi, segno)); segno = __get_next_segno(sbi, type); - if (get_new_segment(sbi, &segno, new_sec, pinning)) { - curseg->segno = NULL_SEGNO; - return -ENOSPC; - } - if (new_sec && pinning && - !f2fs_valid_pinned_area(sbi, START_BLOCK(sbi, segno))) { - __set_free(sbi, segno); - return -EAGAIN; + ret = get_new_segment(sbi, &segno, new_sec, pinning); + if (ret) { + if (ret == -ENOSPC) + curseg->segno = NULL_SEGNO; + return ret; } curseg->next_segno = segno; From patchwork Mon Feb 26 01:32:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 206162 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1816317dyb; Sun, 25 Feb 2024 17:33:07 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWof1jFgLQmpNByy6apZfWsZEZCdOLkl41/M/BP7XLf2p9akrOIoA9ldAkzqwMl2wjT8HYOTLI6awlJkwf6PrmKHALMBQ== X-Google-Smtp-Source: AGHT+IHvoIyrbgYG6p9Hxdw1u0vj61wMr/iFakFy7CDsQXxZNUVcuk1wEq1IVUgVw0R6Ka5dqnBN X-Received: by 2002:a05:6a20:9598:b0:1a0:e838:8e76 with SMTP id iu24-20020a056a20959800b001a0e8388e76mr5322870pzb.5.1708911187565; Sun, 25 Feb 2024 17:33:07 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708911187; cv=pass; d=google.com; s=arc-20160816; b=Ns+ijAy/DvjebgqwJeU0BUtJ4bVx05622Vz8qA/qEZzijJzRNuYmjPvP2QWNdBRFjJ mOXgG3MeBDPuGVFaRA2xN+OEwk4HIY3jlWJ4Mme/XzuQbz2Jzq0TWoJqlYWfKczWWKY8 163YglcWIVZzL/mWr2P3nCAZIcB5PKGb09WgJikzUwA/dZC0E5zR4UnF9DXgPmSlRP92 jgJu3sPWUaKJQUBBsbxNKvJcDunwGTgZ7cugDRi7BmgQ8JUgzIkYbhDz8YNYu6/cw/6T Vgn09tGj1poTDPj7KceqhIbSm25f2Z9M7m1JB1fiaTQycIoJFVQXCm2xOTeW2b0lYfpo S3pA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=qsYdnGmit0kwgplmuGgycR7o7ZBQPU1A1t8X48r2Hhs=; fh=X1/oBJvTGJUQ0YtRp03u+3tPfRw/dXXALWynfOSlfQQ=; b=KCIeXX3SXslqUfZvh/vm+msEgOzCgji20pMbtdcGj7u3jTIkH76ysQQLLB7U9zgZI3 HcgTz8G2EW5xbDfWJGbijqDQ/4GSIKIHgAKXuUXWpt3RfKGuDukHDd685WAHrljyoG8R BAKdvEtiaPXI370UEEwmyXnntStOiUhzAnCTE2HSJ24oSK2bVNPcurR20lc1RvNLbYoe AgNMY9XusJLM1ji9AkSWTEEqt8JDpoegLWkLae9iyONO5IA1tlsZrf64ecVfPC1xG9pb aqBWfSDGnsTJ9xiEN4xonsK4mUYU5ee0Q+5Z1FUrHZTFPXtHecTx/urPV7bWl/hshDW/ coKg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FwvylUGm; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-80380-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80380-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id j2-20020a170902da8200b001dc1d34c754si2776683plx.544.2024.02.25.17.33.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 17:33:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80380-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FwvylUGm; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-80380-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80380-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 64817281821 for ; Mon, 26 Feb 2024 01:33:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C564F1B7E3; Mon, 26 Feb 2024 01:32:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FwvylUGm" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D4E418EA1 for ; Mon, 26 Feb 2024 01:32:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708911147; cv=none; b=TIju33PY7Tb9/GQ+8Q4YIP0wk0ZV/QazCcChWsgWcf1JThreX3ev2/iv9xVhhsRki0uIqXXGrbeGeQlJtWHoEAXj1LlS2482RA/MurIbrly4bz3lU8UTUUd66k+TiyjIdvSo/bCUoqebYOu1niuh5Q/ixLPt4xNJgZ5NtbSd3yc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708911147; c=relaxed/simple; bh=swCJRsLLHSfSL70VZ8N2jxsoH3eh6oxUKRyJYOvWmVE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JJ91Ompqx8MQfxmTKQdKCpncvHn5nHE2cDOYaKh2vu1672uSVCufD2mNjDmQlfDq+2VN+OtQ4vQMEgF0tvax0B4BIOP60Vl/3TU6DyIqcUiEYuVqDnn5foZLqsuSLwFmMf5DThuAmpeRk0HTNqJxrFz3zEerF9W/Ltgmxcn2fLI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FwvylUGm; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8815C433C7; Mon, 26 Feb 2024 01:32:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708911146; bh=swCJRsLLHSfSL70VZ8N2jxsoH3eh6oxUKRyJYOvWmVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FwvylUGmaR3/VKWOxYxEaJZFu7yTShWFdpZBHMKyTV7/KhCdXYdJQM4qdlXZ1cMVj AVyHxWq2CW3omXby49h2WXemiInYv1+c3I7DL9A0PFq1qe+AtnLDIQr7ZSnWHEG+xZ B/5L3O00WoJmT7Gu1CwyIF2pWGI4qDAcbkctSH1v9tDAhrofkeVJsl9MdcXOKqTyoK cyYyg0iYkBIWb2Ogv5MJksLuVfAFi53CIeJMLbuyARUq8xPJY8Y+UvcCGpMM57RXgn 2xOrCsUd9OAvfpT7mXQQAVQOY3+Drbudsbcw8GsZRJutXUiPF9IvxrZFS4cIUg3IzC L54KRQ7EBb9UA== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH 4/4] f2fs: fix to reset fields for unloaded curseg Date: Mon, 26 Feb 2024 09:32:08 +0800 Message-Id: <20240226013208.2389246-4-chao@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240226013208.2389246-1-chao@kernel.org> References: <20240226013208.2389246-1-chao@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791923257783870566 X-GMAIL-MSGID: 1791923257783870566 In f2fs_allocate_data_block(), before skip allocating new segment for DATA_PINNED log header, it needs to tag log header as unloaded one to avoid skipping logic in locate_dirty_segment() and __f2fs_save_inmem_curseg(). Signed-off-by: Chao Yu Reviewed-by: Daeho Jeong --- fs/f2fs/segment.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index c159b0985596..5e45afd69f3f 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -3101,12 +3101,16 @@ static int __allocate_new_segment(struct f2fs_sb_info *sbi, int type, struct curseg_info *curseg = CURSEG_I(sbi, type); unsigned int old_segno; + if (type == CURSEG_COLD_DATA_PINNED && !curseg->inited) + goto allocate; + if (!force && curseg->inited && !curseg->next_blkoff && !get_valid_blocks(sbi, curseg->segno, new_sec) && !get_ckpt_valid_blocks(sbi, curseg->segno, new_sec)) return 0; +allocate: old_segno = curseg->segno; if (new_curseg(sbi, type, true)) return -EAGAIN; @@ -3451,6 +3455,13 @@ static void f2fs_randomize_chunk(struct f2fs_sb_info *sbi, get_random_u32_inclusive(1, sbi->max_fragment_hole); } +static void reset_curseg_fields(struct curseg_info *curseg) +{ + curseg->inited = false; + curseg->segno = NULL_SEGNO; + curseg->next_segno = 0; +} + int f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page, block_t old_blkaddr, block_t *new_blkaddr, struct f2fs_summary *sum, int type, @@ -3516,8 +3527,10 @@ int f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page, */ if (segment_full) { if (type == CURSEG_COLD_DATA_PINNED && - !((curseg->segno + 1) % sbi->segs_per_sec)) + !((curseg->segno + 1) % sbi->segs_per_sec)) { + reset_curseg_fields(curseg); goto skip_new_segment; + } if (from_gc) { get_atssr_segment(sbi, type, se->type, @@ -4595,9 +4608,7 @@ static int build_curseg(struct f2fs_sb_info *sbi) array[i].seg_type = CURSEG_COLD_DATA; else if (i == CURSEG_ALL_DATA_ATGC) array[i].seg_type = CURSEG_COLD_DATA; - array[i].segno = NULL_SEGNO; - array[i].next_blkoff = 0; - array[i].inited = false; + reset_curseg_fields(&array[i]); } return restore_curseg_summaries(sbi); }