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;