From patchwork Tue Oct 25 06:56:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhangdongdong X-Patchwork-Id: 10531 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp850787wru; Tue, 25 Oct 2022 00:06:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5PVDpwZ4vynYfAtWAZTD+e8InppQFnkSECwIaNrv97FFfW9vHi0aOPqAGYov+c6Kiv3ZRY X-Received: by 2002:a05:6402:688:b0:461:a1c1:b66d with SMTP id f8-20020a056402068800b00461a1c1b66dmr11485076edy.191.1666681592803; Tue, 25 Oct 2022 00:06:32 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1666681592; cv=pass; d=google.com; s=arc-20160816; b=IsW8bERcWqyE/dbjbT8gknHEPjOEeNdtpm8ONj9H3U1VzxzGG8G7sQEZn/GJLY+Jo9 dysIM/BYRuyaBxcYkT8pqxojCIG66OqCGFeMouNnsc8BeSS6ys5RcguU6B6OIf7gA/L1 1cnxQuqzvKihAk8Kvm0R9NuzMOfGt/QFVrUaUPViTqb9fyY2ddMelQ976YtBJFpqChjR n6GKvV6GmlQWv6iTtJ+cqv6vbeGyaN69h8kefYX8Kln/+NpB04v5P5MGDhGN1yOOjp9r dyD4qONaUVfyQN31iy/lqynpH/fz9/irDc56AuJ0ebaYD2lI4iyODVtvOlipguUSQPSA kMQw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=8QBoIcBV0ym/ZW3SRDwZrRx/PJPD6EmYXQ8snYK9Wzg=; b=lzuYDw8RGtXfeaJRXj8iXi4NaD8a5zmJXE5pFVvSO4oPPCHv02MrIZqqxSp4JZw3tq b12J1ksVpNLt3pqzAKuwSLnHREbPaKs67gCZpHLiw4etrQ2vde434t123R6H9tmREDuo 1y6G2m0zw7ISzFAhrrNfVj2jwsBcVc5tauCbjXY5pABgIEHLONyMyMI3SEgOQ16e4y3T K+mfkm9fy/uLq9Ylg9sMiqhlrkv7+IFOAdXXZjeJv9s81z8Tr+4dsHWX1U69N63/btkV /ybFD5z2OYEriNAKsEsr1OIY2G08+5s7eGPhhrphSaCiWmYMqod5Z/n93AEoANHWXQ/W t+Tw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@oppo.com header.s=selector1 header.b=QbN0ZjMu; arc=pass (i=1 spf=pass spfdomain=oppo.com dkim=pass dkdomain=oppo.com dmarc=pass fromdomain=oppo.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=oppo.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hp39-20020a1709073e2700b00730a4246dd0si1804245ejc.593.2022.10.25.00.06.07; Tue, 25 Oct 2022 00:06:32 -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=@oppo.com header.s=selector1 header.b=QbN0ZjMu; arc=pass (i=1 spf=pass spfdomain=oppo.com dkim=pass dkdomain=oppo.com dmarc=pass fromdomain=oppo.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=oppo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231441AbiJYG5o (ORCPT + 99 others); Tue, 25 Oct 2022 02:57:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231579AbiJYG5U (ORCPT ); Tue, 25 Oct 2022 02:57:20 -0400 Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on2049.outbound.protection.outlook.com [40.107.117.49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA17073C00 for ; Mon, 24 Oct 2022 23:56:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lhp+HIsybUGxFcJRh4PkKPb2aLHdApDX9eKvsvnukip8xOlBjhsGsh9iPsoIyBNa3B/xOu6lnNHigL+y5EO6+bBH7raHrHFeT3kUlVOR3AbkybFsZJVroHEDsJx6fCNA7mcBRZ1hd+08Uvr8M/xg2/gtGfcMRyJnt9r8SnuyhJcxTTn6yGPn6X+6vte7P7bxcUgTEpR5Pe878/YVTP8bJ1kXZg05E3b4JOFvvDmD19Nw0e8uawQDwqb440VHMZa1UYOUbhRK60jplQrOpI8AbvMvRaMJSrfW9Sz04c5ljOBA5Pgby4ZhBtXWh+8J7gGHpCn2jYdjKUeTmK+e9OsIWA== 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=8QBoIcBV0ym/ZW3SRDwZrRx/PJPD6EmYXQ8snYK9Wzg=; b=As4DQIy/+/KDmQd4Arkc7KT4iHYMXHeZGZ4RY2PJsUhUyjq5dvEL96idNIcfAPDTIzzjQw/78t7LSF7C//e2KzxCuLLsb/1G+MTN6PHLN3d5b9AH2uV9LCaILsy5oTOzwBlzqm+SOe1PiF+a3RtyzIsvSZORyxHxUTxkWjvqyYnwlvTFV5WJDpr435YFIaQ+pNxMpE2oIxk++7DWU5JOFuZ6hKlbqk1T3ClTNbMEiUVUMW5z+ePDCMhCfeGO4/EwyYBUck7pLLKVkfXBrVlHfRHbYCjc0OzkRxLAbMJ4Y6mZrgZr8P9I+qAwF3ai1Rdbg2W25/r7aD2Lrfl4qgho7A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oppo.com; dmarc=pass action=none header.from=oppo.com; dkim=pass header.d=oppo.com; arc=none 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=8QBoIcBV0ym/ZW3SRDwZrRx/PJPD6EmYXQ8snYK9Wzg=; b=QbN0ZjMuADQPBOQbSsMdqk877cps8oBCjeXc/rB2+piLHJ280eoQ2sMwjFw8kINFWGd3JkHJBDFz3d7qcwcAW4RZ85t7sM3r49gA1yHPhfj+qzYGKApi6WE+hPCGU8clRomsTmCGaFW30j42iwUpmnSv4rMCVMjEBkURs5Qs3eg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oppo.com; Received: from SI2PR02MB5129.apcprd02.prod.outlook.com (2603:1096:4:15e::10) by TYZPR02MB5246.apcprd02.prod.outlook.com (2603:1096:400:83::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.21; Tue, 25 Oct 2022 06:56:45 +0000 Received: from SI2PR02MB5129.apcprd02.prod.outlook.com ([fe80::711d:e5bb:1951:139e]) by SI2PR02MB5129.apcprd02.prod.outlook.com ([fe80::711d:e5bb:1951:139e%9]) with mapi id 15.20.5746.023; Tue, 25 Oct 2022 06:56:45 +0000 From: zhangdongdong To: jaegeuk@kernel.org, chao@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, zhangdongdong Subject: [PATCH] f2fs: fix normal discard process Date: Tue, 25 Oct 2022 14:56:22 +0800 Message-Id: <1666680982-372975-1-git-send-email-zhangdongdong1@oppo.com> X-Mailer: git-send-email 2.7.4 X-ClientProxiedBy: SI2PR02CA0024.apcprd02.prod.outlook.com (2603:1096:4:195::18) To SI2PR02MB5129.apcprd02.prod.outlook.com (2603:1096:4:15e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SI2PR02MB5129:EE_|TYZPR02MB5246:EE_ X-MS-Office365-Filtering-Correlation-Id: 574f92fb-43ad-4e6c-0d5b-08dab656144c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rD4XS5nWLW/SogifjPRUzm6+l+BilPdc14FhVInkUtu/n9AfYCP0zupc0dJDoxDCIAoHwJBR8x+iCDj+KAtQMqMZQKqjSBL9nEiODzM0ls+vhNV8E1uDTS378bQm89zmdR+BH225GdASLmRbNEgla3wGPpMmEcxNuynjfZvPjAsvpcmfoFEIZS1boQwEepXMA4ttB9tw37dXjchz98y3JnKT+zWFEy9WYQQlbNA/LqsyH4Th3oPocRPBDYJu7hZpJJz3NzxNp4sCmlesNtU8ePb/UFu1HlmacXW56QptLoQVRQ5P30fCpe8dqHCORm7DoR/hZGjmkX3Ixa+/xkynmEwiFRPkRORxifb+zGDY8NqgUvlPgEylu2PT/+SeaJtU1u/R7Q8RUg54sG1beWs3gdwpzYnB8deO7NwUhvZf6lUmpeGfHIOg0G21Kf9TMn/66vIBS2sfRAoesVN8B09LxpFYl0RS5PgM+QZwFGz3X6pxYdhQL43IiPVnAtd0pLcEz4qmIP1V8v6Q5ww8Nn4FF0o8fC5jedJFP0HJ/ohZSMJUTBw3zzEhn2Wug5fWQvToduhAA0yb+kP3BBBpVlxaR5Fb3VTkMOFnuq2rT6pr4UBCK6gMm+COTAqGfEf2B9sWUAsJeNU0F0jm09B7k1BYJNhoA8C1dFiAMq+kkT2Sshhf421PgV3xXNYJiMY7fAS+D9bBEJJvAkcm54vUsDO9fq9wLkCNsj/5gLZofN897dR7LbYOGqLnaEKs7T1U8YhxbbIfUYem/LQa14VwBvsCbA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SI2PR02MB5129.apcprd02.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(396003)(376002)(136003)(39860400002)(346002)(366004)(451199015)(38350700002)(86362001)(38100700002)(316002)(2906002)(8676002)(6506007)(5660300002)(8936002)(66946007)(66556008)(66476007)(4326008)(41300700001)(83380400001)(2616005)(186003)(52116002)(6666004)(107886003)(478600001)(6486002)(26005)(6512007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?osa58vRdwlbF9zpP0WT8fHI0+V7n?= =?utf-8?q?ON0MD+oe+P68FE3OPjZQIUy1CjOu8I7vTh16r0kQKHOlZA/8Cty9K3tVaO5LD6QJy?= =?utf-8?q?FpaVW+3TS5WbKktD+vcM6bdObqbvnAySgjuO+vbFmQS1fOG1ksbjurUPXJK8bJ4Lz?= =?utf-8?q?gbAyuwafXvnNrHa3IJnrX8Spy5/q67IV339KSNe2IsXHL+5RvuxaJxvdB0Qtw5HPY?= =?utf-8?q?eqgoPjNjws2xVoH/CMBqVpvTh/aOkuPjXUW8brGeH81NCCvKToHf2y40XS5+ujkd+?= =?utf-8?q?eHiEG7Qa3+AU5QCU5Pnf+Xb4rY8dIXUR8YEl2GzfJvnzZ2EeWUQo0JXFdf9b0Z9YV?= =?utf-8?q?tgvAkORkd7Q/ff4tP95MmA9MqEm3qEOpi5Nxc35LGKO0iDSijRwFbGxd662k4bm/R?= =?utf-8?q?9AJRfB9gJkXlhvQxvFcPHMRSawO8gQ6D7xZLsZYNrIxEVN5omdzpCTdv2eEsE3FEK?= =?utf-8?q?9VBgwqD16nX44uQBhMazK+0AbDlBrfYZgToi/2n4JilDXC5ohFMrNfnCaosWHiinM?= =?utf-8?q?y3pFJegOg4MeYjLkUINAEYDfE36uCGd+UxKNCNtX1eBUNnT8YuXnLHUa8mTK1PBIu?= =?utf-8?q?Wo7WuOMV2/aupaZw7YiHyiiZNjUnB5Tzh8ixH4Ix2oTZDPRSvyQkEXhkYl7sL5OEg?= =?utf-8?q?AD7p31CG+m+N88UT77GlSe6ytaWHd4rzdqe+1+xoRWpsBl821hPsjVXQ2/BwWMjmh?= =?utf-8?q?QJizYU9RFAyYT7m79fQMB9hGj6qt8t/yN6Y96nTGoHL4R9SYijt0/CTNjBc77WDQL?= =?utf-8?q?ol/A3/wXlpudglHiOSH1YSs6NvEmVHN7+/X7MhXR3QaagsRpSyXXqERxlprM3MIJ3?= =?utf-8?q?MDUQB1Y5KF68rTQ98kLFC59Uk538n4z2lS30hYyBo89mChNJ4LRLWipdiRkMRQaK6?= =?utf-8?q?qGHm4tcq97oh1pgDomGGaapmLgWBfCQV9Who7Q7wHLxfFajuDKjcN7isEwEnm7BNM?= =?utf-8?q?knoNJb1ukl6pZtIQmYK39y0RUk+KH0ph7W/zLfquKqs5PHc5HqOIrGAA8f60Hctp8?= =?utf-8?q?NVLUij01v0VIulTtqun0YOkctrEd8hYOTO9qkZ4/jGB6BGtL4rWRl7UMfGB3z2NdO?= =?utf-8?q?HZvipLuwxh7R/13UFr6huzp9R1buW6+H1GOlDnUwUvjpxsp43D5XmqgCTsJ7iCaA0?= =?utf-8?q?YDOJp5f4NWCj/HZx5LgMjPKQeiz6MJqq3QRxDSISQ2qI7vnLPyuPivLzJvwMqNfuW?= =?utf-8?q?DBF/4PK5us/JjQ7jyt3M5ytMnfiklKO6rw8bqTFXd9rGtBctNUvuMgItuuWIxZJIB?= =?utf-8?q?r8d2FcYokzKIXaZkjPA11jZdhwpTPOLh5np+REz+UxE/lgh5GIgcWM2JQ6LwlFX68?= =?utf-8?q?1ZejjbNFdw1sU/9MF9SfbjnJSi8pGGpTxUUfycp9bzorlcmtTxF0syYflqpF67Qfp?= =?utf-8?q?hu8mTQ+iMrTWALA5nHwoVF7vlDNB525LLJ0escX7GvkBLOTQop75mBa/QEFtDj16j?= =?utf-8?q?rp4igy1qLYBIM2CblBLyQIBZ65ncWE49qoYpTuPIKcHrWUwpzUrtCWffvlPk2i/Ob?= =?utf-8?q?hIfP6r3vGZaOG78nhvxVALIXt9Uczw2owg=3D=3D?= X-OriginatorOrg: oppo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 574f92fb-43ad-4e6c-0d5b-08dab656144c X-MS-Exchange-CrossTenant-AuthSource: SI2PR02MB5129.apcprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2022 06:56:45.2192 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f1905eb1-c353-41c5-9516-62b4a54b5ee6 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ysgjGMmeF3CEq0mCeCH5E4x6e6DOhqhrMe1jSGU5RDkEzqrS0sBzscIJffbD8g2P3eemqcsI2vMHmf0cOZMVUQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR02MB5246 X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_50,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED 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?1747642317566676623?= X-GMAIL-MSGID: =?utf-8?q?1747642317566676623?= in the DPOLICY_BG mode, i + 1 < dpolicy->granularity and i < DEFAULT_DISCARD_GRANULARITY conflict. if i = 15,The first condition is not met, it will directly enter the second condition and dispatch all small granularity discards. The restrictive effect of the first condition will be invalidated. Fixes: <20ee438232> ("f2fs: issue small discard by LBA order") Signed-off-by: zhangdongdong --- fs/f2fs/segment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index acf3d3f..2fcb140 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -1448,7 +1448,7 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi, if (i + 1 < dpolicy->granularity) break; - if (i < DEFAULT_DISCARD_GRANULARITY && dpolicy->ordered) + if (i + 1 < DEFAULT_DISCARD_GRANULARITY && dpolicy->ordered) return __issue_discard_cmd_orderly(sbi, dpolicy); pend_list = &dcc->pend_list[i];