From patchwork Wed Sep 25 21:39:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11161581 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A3B60912 for ; Wed, 25 Sep 2019 21:39:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8360D20872 for ; Wed, 25 Sep 2019 21:39:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="QfZnCr9q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728719AbfIYVjn (ORCPT ); Wed, 25 Sep 2019 17:39:43 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:48404 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728696AbfIYVjm (ORCPT ); Wed, 25 Sep 2019 17:39:42 -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 x8PLdPnV013275; Wed, 25 Sep 2019 21:39:41 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=nVy87dfq86TLdO1khKxSxJVFpb5TTwiel/D3+7L414I=; b=QfZnCr9qJtQzumziSdpCjhk5yw624s79ouyE12RPDawWaWfpfXOH1czTS8LWDnXcMngQ fOlDBXbE+V+AIwMZwi0LfEEdb+uyEB4jx3Qn9PJ6ghY6LVQhS6f4oUriHV+VkcA3Bgji S1ealWpPRDFRIar+3buxXNMYrH6d3M0BSLlFZhNbtX0lt3pz5pfgHUpVMl08+QXoIYjk cwJuPk3YdRgOKJ73da0QwDnKTKnPGyqdMUpt2KZjPYkeNvzl2pbSx/VOWXGIVIp5JBq2 PoGhOE4ItO+oS1sFksGXB102by6aWUA17YbZIPuI8zhxW5X0VkKqn3KEQ6gEvZtoa9Jp cg== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by aserp2120.oracle.com with ESMTP id 2v5btq7jah-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Sep 2019 21:39:41 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x8PLdGYi021187; Wed, 25 Sep 2019 21:39:40 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userp3030.oracle.com with ESMTP id 2v829w55v9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Sep 2019 21:39:40 +0000 Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x8PLddMt019242; Wed, 25 Sep 2019 21:39:39 GMT Received: from localhost (/10.145.178.55) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 25 Sep 2019 14:39:39 -0700 Subject: [PATCH 15/18] xfs_scrub: remove moveon from phase 2 functions From: "Darrick J. Wong" To: sandeen@sandeen.net, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Wed, 25 Sep 2019 14:39:36 -0700 Message-ID: <156944757665.301514.13008677573386678611.stgit@magnolia> In-Reply-To: <156944748487.301514.14685083474028866113.stgit@magnolia> References: <156944748487.301514.14685083474028866113.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9391 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-1908290000 definitions=main-1909250175 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9391 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-1908290000 definitions=main-1909250175 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong Replace the moveon returns in the phase 2 code with a direct integer error return. Signed-off-by: Darrick J. Wong --- scrub/phase2.c | 88 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 55 insertions(+), 33 deletions(-) diff --git a/scrub/phase2.c b/scrub/phase2.c index 7388b8e2..81b2b3dc 100644 --- a/scrub/phase2.c +++ b/scrub/phase2.c @@ -19,13 +19,13 @@ /* Scrub each AG's metadata btrees. */ static void -xfs_scan_ag_metadata( +scan_ag_metadata( struct workqueue *wq, xfs_agnumber_t agno, void *arg) { struct scrub_ctx *ctx = (struct scrub_ctx *)wq->wq_ctx; - bool *pmoveon = arg; + bool *aborted = arg; struct action_list alist; struct action_list immediate_alist; unsigned long long broken_primaries; @@ -33,6 +33,9 @@ xfs_scan_ag_metadata( char descr[DESCR_BUFSZ]; int ret; + if (*aborted) + return; + action_list_init(&alist); action_list_init(&immediate_alist); snprintf(descr, DESCR_BUFSZ, _("AG %u"), agno); @@ -84,48 +87,52 @@ _("Filesystem might not be repairable.")); /* Everything else gets fixed during phase 4. */ action_list_defer(ctx, agno, &alist); - return; err: - *pmoveon = false; + *aborted = true; } /* Scrub whole-FS metadata btrees. */ static void -xfs_scan_fs_metadata( +scan_fs_metadata( struct workqueue *wq, xfs_agnumber_t agno, void *arg) { struct scrub_ctx *ctx = (struct scrub_ctx *)wq->wq_ctx; - bool *pmoveon = arg; + bool *aborted = arg; struct action_list alist; int ret; + if (*aborted) + return; + action_list_init(&alist); ret = xfs_scrub_fs_metadata(ctx, &alist); - if (ret) - *pmoveon = false; + if (ret) { + *aborted = true; + return; + } action_list_defer(ctx, agno, &alist); } /* Scan all filesystem metadata. */ -bool -xfs_scan_metadata( +int +phase2_func( struct scrub_ctx *ctx) { struct action_list alist; struct workqueue wq; xfs_agnumber_t agno; - bool moveon = true; - int ret; + bool aborted = false; + int ret, ret2; ret = workqueue_create(&wq, (struct xfs_mount *)ctx, scrub_nproc_workqueue(ctx)); if (ret) { str_liberror(ctx, ret, _("creating scrub workqueue")); - return false; + return ret; } /* @@ -135,48 +142,53 @@ xfs_scan_metadata( */ action_list_init(&alist); ret = xfs_scrub_primary_super(ctx, &alist); - if (ret) { - moveon = false; + if (ret) goto out; - } ret = action_list_process_or_defer(ctx, 0, &alist); - if (ret) { - moveon = false; + if (ret) goto out; - } - for (agno = 0; moveon && agno < ctx->mnt.fsgeom.agcount; agno++) { - ret = workqueue_add(&wq, xfs_scan_ag_metadata, agno, &moveon); + for (agno = 0; !aborted && agno < ctx->mnt.fsgeom.agcount; agno++) { + ret = workqueue_add(&wq, scan_ag_metadata, agno, &aborted); if (ret) { - moveon = false; str_liberror(ctx, ret, _("queueing per-AG scrub work")); goto out; } } - if (!moveon) + if (aborted) goto out; - ret = workqueue_add(&wq, xfs_scan_fs_metadata, 0, &moveon); + ret = workqueue_add(&wq, scan_fs_metadata, 0, &aborted); if (ret) { - moveon = false; str_liberror(ctx, ret, _("queueing per-FS scrub work")); goto out; } out: - ret = workqueue_terminate(&wq); - if (ret) { - moveon = false; - str_liberror(ctx, ret, _("finishing scrub work")); + ret2 = workqueue_terminate(&wq); + if (ret2) { + str_liberror(ctx, ret2, _("finishing scrub work")); + if (!ret && ret2) + ret = ret2; } workqueue_destroy(&wq); - return moveon; + + if (!ret && aborted) + ret = ECANCELED; + return ret; } -/* Estimate how much work we're going to do. */ bool -xfs_estimate_metadata_work( +xfs_scan_metadata( + struct scrub_ctx *ctx) +{ + return phase2_func(ctx) == 0; +} + +/* Estimate how much work we're going to do. */ +int +phase2_estimate( struct scrub_ctx *ctx, uint64_t *items, unsigned int *nr_threads, @@ -185,5 +197,15 @@ xfs_estimate_metadata_work( *items = scrub_estimate_ag_work(ctx); *nr_threads = scrub_nproc(ctx); *rshift = 0; - return true; + return 0; +} + +bool +xfs_estimate_metadata_work( + struct scrub_ctx *ctx, + uint64_t *items, + unsigned int *nr_threads, + int *rshift) +{ + return phase2_estimate(ctx, items, nr_threads, rshift) == 0; }