Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp3039235rwd; Fri, 2 Jun 2023 20:14:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6FzjJB+PHmr+nA3pW+cQIQca9//ptmBugWt9VTwJHqdAhshcuFde60n5nplJkMMjU/mRp/ X-Received: by 2002:a25:328c:0:b0:bac:fd4f:5291 with SMTP id y134-20020a25328c000000b00bacfd4f5291mr5269908yby.59.1685762098445; Fri, 02 Jun 2023 20:14:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685762098; cv=none; d=google.com; s=arc-20160816; b=qDFhEBUcssIAG9Mp2XqMhajYeKelxcO6++EZ6d2VUBrJJSx0NlzzRwyRUJZCoYiJFS nQsNGjjcVVkTmo57c087cDgPXZlyfRWVLh1VsvhYvU79WI0TtXT3l4uSrk6PmbRn0o9O XXeLdlVgDDcYKSEuDZ16WU2X8RcKbN6AVXYLKdPNb3iNea2Hj2F9l/OmN+KujNTPksEy skRwJSq0WlwTUheYYl7IRjMex8BnaZaj3rOmXEkdItBJFtvIKQch9cN1YtgP3Art80BH bHijiqScnrs2oneJyxFuIYcEDy0ZI0YhHpkHHjHxRU8nuNoqqa2x8GXTIUZgYFSKCuC+ ALTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to :mime-version:user-agent:date:message-id:from:cc:references:to :subject; bh=xMdHnDKNcmISwG9norqOKHkCdXLjrZHbQ3mf7siP0uY=; b=c8Uxqp2KycQxRiDgWneqTl1u/6kd/3ZG0hZ7PY40hydJxB/PyTZNpMgwYuCXNlQvXk HXUZE4uBqxUgTQauVMxx2e2SABy+NV4s+DSveypxxW10amTxNkL+68n7EHbNCp5BjvIc 8lUnaXn4Y8jYwKerZAZmVZZxZF4w1B5eU5uOWXqRAXXZTocp75AFJq4f8AClXvm1wfjR e2RwcD8IM6X9T6Zfl/tM//kH8lBGrShCmOzBgLA9MNBGo8ECz87/KvVrNdlhxy14gCtm zz6X0mgOajIzsMHZk6He9wIDY7cvfKdrPylcO7kZUCBGHH5wo8PtxCg7D7mialvpzPID L5dg== ARC-Authentication-Results: i=1; mx.google.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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bs192-20020a6328c9000000b0053f47561f35si1990775pgb.335.2023.06.02.20.14.42; Fri, 02 Jun 2023 20:14:58 -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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236980AbjFCC5o (ORCPT + 99 others); Fri, 2 Jun 2023 22:57:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232212AbjFCC5n (ORCPT ); Fri, 2 Jun 2023 22:57:43 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B4BD135 for ; Fri, 2 Jun 2023 19:57:41 -0700 (PDT) Received: from canpemm500010.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4QY4DS1mYhzqSMb; Sat, 3 Jun 2023 10:52:56 +0800 (CST) Received: from [10.174.178.185] (10.174.178.185) by canpemm500010.china.huawei.com (7.192.105.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Sat, 3 Jun 2023 10:57:38 +0800 Subject: Re: [PATCH 2/2] quota: fix warning in dqgrab() To: Jan Kara References: <20230527014018.47396-1-yebin10@huawei.com> <20230527014018.47396-3-yebin10@huawei.com> <20230530101521.37k7hcjyly2tqj5g@quack3> CC: , From: "yebin (H)" Message-ID: <647AAC22.9020409@huawei.com> Date: Sat, 3 Jun 2023 10:57:38 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.1.0 MIME-Version: 1.0 In-Reply-To: <20230530101521.37k7hcjyly2tqj5g@quack3> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.178.185] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To canpemm500010.china.huawei.com (7.192.105.118) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,NICE_REPLY_A, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 On 2023/5/30 18:15, Jan Kara wrote: > On Sat 27-05-23 09:40:18, Ye Bin wrote: >> There's issue as follows when do fault injection: >> WARNING: CPU: 1 PID: 14870 at include/linux/quotaops.h:51 dquot_disable+0x13b7/0x18c0 >> Modules linked in: >> CPU: 1 PID: 14870 Comm: fsconfig Not tainted 6.3.0-next-20230505-00006-g5107a9c821af-dirty #541 >> RIP: 0010:dquot_disable+0x13b7/0x18c0 >> RSP: 0018:ffffc9000acc79e0 EFLAGS: 00010246 >> RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffff88825e41b980 >> RDX: 0000000000000000 RSI: ffff88825e41b980 RDI: 0000000000000002 >> RBP: ffff888179f68000 R08: ffffffff82087ca7 R09: 0000000000000000 >> R10: 0000000000000001 R11: ffffed102f3ed026 R12: ffff888179f68130 >> R13: ffff888179f68110 R14: dffffc0000000000 R15: ffff888179f68118 >> FS: 00007f450a073740(0000) GS:ffff88882fc00000(0000) knlGS:0000000000000000 >> CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 >> CR2: 00007ffe96f2efd8 CR3: 000000025c8ad000 CR4: 00000000000006e0 >> DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 >> DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 >> Call Trace: >> >> dquot_load_quota_sb+0xd53/0x1060 >> dquot_resume+0x172/0x230 >> ext4_reconfigure+0x1dc6/0x27b0 >> reconfigure_super+0x515/0xa90 >> __x64_sys_fsconfig+0xb19/0xd20 >> do_syscall_64+0x39/0xb0 >> entry_SYSCALL_64_after_hwframe+0x63/0xcd >> >> Above issue may happens as follows: >> ProcessA ProcessB ProcessC >> sys_fsconfig >> vfs_fsconfig_locked >> reconfigure_super >> ext4_remount >> dquot_suspend -> suspend all type quota >> >> sys_fsconfig >> vfs_fsconfig_locked >> reconfigure_super >> ext4_remount >> dquot_resume >> ret = dquot_load_quota_sb >> add_dquot_ref >> do_open -> open file O_RDWR >> vfs_open >> do_dentry_open >> get_write_access >> atomic_inc_unless_negative(&inode->i_writecount) >> ext4_file_open >> dquot_file_open >> dquot_initialize >> __dquot_initialize >> dqget >> atomic_inc(&dquot->dq_count); >> >> __dquot_initialize >> __dquot_initialize >> dqget >> if (!test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) >> ext4_acquire_dquot >> -> Return error DQ_ACTIVE_B flag isn't set >> dquot_disable >> invalidate_dquots >> if (atomic_read(&dquot->dq_count)) >> dqgrab >> WARN_ON_ONCE(!test_bit(DQ_ACTIVE_B, &dquot->dq_flags)) >> -> Trigger warning >> >> In the above scenario, 'dquot->dq_flags' has no DQ_ACTIVE_B is normal when >> dqgrab(). >> So just remove 'WARN_ON_ONCE(!test_bit(DQ_ACTIVE_B, &dquot->dq_flags))' >> in dqgrab(). >> >> Signed-off-by: Ye Bin > Thanks for the patch! Actually rather than deleting the assertion from > dqgrab() (which can be and is used by filesystems) I'd replace the dqgrab() > use in invalidate_dquots() with plain: > > atomic_inc(&dquot->dq_count); > > Honza This is indeed a good idea, I will send a new version. >> --- >> include/linux/quotaops.h | 1 - >> 1 file changed, 1 deletion(-) >> >> diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h >> index 11a4becff3a9..cb5e4c11e503 100644 >> --- a/include/linux/quotaops.h >> +++ b/include/linux/quotaops.h >> @@ -48,7 +48,6 @@ static inline struct dquot *dqgrab(struct dquot *dquot) >> { >> /* Make sure someone else has active reference to dquot */ >> WARN_ON_ONCE(!atomic_read(&dquot->dq_count)); >> - WARN_ON_ONCE(!test_bit(DQ_ACTIVE_B, &dquot->dq_flags)); >> atomic_inc(&dquot->dq_count); >> return dquot; >> } >> -- >> 2.31.1 >>