From nobody Sat Nov 30 03:39:38 2024 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2068.outbound.protection.outlook.com [40.107.215.68]) (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 CE7AB189B88 for ; Thu, 12 Sep 2024 06:40:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.215.68 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726123234; cv=fail; b=hgQbHg7XoyaCPLX3iQ3zSQiNbd0SIL79kevXrLtE3dCxX5+k8+YbMWoPDUSZP0dA/nMc0zgeccyXKZg7HW1ZTlVQav/kg8tXfUko/RYHNCb73Z1TEm0Q/Cn4p6WjN2iuWun4wIlry3+tzKa5yQHR+JmitLQXV9VWi1gUpH0rg08= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726123234; c=relaxed/simple; bh=GVrbU7Vjul+8aUcVTY9vwAomZI1BX61eyLoxUYWbJH4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=IHeHP1RwI/87WOYyVnx+H+YN7HGR/+ZromkQZqzwMykZ19QXa70M4sLUKGqrTRXJL/VU6sVFvuMIjxkYiG5xr+8UMv6AO/9efUq+ec6Z+O1/jNS7ruw1j7me3MJnZ/ScS9vOIWXs0coei0un3QSd97SeXFKOXbceRPXsWr1k83c= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oppo.com; spf=pass smtp.mailfrom=oppo.com; dkim=pass (1024-bit key) header.d=oppo.com header.i=@oppo.com header.b=Gr2645xm; arc=fail smtp.client-ip=40.107.215.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oppo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oppo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=oppo.com header.i=@oppo.com header.b="Gr2645xm" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=X6EoIvg8kML8rZMjcFovTfd0gS6jYXOjklluBiz1t/eZAYjJWURAqBVwfRfV3bLVyW/zI/KEJfQgXG9IqRbWrrN8Btbizx6fjnxdjWTFWmdMwMvbAcfN5Wu6femoYQKrSxu9h98PoScnOt9BHUTMSfzFuHda0eFolESjodtFuzdjPftzQsST91ppzc1L4k9jQEa6tRKvCRBKBvFeVtiZhahojtPyDE5e//6HjuN26ZlR/wh7Xe2Kld8uf4Wow/e8NOquzEXKZ6bfxDs76CTbgy4N45vgMWAp7TvB3ClFDjZxuHhxPDN740mppYlJBKZ/ENNLtTa91sdooBfI3CgPHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oSsqPVk30Mqw3IyemL0Qad2li3axTIaKLI61/rZwLIQ=; b=KRaGUYjP7efvHxWKbujUgXivmGD0X5kAmOOLz6x95h/e/im4xyy9mbvokYhOKM7fBdbG9TnYQbTiVfIn3gZsOuic/BrYC89gTjXrovA/Wp5zAyJBJvDwHUi8ruM13Q9RGRiPRR3jdGaII3vM8FaaeGllfssbN0YM71SgTw86BzFYRT0OHtj0dcUu7hz9ZdLULU+OiGDWDAO7H+va7edDwJZGqHJW1+N96GLzAAuc9t73U2PJ3/U5Tpnx3cAMjsSLQrNztMUuQuIQMbbl/HMo8OXf7A1mJAKr5D4Yve2pexOD5+h7W60sHl5L+r3WymG/FMT+Cd9wrvDVSKLdTS8dfg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 58.252.5.68) smtp.rcpttodomain=kernel.org smtp.mailfrom=oppo.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=oppo.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oppo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oSsqPVk30Mqw3IyemL0Qad2li3axTIaKLI61/rZwLIQ=; b=Gr2645xm6Z5QwgN4gbWUEDa9pTsbZNuioQC4ISkL3sMHyPLuHtEEkqgIBoZt0tkX052QRNbYiA1EBoo+NswV7tLdejiR+xhuEeMJoHYALnIoO/EbmC91tPCoRQubuLSJvEpj5irHlp5CMXENzETja0SFRCs7p9oKQrU56tXD1tg= Received: from SI2P153CA0031.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::7) by TYSPR02MB7370.apcprd02.prod.outlook.com (2603:1096:405:37::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7962.17; Thu, 12 Sep 2024 06:40:28 +0000 Received: from HK2PEPF00006FB2.apcprd02.prod.outlook.com (2603:1096:4:190:cafe::4d) by SI2P153CA0031.outlook.office365.com (2603:1096:4:190::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7982.7 via Frontend Transport; Thu, 12 Sep 2024 06:40:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 58.252.5.68) smtp.mailfrom=oppo.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=oppo.com; Received-SPF: Pass (protection.outlook.com: domain of oppo.com designates 58.252.5.68 as permitted sender) receiver=protection.outlook.com; client-ip=58.252.5.68; helo=mail.oppo.com; pr=C Received: from mail.oppo.com (58.252.5.68) by HK2PEPF00006FB2.mail.protection.outlook.com (10.167.8.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7918.13 via Frontend Transport; Thu, 12 Sep 2024 06:40:27 +0000 Received: from cndgdcavdu0c-218-29.172.16.40.114 (172.16.40.118) by mailappw30.adc.com (172.16.56.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Thu, 12 Sep 2024 14:40:27 +0800 From: To: , CC: , , liuderong Subject: [PATCH v2 1/2] f2fs: remove unused parameters Date: Thu, 12 Sep 2024 14:40:13 +0800 Message-ID: <1726123214-208356-2-git-send-email-liuderong@oppo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1726123214-208356-1-git-send-email-liuderong@oppo.com> References: <1726123214-208356-1-git-send-email-liuderong@oppo.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: mailappw30.adc.com (172.16.56.197) To mailappw30.adc.com (172.16.56.197) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HK2PEPF00006FB2:EE_|TYSPR02MB7370:EE_ X-MS-Office365-Filtering-Correlation-Id: a8f50448-0636-412f-2345-08dcd2f5ca11 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?KB9Vb/+sAKJ+OKIHOuJsgg85HodLzDMIsFwcJL7h7kSq9t5ugsz2ZppQBdG9?= =?us-ascii?Q?Z3pUuxjvXuPMslaaSf7uslG+8VlZS1sLuCPXkNLpJfYpQuq0Ypar72GCOb52?= =?us-ascii?Q?Z2UuW153GJ7/aXkfOOu7IjO3JWxxyCjXl3h6lUK/dBw+oWuBjrKVUmGRGlfA?= =?us-ascii?Q?+gjauiuPk725mWbLJ2H6zjNvIPNntGIStZOtlAXKpgaSTdJi/WGJ4gTnubvY?= =?us-ascii?Q?dDFIvkv3hCw/qRp95tBfDJGqIbSqoR9FMOgnsYYtpcai51nIfXQoRXJpuuU0?= =?us-ascii?Q?MXyGCcFNlz799C6JFttAfZi9CAz1J/qTNQKa7ZUiZ/JfVF1f0HQO2aIgzlSG?= =?us-ascii?Q?y1+2aQmNgFv/ViZ2ZZtQT/x4QMEFNJdhAlOvg0bQ8POjwkjF1kfeYjX/NDbt?= =?us-ascii?Q?WMzquVjBf0No9RBDvrzJyWRG9HbrQUpdnDZXQXW/kuqWBzMYE/O+c1rASWvn?= =?us-ascii?Q?sqTqkJrztC+LT6Q0WzPTXJj3z+HGmZyeJQCcuWlPAILTHgp9SrY/7VxVYpZA?= =?us-ascii?Q?uBZD6MTaINl6Ql+cxTGEJ9+BhryQYT1aHa6M69qJrQaFRJjX9az2FfK0F2AU?= =?us-ascii?Q?kNXtNgoKR6NLQYJKwdplrtGgXnfG9kkm6bglkN4UiyD8YUJ/Yyw1BlXFjNLT?= =?us-ascii?Q?lFiaziiX90md9m+YbCRF9vd2h88D3GCPAw14o+Ki+1jKHH9rjAksjeyQ72kC?= =?us-ascii?Q?rWmolmrvRLwkxeflqqdqOl1Jz3aoXwjj/04R9LVXLOZC3cLj8dZw84bLWqK6?= =?us-ascii?Q?I1OPX+QWcrW39cFOjGKVBfYvCnpmnNXRSE4SiQeSQZ4hDOHIvGaAtDZiF1Uk?= =?us-ascii?Q?2QnZMODmDu50Pxb3h6xqoI1BtG8u2aEVvRmGi5qf5EALm2l0/ZdUSNbzN5BY?= =?us-ascii?Q?f6dFWzb7nQ/maomC2FYXVYcff0cb6Z/vpOu+9TifQROS+SyTmr3FGRSMBjr+?= =?us-ascii?Q?0HTAeuioJkMjBzZ2mJ3jg+W00ne2WpAJVdsBzBaN/QueU8VmffClJHxB7ew/?= =?us-ascii?Q?lPeI8wGnzK/a34dVEivkbVTMF6DT0STunRPBkjybgkZGTTmhiXwcSAgQStN+?= =?us-ascii?Q?6miytD5Ow6gnaJGPjaIatzxtpoJeKGGuh9CuGlZKO6grsDgJ1D6qIHohAGaW?= =?us-ascii?Q?SB3hiV/GMcfGzM2jdwT+KsRSP9m/5hK+mVqKdSGQDMVJnxY6qkopXL/S9nqI?= =?us-ascii?Q?2kvuWtxFVnw4zow9wgckLRsyUP7K7YUTUvkftY3xth19uja+lUJ0LrTdH9uO?= =?us-ascii?Q?4xzC/pcHrcVAK8EIknB1qUf1Vc3DhVfIW5/YkFbR00c/s1vGOzCvanHPOoRQ?= =?us-ascii?Q?x1HnOzfPDaMNEpzQeyl41LSNvEtp8TuYIhmGBt5bE5K/YglU2UCP/0zMcM1t?= =?us-ascii?Q?yMbSaS8hmdq4O2v8uIqlA+9C6bjK2e12VPNWvk36usYx2ZLVtrcUBZQmyfoT?= =?us-ascii?Q?99S5+ht/U1lwWeVJxjrkwb8gEntSnBBU?= X-Forefront-Antispam-Report: CIP:58.252.5.68;CTRY:CN;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.oppo.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: oppo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2024 06:40:27.7146 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a8f50448-0636-412f-2345-08dcd2f5ca11 X-MS-Exchange-CrossTenant-Id: f1905eb1-c353-41c5-9516-62b4a54b5ee6 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f1905eb1-c353-41c5-9516-62b4a54b5ee6;Ip=[58.252.5.68];Helo=[mail.oppo.com] X-MS-Exchange-CrossTenant-AuthSource: HK2PEPF00006FB2.apcprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYSPR02MB7370 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: liuderong Remove unused parameter segno from f2fs_usable_segs_in_sec. Signed-off-by: liuderong --- fs/f2fs/f2fs.h | 3 +-- fs/f2fs/gc.c | 6 +++--- fs/f2fs/segment.c | 3 +-- fs/f2fs/segment.h | 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index ac19c61..4dcdcdd 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -3759,8 +3759,7 @@ void f2fs_destroy_segment_manager_caches(void); int f2fs_rw_hint_to_seg_type(struct f2fs_sb_info *sbi, enum rw_hint hint); enum rw_hint f2fs_io_type_to_rw_hint(struct f2fs_sb_info *sbi, enum page_type type, enum temp_type temp); -unsigned int f2fs_usable_segs_in_sec(struct f2fs_sb_info *sbi, - unsigned int segno); +unsigned int f2fs_usable_segs_in_sec(struct f2fs_sb_info *sbi); unsigned int f2fs_usable_blks_in_seg(struct f2fs_sb_info *sbi, unsigned int segno); =20 diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index 724bbcb..6299639 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -339,7 +339,7 @@ static unsigned int get_cb_cost(struct f2fs_sb_info *sb= i, unsigned int segno) unsigned char age =3D 0; unsigned char u; unsigned int i; - unsigned int usable_segs_per_sec =3D f2fs_usable_segs_in_sec(sbi, segno); + unsigned int usable_segs_per_sec =3D f2fs_usable_segs_in_sec(sbi); =20 for (i =3D 0; i < usable_segs_per_sec; i++) mtime +=3D get_seg_entry(sbi, start + i)->mtime; @@ -1707,7 +1707,7 @@ static int do_garbage_collect(struct f2fs_sb_info *sb= i, */ if (f2fs_sb_has_blkzoned(sbi)) end_segno -=3D SEGS_PER_SEC(sbi) - - f2fs_usable_segs_in_sec(sbi, segno); + f2fs_usable_segs_in_sec(sbi); =20 sanity_check_seg_type(sbi, get_seg_entry(sbi, segno)->type); =20 @@ -1881,7 +1881,7 @@ int f2fs_gc(struct f2fs_sb_info *sbi, struct f2fs_gc_= control *gc_control) =20 total_freed +=3D seg_freed; =20 - if (seg_freed =3D=3D f2fs_usable_segs_in_sec(sbi, segno)) { + if (seg_freed =3D=3D f2fs_usable_segs_in_sec(sbi)) { sec_freed++; total_sec_freed++; } diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 78c3198..6627394 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -5381,8 +5381,7 @@ unsigned int f2fs_usable_blks_in_seg(struct f2fs_sb_i= nfo *sbi, return BLKS_PER_SEG(sbi); } =20 -unsigned int f2fs_usable_segs_in_sec(struct f2fs_sb_info *sbi, - unsigned int segno) +unsigned int f2fs_usable_segs_in_sec(struct f2fs_sb_info *sbi) { if (f2fs_sb_has_blkzoned(sbi)) return CAP_SEGS_PER_SEC(sbi); diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h index bfc01a5..9e61ded 100644 --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h @@ -430,7 +430,7 @@ static inline void __set_free(struct f2fs_sb_info *sbi,= unsigned int segno) unsigned int secno =3D GET_SEC_FROM_SEG(sbi, segno); unsigned int start_segno =3D GET_SEG_FROM_SEC(sbi, secno); unsigned int next; - unsigned int usable_segs =3D f2fs_usable_segs_in_sec(sbi, segno); + unsigned int usable_segs =3D f2fs_usable_segs_in_sec(sbi); =20 spin_lock(&free_i->segmap_lock); clear_bit(segno, free_i->free_segmap); @@ -464,7 +464,7 @@ static inline void __set_test_and_free(struct f2fs_sb_i= nfo *sbi, unsigned int secno =3D GET_SEC_FROM_SEG(sbi, segno); unsigned int start_segno =3D GET_SEG_FROM_SEC(sbi, secno); unsigned int next; - unsigned int usable_segs =3D f2fs_usable_segs_in_sec(sbi, segno); + unsigned int usable_segs =3D f2fs_usable_segs_in_sec(sbi); =20 spin_lock(&free_i->segmap_lock); if (test_and_clear_bit(segno, free_i->free_segmap)) { --=20 2.7.4 From nobody Sat Nov 30 03:39:38 2024 Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on2072.outbound.protection.outlook.com [40.107.117.72]) (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 1E2D61898E6 for ; Thu, 12 Sep 2024 06:40:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.117.72 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726123234; cv=fail; b=ErtpM32mcorxYn37JlfYcpiO+Gfizp4swV/1C+K3vNpyv6muSejS4Zniz571M67vv1axEVgG9zzUFzCXU0vx1AsY1MXuq+0BS5LxmKfR1Q//e8LQqv5IwqjTmqQWpEarMEXQ+U4CzL1xpKUFYY1aK2sefTERhHcejwDHMFJfA40= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726123234; c=relaxed/simple; bh=UWNFunFKT5uix9SMyfUS7se63mPvUau310RfsI3A5Rg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jm/2mff+5cHCl3nu81B70/i8ucA7eHfIiuNVr/D3jTbyZVaABl/1lVEmw7fPHXh7zw5Fm3t1Pkjb+TagDAfPWPaF1hmGciI8LxXxPnaMXwqF2NtMwhoTck5MVgSQwNATJpUVcfV86zfHklwHaIuI++6X4rehTKquwiYURAAqG8Y= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oppo.com; spf=pass smtp.mailfrom=oppo.com; dkim=pass (1024-bit key) header.d=oppo.com header.i=@oppo.com header.b=BH0LacuB; arc=fail smtp.client-ip=40.107.117.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oppo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oppo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=oppo.com header.i=@oppo.com header.b="BH0LacuB" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xYVBXfovI4mfQXGsaQc3AKn7JqtQXwocLykEPX1X1oJrmUgfGj1aFWYR16es7oaq7Qe92tjUypcJ1dn757oB9ExZBDFOwQ60wYvQPBLggasRijCPifyU8QJAnduLsjiWCScA56fMYXDnL2eK6MeWeFPD45vzoVXwFv9QdYTMl+l5sUAuoDXmGm/u7GY57w+g3eFiWsy9S5gyuWsnGBk5V99MrlVu8BO6LRSoJyZ9zdFS3mtWtcYOkCQoDFVke/h810NFTUs19qumjwz74oGC6cvwbgKRv/vIKcjBhXXedUA6teNfyJm5FMaxCgmoULlrOBXwPXX98JhEtr9gFW4olA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qhFrel5hVc+QCQ3Zf1JE5M1aC4spplciKDjRVfXbf+A=; b=oU24125hCPHeOKa1e8lDIl8nauyhWf+JpXcX5W/oB1MoBO9OsdlN8nfbHG3/rbJHgLKwiKWMOIKWCA8NO2KLXLt98ClMEbOlv+MUG6k8Q0CSkw/m7hKko6GCit106BE4iUAZ8V1T8zR+La+kpw1QWxd8gXymF8AIzYNqV26xZ973TH3la5ZUrs5O7nAyYVndo2MJ7+aG1nsC6GZZng6acxRu+4tqkDe0GjWpccUSgJyyrfrNMTy1AVBQaHxYSEbmp6dTS2jRjeVYgzSNsgk2pYbODAvufW3qOar9yNbNA9STI1P7IsVtSdv7GFwwoBVetrQ5oYPAnMTiQIVSA6wseA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 58.252.5.68) smtp.rcpttodomain=kernel.org smtp.mailfrom=oppo.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=oppo.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oppo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qhFrel5hVc+QCQ3Zf1JE5M1aC4spplciKDjRVfXbf+A=; b=BH0LacuBDzYK4KBANJICGu3UH7ZHYh5lWS2YlaRW+5dp1+RTBig53KQhhlLN14hjQ0Fm7UbwJml8Np+YcFbFtjOZiF3N93tYBH3Q4X5L+RZqzZmF06kdLuDCj1+deb3tyxz8lGrv/Y66hnjT4ZOKCYgoiZj6OOXTkdMv1VkCBzs= Received: from SGAP274CA0005.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::17) by SI2PR02MB5858.apcprd02.prod.outlook.com (2603:1096:4:1ed::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7962.18; Thu, 12 Sep 2024 06:40:28 +0000 Received: from HK2PEPF00006FAE.apcprd02.prod.outlook.com (2603:1096:4:b6:cafe::36) by SGAP274CA0005.outlook.office365.com (2603:1096:4:b6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7939.26 via Frontend Transport; Thu, 12 Sep 2024 06:40:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 58.252.5.68) smtp.mailfrom=oppo.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=oppo.com; Received-SPF: Pass (protection.outlook.com: domain of oppo.com designates 58.252.5.68 as permitted sender) receiver=protection.outlook.com; client-ip=58.252.5.68; helo=mail.oppo.com; pr=C Received: from mail.oppo.com (58.252.5.68) by HK2PEPF00006FAE.mail.protection.outlook.com (10.167.8.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7918.13 via Frontend Transport; Thu, 12 Sep 2024 06:40:27 +0000 Received: from cndgdcavdu0c-218-29.172.16.40.114 (172.16.40.118) by mailappw30.adc.com (172.16.56.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Thu, 12 Sep 2024 14:40:27 +0800 From: To: , CC: , , liuderong Subject: [PATCH v2 2/2] f2fs: introduce get_section_mtime Date: Thu, 12 Sep 2024 14:40:14 +0800 Message-ID: <1726123214-208356-3-git-send-email-liuderong@oppo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1726123214-208356-1-git-send-email-liuderong@oppo.com> References: <1726123214-208356-1-git-send-email-liuderong@oppo.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: mailappw30.adc.com (172.16.56.197) To mailappw30.adc.com (172.16.56.197) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HK2PEPF00006FAE:EE_|SI2PR02MB5858:EE_ X-MS-Office365-Filtering-Correlation-Id: af84986f-21fe-4ac3-0124-08dcd2f5ca1a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?SsHvoWnEbNRw5NDtsSPQfIUh79fBBDCqi76HRMZJCSmGV1RrsDqRgwxv7uFY?= =?us-ascii?Q?35IBQOjxTv358pVSwNuuLLkYfE7gz9/w9jlyzWLZsXpBNPzwBv82E+G9PDmr?= =?us-ascii?Q?FGQpOVjwXk6jyFx1DcAsPqWzJmWX7z/7FuyEUn8c2LhMtzZ2wgUyTYAu/arE?= =?us-ascii?Q?m11DnsrP4tBUaROAOPOyejbJPlOU8eIxXEwQ86yhx3kztXHF6uhgcQ5t7jeq?= =?us-ascii?Q?JnNYeCkY+ERMidEZraCkOQWHEZf0ej5ieJZlbDV/iL1CoGFE7HF1oTGUboZc?= =?us-ascii?Q?O1lyz9oqSNsTvjhl9lMqL+aXalcz6xVc2AyhYubXz6KvpDOU0ob/mvCbhGc5?= =?us-ascii?Q?shQaVXCIKt0FCVvpQSLLhpX+3LEASXs0bRvUGpp5pMuM+jqRhxjCISQoyL4w?= =?us-ascii?Q?O9GNEByjsxeeiHJ8apr9Sh1SBSXg2DVHD7o+eKFW1GLUG4ndJ4lfiPmtnXGG?= =?us-ascii?Q?A8uA1R0PcV1qPcbBGq1eKgZcKc9JrIX357PL3lFwUyLQtqf9lfdnsOLKlX0V?= =?us-ascii?Q?XS+uYLi7u8kEO2wcKiMcg/cgKkRdKkvtt1Xj5/S7btU4DPlnjy41O2NnvU37?= =?us-ascii?Q?oD/eiu7zsfOvu+cGs3wdA4+2chj4i3xtFRGx2PNRIrZ+VWYSewcN0v/3JGy+?= =?us-ascii?Q?sqI5V+6aLPtbcpHzOhPKqFSHldttMa28wKqhwAlf1TjGxjOoxvOYrALjrkQ0?= =?us-ascii?Q?P9+nzxHIPA/FKREI5ppPlNhBECYvBuzzCC5PCi8Z+5x1PtcNMF8S+4BVndm+?= =?us-ascii?Q?rfxSMzNDJ0r1ihBPgKF5Kx16LQVW/3atlHekEYw+xNNJHuuSkoaNOw0Rf0En?= =?us-ascii?Q?M9Vh5bflR6ODsalWXCRW3W19CqzxbtTjVAZhX1YgkKCMecGLw9gyNBye3lxn?= =?us-ascii?Q?JFgvQEcUeMF8mx/9b+fcNPkpLbgoAB+Xdqs3qy8c45w3KmH84f7bF0lZsGTq?= =?us-ascii?Q?IB24R8rVA3oekdDj1bUCbqmidqNhV6iMVwDQKqZygP2b/cUVOrK10FMA6KRi?= =?us-ascii?Q?xZlYuVPrwZIshZ8BKYBSaUulgM+xMmhF0M8WajAbVImSnHLNB9d4QFOCCaQg?= =?us-ascii?Q?j6cqKnfmmCcu+Ha41bVwI9i7DZEGHBOqYF5QvOrLzX3D3Vv+gIL5msf3KFVE?= =?us-ascii?Q?C+M7dwtqxiL3uFByz+hLWGmD8++8fqqCCd8Xxo2paov08LpegQoQmt89hrxn?= =?us-ascii?Q?2g/60JkWBae7fKnNI4VUcVP21GMOvryXxQDkCPBJBN5gTm6IKq83tZ3zIsJp?= =?us-ascii?Q?xqw0/BzX9MMeysPtH5BcGvo8YP3UvWa1WK69s1NLZQ76t/RTno3T/9+JuY0k?= =?us-ascii?Q?Ts/Ami7/PIaMaogFpLTLnQw19JRJzvSdyPqIq85gfRvdLQB8zRXMHR7S+dUl?= =?us-ascii?Q?70zUxIBuHA8NDaBd1hNnPEMvvUsxeO/Vcc3jTRan1qxo5lJnd7I6Acb7LfcK?= =?us-ascii?Q?mxLCcm/erjMs71MVHFUJX/9ivicXDQkw?= X-Forefront-Antispam-Report: CIP:58.252.5.68;CTRY:CN;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.oppo.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: oppo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2024 06:40:27.7727 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: af84986f-21fe-4ac3-0124-08dcd2f5ca1a X-MS-Exchange-CrossTenant-Id: f1905eb1-c353-41c5-9516-62b4a54b5ee6 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f1905eb1-c353-41c5-9516-62b4a54b5ee6;Ip=[58.252.5.68];Helo=[mail.oppo.com] X-MS-Exchange-CrossTenant-AuthSource: HK2PEPF00006FAE.apcprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR02MB5858 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: liuderong When segs_per_sec is larger than 1, section may contain free segments, mtime should be the mean value of each valid segments, so introduce get_section_mtime to exclude free segments in a section. Signed-off-by: liuderong --- fs/f2fs/f2fs.h | 2 ++ fs/f2fs/gc.c | 15 ++------------- fs/f2fs/segment.c | 41 ++++++++++++++++++++++++++++++++++++----- 3 files changed, 40 insertions(+), 18 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 4dcdcdd..d6adf0f 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -3762,6 +3762,8 @@ enum rw_hint f2fs_io_type_to_rw_hint(struct f2fs_sb_i= nfo *sbi, unsigned int f2fs_usable_segs_in_sec(struct f2fs_sb_info *sbi); unsigned int f2fs_usable_blks_in_seg(struct f2fs_sb_info *sbi, unsigned int segno); +unsigned long long get_section_mtime(struct f2fs_sb_info *sbi, + unsigned int segno); =20 #define DEF_FRAGMENT_SIZE 4 #define MIN_FRAGMENT_SIZE 1 diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index 6299639..03c6117 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -332,20 +332,14 @@ static unsigned int check_bg_victims(struct f2fs_sb_i= nfo *sbi) static unsigned int get_cb_cost(struct f2fs_sb_info *sbi, unsigned int seg= no) { struct sit_info *sit_i =3D SIT_I(sbi); - unsigned int secno =3D GET_SEC_FROM_SEG(sbi, segno); - unsigned int start =3D GET_SEG_FROM_SEC(sbi, secno); unsigned long long mtime =3D 0; unsigned int vblocks; unsigned char age =3D 0; unsigned char u; - unsigned int i; unsigned int usable_segs_per_sec =3D f2fs_usable_segs_in_sec(sbi); =20 - for (i =3D 0; i < usable_segs_per_sec; i++) - mtime +=3D get_seg_entry(sbi, start + i)->mtime; + mtime =3D get_section_mtime(sbi, segno); vblocks =3D get_valid_blocks(sbi, segno, true); - - mtime =3D div_u64(mtime, usable_segs_per_sec); vblocks =3D div_u64(vblocks, usable_segs_per_sec); =20 u =3D BLKS_TO_SEGS(sbi, vblocks * 100); @@ -485,10 +479,7 @@ static void add_victim_entry(struct f2fs_sb_info *sbi, struct victim_sel_policy *p, unsigned int segno) { struct sit_info *sit_i =3D SIT_I(sbi); - unsigned int secno =3D GET_SEC_FROM_SEG(sbi, segno); - unsigned int start =3D GET_SEG_FROM_SEC(sbi, secno); unsigned long long mtime =3D 0; - unsigned int i; =20 if (unlikely(is_sbi_flag_set(sbi, SBI_CP_DISABLED))) { if (p->gc_mode =3D=3D GC_AT && @@ -496,9 +487,7 @@ static void add_victim_entry(struct f2fs_sb_info *sbi, return; } =20 - for (i =3D 0; i < SEGS_PER_SEC(sbi); i++) - mtime +=3D get_seg_entry(sbi, start + i)->mtime; - mtime =3D div_u64(mtime, SEGS_PER_SEC(sbi)); + mtime =3D get_section_mtime(sbi, segno); =20 /* Handle if the system time has changed by the user */ if (mtime < sit_i->min_mtime) diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 6627394..e62e722 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -5389,6 +5389,41 @@ unsigned int f2fs_usable_segs_in_sec(struct f2fs_sb_= info *sbi) return SEGS_PER_SEC(sbi); } =20 +unsigned long long get_section_mtime(struct f2fs_sb_info *sbi, + unsigned int segno) +{ + unsigned int usable_segs_per_sec =3D f2fs_usable_segs_in_sec(sbi); + unsigned int secno =3D 0, start =3D 0; + struct free_segmap_info *free_i =3D FREE_I(sbi); + unsigned int valid_seg_count =3D 0; + unsigned long long mtime =3D 0; + unsigned int i =3D 0; + + if (segno =3D=3D NULL_SEGNO) + return 0; + + secno =3D GET_SEC_FROM_SEG(sbi, segno); + start =3D GET_SEG_FROM_SEC(sbi, secno); + + if (!__is_large_section(sbi)) + return get_seg_entry(sbi, start + i)->mtime; + + for (i =3D 0; i < usable_segs_per_sec; i++) { + /* for large section, only check the mtime of valid segments */ + spin_lock(&free_i->segmap_lock); + if (test_bit(start + i, free_i->free_segmap)) { + mtime +=3D get_seg_entry(sbi, start + i)->mtime; + valid_seg_count++; + } + spin_unlock(&free_i->segmap_lock); + } + + if (valid_seg_count =3D=3D 0) + return 0; + + return div_u64(mtime, valid_seg_count); +} + /* * Update min, max modified time for cost-benefit GC algorithm */ @@ -5402,13 +5437,9 @@ static void init_min_max_mtime(struct f2fs_sb_info *= sbi) sit_i->min_mtime =3D ULLONG_MAX; =20 for (segno =3D 0; segno < MAIN_SEGS(sbi); segno +=3D SEGS_PER_SEC(sbi)) { - unsigned int i; unsigned long long mtime =3D 0; =20 - for (i =3D 0; i < SEGS_PER_SEC(sbi); i++) - mtime +=3D get_seg_entry(sbi, segno + i)->mtime; - - mtime =3D div_u64(mtime, SEGS_PER_SEC(sbi)); + mtime =3D get_section_mtime(sbi, segno); =20 if (sit_i->min_mtime > mtime) sit_i->min_mtime =3D mtime; --=20 2.7.4