From patchwork Thu Oct 29 03:07:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Ruffell X-Patchwork-Id: 1389818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CM9Nz4f85z9sTR; Thu, 29 Oct 2020 14:08:03 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kXyI5-0005AV-Tq; Thu, 29 Oct 2020 03:07:53 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kXyI2-0005A6-N9 for kernel-team@lists.ubuntu.com; Thu, 29 Oct 2020 03:07:50 +0000 Received: from mail-pf1-f197.google.com ([209.85.210.197]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kXyI2-00034X-Ay for kernel-team@lists.ubuntu.com; Thu, 29 Oct 2020 03:07:50 +0000 Received: by mail-pf1-f197.google.com with SMTP id m64so1074007pfm.0 for ; Wed, 28 Oct 2020 20:07:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=H1iKaj1FTtJtLnwZBAK2QEqXX4Ss1FOIURk+mGDotIw=; b=djF73gxu7DhIS66MeTqvUDuenqwUggb24qnkI8qJeGj6QjvrSTSyjSbe0jFZoUV+6o B5KBmFy5M7Yw8MeHl6W+t/xZyELuht1lDBBXDkjO8EcwSCQHM+5m9+4k9gZdR7GMR58X kzowQ8Xqn/T6lMTzFXHzHuunc+aCDNdz07uc0wu4piEhRMEyIUYK0xdMlI8Tv/1xW7Ki Xxvnt4LrtaQQSrywx2YpXRMo1i/afzWPAoZFKW+Hcjh277r7seryuCnZjjKN+rR2BBbY ATUGVYHfGVz8/E01U5qswOOJf5fAZg3044ZFFZDB/WB3rhteg6mqYPBVA8wy7YZg9txW XgAg== X-Gm-Message-State: AOAM532MfqrMM4rf76xljQMKplhbKFQh18qvDIYDyHIPCukTyQaj1mf8 3k57kO6FZJJ2C5+N1znAD/6ckGnsmsZ6in3DuHax25opPetnsyxHANJN1EiKIZAYh6CKuwx5ajd zEKpKyVJ7HAkVuH2eNVrOKaDO9bq3tioNB0vmAyf1bw== X-Received: by 2002:a63:234c:: with SMTP id u12mr2189307pgm.149.1603940868789; Wed, 28 Oct 2020 20:07:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFTEWVXF3/MyfrYtpQDkvwc/bXcjTdWjaRS7ifASw6Mjn5PUC7dnG3Vb1f5hVtTh2AoLxYCQ== X-Received: by 2002:a63:234c:: with SMTP id u12mr2189293pgm.149.1603940868500; Wed, 28 Oct 2020 20:07:48 -0700 (PDT) Received: from localhost.localdomain (222-152-178-139-fibre.sparkbb.co.nz. [222.152.178.139]) by smtp.gmail.com with ESMTPSA id r6sm966882pfg.85.2020.10.28.20.07.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 20:07:47 -0700 (PDT) From: Matthew Ruffell To: kernel-team@lists.ubuntu.com Subject: [SRU][F][G][PATCH 1/7] md: add md_submit_discard_bio() for submitting discard bio Date: Thu, 29 Oct 2020 16:07:28 +1300 Message-Id: <20201029030737.21204-2-matthew.ruffell@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201029030737.21204-1-matthew.ruffell@canonical.com> References: <20201029030737.21204-1-matthew.ruffell@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Xiao Ni BugLink: https://bugs.launchpad.net/bugs/1896578 Move these logic from raid0.c to md.c, so that we can also use it in raid10.c. Reviewed-by: Coly Li Reviewed-by: Guoqing Jiang Signed-off-by: Xiao Ni Signed-off-by: Song Liu (backported from commit 2628089b74d5a64bd0bcb5d247a18f78d7b6f4d0) [mruffell: change submit_bio_noacct() to generic_make_request()] Signed-off-by: Matthew Ruffell --- drivers/md/md.c | 20 ++++++++++++++++++++ drivers/md/md.h | 2 ++ drivers/md/raid0.c | 14 ++------------ 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 5a6f96bdb0f7..575dbbab1604 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -8558,6 +8558,26 @@ 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 start, sector_t size) +{ + struct bio *discard_bio = NULL; + + if (__blkdev_issue_discard(rdev->bdev, start, size, + 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); + generic_make_request(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 c26fa8bd41e7..cc9932f17339 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h @@ -710,6 +710,8 @@ 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 start, sector_t size); 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 57e834964b00..b1cf4384d253 100644 --- a/drivers/md/raid0.c +++ b/drivers/md/raid0.c @@ -526,7 +526,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) @@ -549,18 +548,9 @@ 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, + md_submit_discard_bio(mddev, rdev, bio, 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); - generic_make_request(discard_bio); + dev_end - dev_start); } bio_endio(bio); }