Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3399758rwa; Tue, 23 Aug 2022 04:15:47 -0700 (PDT) X-Google-Smtp-Source: AA6agR67F520FgBL5Hcd07lvIIk/Jz75pR/2azYO+4b6DNptJidWj12CWiQU1i/0DH7u6oOsKxvu X-Received: by 2002:a17:902:ea01:b0:173:897:61c3 with SMTP id s1-20020a170902ea0100b00173089761c3mr1289853plg.65.1661253346747; Tue, 23 Aug 2022 04:15:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661253346; cv=none; d=google.com; s=arc-20160816; b=daSHcEvwUHyRilxT+7XvP85VrMmNTMXHupj0dwE4G6CdKBth186bau8nMDSgArKdK9 bqLY9u33E/KmwtRLTYFsjWLQop1fp6dVHSgrqsQWvHdQOrbMad4UH4iDAyNIDUkqBjMO tPhwE+VHDy8dQrlrn1xMNTvrHk2bcLs8kSt0uGpcv1LlXwi6QWgrAisjx41O5ae0XB1A WGa3zGKFpDZ0RxwZce5qIABiRWZQzyWpwCbu/YxHrkV1SPsDcieil/kRHjgXox10gQ63 PZjy003uwzls0IdBwAXT9hvdqan+x7ypxa3pNWQ02QtI6p2CT/g0zFwptyEwWmr1esFi RcIw== 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=3jQ/omszP1XI8+Cjjs+CUq14YPSpnw4lSvwc8uY+aAw=; b=WPuD+lrkvaxW8XMa4GCNZ912oHVdRUuVAOiZZsDL2NRA78a9vTqw5uB+Z9Q6pxVxV/ sjFQRGPe7z7xW3COqYLpKKbaOwW4crzAHwAAv00Y2NUNnxubEZL8MvIDHAC0F/7aCxFM uY92DNaPi4NdDKXTTqipuXyM7EiuRmollcXQUZEu+8H3KcYFfeYMvbosLCqln+d9IrW+ 29BI3i14Z3NllBHzPg7IArEgN27bgQX38t0oRpUTCOqimCQ+hogQUAKwV3DZdSCz/ZV8 fsCmtaDMCP7bz9FrBfrVZEkojRkQ4k6aqbVE2b4yWbVsiJxz4LEjQMIOIfAtq8c1quNC 7jSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=o7Mu0WhF; 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 y12-20020a63ce0c000000b0041a23dd4f58si15859185pgf.513.2022.08.23.04.15.35; Tue, 23 Aug 2022 04:15:46 -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=o7Mu0WhF; 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 S1354138AbiHWKUd (ORCPT + 99 others); Tue, 23 Aug 2022 06:20:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352818AbiHWKJE (ORCPT ); Tue, 23 Aug 2022 06:09:04 -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 26D5C6B8CD; Tue, 23 Aug 2022 01:55:05 -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 C95A4B81C39; Tue, 23 Aug 2022 08:55:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1C903C433D6; Tue, 23 Aug 2022 08:55:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661244902; bh=03o8XUXP7UAjx6AQTbs0AGKRD8xZsQaZLgJmXYyTFSI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o7Mu0WhFmdlnvzs0HH8iKLWi9QT/qzNUbQGO/IyzMpsBWjCEL46uQNbe14fjDipj6 NY3e0RFYUd+PJ1ATMRflrVKtFXCKisD3P1EgHxwaM0VuDz3krO+wXYyCbVGknief7v 7owAac0M9ieZ9c8sH3xuKtxs5UJcZSMtlpWOWoRg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, David Sterba , Qu Wenruo Subject: [PATCH 4.14 209/229] btrfs: only write the sectors in the vertical stripe which has data stripes Date: Tue, 23 Aug 2022 10:26:10 +0200 Message-Id: <20220823080101.111287001@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080053.202747790@linuxfoundation.org> References: <20220823080053.202747790@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 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: Qu Wenruo commit bd8f7e627703ca5707833d623efcd43f104c7b3f upstream. If we have only 8K partial write at the beginning of a full RAID56 stripe, we will write the following contents: 0 8K 32K 64K Disk 1 (data): |XX| | | Disk 2 (data): | | | Disk 3 (parity): |XXXXXXXXXXXXXXX|XXXXXXXXXXXXXXX| |X| means the sector will be written back to disk. Note that, although we won't write any sectors from disk 2, but we will write the full 64KiB of parity to disk. This behavior is fine for now, but not for the future (especially for RAID56J, as we waste quite some space to journal the unused parity stripes). So here we will also utilize the btrfs_raid_bio::dbitmap, anytime we queue a higher level bio into an rbio, we will update rbio::dbitmap to indicate which vertical stripes we need to writeback. And at finish_rmw(), we also check dbitmap to see if we need to write any sector in the vertical stripe. So after the patch, above example will only lead to the following writeback pattern: 0 8K 32K 64K Disk 1 (data): |XX| | | Disk 2 (data): | | | Disk 3 (parity): |XX| | | Acked-by: David Sterba Signed-off-by: Qu Wenruo Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/raid56.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 4 deletions(-) --- a/fs/btrfs/raid56.c +++ b/fs/btrfs/raid56.c @@ -334,6 +334,9 @@ static void merge_rbio(struct btrfs_raid { bio_list_merge(&dest->bio_list, &victim->bio_list); dest->bio_list_bytes += victim->bio_list_bytes; + /* Also inherit the bitmaps from @victim. */ + bitmap_or(dest->dbitmap, victim->dbitmap, dest->dbitmap, + dest->stripe_npages); dest->generic_bio_cnt += victim->generic_bio_cnt; bio_list_init(&victim->bio_list); } @@ -882,6 +885,12 @@ static void rbio_orig_end_io(struct btrf if (rbio->generic_bio_cnt) btrfs_bio_counter_sub(rbio->fs_info, rbio->generic_bio_cnt); + /* + * Clear the data bitmap, as the rbio may be cached for later usage. + * do this before before unlock_stripe() so there will be no new bio + * for this bio. + */ + bitmap_clear(rbio->dbitmap, 0, rbio->stripe_npages); /* * At this moment, rbio->bio_list is empty, however since rbio does not @@ -1204,6 +1213,9 @@ static noinline void finish_rmw(struct b else BUG(); + /* We should have at least one data sector. */ + ASSERT(bitmap_weight(rbio->dbitmap, rbio->stripe_npages)); + /* at this point we either have a full stripe, * or we've read the full stripe from the drive. * recalculate the parity and write the new results. @@ -1277,6 +1289,11 @@ static noinline void finish_rmw(struct b for (stripe = 0; stripe < rbio->real_stripes; stripe++) { for (pagenr = 0; pagenr < rbio->stripe_npages; pagenr++) { struct page *page; + + /* This vertical stripe has no data, skip it. */ + if (!test_bit(pagenr, rbio->dbitmap)) + continue; + if (stripe < rbio->nr_data) { page = page_in_rbio(rbio, stripe, pagenr, 1); if (!page) @@ -1301,6 +1318,11 @@ static noinline void finish_rmw(struct b for (pagenr = 0; pagenr < rbio->stripe_npages; pagenr++) { struct page *page; + + /* This vertical stripe has no data, skip it. */ + if (!test_bit(pagenr, rbio->dbitmap)) + continue; + if (stripe < rbio->nr_data) { page = page_in_rbio(rbio, stripe, pagenr, 1); if (!page) @@ -1745,6 +1767,33 @@ static void btrfs_raid_unplug(struct blk run_plug(plug); } +/* Add the original bio into rbio->bio_list, and update rbio::dbitmap. */ +static void rbio_add_bio(struct btrfs_raid_bio *rbio, struct bio *orig_bio) +{ + const struct btrfs_fs_info *fs_info = rbio->fs_info; + const u64 orig_logical = orig_bio->bi_iter.bi_sector << SECTOR_SHIFT; + const u64 full_stripe_start = rbio->bbio->raid_map[0]; + const u32 orig_len = orig_bio->bi_iter.bi_size; + const u32 sectorsize = fs_info->sectorsize; + u64 cur_logical; + + ASSERT(orig_logical >= full_stripe_start && + orig_logical + orig_len <= full_stripe_start + + rbio->nr_data * rbio->stripe_len); + + bio_list_add(&rbio->bio_list, orig_bio); + rbio->bio_list_bytes += orig_bio->bi_iter.bi_size; + + /* Update the dbitmap. */ + for (cur_logical = orig_logical; cur_logical < orig_logical + orig_len; + cur_logical += sectorsize) { + int bit = ((u32)(cur_logical - full_stripe_start) >> + PAGE_SHIFT) % rbio->stripe_npages; + + set_bit(bit, rbio->dbitmap); + } +} + /* * our main entry point for writes from the rest of the FS. */ @@ -1761,9 +1810,8 @@ int raid56_parity_write(struct btrfs_fs_ btrfs_put_bbio(bbio); return PTR_ERR(rbio); } - bio_list_add(&rbio->bio_list, bio); - rbio->bio_list_bytes = bio->bi_iter.bi_size; rbio->operation = BTRFS_RBIO_WRITE; + rbio_add_bio(rbio, bio); btrfs_bio_counter_inc_noblocked(fs_info); rbio->generic_bio_cnt = 1; @@ -2146,8 +2194,7 @@ int raid56_parity_recover(struct btrfs_f } rbio->operation = BTRFS_RBIO_READ_REBUILD; - bio_list_add(&rbio->bio_list, bio); - rbio->bio_list_bytes = bio->bi_iter.bi_size; + rbio_add_bio(rbio, bio); rbio->faila = find_logical_bio_stripe(rbio, bio); if (rbio->faila == -1) {