From nobody Wed Apr 8 10:04:15 2026 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 94E6DC38A2D for ; Tue, 25 Oct 2022 07:36:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231852AbiJYHgC (ORCPT ); Tue, 25 Oct 2022 03:36:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231871AbiJYHfj (ORCPT ); Tue, 25 Oct 2022 03:35:39 -0400 Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on2103.outbound.protection.outlook.com [40.107.117.103]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DDC62AC4C for ; Tue, 25 Oct 2022 00:35:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A/lsyufqlrbGYepxUfv5KTdKbq88mXs4D8NtJa3D+T/It7EXubiV/jztm6sYzcV6mO16i/PbIfZjghEzfaUDAGbVOUyH8/qHF6HDsq/oXbNmUA7IIv2fqK+5n215Hx6ZE5Wfcos3VZrx8jqQmwqDV6VDdXimCYuk9TZE/BCM6HlTdGw/e0/ZZoG5FZzPMbJ/L+eawbMSoVimSnlvRwI+ASO6Yac79NM0gi82VMnjzhQ+061lsUkHFyhvI3UOMVpZLP7PvjAP1ZH9+zK9zCQ0ULkz6pWSczl0Ols0PAInhqRQ9qnIXTvBY3FSHaYFKCKs9Ch3CjxvDRIalMCqRj1IMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=LCKW3ial4Cm1cWRAB2S2YZpocCOQmHjoDDkpQODPvYE=; b=nsCt1jZhp+hMXsvALN63BRO0BmSujXWEAKNvBC3eiUGeT5RrDXcVRyL8pWo2p6AwB4ZZHlQ5BH98OVeukqlevwYMQwU9BdeS11WWcNd0B+WSt2j0BWwiXbGRr356JAV8Uz75b3zodI3aFm0ozGKJ7+HNjc94UntqAsNFOWNDV46sM4nukH11eL7ZMj7V2134CtdHC3nWawMEIt593rq1eBFzL8vUDfWCXa6qMOUtPQfi2pk0wf8C35EWoQG8n+AlQLwGGzfKMvNJJ3OSALxercGPGSArIhohwRMYnXocakIRTgo7XqN5xG834iev8EdqP9LBsxSaiSHd4IDrgwy4+Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LCKW3ial4Cm1cWRAB2S2YZpocCOQmHjoDDkpQODPvYE=; b=qYJPvLWNGPq8UcCYIyAFGhSPMOU3ne/RryD/7PZD9qhvvqVT704Hwe9v7aEvXq3ECbryI+51OR9gk2hMlwntz5GwT4PLcO6VuHxtb4vLhSzSIxj+TlLI/fl5rosTH1XqqX2mr7FqYByP4hFnTZw6agJgmsLcBvFtr9lFWTQaV7SHEQVr0YHU7B+uGwuLeAn8LjHZGo4lTgymefGaHbuC1jh11bBMEk7+iqslFfCAVqLy99icsJsBL23vJoMshuT7xEeOhosO0rvOwXrSKdDlqn+Ye8iapjT+kTJfTlI4eTp/IaD60VRuuCLuyKxiJfWUnu1Sl6JzAq4BESIzUiGr+w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) by TY0PR06MB5236.apcprd06.prod.outlook.com (2603:1096:400:205::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28; Tue, 25 Oct 2022 07:35:13 +0000 Received: from SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::c84b:5a6c:d66f:c0fd]) by SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::c84b:5a6c:d66f:c0fd%3]) with mapi id 15.20.5746.023; Tue, 25 Oct 2022 07:35:13 +0000 From: Yangtao Li To: jaegeuk@kernel.org, chao@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Yangtao Li Subject: [PATCH v2] f2fs: introduce max_ordered_discard sysfs node Date: Tue, 25 Oct 2022 15:35:03 +0800 Message-Id: <20221025073503.43935-1-frank.li@vivo.com> X-Mailer: git-send-email 2.35.1 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0020.apcprd02.prod.outlook.com (2603:1096:4:1f4::9) To SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5269:EE_|TY0PR06MB5236:EE_ X-MS-Office365-Filtering-Correlation-Id: d3231c5c-e787-44b3-92a5-08dab65b73da X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gkWsjBcNSubVx2QPfEI9AH3Sb59T3XAC5fzl0U1pproC/6GIxe23ImUbLxFvFPOB2rB05G9Riucm1Yn9yEQZ7iC0dccn0FZhXdylDc/3vKKbVnZdrCBwvc4hzZQyRt8sE7ItQJkUqb0BUyFuiog/MlaFrCpoQiI1vD/3pxLWU3bc96SIXCUMhm//9b4Kwo9EgVPU8cDgwY6NZ4GtB+YdkIMV/EA3FNd9fsgkKl2ETCemYRu8/rCRYnatr73KzQLErw9OOfQSBu9rRBSkexNkORRtUu7VGw2rYti2jb1RUD7nkJKvfbgijfPbr3IFSrM8ZNoJn5PHAJDcsu5gtY3oh/vvYRL6CgI//VtUPQ/UnEekEseF6fPCBKdcUFeK7lAmywzTiUKhl2tkemsSDgzFhUZUrGEHt9HT7BkSgHB8MWgMrwzzvAGp39NaORlXTgqd0u5jIfBtApaP8upyQzAkngMGyXCbQdrEfNrGAFZqDp7Z//HWjax24DHjbLzLNDsb61xCrvQpN/2zhKCQic7V4PearRXc7q2F6/sgoGbbHLTcYNG2U+BsnKvNw05uvl+Mba8Pk3/6qaVJ7NymtwEv9ngCd+3Klq1zVT3qXGLRZVQ3utRQ/MogthoLBDIGv2ZyazhSoeMT22iIxgBvlst0RCKTYFEhvjKMgOH/bmmvagkgaRKAt8A8H8B93dnqejReDB16KlSbGd8v//zsGdTa2jM8X5g6oI5Nqxe7PzkMW2fOhrSKxyppVj8bAnu9WW89Pm0gRaP2MDXCvmaKyuH3XQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SEZPR06MB5269.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(136003)(376002)(366004)(396003)(39860400002)(346002)(451199015)(52116002)(66946007)(6506007)(66476007)(2616005)(66556008)(19627235002)(6666004)(83380400001)(316002)(107886003)(36756003)(1076003)(186003)(8676002)(6486002)(4326008)(41300700001)(5660300002)(2906002)(6512007)(26005)(38100700002)(38350700002)(8936002)(86362001)(478600001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4RoxzEqKVOFV5Y2K8SkQ/HreJhzVG1u2vhd3O6W3jbXzqPAk2kCpmKSfTHzt?= =?us-ascii?Q?Kr0VeYVX8PqNUF79euU5w/aCdtnflCoILlT0yh555S56QFPJiSmtXoMDTzCm?= =?us-ascii?Q?4gbi2aynLyXtoxkUhsbIW3el5qTWf4OErbVmdZIRG0TXNgjr8viwRP6ty3Jq?= =?us-ascii?Q?SV6FJYxRyZ+Mo5i6+Vt4D4rEA6baMslDipCvaGZdi06+3ogo8d+DE+j4O9dI?= =?us-ascii?Q?s67Az4t7CSFb7U7dAH2LWzpRKr+9lcvUqr+Hl1UcVTRLDJv32RJhHrqWGtxK?= =?us-ascii?Q?JuesMmc7s4DkyAaAjSS8W89tOAbHTuJi8u+24dO1t3BWrWXcuIXnenSStMVo?= =?us-ascii?Q?uKp+oPyx8AjnzKgH2N5lTVYwpOaTORoHdEyOQ/UBmqdzpJqHYjjz4Vw8TWtv?= =?us-ascii?Q?swNB8oQsuogsF1GhmZybMnMs3YE79rqqdlIirva/SwR+vwcxbGRn2eG3xk5b?= =?us-ascii?Q?5VA/0m3L7vs18iq02MqUfl6tcr7dfXMhN3yZfEE0Wun9GAX3IyYigp+tfDLJ?= =?us-ascii?Q?aPvgO2ji5lhsA7OueNeHOlSSlJq/IvAfLVRgvd5M8CO/atffbcDRjuTbO5v9?= =?us-ascii?Q?fnREPTUGVtMwIkQ5TJD1ucenJq1H10PXLOQgEdEd1aMH6jsk15kZDi6JD7v0?= =?us-ascii?Q?Pjp+CSeNgnd57aHF+RzWl/ugapEe3WJDk/HnhRqg/KQ+LR/d2WglML+4EuNR?= =?us-ascii?Q?K7ESo1yYEkvRPrCZMEaYcTn1wxaMrXMZ6BzQ/MRXxzJexOxA0bgbBHGxLFqy?= =?us-ascii?Q?kZzkP8U6Ta2qA6JT1zi58bElbPR91UmhlfoumsmD0XU82rB1JcFTZ8CZOtfp?= =?us-ascii?Q?P9O62OJ0FvBhqBXy5zwejIwRCLfDuJc8xk6rEYg/RhwMgJP+KQqcXns6neIU?= =?us-ascii?Q?Glg374UJt65npc6JWYzB5JjHXeo3iUub3CTRUTmwWQcoA9NCqfZVjRBCrxr6?= =?us-ascii?Q?xgnEnedHOiOgyp484h9O7jZyNtzYjFJuUTC38fGeCHv0u3j7orAA1wif71sI?= =?us-ascii?Q?2tSLXL2Yv58kamNOfgWiLF+yIlbHsuePfB2+YsVZ7vxUW/Hx5FfYcdc6Pqeh?= =?us-ascii?Q?c9v6vGm74f+/j8oE5x7VT4AEGpPIzmrZIcjdhKk3cCPeFiM4x9WXYgCe1BOK?= =?us-ascii?Q?/d1jVJSKm4riK2kehxslGSx00HZfNPOhxgPPDFK4r5e3j38PYwHqbvZX7fb6?= =?us-ascii?Q?THDXk2yNuzNCb8aVDKDLB1+2AMiKG09QclM6l2azpi8uxbIz19J56BSQIuP2?= =?us-ascii?Q?5B/s1XnmzjGIjnbhBh6A4eLt4G9VurRwsIz6n2/lMtBqzy6nKQtD4PG7By8h?= =?us-ascii?Q?k1kVMcoM/jy+V5Dftx4FxnmP5klIO7AsffMxu+SIY8grrh+cXcfJiSysgsNq?= =?us-ascii?Q?W+2TMdxaFxI1CYsdUNTvFaRhvNOP3moyu/6mMqroq+G4liRJM3fjQmLuqfEX?= =?us-ascii?Q?rPuk5DDgtD7cSNoaBVY9t8VUW4RyIh6YhLLgxh3kx39YtCittFsfz2hNJbZN?= =?us-ascii?Q?CnUVALO/rBN3bsGS5jRyfOXx/cEfDri/S7vBatI0SeXvK0pb1sJmq+8B7dZm?= =?us-ascii?Q?KlZSPMPq0SXktNAPErEtB8FK5jTV8BLixKZGH5hg?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3231c5c-e787-44b3-92a5-08dab65b73da X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2022 07:35:12.9423 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xZV+m3584kpdSqJJqSeXppd0t4Y9Vxom1olsZUjDc6PIKZDTK39rMR45npGHe8R2g1ORoGPAWXaVvYr1o8DVww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY0PR06MB5236 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The current max_ordered_discard is a fixed value, change it to be configurable through the sys node. Signed-off-by: Yangtao Li Reviewed-by: Chao Yu --- v2: - s/order/ordered Documentation/ABI/testing/sysfs-fs-f2fs | 6 ++++++ fs/f2fs/f2fs.h | 3 +++ fs/f2fs/segment.c | 3 ++- fs/f2fs/sysfs.c | 11 +++++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Documentation/ABI/testing/sysfs-fs-f2fs b/Documentation/ABI/te= sting/sysfs-fs-f2fs index 859c4e53a846..8faf7b1274df 100644 --- a/Documentation/ABI/testing/sysfs-fs-f2fs +++ b/Documentation/ABI/testing/sysfs-fs-f2fs @@ -99,6 +99,12 @@ Description: Controls the issue rate of discard commands= that consist of small checkpoint is triggered, and issued during the checkpoint. By default, it is disabled with 0. =20 +What: /sys/fs/f2fs//max_ordered_discard +Date: October 2022 +Contact: "Yangtao Li" +Description: Controls the maximum ordered discard, the unit size is one bl= ock(4KB). + Set it to 16 by default. + What: /sys/fs/f2fs//max_discard_request Date: December 2021 Contact: "Konstantin Vyshetsky" diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 2bad69cf9fd9..91c3fc5383f1 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -330,6 +330,8 @@ struct discard_entry { =20 /* default discard granularity of inner discard thread, unit: block count = */ #define DEFAULT_DISCARD_GRANULARITY 16 +/* default maximum discard granularity of ordered discard, unit: block cou= nt */ +#define DEFAULT_MAX_ORDERED_DISCARD_GRANULARITY 16 =20 /* max discard pend list number */ #define MAX_PLIST_NUM 512 @@ -409,6 +411,7 @@ struct discard_cmd_control { unsigned int mid_discard_issue_time; /* mid. interval between discard iss= ue */ unsigned int max_discard_issue_time; /* max. interval between discard iss= ue */ unsigned int discard_granularity; /* discard granularity */ + unsigned int max_ordered_discard; /* maximum discard granularity issued b= y lba order */ unsigned int undiscard_blks; /* # of undiscard blocks */ unsigned int next_pos; /* next discard position */ atomic_t issued_discard; /* # of issued discard */ diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index acf3d3fa4363..dfa9dc3a1bc3 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -1448,7 +1448,7 @@ static int __issue_discard_cmd(struct f2fs_sb_info *s= bi, if (i + 1 < dpolicy->granularity) break; =20 - if (i < DEFAULT_DISCARD_GRANULARITY && dpolicy->ordered) + if (i < dcc->max_ordered_discard && dpolicy->ordered) return __issue_discard_cmd_orderly(sbi, dpolicy); =20 pend_list =3D &dcc->pend_list[i]; @@ -2046,6 +2046,7 @@ static int create_discard_cmd_control(struct f2fs_sb_= info *sbi) return -ENOMEM; =20 dcc->discard_granularity =3D DEFAULT_DISCARD_GRANULARITY; + dcc->max_ordered_discard =3D DEFAULT_MAX_ORDERED_DISCARD_GRANULARITY; if (F2FS_OPTION(sbi).discard_unit =3D=3D DISCARD_UNIT_SEGMENT) dcc->discard_granularity =3D sbi->blocks_per_seg; else if (F2FS_OPTION(sbi).discard_unit =3D=3D DISCARD_UNIT_SECTION) diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c index 2b1c653b37cf..e2325d8dcbb1 100644 --- a/fs/f2fs/sysfs.c +++ b/fs/f2fs/sysfs.c @@ -483,6 +483,15 @@ static ssize_t __sbi_store(struct f2fs_attr *a, return count; } =20 + if (!strcmp(a->attr.name, "max_ordered_discard")) { + if (t =3D=3D 0 || t > MAX_PLIST_NUM) + return -EINVAL; + if (!f2fs_block_unit_discard(sbi)) + return -EINVAL; + *ui =3D t; + return count; + } + if (!strcmp(a->attr.name, "migration_granularity")) { if (t =3D=3D 0 || t > sbi->segs_per_sec) return -EINVAL; @@ -793,6 +802,7 @@ F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, min_discard= _issue_time, min_discard_ F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, mid_discard_issue_time, mid_di= scard_issue_time); F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, max_discard_issue_time, max_di= scard_issue_time); F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, discard_granularity, discard_g= ranularity); +F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, max_ordered_discard, max_order= ed_discard); F2FS_RW_ATTR(RESERVED_BLOCKS, f2fs_sb_info, reserved_blocks, reserved_bloc= ks); F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, batched_trim_sections, trim_sections); F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, ipu_policy, ipu_policy); @@ -923,6 +933,7 @@ static struct attribute *f2fs_attrs[] =3D { ATTR_LIST(mid_discard_issue_time), ATTR_LIST(max_discard_issue_time), ATTR_LIST(discard_granularity), + ATTR_LIST(max_ordered_discard), ATTR_LIST(pending_discard), ATTR_LIST(batched_trim_sections), ATTR_LIST(ipu_policy), --=20 2.25.1