From: Darrick J. Wong Date: Fri, 1 Nov 2019 20:32:45 +0000 (-0400) Subject: xfs_scrub: fix media verification thread pool size calculations X-Git-Tag: v5.3.0-rc2~47 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eacea7078cc22d42ab8c080da5c3761f78aaf55e;p=thirdparty%2Fxfsprogs-dev.git xfs_scrub: fix media verification thread pool size calculations The read verifier pool deals with two different thread counts -- there's the submitter thread count that enables us to perform per-thread verify request aggregation, and then there's the io thread pool count which is the maximum number of IO requests we want to send to the disk at any given time. The io thread pool count should be derived from disk_heads() but instead we bungle it by measuring and modifying(!) the nproc global variable. Fix the derivation to use global variables correctly. Signed-off-by: Darrick J. Wong Reviewed-by: Eric Sandeen Signed-off-by: Eric Sandeen --- diff --git a/scrub/read_verify.c b/scrub/read_verify.c index cba1b2d41..a963a3fd2 100644 --- a/scrub/read_verify.c +++ b/scrub/read_verify.c @@ -80,6 +80,7 @@ read_verify_pool_alloc( struct read_verify_pool **prvp) { struct read_verify_pool *rvp; + unsigned int verifier_threads = disk_heads(disk); int ret; /* @@ -99,7 +100,7 @@ read_verify_pool_alloc( RVP_IO_MAX_SIZE); if (ret) goto out_free; - ret = ptcounter_alloc(nproc, &rvp->verified_bytes); + ret = ptcounter_alloc(verifier_threads, &rvp->verified_bytes); if (ret) goto out_buf; rvp->miniosz = miniosz; @@ -110,11 +111,8 @@ read_verify_pool_alloc( &rvp->rvstate); if (ret) goto out_counter; - /* Run in the main thread if we only want one thread. */ - if (nproc == 1) - nproc = 0; ret = workqueue_create(&rvp->wq, (struct xfs_mount *)rvp, - disk_heads(disk)); + verifier_threads == 1 ? 0 : verifier_threads); if (ret) goto out_rvstate; *prvp = rvp;