From patchwork Thu Mar 16 16:12:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 9628861 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 27FBF60244 for ; Thu, 16 Mar 2017 16:15:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 194F6283F9 for ; Thu, 16 Mar 2017 16:15:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0E0FD2841E; Thu, 16 Mar 2017 16:15:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8BBA283F9 for ; Thu, 16 Mar 2017 16:15:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755142AbdCPQOg (ORCPT ); Thu, 16 Mar 2017 12:14:36 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:33735 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755095AbdCPQO2 (ORCPT ); Thu, 16 Mar 2017 12:14:28 -0400 Received: by mail-pf0-f195.google.com with SMTP id p189so737038pfp.0; Thu, 16 Mar 2017 09:14:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JJjaDKU1XnPnIKjFyPITJp+iT+ngLhlVOBa9PFBXERA=; b=vGsiHaXPcUM7x2EJHUReE3cS+zmDzLbdo/TzSL1Uaue0f2TKiNAhfz2D50/Y4GLPNi yh3fjOmoWHBbqlHpA4dQeGBvXgskfQRAoNPvs4CrkexHwfM6G9lIkD5r23dgY8TDetOw fj1nnYGVVnotxJ8G++HtLBYyr6ajM3r0oaYtBb84BYcH0dbEzEy9ZV1JKHX/DKj91Hl/ 3qL9ovjlOnlxGoriwGxxP3NermPyWePa6uEPURh3d90yx8itc/XRWti552UpZTq4uBPM o6r5LbknA/a0lm9nX7d31isXsghI2vGpoCh6zsvw5Qs5hHHO/fkN/KLLGZE2L1pVv3av 4/zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JJjaDKU1XnPnIKjFyPITJp+iT+ngLhlVOBa9PFBXERA=; b=bg559WtNkev2dupRvnmflxNi1AxTll4ENN/oHv/mj7roaLjSGjzLPdJ6WDM1ZcrjwJ 3AJKNL4kKxduuAuDb6qO3/67fVvWMXpBTQXRY7NAL0rbDYLaHGaJPTUgoPL+aTQNkJG4 ihp9Q40CrB15LowEBfYKWWvc7R49LOo7yuNigLB6k6wfd/M8rD8f0gz328LXhgi244OH T3s5dSW5wRJwEQdVWkpzF5vYbctXgHq9gw8cwKBWts2/XmPSRgUHsvJA3O5jWhibn/HT nDHi1Rrs2OH+S25Ph8ECg1bnoxo2pK+QPKyP5ex1gyua7HoVQ4qAxIzY8UAFoWlzqUNC y+6g== X-Gm-Message-State: AFeK/H3xolgMLGQFDLMaqR5QHY3lJUBH1/DtKszYb+gHrREIZid4nkw3hbEucgDWIeAItQ== X-Received: by 10.98.139.195 with SMTP id e64mr11469854pfl.86.1489680867238; Thu, 16 Mar 2017 09:14:27 -0700 (PDT) Received: from localhost ([103.192.224.52]) by smtp.gmail.com with ESMTPSA id w20sm11582609pgc.18.2017.03.16.09.14.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Mar 2017 09:14:26 -0700 (PDT) From: Ming Lei To: Shaohua Li , Jens Axboe , linux-raid@vger.kernel.org, linux-block@vger.kernel.org, Christoph Hellwig Cc: Ming Lei Subject: [PATCH v3 06/14] md: raid1: retrieve page from pre-allocated resync page array Date: Fri, 17 Mar 2017 00:12:27 +0800 Message-Id: <20170316161235.27110-7-tom.leiming@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170316161235.27110-1-tom.leiming@gmail.com> References: <20170316161235.27110-1-tom.leiming@gmail.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now one page array is allocated for each resync bio, and we can retrieve page from this table directly. Signed-off-by: Ming Lei --- drivers/md/raid1.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 0e64beb60e4d..b1345aa4efd8 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -1992,6 +1992,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio) struct mddev *mddev = r1_bio->mddev; struct r1conf *conf = mddev->private; struct bio *bio = r1_bio->bios[r1_bio->read_disk]; + struct page **pages = get_resync_pages(bio)->pages; sector_t sect = r1_bio->sector; int sectors = r1_bio->sectors; int idx = 0; @@ -2025,7 +2026,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio) */ rdev = conf->mirrors[d].rdev; if (sync_page_io(rdev, sect, s<<9, - bio->bi_io_vec[idx].bv_page, + pages[idx], REQ_OP_READ, 0, false)) { success = 1; break; @@ -2080,7 +2081,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio) continue; rdev = conf->mirrors[d].rdev; if (r1_sync_page_io(rdev, sect, s, - bio->bi_io_vec[idx].bv_page, + pages[idx], WRITE) == 0) { r1_bio->bios[d]->bi_end_io = NULL; rdev_dec_pending(rdev, mddev); @@ -2095,7 +2096,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio) continue; rdev = conf->mirrors[d].rdev; if (r1_sync_page_io(rdev, sect, s, - bio->bi_io_vec[idx].bv_page, + pages[idx], READ) != 0) atomic_add(s, &rdev->corrected_errors); } @@ -2171,6 +2172,8 @@ static void process_checks(struct r1bio *r1_bio) struct bio *pbio = r1_bio->bios[primary]; struct bio *sbio = r1_bio->bios[i]; int error = sbio->bi_error; + struct page **ppages = get_resync_pages(pbio)->pages; + struct page **spages = get_resync_pages(sbio)->pages; if (sbio->bi_end_io != end_sync_read) continue; @@ -2179,11 +2182,8 @@ static void process_checks(struct r1bio *r1_bio) if (!error) { for (j = vcnt; j-- ; ) { - struct page *p, *s; - p = pbio->bi_io_vec[j].bv_page; - s = sbio->bi_io_vec[j].bv_page; - if (memcmp(page_address(p), - page_address(s), + if (memcmp(page_address(ppages[j]), + page_address(spages[j]), sbio->bi_io_vec[j].bv_len)) break; }