Received: by 2002:a05:6358:e9c4:b0:b2:91dc:71ab with SMTP id hc4csp6266947rwb; Tue, 9 Aug 2022 12:04:36 -0700 (PDT) X-Google-Smtp-Source: AA6agR6tfRWJb5gaXNWzOsbjEn0fOwY7TAKoBQrN94PRRG16EESs0JyH3NTMnL2taiMB+5ViSHMH X-Received: by 2002:a17:90b:4d91:b0:1f5:2073:6cfd with SMTP id oj17-20020a17090b4d9100b001f520736cfdmr35382771pjb.175.1660071876331; Tue, 09 Aug 2022 12:04:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660071876; cv=none; d=google.com; s=arc-20160816; b=ElHBP7pFGlLN00lo9AZAu4rHGVVovR/SEtUTpZrf85vgM0T5kDQeS4w3u5ULFz1Ggk X5ryq9n83mdaw7MQe1ly6sTrVKDhkCOJCpOs3kyV/UD8xikbFVcxpO9LL1ouYyOGo9yC 9mEBjbtjVhi4MrBz3tSejbxUGV8uwJnIKJoGaRKVcqPTofmHu2xeUlWru6kg1Fw/Xkrt Jd0NpfVPsCB4PzR6crzfTZKnZM1G9dUpRacTW0YVY5a0aGL5tc5eMcz1pHCVxhrOdX4S u+gI2AKMwzJG6z1VFZl5HJWTQXNN1wvVfRBZjzTpbbYw/OPAMKX2SCyobvRDZtZWUne9 kOQA== 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=iUCj5aBfKopZEzUy19Wsp5lI8CsQ6F7EoG3lZ21DH9o=; b=T+hpODNelLtnqOQD30xIolYDx9yB1kfGhjkyBZVsLkV1RyZ0c8YNCj4Zbh807Xjd+M 4ex5sbh3lCK1yaZjalkmEhjRJwLituS5vamaQn69u1CmmjH6Hr3fsB02v/+X8n8I1aG9 SPq6mtd4OPIZ5yz5mW92YWeDoqdgzrMrFwTT45QSRLKoDcrPIorTxcVS64yALA8t4gL/ R0VNf1Gky4xKZH+wSlsteYOXu2XtLTXvSRpQXRI5tA5BWcnJJY0RGppBVJAIjeay+4et Vg/U88xz2za3QFC2l7Dct2vWprbGnLhgPtDxnQAIfHS+lPoxoJWkkt6XAsafSxzT074t M7qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OId86UbL; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y22-20020a63fa16000000b0041c3dcf7da7si13367210pgh.404.2022.08.09.12.04.15; Tue, 09 Aug 2022 12:04:36 -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=OId86UbL; 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 S1344215AbiHISYY (ORCPT + 99 others); Tue, 9 Aug 2022 14:24:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347327AbiHISWU (ORCPT ); Tue, 9 Aug 2022 14:22:20 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9198631DC4; Tue, 9 Aug 2022 11:08:31 -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 8D852B8199A; Tue, 9 Aug 2022 18:07:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DAE7AC43470; Tue, 9 Aug 2022 18:07:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660068443; bh=ywVLN2ma4MVkAmTR58UKcULnKrwma1toTjcHNXw3Wbg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OId86UbL5sY1lR91qK20OFi+3IZ+VZ8TzILrQ9/OWGlIJAg9M+BBV9hREpvMw9/Zl NFCTJceaImhC7xl7i4/qYblNQEcCKTmvbhTDEjkoZD+2bPZCjWdcVIz8ZJ6Nu1mTHr IREZYooR9o3Ipi1ovjWBFalhTgg1TSZfuo0mpKhY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Thumshirn , Naohiro Aota , David Sterba Subject: [PATCH 5.18 21/35] btrfs: zoned: fix critical section of relocation inode writeback Date: Tue, 9 Aug 2022 20:00:50 +0200 Message-Id: <20220809175515.832622102@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220809175515.046484486@linuxfoundation.org> References: <20220809175515.046484486@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 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,T_SCC_BODY_TEXT_LINE 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 From: Naohiro Aota commit 19ab78ca86981e0e1e73036fb73a508731a7c078 upstream. We use btrfs_zoned_data_reloc_{lock,unlock} to allow only one process to write out to the relocation inode. That critical section must include all the IO submission for the inode. However, flush_write_bio() in extent_writepages() is out of the critical section, causing an IO submission outside of the lock. This leads to an out of the order IO submission and fail the relocation process. Fix it by extending the critical section. Fixes: 35156d852762 ("btrfs: zoned: only allow one process to add pages to a relocation inode") CC: stable@vger.kernel.org # 5.16+ Reviewed-by: Johannes Thumshirn Signed-off-by: Naohiro Aota Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/extent_io.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -5214,13 +5214,14 @@ int extent_writepages(struct address_spa */ btrfs_zoned_data_reloc_lock(BTRFS_I(inode)); ret = extent_write_cache_pages(mapping, wbc, &epd); - btrfs_zoned_data_reloc_unlock(BTRFS_I(inode)); ASSERT(ret <= 0); if (ret < 0) { + btrfs_zoned_data_reloc_unlock(BTRFS_I(inode)); end_write_bio(&epd, ret); return ret; } ret = flush_write_bio(&epd); + btrfs_zoned_data_reloc_unlock(BTRFS_I(inode)); return ret; }