Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4C1EC433E3 for ; Thu, 13 Aug 2020 06:45:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C36252078B for ; Thu, 13 Aug 2020 06:45:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="IXkCm0Fn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726043AbgHMGpB (ORCPT ); Thu, 13 Aug 2020 02:45:01 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:28178 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725964AbgHMGpA (ORCPT ); Thu, 13 Aug 2020 02:45:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597301099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=j3q05Y7K8Etlcw6pXKT2orYGABloNy9/H23xi0z5X3c=; b=IXkCm0FnDAt3VSlyV7cdBRV/fokELZskpms17PlukKEUxayh3EZVm3BCnGkUbuis6B4JgZ YLvCrtLGI09nOT/hBlHIIdwFmroLQg6vkDpXq6+5T9+WP5EUl3ehHZsk3GwITj5iD2YUhr zroCQN/EYPmgC2z2Rl4IZYNz+xXgVgw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-132-xZVfbpM6PMelMU0IN0gkAQ-1; Thu, 13 Aug 2020 02:44:57 -0400 X-MC-Unique: xZVfbpM6PMelMU0IN0gkAQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7E6FC80183C; Thu, 13 Aug 2020 06:44:56 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-8-17.pek2.redhat.com [10.72.8.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BCAF5FC1B; Thu, 13 Aug 2020 06:44:53 +0000 (UTC) From: Xiao Ni To: song@kernel.org, linux-raid@vger.kernel.org Cc: colyli@suse.de, guoqing.jiang@cloud.ionos.com, heinzm@redhat.com, ncroxon@redhat.com Subject: [md PATCH V3 1/4] Move codes related with submitting discard bio into one function Date: Thu, 13 Aug 2020 14:44:44 +0800 Message-Id: <1597301087-6565-2-git-send-email-xni@redhat.com> In-Reply-To: <1597301087-6565-1-git-send-email-xni@redhat.com> References: <1597301087-6565-1-git-send-email-xni@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Sender: linux-raid-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-raid@vger.kernel.org These codes can be used in raid10. So we can move these codes into md.c. raid0 and raid10 can share these codes. Reviewed-by: Coly Li Reviewed-by: Guoqing Jiang Signed-off-by: Xiao Ni --- drivers/md/md.c | 23 +++++++++++++++++++++++ drivers/md/md.h | 3 +++ drivers/md/raid0.c | 15 ++------------- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 9c69084..e70f19c 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -8622,6 +8622,29 @@ void md_write_end(struct mddev *mddev) EXPORT_SYMBOL(md_write_end); +/* This is used by raid0 and raid10 */ +void md_submit_discard_bio(struct mddev *mddev, struct md_rdev *rdev, + struct bio *bio, + sector_t dev_start, sector_t dev_end) +{ + struct bio *discard_bio = NULL; + + if (__blkdev_issue_discard(rdev->bdev, + dev_start + rdev->data_offset, + dev_end - dev_start, GFP_NOIO, 0, &discard_bio) || + !discard_bio) + return; + + bio_chain(discard_bio, bio); + bio_clone_blkg_association(discard_bio, bio); + if (mddev->gendisk) + trace_block_bio_remap(bdev_get_queue(rdev->bdev), + discard_bio, disk_devt(mddev->gendisk), + bio->bi_iter.bi_sector); + submit_bio_noacct(discard_bio); +} +EXPORT_SYMBOL(md_submit_discard_bio); + /* md_allow_write(mddev) * Calling this ensures that the array is marked 'active' so that writes * may proceed without blocking. It is important to call this before diff --git a/drivers/md/md.h b/drivers/md/md.h index 1e172b3..64c1a18 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h @@ -716,6 +716,9 @@ extern void md_write_end(struct mddev *mddev); extern void md_done_sync(struct mddev *mddev, int blocks, int ok); extern void md_error(struct mddev *mddev, struct md_rdev *rdev); extern void md_finish_reshape(struct mddev *mddev); +extern void md_submit_discard_bio(struct mddev *mddev, struct md_rdev *rdev, + struct bio *bio, + sector_t dev_start, sector_t dev_end); extern int mddev_congested(struct mddev *mddev, int bits); extern bool __must_check md_flush_request(struct mddev *mddev, struct bio *bio); diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c index e9e91c8..e37fe8a 100644 --- a/drivers/md/raid0.c +++ b/drivers/md/raid0.c @@ -525,7 +525,6 @@ static void raid0_handle_discard(struct mddev *mddev, struct bio *bio) for (disk = 0; disk < zone->nb_dev; disk++) { sector_t dev_start, dev_end; - struct bio *discard_bio = NULL; struct md_rdev *rdev; if (disk < start_disk_index) @@ -548,18 +547,8 @@ static void raid0_handle_discard(struct mddev *mddev, struct bio *bio) rdev = conf->devlist[(zone - conf->strip_zone) * conf->strip_zone[0].nb_dev + disk]; - if (__blkdev_issue_discard(rdev->bdev, - dev_start + zone->dev_start + rdev->data_offset, - dev_end - dev_start, GFP_NOIO, 0, &discard_bio) || - !discard_bio) - continue; - bio_chain(discard_bio, bio); - bio_clone_blkg_association(discard_bio, bio); - if (mddev->gendisk) - trace_block_bio_remap(bdev_get_queue(rdev->bdev), - discard_bio, disk_devt(mddev->gendisk), - bio->bi_iter.bi_sector); - submit_bio_noacct(discard_bio); + dev_start += zone->dev_start; + md_submit_discard_bio(mddev, rdev, bio, dev_start, dev_end); } bio_endio(bio); } -- 2.7.5