From mboxrd@z Thu Jan 1 00:00:00 1970 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 aib29ajc252.phx1.oracleemaildelivery.com (aib29ajc252.phx1.oracleemaildelivery.com [192.29.103.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1BA7CC61DA4 for ; Mon, 6 Mar 2023 13:46:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=oss-phx-1109; d=oss.oracle.com; h=Date:To:From:Subject:Message-Id:MIME-Version:Sender; bh=tfrSbFjM1HUMbiIfmj3ht17LBL/k59/iYh1QGXEnJp0=; b=MCwQbOyzAs14Byx2SnoDynIo8ntNb8hsjPugBGCQOkE5lakYJnBPEPNJ7+xQqtzEFQYAwogKQip+ 7/a5PIaxHZIzVu4ufURmkovsSDTiEST63yEchsIQk8LUzlYA/yDfKl0I56J5iVhU6DmTg2vK9pB3 bWCMb7sAHIUARh+rf7c1RiA14Zty6oHljh5AIfEz04B4ohbLHXYBUdGsyHEOmMTv7rv+WdDr1U5y sh53K0l5hrut753bvjrbjhGrrHTh1aFPvYmTr2yAB041wJmlVhlDQoJgoWe17BrmChIAWReGgdf9 6Yvhpggo+K7KMioex6u7G3PUOwFfSAIc0OOSCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=prod-phx-20191217; d=phx1.rp.oracleemaildelivery.com; h=Date:To:From:Subject:Message-Id:MIME-Version:Sender; bh=tfrSbFjM1HUMbiIfmj3ht17LBL/k59/iYh1QGXEnJp0=; b=TICVLp0oeHLzCZvwJQDZZozAWIdtbahnTcNKvrC/8znM0+Z52L+L1opZHG3PNz/BlOyFnUGdr+tc tqOD5/vBqS4LhTdFkoT5JMI20Aig0kDO5537SelMtOXiob9HFejEYYk4r9JTkxQtxpDa8BmxWVvY d55XVptkZwfcrVNbDDaR+gYDJz5irYqc9Sei5HdQ7Z6h5U1B59QAzko/MrmRW5quMJE3iF9uC4P8 x5wDUQ8xX6lXmX4rOGilQCF+uDJssognVHSLTX3Y+eB79+++9FqqsgXDIiNZxeOylLs2B4td7jhm mVMe4xLpdmtTMib31zmYpDJe1dSwx8oKl/sVOA== Received: by omta-ad3-fd1-301-us-phoenix-1.omtaad3.vcndpphx.oraclevcn.com (Oracle Communications Messaging Server 8.1.0.1.20230214 64bit (built Feb 14 2023)) with ESMTPS id <0RR300CEGQA1I1A0@omta-ad3-fd1-301-us-phoenix-1.omtaad3.vcndpphx.oraclevcn.com> for ocfs2-devel@archiver.kernel.org; Mon, 06 Mar 2023 13:46:49 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678110397; bh=XGNHP3H6KhL1ApYmFcSuQ08kBFsmigIHNSTEwyVS4TY=; h=Subject:To:Cc:From:Date:From; b=o8xgAlYaozSoc9f0IDWZc22rTcOU6MDrq7WoHEkr2i+6VnzmpIWN/uBacYWgByMxJ prJ1vz/2rScaLnAKGbq4joiLTm7uewL2+lntE2ldDzP0onxlwL/EoMTY6hPQNOMWKO 7sC80DxM3YORbJZL69fnON9QqNYrVc3nPB/KM98E= To: akpm@linux-foundation.org, gechangwei@live.cn, ghe@suse.com, gregkh@linuxfoundation.org, heming.zhao@suse.com, jlbec@evilplan.org, joseph.qi@linux.alibaba.com, junxiao.bi@oracle.com, mark@fasheh.com, ocfs2-devel@oss.oracle.com, piaojun@huawei.com Date: Mon, 06 Mar 2023 14:44:02 +0100 Message-id: <16781102422022@kroah.com> MIME-version: 1.0 X-Source-IP: 145.40.68.75 X-Proofpoint-Virus-Version: vendor=nai engine=6500 definitions=10641 signatures=596816 X-Proofpoint-Spam-Details: rule=tap_notspam policy=tap score=0 adultscore=0 lowpriorityscore=0 malwarescore=0 suspectscore=0 spamscore=0 priorityscore=128 impostorscore=0 clxscore=254 mlxlogscore=999 phishscore=0 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303060122 Cc: stable-commits@vger.kernel.org Subject: [Ocfs2-devel] Patch "ocfs2: fix non-auto defrag path not working issue" has been added to the 5.15-stable tree X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: gregkh--- via Ocfs2-devel Reply-to: gregkh@linuxfoundation.org Content-type: text/plain; charset="us-ascii" Content-transfer-encoding: 7bit Errors-to: ocfs2-devel-bounces@oss.oracle.com X-stable: commit X-Patchwork-Hint: ignore X-ServerName: ams.source.kernel.org X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 ip4:72.55.140.81 ip4:52.25.139.140 ip4:139.178.84.217 ip6:2604:1380:4641:c500::1 ip4:145.40.68.75 ip6:2604:1380:4601:e00::1 ip4:145.40.73.55 ip6:2604:1380:40e1:4800::1 include:_spf.google.com include:amazonses.com include:_spf.salesforce.com -all X-Spam: Clean X-Proofpoint-GUID: fb0Xr7ND1CNk9RN4mNYc7XGyyn1dtuT0 X-Proofpoint-ORIG-GUID: fb0Xr7ND1CNk9RN4mNYc7XGyyn1dtuT0 Reporting-Meta: AAFPz0rjsEw8C1toOnqm6tmFRLd8WQ6M5LAzRQWG3qJ0SZeoDlhny5aljdeB/S6T EGNP4v8Z/Znnc8fVODvh+RP3RRCgNc2gZDocV93hUH1yFdPtzVIah7i/UEGiQhDW y7VudR0+/PWh3kfpsb8gK8MOZ75MzLDH3vwmzLig+yDCSLUDgGEMGXla0EhW5Xzp sNqhNvvzLfW5C7n9fJGJar7RBgFOP54kRxg26OS8FgVd3OLgoaOo2dk6iaPNEgHt xByiYy1DlEPwb3jynvx8pxctABl+rmpGgtNb0WoW+Pu578AdCZmeqENmdV8nIoxO 6HqVvDTp09vA8WPikQYr0K+e3pbY1/CYxH6tDk8PqqrKvscFkpG4xrH3j+XIjAKy TANbGWHAef2uB4xW0PMspLNDoKQ1tV3Lj+gmljkSJ6UI+87yKhlIbUAcoZQmcIbB 7Jiq923vn0trbZ6vuKAOyzBWqCd+6u0YGBVarXH+0e+SWOpai01d3GQsIs+YCS5V mDyL3quANZA52Wd6Ll8F9zFznkLgKNVcV2ZiShfbtSnn This is a note to let you know that I've just added the patch titled ocfs2: fix non-auto defrag path not working issue to the 5.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: ocfs2-fix-non-auto-defrag-path-not-working-issue.patch and it can be found in the queue-5.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From 236b9254f8d1edc273ad88b420aa85fbd84f492d Mon Sep 17 00:00:00 2001 From: Heming Zhao via Ocfs2-devel Date: Mon, 20 Feb 2023 13:05:26 +0800 Subject: ocfs2: fix non-auto defrag path not working issue From: Heming Zhao via Ocfs2-devel commit 236b9254f8d1edc273ad88b420aa85fbd84f492d upstream. This fixes three issues on move extents ioctl without auto defrag: a) In ocfs2_find_victim_alloc_group(), we have to convert bits to block first in case of global bitmap. b) In ocfs2_probe_alloc_group(), when finding enough bits in block group bitmap, we have to back off move_len to start pos as well, otherwise it may corrupt filesystem. c) In ocfs2_ioctl_move_extents(), set me_threshold both for non-auto and auto defrag paths. Otherwise it will set move_max_hop to 0 and finally cause unexpectedly ENOSPC error. Currently there are no tools triggering the above issues since defragfs.ocfs2 enables auto defrag by default. Tested with manually changing defragfs.ocfs2 to run non auto defrag path. Link: https://lkml.kernel.org/r/20230220050526.22020-1-heming.zhao@suse.com Signed-off-by: Heming Zhao Reviewed-by: Joseph Qi Cc: Mark Fasheh Cc: Joel Becker Cc: Junxiao Bi Cc: Changwei Ge Cc: Gang He Cc: Jun Piao Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- fs/ocfs2/move_extents.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) --- a/fs/ocfs2/move_extents.c +++ b/fs/ocfs2/move_extents.c @@ -434,7 +434,7 @@ static int ocfs2_find_victim_alloc_group bg = (struct ocfs2_group_desc *)gd_bh->b_data; if (vict_blkno < (le64_to_cpu(bg->bg_blkno) + - le16_to_cpu(bg->bg_bits))) { + (le16_to_cpu(bg->bg_bits) << bits_per_unit))) { *ret_bh = gd_bh; *vict_bit = (vict_blkno - blkno) >> @@ -549,6 +549,7 @@ static void ocfs2_probe_alloc_group(stru last_free_bits++; if (last_free_bits == move_len) { + i -= move_len; *goal_bit = i; *phys_cpos = base_cpos + i; break; @@ -1020,18 +1021,19 @@ int ocfs2_ioctl_move_extents(struct file context->range = ⦥ + /* + * ok, the default theshold for the defragmentation + * is 1M, since our maximum clustersize was 1M also. + * any thought? + */ + if (!range.me_threshold) + range.me_threshold = 1024 * 1024; + + if (range.me_threshold > i_size_read(inode)) + range.me_threshold = i_size_read(inode); + if (range.me_flags & OCFS2_MOVE_EXT_FL_AUTO_DEFRAG) { context->auto_defrag = 1; - /* - * ok, the default theshold for the defragmentation - * is 1M, since our maximum clustersize was 1M also. - * any thought? - */ - if (!range.me_threshold) - range.me_threshold = 1024 * 1024; - - if (range.me_threshold > i_size_read(inode)) - range.me_threshold = i_size_read(inode); if (range.me_flags & OCFS2_MOVE_EXT_FL_PART_DEFRAG) context->partial = 1; Patches currently in stable-queue which might be from ocfs2-devel@oss.oracle.com are queue-5.15/ocfs2-fix-non-auto-defrag-path-not-working-issue.patch queue-5.15/ocfs2-fix-defrag-path-triggering-jbd2-assert.patch _______________________________________________ Ocfs2-devel mailing list Ocfs2-devel@oss.oracle.com https://oss.oracle.com/mailman/listinfo/ocfs2-devel