From patchwork Fri Oct 28 13:07:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5p2O5oms6Z+s?= X-Patchwork-Id: 12268 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp820693wru; Fri, 28 Oct 2022 06:09:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5sQI4bSTUR4Z9Z62MVB5i4P8ZtUZy/H8adVn+mjblwXcBYc+Nt5p82dOrU52zCHLrXj0yD X-Received: by 2002:a17:906:9b93:b0:78d:eb36:1ce7 with SMTP id dd19-20020a1709069b9300b0078deb361ce7mr47710419ejc.621.1666962583082; Fri, 28 Oct 2022 06:09:43 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1666962583; cv=pass; d=google.com; s=arc-20160816; b=cIH+d6UjL6rTjFhjYv4YJa3WSxxk6n73Qt3VYWTT0W/Q/IJ2K4/obo3cUfucvc/fRO ins6+n99hXIdw6DgGpap95YRREXBmafoTlYCou/4mkQB3dv5VL7gJ0jgpn4KbwHxnQnA PhiucbjCBn+uxHadIugojiesHFQjOPIbhDkTyLYRFn4otKqA4YWTMfrRuBSsD2zXj/hD V12wgerjdhMzkG7i13dHGrvMtzsUhUSYwuKYt55GtZqJCjblprWD0r3F8T4u45LSyrcn aM89vSIzB5RrZVMqvjN/G33LYXsPWziWA45/3pLsz5DSirwS+Dvu8oWnC/EHIuk67+hh wNxA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :message-id:date:subject:cc:to:from:dkim-signature; bh=Z30fCu+gkZutfLemycgrch/uaJtL/rxBmqIOx/bW5Io=; b=ilpJC7Qigp6z3KiOVvVnui/AiYI8NPsVoyKm/e6spyj6KxF2RdgzSg5KjPtMSOmIlR DhpfzWA2VpCjYhyyhvZ+g6eJh3XPXV6Hl2+heF0yYiVtIBXIswF7gMRo07a5VxDZrwIa IVqXzPNpK2RwYnt2eKJRQ+mZwjHonmbgC4aEpx948q1ypbBnkim/26Cv0qGNG1gwHezG yDlv1+cUOijNtdNKHvZUs+Mi9ojmfL4MJft74WQdLRBmedBTUaR0UPorJN4C7VE075/Q Q0L8M4dlYdSFcg1SxlqoDc2NnS4ymVBOhzfY8HFgSX3vU7Y5t4AfjbbCdKVKG0NVK5DP WMrQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@vivo.com header.s=selector2 header.b=Rcn4jsIS; arc=pass (i=1 spf=pass spfdomain=vivo.com dkim=pass dkdomain=vivo.com dmarc=pass fromdomain=vivo.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vivo.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l22-20020a50d6d6000000b0046187ab5c1bsi4085680edj.512.2022.10.28.06.09.18; Fri, 28 Oct 2022 06:09:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@vivo.com header.s=selector2 header.b=Rcn4jsIS; arc=pass (i=1 spf=pass spfdomain=vivo.com dkim=pass dkdomain=vivo.com dmarc=pass fromdomain=vivo.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vivo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230381AbiJ1NII (ORCPT + 99 others); Fri, 28 Oct 2022 09:08:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230392AbiJ1NHu (ORCPT ); Fri, 28 Oct 2022 09:07:50 -0400 Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01on2106.outbound.protection.outlook.com [40.107.255.106]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1760D259D for ; Fri, 28 Oct 2022 06:07:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FX3rP8eIe1Wm1qd+kEYVB3HGo6GGnmA1H2h+s/S49Nz/ugLCUyquS9GDtwkvzPJteYvkqz00nGhe9EriNBw7aNwHfjEAhcVHY1HBOozXmDL9IMgwF009+SVfeMsmIvqoeLQG/7Evx6MTFCLXHqbI5Ga2jCyzwNFZPjH2qDrbYNbYEmXECMpoej9ZKGxVmb9AiRNrgzz1IbgO+sCJduaCAWJFQEI0rq+YUZ1LQQfzlptaKLvSYPppLH7Z5C4+SGux4IzWJ0PGm6VlucBaDufObqkKCMexFSrptFOS66EgNzMhE6Xa7frzGWumZJk/SW/zh76DZCOV5rV3wPPOoow3ZQ== 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=Z30fCu+gkZutfLemycgrch/uaJtL/rxBmqIOx/bW5Io=; b=OmmQATqnDnBkaX//7IKNnmhP4fhpC8Jhs61xTClQ449gCCXZB43aeuEUGt/Zlu3gWcOccYgXePaEur2fAls3sY7NL/4IOt9Zb4YPAvTDJ/A+p5VEymvT/O73hRjkvBQyXOpTQR28i+QVc9I9boFqM1RZK1gy5zScurkDhdT1RKpP1ZoAKunq3dJEOlYpA3/D8JnXPCMxW3MtQAisTgfVq5YlR0zw5DVK2m1X9qZPaprUGJSB8LlmxgrpEnBep98IFquuy6sLgKdOAnYdZhmnTiF2Ao1F2IWcn3vN3SalhKc7oOFRrZDzhJIjsD1z8TbF+wjmNJOGoqqopJfu36/34g== 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=Z30fCu+gkZutfLemycgrch/uaJtL/rxBmqIOx/bW5Io=; b=Rcn4jsISrQXKDywgmK58yCXIppgls7tF9lIcE6xwfw3xmNsuCyp3+8nsA+QaHv3KLAp8HW8yPMhMC921V5GiJTnVkx8fFK0AU1HU9EO24T44uhQIqGMFKFUIG3vWfYpkfd7xQV2eFLu2/M7LRWVKStUJ5/vdHDZtcScvLFZz0fcwMWdx8uO3g6CMLoOn1BiUuhnR2Ja4KnuwWVK3/hVuoA0NTNFKSi3Op/NkOv5cxJOD+9KJ52E68xkeBnJkzmmaCQBHin8+qe6nUiCDhoPraH4ndek3ib+PEJu01+y2WGieupRe3KaoCBI7TOmRiawPiaxTHVvKZOhC5xbzqsfw7Q== 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 KL1PR0601MB4146.apcprd06.prod.outlook.com (2603:1096:820:29::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28; Fri, 28 Oct 2022 13:07:26 +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.5769.015; Fri, 28 Oct 2022 13:07:25 +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] f2fs: remove gc_urgent_high_remaining node Date: Fri, 28 Oct 2022 21:07:16 +0800 Message-Id: <20221028130716.80850-1-frank.li@vivo.com> X-Mailer: git-send-email 2.35.1 X-ClientProxiedBy: SGXP274CA0019.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::31) To SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5269:EE_|KL1PR0601MB4146:EE_ X-MS-Office365-Filtering-Correlation-Id: 151e8d69-3c7c-4bdf-b024-08dab8e55bd1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C1O60snBvtKtwYDV7YFRSfU0WhcgoHcNwET/LGGmGBMTz0GcLv/lfTti0u4XububX0wS8sF6Ndi7T46iDs+y97U5AjodpN74pBwQk/RoJIyneb5yHwRqk8jYVXg4QEKd8LsuyWeKCr+CB0cKxwaksYbV3CSCBaHBmJJJhQlXhJm3LYVN/O/9sH/nB7ia0XYQDQQB596uknpdoEKR014PRGqY930zT+TSM2sWnXD02ouOhREYben2VweTU8s+CTHtGObaXMXwWQwhUUuxgkzzcZW1cybkhNYD/NkW3bzyMnuPYQ4ZcH9p5hLtS87dl7GL5FmERfACGJy9TQ+MlJnkw6BU/8A+PMv/lWWArB0LxO97SnA4UAqi4sNNKedQZDQuEP0ZWvsWQv99YD/1bCWUdv5euunV0t5aOJ34VitLqepdJA3+KUeIZDx/KgFMNJv4CVPGFe5f3F6aK/PRvy6b9k9FJ4pcjX7uS7V5wz72iSbrE6E95+OBy8Db85MP1iFAfiM6AQ0XU5fLn9ZqjUmbRMDpM239sQjCxt/+ihRIZLNy75eIIjzCuUlCPYVllx0fC/JsJIwLkJsBmMWqj5IRxVOTHg5nxkhmgHI86Ipy3RnoQBYeZafEcrMO3h5Wkr6fGMN1I28W5b5Dl3yUiEhq5vE25iW2OZCphhIFbrLlF0vnVOShpd5xk2OrJ4AiWA0QZWVFrVNCnGKdNaf+pZRnhI3Aa0J4EHbbsACn4Fzos3emKHdVJexSNNNnghI+u/xJkNSflG0/ouLcohh2iOP9Qg== 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)(396003)(346002)(376002)(366004)(39860400002)(451199015)(66556008)(66476007)(66946007)(8676002)(4326008)(41300700001)(83380400001)(5660300002)(8936002)(6486002)(478600001)(316002)(36756003)(19627235002)(2906002)(1076003)(186003)(2616005)(38100700002)(6506007)(107886003)(38350700002)(86362001)(6666004)(6512007)(52116002)(26005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Teo/9B0ykBZy5IHmOFclVzP6u1bdO9RvK1Ejgq+gTvuQdYXW9MoOiJ2He0zqETtdTZBA03dcgiC+uKXagjSMxJRIdaPm/IpYYd1H0GB1rr9ZxQQSxBOLpo+YepcNVpEZ+j+i7tkTtPFrrdtr/l4AcoohNA0LMsWXdtaLYRa408UHhaOl+lFyhkFacnTL8Deek/CsHIfEfDolJzxL8qc0XYM/Tj11lNSg7Fv2wVu349c3+Ml3tepx3YTejaCZYXb9YVZjyKIxUUDANmhS6/o0fxitXAEcaBJTZ2JNvTvOzRk/5CchIJLsLlL/l7gY9HfibM+hk1m8/Kh9L9I/31/AdoOhJKBOrPl5Eb0zgnSG8M2jeCNyU4TJhMgO40vch1sbVV4F3HQdtJY2OBp3DV9pqBv5F3rwM+9/SiyAn9DaYsHJChFdao2/XyeCZA3etJ6oLsW9tJVi9m4lBrCe0KJOAGrrQtrHa64n3g4DM/VnF3SqAVhwclgxzadj+RJCtFvV8e9cDKBakzUeQv81AyME5HVNY6yLBCnKliUJ/kIrz1l/fBxgz4qaNpNrY8kchP5IEAaCM/JSnCWltMtBFNFHX3DmMGAri4UevT+CalGQ1TlpWL+xNG36LQVHbwGkOQ9FqqzyWywnZqIHynY1RtfJLkohWoeQndW3NcXyjQKZ+Y7OTzvk5Nf6YhhrIqCrYACgCzXgpcIomhrO41erpmRLu9FHns5G9BSESB/Nqf2fCwSTRf24TRYRhvFRvo6+YUxc6rfr7Z+Pes6pPB7WumVjZi+Q6iDDkkNJZWQYPoc27pK3BTdRS/y/DE4Q8s0cpSW4Q2v1hFaR8oBtNk7paXzrnl5Tn/jrsSdsm14pFFQgcEhc4cVNX45/KxUvnV2UG7JXZzf+k7FUvylHJHDL3vXXTC6H7+bfg91DnXxvQpiHuJoAXehPkdJroHu7jZRpXGCadp4WGoddYf3/ayw1RXlZxByOWsD/w1kWy0+WPEqhhgJKcnELVej6IgzWUuYDCDpuLrQCpCM8BiQBQ++Dgo3ObrIJAmeisdFCOBj6f2B5xuJkARyaT3JEnyuo54bOYmqRTtkq8EaM161LPyPFBLdr/DkfGxaSvZ9quXqaVSM4CHSYvi84ZR7UKVbCFPwh7HnBJa8yyU+ib7jr3+Fg4h6k8jC0IN4s2uO10FYxsuj3rAXjtQl3Sx9Zhc1DSAdu7AYQlnxpdRXpN5lFhe4cO1TyOKJ7yHqjKrJPQhotEvFcyMVxWqUa9CMP3avgY9rWBhzUcJYVbHiYfufZBmCIqCr0tKmcwGqL+WVKWbwfrcpWjCkEg4qCvPTgnfmdJwZVJHYJz5xjV7DUM1hrEhr5F1F7x/o5gMX9EmNnHVnWMh+kGv9CxwKt7VytsvCH1rBBu9SCWda0DxTQ5N3f0nRAXCjDuJFLKaz8kyYm9VxbJaa3lPMdnrBDQZcmq4EFyfqOozfXpAEXySZp9WKop/Z7pVX6E/GCx+xYD0wKKXgODECEH/VdO8AceHe42M64hJCUVCjNlJoIvHddVUp2wWk3DxAa2ic725Ra97s3TPXfCm0jSySQidggoFwcFVi6AK+YJ4ul X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 151e8d69-3c7c-4bdf-b024-08dab8e55bd1 X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2022 13:07:25.6180 (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: xFsBXHJ63B49BC8syci6GSY1UgYO7JYqcgMQfZhfPT0ZAfiPsVJ2y5yhL2wF3omg6cH/76QeV1RNNYOu/O83xg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB4146 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747936957631511544?= X-GMAIL-MSGID: =?utf-8?q?1747936957631511544?= As Jaegeuk suggested to remove it. And it is not a super critical node, which just for internal tests now. Let's remove the testing gc_urgent_high_remaining sysfs node. As well as updating the description in the documentation to indicate that readers need to use the new node. BTW, fill in a missing '>', :) Signed-off-by: Yangtao Li --- Documentation/ABI/testing/sysfs-fs-f2fs | 6 +++--- fs/f2fs/f2fs.h | 1 - fs/f2fs/sysfs.c | 6 ------ 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-fs-f2fs b/Documentation/ABI/testing/sysfs-fs-f2fs index 374f0c98f8a9..e6b87522518d 100644 --- a/Documentation/ABI/testing/sysfs-fs-f2fs +++ b/Documentation/ABI/testing/sysfs-fs-f2fs @@ -241,7 +241,7 @@ Description: Shows total written kbytes issued to disk. What: /sys/fs/f2fs//features Date: July 2017 Contact: "Jaegeuk Kim" -Description: /feature_list/ +Description: : should use /sys/fs/f2fs//feature_list/ Shows all enabled features in current device. Supported features: encryption, blkzoned, extra_attr, projquota, inode_checksum, @@ -601,10 +601,10 @@ Description: With "mode=fragment:block" mount options, we can scatter block allo What: /sys/fs/f2fs//gc_urgent_high_remaining Date: December 2021 Contact: "Daeho Jeong" -Description: You can set the trial count limit for GC urgent high mode with this value. +Description: : should use /sys/fs/f2fs//gc_urgent_idle_remaining + You can set the trial count limit for GC urgent high mode with this value. If GC thread gets to the limit, the mode will turn back to GC normal mode. By default, the value is zero, which means there is no limit like before. - What: /sys/fs/f2fs//gc_urgent_idle_remaining Date: October 2022 diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index b467c0ca1118..d0a279605f20 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1747,7 +1747,6 @@ struct f2fs_sb_info { spinlock_t gc_urgent_idle_lock; /* remaining trial count for GC_URGENT_* and GC_IDLE_* */ unsigned int gc_urgent_idle_remaining; - unsigned int gc_urgent_high_remaining; /* deprecated */ /* for skip statistic */ unsigned long long skipped_gc_rwsem; /* FG_GC only */ diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c index 9312954ec03b..9db77f18e8a7 100644 --- a/fs/f2fs/sysfs.c +++ b/fs/f2fs/sysfs.c @@ -538,10 +538,6 @@ static ssize_t __sbi_store(struct f2fs_attr *a, return count; } - /* deprecated */ - if (!strcmp(a->attr.name, "gc_urgent_high_remaining")) - return -EINVAL; - if (!strcmp(a->attr.name, "gc_urgent_idle_remaining")) { spin_lock(&sbi->gc_urgent_idle_lock); sbi->gc_urgent_idle_remaining = t; @@ -836,7 +832,6 @@ F2FS_RW_ATTR(FAULT_INFO_TYPE, f2fs_fault_info, inject_type, inject_type); #endif F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, data_io_flag, data_io_flag); F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, node_io_flag, node_io_flag); -F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, gc_urgent_high_remaining, gc_urgent_high_remaining); F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, gc_urgent_idle_remaining, gc_urgent_idle_remaining); F2FS_RW_ATTR(CPRC_INFO, ckpt_req_control, ckpt_thread_ioprio, ckpt_thread_ioprio); F2FS_GENERAL_RO_ATTR(dirty_segments); @@ -966,7 +961,6 @@ static struct attribute *f2fs_attrs[] = { #endif ATTR_LIST(data_io_flag), ATTR_LIST(node_io_flag), - ATTR_LIST(gc_urgent_high_remaining), ATTR_LIST(gc_urgent_idle_remaining), ATTR_LIST(ckpt_thread_ioprio), ATTR_LIST(dirty_segments),