Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754986AbdC1XNB (ORCPT ); Tue, 28 Mar 2017 19:13:01 -0400 Received: from mga03.intel.com ([134.134.136.65]:38685 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752735AbdC1XNA (ORCPT ); Tue, 28 Mar 2017 19:13:00 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,238,1486454400"; d="scan'208";a="1113097341" From: Keith Busch To: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, Thomas Gleixner Cc: Christoph Hellwig , Keith Busch Subject: [PATCH] irq/affinity: Assign all CPUs a vector Date: Tue, 28 Mar 2017 19:21:17 -0400 Message-Id: <1490743277-14139-1-git-send-email-keith.busch@intel.com> X-Mailer: git-send-email 2.5.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2792 Lines: 78 The number of vectors to assign needs to be adjusted for each node such that it doesn't exceed the number of CPUs in that node. This patch recalculates the vector assignment per-node so that we don't try to assign more vectors than there are CPUs. When that previously happened, the cpus_per_vec was calculated to be 0, so many vectors had no CPUs assigned. This then goes on to fail to allocate descriptors due to empty masks, leading to an unoptimal spread. Not only does this patch get the intended spread, this also fixes other subsystems that depend on every CPU being assigned to something: blk_mq_map_swqueue dereferences NULL while mapping s/w queues when CPUs are unnassigned, so making sure all CPUs are assigned fixes that. Signed-off-by: Keith Busch --- kernel/irq/affinity.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/kernel/irq/affinity.c b/kernel/irq/affinity.c index 4544b11..dc52911 100644 --- a/kernel/irq/affinity.c +++ b/kernel/irq/affinity.c @@ -59,7 +59,7 @@ static int get_nodes_in_cpumask(const struct cpumask *mask, nodemask_t *nodemsk) struct cpumask * irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd) { - int n, nodes, vecs_per_node, cpus_per_vec, extra_vecs, curvec; + int n, nodes, cpus_per_vec, extra_vecs, curvec; int affv = nvecs - affd->pre_vectors - affd->post_vectors; int last_affv = affv + affd->pre_vectors; nodemask_t nodemsk = NODE_MASK_NONE; @@ -94,19 +94,21 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd) goto done; } - /* Spread the vectors per node */ - vecs_per_node = affv / nodes; - /* Account for rounding errors */ - extra_vecs = affv - (nodes * vecs_per_node); - for_each_node_mask(n, nodemsk) { - int ncpus, v, vecs_to_assign = vecs_per_node; + int ncpus, v, vecs_to_assign, vecs_per_node; + + /* Spread the vectors per node */ + vecs_per_node = (affv - curvec) / nodes; /* Get the cpus on this node which are in the mask */ cpumask_and(nmsk, cpu_online_mask, cpumask_of_node(n)); /* Calculate the number of cpus per vector */ ncpus = cpumask_weight(nmsk); + vecs_to_assign = min(vecs_per_node, ncpus); + + /* Account for rounding errors */ + extra_vecs = ncpus - vecs_to_assign; for (v = 0; curvec < last_affv && v < vecs_to_assign; curvec++, v++) { @@ -115,14 +117,14 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd) /* Account for extra vectors to compensate rounding errors */ if (extra_vecs) { cpus_per_vec++; - if (!--extra_vecs) - vecs_per_node++; + --extra_vecs; } irq_spread_init_one(masks + curvec, nmsk, cpus_per_vec); } if (curvec >= last_affv) break; + --nodes; } done: -- 2.7.2