From patchwork Fri Mar 10 07:38:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 67248 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp735342wrd; Thu, 9 Mar 2023 23:42:14 -0800 (PST) X-Google-Smtp-Source: AK7set+NF6tHD0rbmCeqJq2aPviSL+kN9x6b+1F32aSSiJaCISFGGOWrHxG5vGZ/e2Q6YHZXn2gD X-Received: by 2002:a17:90b:17c2:b0:236:6dc3:3e66 with SMTP id me2-20020a17090b17c200b002366dc33e66mr24930842pjb.5.1678434134554; Thu, 09 Mar 2023 23:42:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678434134; cv=none; d=google.com; s=arc-20160816; b=cLgj3sWTiIxJzBV7SpB0/MBeE1CIkg7Od1VgApB8QcurVugZ5vRZS4O+JLuRaoJ3kh lb5nOtmctisw54DyL64wr9n/BZDqjHsTKP6EY+TXB6fxr6yZ0CrqIViM42Xwuk8A7fls TiOhCuDbjdYzTvPk+frFz97hWG72WURIGYroaOyau0TB1LilhSrr00cBoym7qVCG3ZH7 Q9DNFCnbUH4ka/wwD6+SeohpXeHVY17XaJJpwgZPWUNsXIOXqDf3yEa0gawfR5X8b6m3 xj5TcT2lHanoeg3WsZ6Z2jHzvDVI3nIiNyl2X6cpIfQNzjxjATCh5jGvtZzjFf6P4Qh1 uoJA== 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; bh=dWoIP310i5bSZ7CNdBPzxcozvgwNGAI/8QfmwQ9g/Pg=; b=TsXbHN605rkhhHP67eVDJvSRCn3Av8Bvghi0erGHLvSsI1CKJ+TsRmB43FnsZgmtUR ZMcTPNBBlxfV7NMoUMyQ0ooJJ6t4XYgSZc47o03AsolF2o7m6pvnMB+POM96xLAgtp86 vdIVCSrNDFBP8Jgs7fHOFenlg+8TdRM4VgNV9zgcEfcqav99DIZE0tUqiIw9CzOP6JP0 XU+ykQ9shiRK+dMz7pqVnq9s8p64hrREfzrCE7QR34J8Sm6ZCYLnNUZWf3DjFYKpMLiU GHJeJoYlKwdF8P2vplxcgeyNX4EwaFI0QfPTiH8ITVa808+UPSjmor6CZjuBK8pDzd3S COOQ== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t34-20020a634462000000b004e658a3b1b0si1361465pgk.183.2023.03.09.23.41.59; Thu, 09 Mar 2023 23:42:14 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229965AbjCJHkV (ORCPT + 99 others); Fri, 10 Mar 2023 02:40:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230353AbjCJHjt (ORCPT ); Fri, 10 Mar 2023 02:39:49 -0500 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5682FFCBD9; Thu, 9 Mar 2023 23:39:38 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PXycP4PsBz4f3jq3; Fri, 10 Mar 2023 15:39:33 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP3 (Coremail) with SMTP id _Ch0CgDn4R+03gpkwSimEg--.34063S7; Fri, 10 Mar 2023 15:39:35 +0800 (CST) From: Yu Kuai To: guoqing.jiang@linux.dev, song@kernel.org, jgq516@gmail.com, neilb@suse.de, shli@fb.com, lzhong@suse.com Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH v2 3/6] md/raid10: don't BUG_ON() in raise_barrier() Date: Fri, 10 Mar 2023 15:38:52 +0800 Message-Id: <20230310073855.1337560-4-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230310073855.1337560-1-yukuai1@huaweicloud.com> References: <20230310073855.1337560-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: _Ch0CgDn4R+03gpkwSimEg--.34063S7 X-Coremail-Antispam: 1UD129KBjvdXoWrKryrGFyrXF48tF47Gw45ZFb_yoWkGFcE93 WfuasxZr1xJrnrKw12kFn2vrWIga1kXF1xuF4rKr13AF98ZFWkC3Wjqas5Jwn5Jay2vr17 ZF92va4UAr4DWjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb6AFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUWwA2048vs2IY02 0Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM2 8EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AI xVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20x vE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xv r2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7M4IIrI8v6xkF7I0E8cxan2IY04 v7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_ Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x 0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8 JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIx AIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUbJ73DUUUUU= = X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_00,KHOP_HELO_FCRDNS, MAY_BE_FORGED,SPF_HELO_NONE,SPF_NONE autolearn=no 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?1759965751054273627?= X-GMAIL-MSGID: =?utf-8?q?1759965751054273627?= From: Yu Kuai If raise_barrier() is called the first time in raid10_sync_request(), which means the first non-normal io is handled, raise_barrier() should wait for all dispatched normal io to be done. This ensures that normal io won't starve. However, BUG_ON() if this is broken is too aggressive. This patch replace BUG_ON() with WARN and fall back to not force. Signed-off-by: Yu Kuai --- drivers/md/raid10.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 4f8edb6ea3e2..a8b5fecef136 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -952,7 +952,9 @@ static void flush_pending_writes(struct r10conf *conf) static void raise_barrier(struct r10conf *conf, int force) { write_seqlock_irq(&conf->resync_lock); - BUG_ON(force && !conf->barrier); + + if (WARN_ON_ONCE(force && !conf->barrier)) + force = false; /* Wait until no block IO is waiting (unless 'force') */ wait_event_barrier(conf, force || !conf->nr_waiting);