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 aib29ajc253.phx1.oracleemaildelivery.com (aib29ajc253.phx1.oracleemaildelivery.com [192.29.103.253]) (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 927D5C6FA99 for ; Mon, 6 Mar 2023 13:44:53 +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=kF0I8qcccXZHsTniJ/7rhv77PkTB+QCpLMP17J/x1PM=; b=Zbu47OntZAd1HLvlxX7X2z9Hrx8USmPH4Mgs4ih9tahJ5/yFa8AT8PBslVnL4tAgNE35ZlBUiidw UlAogYt0NtTMLbnkoSKILdxSLvtWgmN6UZCkSEdiQeJ5lTAv+VLMoLUP2MZw8psvGLnLPINBKYHM 4hryvzSaK6cWuYyfXRS0QJOYC0NirLzOyf95Be/v+7SopMI1LwFEbvrsPTJVuYtaOczocaUHwTuE bEn76EdEBCX/dBPa4q+0cUrxNuGezACoFncfCy3v3qbbCdUhCdLpluYsIUecECnH5iNb970mtn1h SQObEfhsWeXeiK+sekpEUG5AqHozR3zEa+SB+Q== 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=kF0I8qcccXZHsTniJ/7rhv77PkTB+QCpLMP17J/x1PM=; b=rYacjsdsf6brOFTMsD0ojSyJJHD4nXbFN/jqmWPyl0Q5U+Z/xJRNgdg9Qa/vBOWggbvIUCzS+5i1 u8UTyG/r8v+Kk/QxXOetyz1yN/Y0lPhxwgtDJ6z9EpaYEfsCk38Xelri797ge8QIVvjpctg1G7Iv rOoHGvyTBF1OmQoisi2a25efZ+UVzHjR0eDrW93V4GmD8FG+r3KqX9s8dYWWKVFQnECxamR1rAP2 7ZndRjo83uDnTiEudj5DrbGgI5r7iufwWAjXLeWi3m3BUHAY3la+iY+Ta5jg/gXgCKwHWAJlijtg 7SPj+ZzrJO8bLL6fQlVJMGj8I2WsPSc7urdxqg== Received: by omta-ad3-fd1-302-us-phoenix-1.omtaad3.vcndpphx.oraclevcn.com (Oracle Communications Messaging Server 8.1.0.1.20230214 64bit (built Feb 14 2023)) with ESMTPS id <0RR30094LQ6SCO80@omta-ad3-fd1-302-us-phoenix-1.omtaad3.vcndpphx.oraclevcn.com> for ocfs2-devel@archiver.kernel.org; Mon, 06 Mar 2023 13:44:52 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678110276; bh=YC7nKtjNrf0FLEXCvsd1Kl3gDot5utQwVEQ9pOCvAuw=; h=Subject:To:Cc:From:Date:From; b=CFC0LHAtBVjfHl03j4F4ZL2VtlJYv1js0crSetXqbjVOe/TUK1MmjKC8xItTqaWa/ h5ib+8kxxrHGIUQ6rWYGPFiyC8pEyPTQSRV0O8AX3PdIfgOQ6Qm+GYaB2dPdAYr/ap 6qRFYzk7zYRNiH1MD/wOpuaLnC0fIcrKLCU0kbZ0= 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:43:38 +0100 Message-id: <16781102185964@kroah.com> MIME-version: 1.0 X-Source-IP: 139.178.84.217 X-Proofpoint-Virus-Version: vendor=nai engine=6500 definitions=10641 signatures=596816 X-Proofpoint-Spam-Details: rule=tap_notspam policy=tap score=0 lowpriorityscore=0 suspectscore=0 clxscore=163 malwarescore=0 impostorscore=0 mlxscore=0 priorityscore=143 bulkscore=0 spamscore=0 mlxlogscore=999 phishscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303060121 Cc: stable-commits@vger.kernel.org Subject: [Ocfs2-devel] Patch "ocfs2: fix non-auto defrag path not working issue" has been added to the 6.2-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: dfw.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: uq6-uOo5OPByKhAcQs3fopMqlslKFjxy X-Proofpoint-ORIG-GUID: uq6-uOo5OPByKhAcQs3fopMqlslKFjxy Reporting-Meta: AAFZaTOD/ipj3agfGU8+Xh0ELkLNN8svmI6SnN9zJZdwJidd7FyO8yTsudzsxFsR qvNgDUmorqREeToJ9+5SAkfRVHwEGDY9h4BZdLqAVjMB9BYu3tK6UzG2IkkvwVbt hc4/jSLNnfEtd3n0THfuYdSaEIoKLyZ7zje7isi6u+pieJvVCTJhmhdRHXYs4f3O BL53m2sTzwMT+lncGe+zmsn7hwhabT8MGIbYNZaec4u94GJ9l1nZeV6ztlu0m011 vrhfq8D8zziotU6EhsCHcki1P6n4oEwajtHbWXwKHA/TRLjuEY/h8nxh45WjBvjx jKMFFMq3DofuJkrTRYl97C12b5M2mC6GLUlC9aTDpWTRmK8vhuRHtpgicykmto1p gDpbLK/x3sdJwtNC+/LYnCAyV0lI6cfzVCp6VdIIGt9mM8pnBvT0ZvlTjQKsKQtx auxp9M6Z3agNHa1GYwv6dg4TputrXtiDMP3jh7RLTaMJ1lJFbpHoKIRTPY5fgoBi Ew61TfzKKxxpN0OUQkFyrcvZH3OYhKoLw+P6Kg71afE7 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 6.2-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-6.2 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-6.2/ocfs2-fix-non-auto-defrag-path-not-working-issue.patch queue-6.2/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