From patchwork Mon Oct 24 11:30:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9629 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp531997wru; Mon, 24 Oct 2022 09:07:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7yj7jW/fbHuNns7kHUJ8oDEkRzFwuWDHCBxjmFtOm2vvUPv6QpiLg3zQr9pHmvkdAUAwWW X-Received: by 2002:a17:906:fe46:b0:73d:939a:ec99 with SMTP id wz6-20020a170906fe4600b0073d939aec99mr28635150ejb.169.1666627629910; Mon, 24 Oct 2022 09:07:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666627629; cv=none; d=google.com; s=arc-20160816; b=oL1Wr+fwjwQ8g2gR1Lrp6EgafDTVKUEAZRDgLiye5jYK1mvVN00rFHJqz56ZH0X3Jq KtFKwbZbBm3DAKE1h/kwHSi7U38f95oKwQb/bRDn+6Rl+ETAcvHXefKIc2HXDKbeEqG5 oIS/nrCQoZmr8k14VJxyvP3lJJPN5dXu9H+ICIA5JEhXJDqJHpojU16fXE8grhJV3NWN ep2TjofCgSccqmUzqK/t7CyfPSn0mwI52vu30kPHZ5+JTgnRkwWg9W3h7BvQEf6yfuby CutAP8ynNbdRZ6ZQwEcHwnYMTNhM14WWJXXHD76049ao3fOyCZp5McG4UE6EF6CzbGHD Z25Q== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DVACNHFwX/rylEGwwfgPPGe6G1/OTsSVMWnxW6DQo1Y=; b=bzunlwYFKGN54RiPMQ3dkvxff1kfzJqSu8pqoC03KyUvuHm/ObYvDLAD6gxFb+Xjgt 1N9hmMxtGXWeHxFgwJFGLcx4wmFSv+TrH3UoogkJs7I7D/P73/4pksjXqDRauYWdqO0T RpbbEfFxDYbOFpy2T1LtVpsvkRihnuh0+lyFYvkR5J36GfzQ86b2O899h6GddeF0JPHw Xswa47me9bFbjOhEwsTDrorZeJDrQImq2dFHcibA6JPx1IWMnS8robx2/CL79qLhANaF wKkJvNHpMNbfovmdYNUt/Ri4xd3niwmQ85FI9ImLEMsbyfHWbgVKC5umq23aByvmDJvF mJKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=td3JnOHc; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v19-20020a056402349300b0045be589ca7fsi167531edc.331.2022.10.24.09.06.44; Mon, 24 Oct 2022 09:07:09 -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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=td3JnOHc; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233029AbiJXQGH (ORCPT + 99 others); Mon, 24 Oct 2022 12:06:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232342AbiJXQD0 (ORCPT ); Mon, 24 Oct 2022 12:03:26 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E3EB1C2F21; Mon, 24 Oct 2022 07:56:07 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C136CB81684; Mon, 24 Oct 2022 12:25:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E967C433C1; Mon, 24 Oct 2022 12:25:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614355; bh=XS0Hdfl2pYxATSwpgJxBoi+EwwhRfcxcGSPPYm0CGE8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=td3JnOHc4VPI67rZqkuksIH0Hoj3IKwlgOekGdgSASBEUgYLkLW/F/0KeIZfWF3kH mAvwP/E0f7HiHBR82o0LwF/T8HtfJEbONpSgEBllvpsRqriIs9xO7JNcaoEZH+DZEf ZdKWUu0rW4qzJq+VyNAhOxSj2hWTaRySm2og2bEs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Song Liu , Logan Gunthorpe , Sasha Levin Subject: [PATCH 5.10 230/390] md/raid5: Ensure stripe_fill happens on non-read IO with journal Date: Mon, 24 Oct 2022 13:30:27 +0200 Message-Id: <20221024113032.581886966@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747585733548705893?= X-GMAIL-MSGID: =?utf-8?q?1747585733548705893?= From: Logan Gunthorpe [ Upstream commit e2eed85bc75138a9eeb63863d20f8904ac42a577 ] When doing degrade/recover tests using the journal a kernel BUG is hit at drivers/md/raid5.c:4381 in handle_parity_checks5(): BUG_ON(!test_bit(R5_UPTODATE, &dev->flags)); This was found to occur because handle_stripe_fill() was skipped for stripes in the journal due to a condition in that function. Thus blocks were not fetched and R5_UPTODATE was not set when the code reached handle_parity_checks5(). To fix this, don't skip handle_stripe_fill() unless the stripe is for read. Fixes: 07e83364845e ("md/r5cache: shift complex rmw from read path to write path") Link: https://lore.kernel.org/linux-raid/e05c4239-41a9-d2f7-3cfa-4aa9d2cea8c1@deltatee.com/ Suggested-by: Song Liu Signed-off-by: Logan Gunthorpe Signed-off-by: Song Liu Signed-off-by: Sasha Levin --- drivers/md/raid5.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -3936,7 +3936,7 @@ static void handle_stripe_fill(struct st * back cache (prexor with orig_page, and then xor with * page) in the read path */ - if (s->injournal && s->failed) { + if (s->to_read && s->injournal && s->failed) { if (test_bit(STRIPE_R5C_CACHING, &sh->state)) r5c_make_stripe_write_out(sh); goto out;