From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (unknown [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 783E48017D for ; Tue, 22 Sep 2026 13:29:29 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 68MDSBH1018557; Tue, 22 Sep 2026 16:28:11 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 68MDSBH1018557 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="dcDl0UYM" Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 68MDS5AW018539 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 22 Sep 2026 16:28:05 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 68MDS5AW018539 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-49cd55ee2f7so35667975e9.0 for ; Tue, 22 Sep 2026 06:28:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AKwUvBxqcmV/Lx57oNrf96tN+K/aiyJrIVqyLttyDF33VZiWXDli/vP6ThRKtu9gQXTg6xteM++xgA==@openvz.org X-Gm-Message-State: AFuF++nLdccwNX1wfNynI+InMx45crPpBS5qfRvwbCRgP0ohgG+siqm8 z8w9uoJi4dR0goi7YYMxtX7Xf1YGjOc0QCIZz6b3/KzDNUFvwFAP5RT8pEhj2+5KD/YcTHtBdbn DmMH682NfXIookI9C/f8b+8SINb9Kdd8+qdVzziayK8YUsk8XQ+ut9g== X-Gm-Gg: AYBFou3X3qM6HtWaLcmNK6DSs3mVx3QocM2Hxo79OD/pFRptYMsmHzG0Rai/fFoEqqV a7VqKBPkCsXrE1BgSI/ekinRPOhqgb3oEba5Jn6Pbu25pY6NqpteWsdob3lWEhIaQdbXRHwEDHj EzthgVnt3ugKO7FqrpqQ73o8Uldyo7fQVscWXNYG/sYUo3B1LVg6CkvP/5I+eRXiR/H3VcILuY7 WLo3cTlP7GsE7jugz4dygMVINX4K75jv0dk2iR0p/PwpCvc7aGq+FjyqllWpHhzffoVNWzbmb85 FTQrxcQUdR6pKsxbglNh0AivWE1ZasreyNAkaD/dziejkk1G4iWpwFnzpk6dYKGSkVw+kXwtp8j mrwt2CGUKTl8un0TgZQ== X-Received: by 2002:a05:600c:a013:b0:49c:fa21:1c81 with SMTP id 5b1f17b1804b1-49fc57378a2mr180597855e9.22.1790083684878; Tue, 22 Sep 2026 06:28:04 -0700 (PDT) X-Received: by 2002:a05:600c:a013:b0:49c:fa21:1c81 with SMTP id 5b1f17b1804b1-49fc57378a2mr180597445e9.22.1790083684421; Tue, 22 Sep 2026 06:28:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1790083684; cv=none; d=google.com; s=arc-20260327; b=T0RQfUI32NahOj+3Fna2vWshritilhY+K0NxRgnP0dJDtwTJHAl99fuTKZwnMziIcG +0GcWbq9vk3AysFMTQ2rNqjj9SN3kSANtpCDe4cAQ5VxTj5M44Vx1NGavxADkx0uu9NS iLScI1jS6Vt2y4j81LDvD22OnX5wVqOtMVdsiBXsGn4heeex4AufGk35Tq50z1Z764Tn ZvpNyP+YxOPdqxvJm3SuCSwAnWdXmBznCO7CDgVPhE9uDRVzcHM9zKPUjRk/X1GmK67e xyRA9ZZJ0v92kSZVTxYwXjVAEEMEIGrgSVMoJExeN8JQpds9vc/IO+TBCtZmQhpLxF53 lyHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=Gd1CdHzsW1+VRT2YBzY+G+DTVhRXMN7Br+JLd6N0mZc=; fh=BDW6T6CuFQbm41G1BqO2dKDzz8FJj02xnNFn6Y/ysjc=; b=sgPpbRAPrpoYyjJu/tcUsxPT0jRhxpUg4ZSRm5vNj3N7Q+5rQP4gz6BNgnQj5pDO8o fdWYY6BEnhNwjDSvWxODofvGJke9LTrejU5uvrLQ+Mp1Mo+HBjVnufKaZDeD/+ELYFIX XbxbDtfBVHIU+BosJLcswATnXY78JnGr/K5TX0vsBWuEr2G+Ru/oPP6Qw4giov3ZEIR3 7mt9bdzf1p/7IFRbnVbNzOFCMTSvHbwFZF9lEqn4fxMzyy2mMmGDv/HazCDGWMYvrlFe irEWSEOq62D5PGUwRa+poj2GyQiioyHMnTxxio8xfxU8nSpIkcHeN4h1YcK/J35W9aKB 7lYA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=dcDl0UYM; spf=pass (google.com: domain of khorenko@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=khorenko@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-488628dee93si3158152f8f.388.2026.09.22.06.28.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2026 06:28:04 -0700 (PDT) Received-SPF: pass (google.com: domain of khorenko@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=dcDl0UYM; spf=pass (google.com: domain of khorenko@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=khorenko@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=Message-Id:Content-Type:MIME-Version:Subject:Date :From; bh=Gd1CdHzsW1+VRT2YBzY+G+DTVhRXMN7Br+JLd6N0mZc=; b=dcDl0UYMgreVy5PeTp5 zkXyBS+JrbLOdRHG7w1sCTKMax3MTTIR7kJaa2qukAx8wbOEd0gAXS+DaQC8LnDb+8AaixYyPsbo/ 2HnkwSLhaPYd1F8/ioCaBoeKMFvpU3UC3XG6Cl764IWF6XEWdPH4ijjlzEtVrUDPolBsx19M3CCUt 20ZfGcXiysGlmpL0gAef6n4sWJ3QE3MSuKqn4Ivf6JTtpPR0cQPpbafV/7tfFO6CxkxcmTWcL8qC6 bYkTJhmoQq3j1G0JASF6YcVOz9/dTx71mWLB9W89Y5LSeKwY2z6wZLj3W3lIqCZPyM7p8p1pDjHsh 2MLZ0Ue8qRyQasA==; Received: from ch-demo-asa.virtuozzo.com ([130.117.225.8] helo=f0.sw.ru) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1x90Ua-00BPyl-1p; Tue, 22 Sep 2026 15:27:54 +0200 From: Konstantin Khorenko Date: Tue, 22 Sep 2026 15:27:47 +0200 MIME-Version: 1.0 Message-Id: <20260922-pr-khorenko-vstor-145663-ext4-ms-v1-1-4dd83d495810@virtuozzo.com> References: <20260922-pr-khorenko-vstor-145663-ext4-ms-v1-0-4dd83d495810@virtuozzo.com> In-Reply-To: <20260922-pr-khorenko-vstor-145663-ext4-ms-v1-0-4dd83d495810@virtuozzo.com> To: Alexey Kuznetsov , devel@openvz.org, Konstantin Khorenko X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1844; i=khorenko@virtuozzo.com; h=from:subject:message-id; bh=15FAi+AnYJPnxJZNnTnJO7v4fsmrPOqw7IWRNUbSWWc=; b=owEBbAKT/ZANAwAKAVGWCkf5YVwqAcsmYgBqsoJiAIAGbDgG1J+r0QTMXDBYthLluJeQDIrQU xAmmUt95MCJAjIEAAEKAB0WIQRWD23IPcXT0GO9CCxRlgpH+WFcKgUCarKCYgAKCRBRlgpH+WFc KnAbD/jJyOlJwHOZu7PHQZn1zVMy9OkZswtEIIGA3dzP5TvrYQaULBgCpJzRsYCpWYQylDhLEeU GwK1A3gBE/K4koc0p2gEtfouOQ1KSqjepey5xbzQgRDKyU4280a+/1iOryoQwxdOHZyBXCM9JFf jaRZ1dFTbkbsokM7IDc2iqx00BfI26y1ALqZK7/8vy5mNipAEmqOMZSi9GIKwZYCZ7400Oorsvi Feye5Q9oHZ4B4yuoTMAPfXrIKVe/XZMusEw5XNzJ0BR9TaNXQdFdCoC/2lS4dQorEVxdE6Z1nLK LNriKcGzhANQP4YvZJNszMUNb0yGdARrlIIHLaVkt9730HT5mW6/beXftxhPB4broocVel1gOh5 uDp68D3+N2U/A1oHejWnR8loDomJikhwlzKTZxT/9ySAJXgAJIqrFnpOvn84RBqD5eTR80wnysH 3YhmjpV4YsYaPvEvLCRYFT0xK4yH1FXNFc8AWSHJUrV2cdcH8OwuaHlKWB7p84bUOyqV3DUvDLk Rc1g/4PjqgR2no4wHkWW77/ytsVqBlrh4i+6ylRUlLIiXnAkp7wRte2F9CrHwJ81h8uEZ+joWXu DXEH7dcx3rUwhZEVWxY3KQzciy9yjXDzf9Zq2By6lqW+Uxz4ME8234RmMYt2bbsbALVJppPYJzg +EeiXEQ7Rh13u X-Developer-Key: i=khorenko@virtuozzo.com; a=openpgp; fpr=560F6DC83DC5D3D063BD082C51960A47F9615C2A X-OZ-Fwd: true Subject: [Devel] [PATCH hci-8.1 1/2] Revert "fs/ext4: do not run test_and_set_bit on every prefetch scan" X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org This reverts commit 3fff8724d1f894459c1477990fe086c0c2573410. Mainstream has already fixed this issue the same way, only with the test_bit check folded into the macro instead of the call site, so drop our patch and take the mainstream version: 0e364a030229b ("ext4: avoid RWM atomic in EXT4_MB_GRP_TEST_AND_SET_READ") https://virtuozzo.atlassian.net/browse/VSTOR-137147 https://virtuozzo.atlassian.net/browse/VSTOR-145663 Feature: fix ms/ext4 Signed-off-by: Konstantin Khorenko --- fs/ext4/ext4.h | 2 -- fs/ext4/mballoc.c | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index ca6498609e2e1..bf7637785e073 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -3514,8 +3514,6 @@ struct ext4_group_info { (clear_bit(EXT4_GROUP_INFO_WAS_TRIMMED_BIT, &((grp)->bb_state))) #define EXT4_MB_GRP_TEST_AND_SET_READ(grp) \ (test_and_set_bit(EXT4_GROUP_INFO_BBITMAP_READ_BIT, &((grp)->bb_state))) -#define EXT4_MB_GRP_TEST_READ(grp) \ - (test_bit(EXT4_GROUP_INFO_BBITMAP_READ_BIT, &((grp)->bb_state))) #define EXT4_MAX_CONTENTION 8 #define EXT4_CONTENTION_THRESHOLD 2 diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index b50aa34057967..aaf2c24c514c6 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2836,9 +2836,7 @@ ext4_group_t ext4_mb_prefetch(struct super_block *sb, ext4_group_t group, * prefetch once, so we avoid getblk() call, which can * be expensive. */ - if (gdp && grp && - !EXT4_MB_GRP_TEST_READ(grp) && - !EXT4_MB_GRP_TEST_AND_SET_READ(grp) && + if (gdp && grp && !EXT4_MB_GRP_TEST_AND_SET_READ(grp) && EXT4_MB_GRP_NEED_INIT(grp) && ext4_free_group_clusters(sb, gdp) > 0 ) { bh = ext4_read_block_bitmap_nowait(sb, group, true); -- 2.43.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel