From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.8 required=3.0 tests=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,UNPARSEABLE_RELAY 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 DBBA6C43331 for ; Fri, 6 Sep 2019 03:38:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D98A02082C for ; Fri, 6 Sep 2019 03:38:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="hTCN77Ww" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392151AbfIFDid (ORCPT ); Thu, 5 Sep 2019 23:38:33 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:44572 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392146AbfIFDid (ORCPT ); Thu, 5 Sep 2019 23:38:33 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x863YcEx074767; Fri, 6 Sep 2019 03:38:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2019-08-05; bh=R70hgIyKXJJpl4QuH/sILArckwUjy35P4RsDGzar/2c=; b=hTCN77Ww2QbyKEzX7xwklCR320E4PgNSIiOKtvbl2isH7LnpMnA7lP0hVQ2pau1pHfk6 5Gz9r7mnwLxmxAs8oOMukYxWnXRoB/GKyDnkG5AIrcEEDJ6KgOdTp7rgLc/nIhYn+WhP qm978v1xne2T33VG2NFw7SsB1TRQjR7VfKfeFuynIea3B8EpvOtBIqG0Lh4BD652Wd2Z Sh0P7m4g2yxgoBpwen8BeF8P9HFVHsSgzIajSZzLT/Oe4QhLtWELQlA+lvW+7snWeUUG PtxdquUDnjLXSTdaJKvX7/UAgJt6kJU+3dnXcbZu2BqgJJn5tX5vEdDRiI66fTmKsICp cA== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by aserp2120.oracle.com with ESMTP id 2uuf51g3bh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 06 Sep 2019 03:38:31 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x863cTXk096134; Fri, 6 Sep 2019 03:38:30 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserp3030.oracle.com with ESMTP id 2uu1b99sqy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 06 Sep 2019 03:38:30 +0000 Received: from abhmp0006.oracle.com (abhmp0006.oracle.com [141.146.116.12]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x863cFYT015906; Fri, 6 Sep 2019 03:38:15 GMT Received: from localhost (/10.159.148.70) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 05 Sep 2019 20:38:14 -0700 Subject: [PATCH 05/11] xfs_scrub: only call read_verify_force_io once per pool From: "Darrick J. Wong" To: sandeen@sandeen.net, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Thu, 05 Sep 2019 20:38:13 -0700 Message-ID: <156774109332.2645135.1085596269768224961.stgit@magnolia> In-Reply-To: <156774106064.2645135.2756383874064764589.stgit@magnolia> References: <156774106064.2645135.2756383874064764589.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9371 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1909060040 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9371 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1909060039 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong There's no reason we need to call read_verify_force_io every AG; we can just let the request aggregation code do its thing and push when we're totally done browsing the fsmap information. Signed-off-by: Darrick J. Wong --- scrub/phase6.c | 16 +++++----------- scrub/read_verify.c | 26 +++++++++++++++++--------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/scrub/phase6.c b/scrub/phase6.c index f6274a49..8063d6ce 100644 --- a/scrub/phase6.c +++ b/scrub/phase6.c @@ -411,7 +411,7 @@ xfs_check_rmap( */ if (map->fmr_flags & (FMR_OF_PREALLOC | FMR_OF_ATTR_FORK | FMR_OF_EXTENT_MAP | FMR_OF_SPECIAL_OWNER)) - goto out; + return true; /* XXX: Filter out directory data blocks. */ @@ -423,16 +423,6 @@ xfs_check_rmap( return false; } -out: - /* Is this the last extent? Fire off the read. */ - if (map->fmr_flags & FMR_OF_LAST) { - ret = read_verify_force_io(rvp); - if (ret) { - str_liberror(ctx, ret, descr); - return false; - } - } - return true; } @@ -448,6 +438,10 @@ clean_pool( if (!rvp) return 0; + ret = read_verify_force_io(rvp); + if (ret) + return ret; + ret = read_verify_pool_flush(rvp); if (ret) goto out_destroy; diff --git a/scrub/read_verify.c b/scrub/read_verify.c index 980b92b8..73d30817 100644 --- a/scrub/read_verify.c +++ b/scrub/read_verify.c @@ -282,22 +282,30 @@ read_verify_schedule_io( return 0; } +/* Force any per-thread stashed IOs into the verifier. */ +static int +force_one_io( + struct ptvar *ptv, + void *data, + void *foreach_arg) +{ + struct read_verify_pool *rvp = foreach_arg; + struct read_verify *rv = data; + + if (rv->io_length == 0) + return 0; + + return read_verify_queue(rvp, rv); +} + /* Force any stashed IOs into the verifier. */ int read_verify_force_io( struct read_verify_pool *rvp) { - struct read_verify *rv; - int ret; - assert(rvp->readbuf); - rv = ptvar_get(rvp->rvstate, &ret); - if (ret) - return ret; - if (rv->io_length == 0) - return 0; - return read_verify_queue(rvp, rv); + return ptvar_foreach(rvp->rvstate, force_one_io, rvp); } /* How many bytes has this process verified? */