From patchwork Mon Oct 24 11:31:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10291 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp653825wru; Mon, 24 Oct 2022 14:10:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6QQB2Hpbqizwjr6s/YNKJ/Hsqq93eTLMGdP6RfUzFtzMwgOoGJyiDvwu2XD0q2jghzS/Hs X-Received: by 2002:a17:90a:df04:b0:213:1cf1:435d with SMTP id gp4-20020a17090adf0400b002131cf1435dmr6114931pjb.210.1666645854981; Mon, 24 Oct 2022 14:10:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666645854; cv=none; d=google.com; s=arc-20160816; b=FmKK8yKN5OnnpdN8jZCev5Mi0UuufsHnqjeuiUHys363YGHVziwMhlJ02RcNankThT DUK7xwjfm8ktBz2kyJdHGUUfsO5On7PlnwbXNmlMeMh//pnWKFTfaQb6pD58XCMSgfhq MHupI1h64C9iSu9D2tQjoUB/aVvSJ8QD4e21of/RDNjFZLFSoyAJsYjEbj7bHPEVg6LJ e/cLskX3KPFIpGxr5Thz/IuF1+55t+H2GxsliEdO+oWohXJ6tApP8/hNWGQP/OGgS7Xa BLIlg5zU07Zj8M7iM2DTw2Dz9c0qIUL6XdDCYJZNGTHcYGPoG6+O9BQpmefTv/fMBRGN 5XiA== 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=kyNwUQ9sAy8zT14F3fEzWAPIyDXqyRkJsHm4+4+f+xaeBs38cAY5q4cI3/W75COVXv WYFeE+ZeN2EygrxQlY8Ix4QU/DYc+TxYRLr14xQJkMG9eiO1Y3GqbXjdDoyxWJtgZXUp DEYUA6wRaODDYMcJzX9tP3cQyVlIda6/wAhoUMDiPHNcFWQkcyz+WRtoSLQk+fbeQVWc icQ3AG0cKNXRA3jYDKfVh/8vbCj78Rkr7Q8igT8kSfTJToPnXfSCyFdyi3Q80vjU1EDT QFkLZ+KjMkRm7ykbvaRgdZ2dApyosCJyfSECwxWMzNmhYaK/QBT4D7mkc6imEYoLs02c uWpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KwTzGaSw; 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 u28-20020a056a00099c00b00561fb77aed3si839229pfg.368.2022.10.24.14.10.39; Mon, 24 Oct 2022 14:10:54 -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=KwTzGaSw; 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 S234780AbiJXUsE (ORCPT + 99 others); Mon, 24 Oct 2022 16:48:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234107AbiJXUrH (ORCPT ); Mon, 24 Oct 2022 16:47:07 -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 A1C9E1F617; Mon, 24 Oct 2022 11:54:38 -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 B2C57B818BE; Mon, 24 Oct 2022 12:46:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0AA92C433D6; Mon, 24 Oct 2022 12:46:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615615; bh=XS0Hdfl2pYxATSwpgJxBoi+EwwhRfcxcGSPPYm0CGE8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KwTzGaSwDp2I8kJFatyGBsIT4xSCexIWexy6bh2vXMgZeRhuJdSzPOch7b5kytylB Ij+hRibHSEdLUaOCgQaqdG/6dhZMWREZ9Yy8TvlgPyWdsIZP7+QB3Wrw2hYNEvd/gU mRCqXL4KdjvnUJ+Fy5HRk5Z6ybWB1v9wENc0nh4g= 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.15 318/530] md/raid5: Ensure stripe_fill happens on non-read IO with journal Date: Mon, 24 Oct 2022 13:31:02 +0200 Message-Id: <20221024113059.422789802@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@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?1747604844060930296?= X-GMAIL-MSGID: =?utf-8?q?1747604844060930296?= 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;