From patchwork Mon Oct 24 11:30:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8797 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp430853wru; Mon, 24 Oct 2022 05:42:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6lSTxNM4Yg4n4iRQZpOf5xQ+4QPSxoTMReX1DylXZCXGTmRl0taf4vt8AyxMnx8MU15+72 X-Received: by 2002:a17:903:509:b0:179:ffcf:d275 with SMTP id jn9-20020a170903050900b00179ffcfd275mr33338057plb.150.1666615343420; Mon, 24 Oct 2022 05:42:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666615343; cv=none; d=google.com; s=arc-20160816; b=dF9KE/GwwbwoX7uFMARR/opSuHUSZoTjq8Z2mOIuLcwfEwzpN6rKiDog3fdHsar6Ro erAWUDztqTqnV5SDl6PAACSmXU+KtOHULwR8V6tQgc7WuIy/o3bk1bvWOLFv9JwByH/S PF7ow8ZAM0nWsICyRAorVji1eRIO5EndFDe+YHscEHgsulkNJMQHsJAqgBe2I0qkeuGQ n9vrxj3v3TiCySiiHt+zNOsAiY99xPcbquAAtSrdtUDGl0QAlZ9YJJqaBXkFe9mcD/Tk 4cEaSdsMkO9LSk0ifTzYiN/wvPZp+36MjrQ2ldzrAG/y8/hZd/9V/y4R1zKv7uUbFSAW Vxmg== 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=NedJ22pXIoACFm4/7PLNMzOlpUI8VUifasZ57Z1/hqY=; b=m8UBZD/GdBWpadWtb/lFN2TxofgQ3Bfw0PQTPBdf3e0JnqD1HBcsBBMxiwWL8RT05J enL4Fnzn8m+xhCrj/pptMYZAiL5MnLWTuRdNXoVJnDzhekbDD5zH3PZNEJVnJdiXaDs5 h5t6upB5/r9g5fUdAIE54Dd6hSrf0r8efiVSVQz55OUcJGFvnGY6xrGJv9gIey4uZndu uROqfDhviGJwAFm2nk5cn8WpXTLgeDKnuaiI8KNG1w3R3TblZwEX/HozZ+QIuDGe736T ok8sfNZw/yDL/ccM4oG+p7bnyC+s49VK46efTCS0v0SdhpdnPus6rNUaqIOtf6W/Za1B e36w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DHTm01rK; 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 v10-20020a63b64a000000b00438e839828bsi35161970pgt.72.2022.10.24.05.42.07; Mon, 24 Oct 2022 05:42:23 -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=DHTm01rK; 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 S234122AbiJXMeD (ORCPT + 99 others); Mon, 24 Oct 2022 08:34:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234152AbiJXM32 (ORCPT ); Mon, 24 Oct 2022 08:29:28 -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 6EB1788DCA; Mon, 24 Oct 2022 05:03:27 -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 EDB91B811E0; Mon, 24 Oct 2022 12:00:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51F3CC433D7; Mon, 24 Oct 2022 12:00:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612843; bh=chCnK0CTUE8MKF84sALHRdUDz6uWT3Lh249NPivG9qI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DHTm01rKIgI+yuO48s4aeQxaqpMO+hCwxRos3uJDAxrxsiuh3RHFdThKzgZlmQmxW As6p3ten/adgPboEhRM0IMjhvOLuW/nrl+kWcC1+55MleUxnaqycsbOm/kjAMV+bO6 QllOi8Xu9XOjeJupbv48lx63dHABgqiSk2eirRzM= 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 4.19 140/229] md/raid5: Ensure stripe_fill happens on non-read IO with journal Date: Mon, 24 Oct 2022 13:30:59 +0200 Message-Id: <20221024113003.540404190@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112959.085534368@linuxfoundation.org> References: <20221024112959.085534368@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?1747572850428401975?= X-GMAIL-MSGID: =?utf-8?q?1747572850428401975?= 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(-) diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 6f04473f0838..3310f670a4ab 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -3723,7 +3723,7 @@ static void handle_stripe_fill(struct stripe_head *sh, * 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;