From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755043AbbJIDZP (ORCPT ); Thu, 8 Oct 2015 23:25:15 -0400 Received: from m50-111.126.com ([123.125.50.111]:52003 "EHLO m50-111.126.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750949AbbJIDZN (ORCPT ); Thu, 8 Oct 2015 23:25:13 -0400 From: Xunlei Pang To: linux-kernel@vger.kernel.org Cc: linux-raid@vger.kernel.org, Alasdair Kergon , Mike Snitzer , Mikulas Patocka , Neil Brown , Tejun Heo , Xunlei Pang Subject: [PATCH] md: workqueue: Remove WQ_CPU_INTENSIVE from unbound workqueue allocations Date: Fri, 9 Oct 2015 11:25:35 +0800 Message-Id: <1444361135-22624-1-git-send-email-xlpang@126.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: jtKowACXMHRZMxdWnSj3BQ--.18083S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7AF4UArW5uFykXr4UtF47Arb_yoW8KF47pF s0qFy5XrW5tw47G3s0k3W8ua13K3WUKr9rCFWa9ws5ZF15uFyrZ3W2yFW5urWDAF95JF4a vF48JFsrC3WYy3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jqGQhUUUUU= X-Originating-IP: [210.21.223.3] X-CM-SenderInfo: p0ost0bj6rjloofrz/1tbiXASOv1R0ZC-dUwAAsM Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xunlei Pang WQ_CPU_INTENSIVE is meaningless for the unbound workqueue, so remove it. Signed-off-by: Xunlei Pang --- drivers/md/dm-crypt.c | 4 ++-- drivers/md/dm-verity.c | 3 ++- drivers/md/raid5.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 4b3b6f8..56b2560 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -1871,8 +1871,8 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) if (test_bit(DM_CRYPT_SAME_CPU, &cc->flags)) cc->crypt_queue = alloc_workqueue("kcryptd", WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM, 1); else - cc->crypt_queue = alloc_workqueue("kcryptd", WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM | WQ_UNBOUND, - num_online_cpus()); + cc->crypt_queue = alloc_workqueue("kcryptd", + WQ_MEM_RECLAIM | WQ_UNBOUND, num_online_cpus()); if (!cc->crypt_queue) { ti->error = "Couldn't create kcryptd queue"; goto bad; diff --git a/drivers/md/dm-verity.c b/drivers/md/dm-verity.c index edc624b..f2fc693 100644 --- a/drivers/md/dm-verity.c +++ b/drivers/md/dm-verity.c @@ -942,7 +942,8 @@ static int verity_ctr(struct dm_target *ti, unsigned argc, char **argv) ti->per_bio_data_size = roundup(sizeof(struct dm_verity_io) + v->shash_descsize + v->digest_size * 2, __alignof__(struct dm_verity_io)); /* WQ_UNBOUND greatly improves performance when running on ramdisk */ - v->verify_wq = alloc_workqueue("kverityd", WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM | WQ_UNBOUND, num_online_cpus()); + v->verify_wq = alloc_workqueue("kverityd", + WQ_MEM_RECLAIM | WQ_UNBOUND, num_online_cpus()); if (!v->verify_wq) { ti->error = "Cannot allocate workqueue"; r = -ENOMEM; diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 49bb8d3..2a25af8 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -7840,7 +7840,7 @@ static struct md_personality raid4_personality = static int __init raid5_init(void) { raid5_wq = alloc_workqueue("raid5wq", - WQ_UNBOUND|WQ_MEM_RECLAIM|WQ_CPU_INTENSIVE|WQ_SYSFS, 0); + WQ_UNBOUND | WQ_MEM_RECLAIM | WQ_SYSFS, 0); if (!raid5_wq) return -ENOMEM; register_md_personality(&raid6_personality); -- 1.9.1