Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1083189ybn; Tue, 24 Sep 2019 14:28:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqzoluU6P3eGJj7rEz+6ko9Iy9f6098PBN2YjvUtT6UZjmvB0mp7Xt4li8nyC//qQyCe1+UQ X-Received: by 2002:adf:f011:: with SMTP id j17mr4915090wro.131.1569360526783; Tue, 24 Sep 2019 14:28:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569360526; cv=none; d=google.com; s=arc-20160816; b=io4eTgGKgZgH5uSLjMFKXPmh4y9TEB0Mvf0fwgNl8qUfZlAA/chvuTL/VXZ36zK88L hmlsOEGw1tMuSvNHwxmG5iNANNU4XxfjPH8ov1/P3NBx7qeTNTWeciSUPHQDUH09saXm LD7Pn8tkqDCr7iRXZaaCbWVBgvcjTzcqYR9X7s/+ZNuWXSiJ/g0+vcBGgjuWymywlDri Uuk7B8LM2y8cxfIsDmAaxH9So3oIoAuY3c737PIbAtE3eXBQG8TUbxfEYV8urz/HK+Za oWk5HMpsIZNF8yOtt16Kaqi9iYhCv1It7eNZI9Htj7q2pZOHa9zQtY/OnTRwgLb7ITBK mQYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qMU9rq7ef0dSrgxWYFhFwa14d/dzoVG+KxctCvMymbE=; b=g/e+i+oeM/BV6gyBYHy36/Bh2qUrIZl41SodDfXaNp6K06JOp+9gPg2Cj19M61mxIi 5rKRPbn3P5HehkHBx2BRBTLBTCkxLJM5bTLdzREcvq3D9Po3sXoVxqaGOq/wButNgD51 7R8SOhZuBpAOIY0NlPExHgVlhO1kRnMMUhchht1q/7vxXsEjhNpOUgc49vtw2ALzWh/N GZyfXt+GAsy3zRIZxUJwFSsop1Ffe+PGnSXse4wucdCc7Tv4strclNstB49e8iA8tHkE jbjCbU4LR4/IzKCA/QP3snRlcAGSr6JCp5uugSq6ciim73fE3fZ5Y0ECJCuiVJbmhEsv c6xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=lhqcYGWi; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f57si1918669ede.78.2019.09.24.14.28.23; Tue, 24 Sep 2019 14:28:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=lhqcYGWi; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387735AbfIVTbf (ORCPT + 99 others); Sun, 22 Sep 2019 15:31:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:45740 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391766AbfIVSss (ORCPT ); Sun, 22 Sep 2019 14:48:48 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E8865208C2; Sun, 22 Sep 2019 18:48:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178126; bh=vNmoFFEBAwmRbkNPotkq14fYmjwQEJC6ATGtg3SyS7o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lhqcYGWiwtwGD2ZWVQL4ANaI0SfAdI4W6wEHxJ+m+4FBc5tFoqIGef9ptGTjsYYpk SP3QuXzW5OuCt0r93EOLmoUe1k0CcOJi+GujKmSYA9SDxZxbOmAXhIYDvu8IJ0OeNJ KRxyHtV+z5XkUzFu4LHPX4JCq/jPNN8dY/ftT1UA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Guoqing Jiang , Song Liu , Sasha Levin , linux-raid@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 180/203] raid5: don't set STRIPE_HANDLE to stripe which is in batch list Date: Sun, 22 Sep 2019 14:43:26 -0400 Message-Id: <20190922184350.30563-180-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guoqing Jiang [ Upstream commit 6ce220dd2f8ea71d6afc29b9a7524c12e39f374a ] If stripe in batch list is set with STRIPE_HANDLE flag, then the stripe could be set with STRIPE_ACTIVE by the handle_stripe function. And if error happens to the batch_head at the same time, break_stripe_batch_list is called, then below warning could happen (the same report in [1]), it means a member of batch list was set with STRIPE_ACTIVE. [7028915.431770] stripe state: 2001 [7028915.431815] ------------[ cut here ]------------ [7028915.431828] WARNING: CPU: 18 PID: 29089 at drivers/md/raid5.c:4614 break_stripe_batch_list+0x203/0x240 [raid456] [...] [7028915.431879] CPU: 18 PID: 29089 Comm: kworker/u82:5 Tainted: G O 4.14.86-1-storage #4.14.86-1.2~deb9 [7028915.431881] Hardware name: Supermicro SSG-2028R-ACR24L/X10DRH-iT, BIOS 3.1 06/18/2018 [7028915.431888] Workqueue: raid5wq raid5_do_work [raid456] [7028915.431890] task: ffff9ab0ef36d7c0 task.stack: ffffb72926f84000 [7028915.431896] RIP: 0010:break_stripe_batch_list+0x203/0x240 [raid456] [7028915.431898] RSP: 0018:ffffb72926f87ba8 EFLAGS: 00010286 [7028915.431900] RAX: 0000000000000012 RBX: ffff9aaa84a98000 RCX: 0000000000000000 [7028915.431901] RDX: 0000000000000000 RSI: ffff9ab2bfa15458 RDI: ffff9ab2bfa15458 [7028915.431902] RBP: ffff9aaa8fb4e900 R08: 0000000000000001 R09: 0000000000002eb4 [7028915.431903] R10: 00000000ffffffff R11: 0000000000000000 R12: ffff9ab1736f1b00 [7028915.431904] R13: 0000000000000000 R14: ffff9aaa8fb4e900 R15: 0000000000000001 [7028915.431906] FS: 0000000000000000(0000) GS:ffff9ab2bfa00000(0000) knlGS:0000000000000000 [7028915.431907] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [7028915.431908] CR2: 00007ff953b9f5d8 CR3: 0000000bf4009002 CR4: 00000000003606e0 [7028915.431909] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [7028915.431910] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [7028915.431910] Call Trace: [7028915.431923] handle_stripe+0x8e7/0x2020 [raid456] [7028915.431930] ? __wake_up_common_lock+0x89/0xc0 [7028915.431935] handle_active_stripes.isra.58+0x35f/0x560 [raid456] [7028915.431939] raid5_do_work+0xc6/0x1f0 [raid456] Also commit 59fc630b8b5f9f ("RAID5: batch adjacent full stripe write") said "If a stripe is added to batch list, then only the first stripe of the list should be put to handle_list and run handle_stripe." So don't set STRIPE_HANDLE to stripe which is already in batch list, otherwise the stripe could be put to handle_list and run handle_stripe, then the above warning could be triggered. [1]. https://www.spinics.net/lists/raid/msg62552.html Signed-off-by: Guoqing Jiang Signed-off-by: Song Liu Signed-off-by: Sasha Levin --- drivers/md/raid5.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 3de4e13bde984..21514edb2bea3 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -5718,7 +5718,8 @@ static bool raid5_make_request(struct mddev *mddev, struct bio * bi) do_flush = false; } - set_bit(STRIPE_HANDLE, &sh->state); + if (!sh->batch_head) + set_bit(STRIPE_HANDLE, &sh->state); clear_bit(STRIPE_DELAYED, &sh->state); if ((!sh->batch_head || sh == sh->batch_head) && (bi->bi_opf & REQ_SYNC) && -- 2.20.1