From patchwork Thu Feb 2 08:20:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: qixiaoyu1 X-Patchwork-Id: 51785 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp110385wrn; Thu, 2 Feb 2023 00:26:13 -0800 (PST) X-Google-Smtp-Source: AK7set901CdISCtxMeXnCqOlNCNWZ/hITf4qxGFBaOrTLMZhAnqTlpvesHEgznIacMQ0OgQQwFub X-Received: by 2002:a17:902:c64b:b0:194:749a:1e78 with SMTP id s11-20020a170902c64b00b00194749a1e78mr4646435pls.40.1675326373312; Thu, 02 Feb 2023 00:26:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675326373; cv=none; d=google.com; s=arc-20160816; b=fXVll2smdTK1sEtEzCzsgyDgzBlZDsDnlv/to+f5rIMFxtea+e8jp2zcPITDz6sGJi CQ5TNQlKVGHFr63H096FBbB8qtBq868c1wHnsgAS0yf1TxHs4FdTsEVZ5EPC2q0Pl2+M EmjlaR8VJXqtfThSS2r7/v9qrkT2EiR1QWo1q3MUQldQzoQt/QI8q+KejynI5fN4qg0k H7Br5nQfZmifFUCogUv2W7w4kwisRTNlGS6t+tMKCzXSdgu+FNxZjUyJhgYYIO+Ezt7w lpX4PE6WHwEZD3kP86d/VIDqxX8tonOw8x0bPbtgYXwdne+GwY1skNNofUnofeUSTAaS gDLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DIcuUiiD/SBGnIgaWh9h7tdpch/KAXjOE7i0nNR5sBg=; b=PWQT1D+N1f22ovXRhhBV13S4SUJihjkCxzgCSVkTEl3ZhxtbgVM4Dcj49TRYz4+FhC Up6vt6LzAYvg/SDD7Win5gfNaAwXSzC990kGbjGBsCJ7gB381lZilGe349XXMehdstZ+ rADYnrigD2S8Y/EDYG/Vpu9splsJk8R3Qqd1D8vz3ERxntCNNrejyLojIImuhMN1EPnS Nu9fUoHyDnSc9/NP4NHSiI5TEicxPJt4d/pPN79m+3GUn+gVzUzNnc3kly9bqA5AyMvN QtVR5gpNlv5X/bfYujAHU0HwaiMK3ktHh55O6Ek+GJZ6XnPEgS7reiQbC+CgfVEhFQi5 Y3Og== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=bavLq+Rr; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d13-20020a170902cecd00b00189b7f50e78si7555572plg.134.2023.02.02.00.26.01; Thu, 02 Feb 2023 00:26:13 -0800 (PST) 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=@gmail.com header.s=20210112 header.b=bavLq+Rr; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230251AbjBBIUu (ORCPT + 99 others); Thu, 2 Feb 2023 03:20:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230021AbjBBIUp (ORCPT ); Thu, 2 Feb 2023 03:20:45 -0500 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B4198349A for ; Thu, 2 Feb 2023 00:20:45 -0800 (PST) Received: by mail-pj1-x1034.google.com with SMTP id e10-20020a17090a630a00b0022bedd66e6dso4851958pjj.1 for ; Thu, 02 Feb 2023 00:20:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DIcuUiiD/SBGnIgaWh9h7tdpch/KAXjOE7i0nNR5sBg=; b=bavLq+RrC+kxjPPcdrbN+TxKPZ/oy996YNrl+gPTSl6aIelDmWWiK0ZbnTy9P5lVRf TR9VXV1ywAjmK5xeA6iau58arLHAdcP/4ubbpDPnj8RyIUEsCWVaGT9dF1Papgp6rQig ZeMLiWJNzKwOL2QfJPiwee0zLKmjomIIWm8QlU6mdQcWS/MA4DO9br58WxkoNrNg1h9v yyw18cifRidBJ8uDKXnCvwdHfMtjyVHjVoFRy0JQKAZ1e14Kuij2wSlLyaxflNute/mb I4ughYaQEffqcPOATrx6wWXX1roQB9e51llMaB/nIMKZsTc/TVRekFbWDp9hlP3j06e1 Wpmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DIcuUiiD/SBGnIgaWh9h7tdpch/KAXjOE7i0nNR5sBg=; b=BjUeSf+pIMsinvDdIAJchrR9kKIULzzqfrIFHSb+nDnefWoxlJGpu24EJGDow1YGH1 FJr0uhOdms4cKSgBX98xfLyso+z5O0kWipNNOc54oD/MoaW611AgBijBPYfndvyoHBgB +fUudRzllm1Tmp1v8tBu7y0HqWxz1uvIYUESeqs2IDPTHfI0sd/28rv/m0kUM7M82B32 HC4KrlwERW6uWrzywi2hvvpycUbDRcTyi6Ol/tdVySI8ZCIGBUezek7HvFTfMdMYZZPa FlSm50VWqPZVe8PcfzT7T5GhNoGWaR+K8+z936SKP8vDy6V38XZFn0R26GVRQ0WUPJ2N eTMQ== X-Gm-Message-State: AO0yUKVVdZJ83kmYzGRLEg0l5r24fD2zqehgk1EJVz0BNZ9PnfcZ+0rX bMVJ0k8AWlhSr18RwFv68lvSbZVzgHJKGZ6i X-Received: by 2002:a17:90a:bf04:b0:22c:90bd:18a4 with SMTP id c4-20020a17090abf0400b0022c90bd18a4mr5658032pjs.22.1675326044732; Thu, 02 Feb 2023 00:20:44 -0800 (PST) Received: from mi-HP-ProDesk-680-G4-MT.mioffice.cn ([43.224.245.237]) by smtp.gmail.com with ESMTPSA id j5-20020a17090a694500b0022c2e29cadbsm2578563pjm.45.2023.02.02.00.20.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Feb 2023 00:20:44 -0800 (PST) From: qixiaoyu1 X-Google-Original-From: qixiaoyu1 To: Jaegeuk Kim , Chao Yu Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, Ping Xiong , Xiaoyu Qi Subject: [PATCH 1/2 v3] f2fs: fix wrong calculation of block age Date: Thu, 2 Feb 2023 16:20:27 +0800 Message-Id: <20230202082028.9013-1-qixiaoyu1@xiaomi.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <938a8e61-4e47-1acc-938c-c90d213d2c86@kernel.org> References: <938a8e61-4e47-1acc-938c-c90d213d2c86@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,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?1754913111440509882?= X-GMAIL-MSGID: =?utf-8?q?1756707027124019882?= Currently we wrongly calculate the new block age to old * LAST_AGE_WEIGHT / 100. Fix it to new * (100 - LAST_AGE_WEIGHT) / 100 + old * LAST_AGE_WEIGHT / 100. Signed-off-by: qixiaoyu1 Signed-off-by: xiongping1 Reviewed-by: Chao Yu --- Change log v1 -> v2: - fix udiv Change log v2 -> v3: - keep the accuracy with div_u64_rem fs/f2fs/extent_cache.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c index 342af24b2f8c..d9f12f404beb 100644 --- a/fs/f2fs/extent_cache.c +++ b/fs/f2fs/extent_cache.c @@ -874,11 +874,18 @@ void f2fs_update_read_extent_tree_range_compressed(struct inode *inode, static unsigned long long __calculate_block_age(unsigned long long new, unsigned long long old) { - unsigned long long diff; + unsigned int rem_old, rem_new; + unsigned long long res; - diff = (new >= old) ? new - (new - old) : new + (old - new); + res = div_u64_rem(new, 100, &rem_new) * (100 - LAST_AGE_WEIGHT) + + div_u64_rem(old, 100, &rem_old) * LAST_AGE_WEIGHT; - return div_u64(diff * LAST_AGE_WEIGHT, 100); + if (rem_new) + res += rem_new * (100 - LAST_AGE_WEIGHT) / 100; + if (rem_old) + res += rem_old * LAST_AGE_WEIGHT / 100; + + return res; } /* This returns a new age and allocated blocks in ei */