Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0810daf authored by Bryan O'Sullivan's avatar Bryan O'Sullivan Committed by Roland Dreier
Browse files

IB/ipath: Fix unit selection when all CPU affinity bits set 



At some point things changed so that all the affinity bits can be set,
but cpus_full() macro is not true.  This caused problems with the unit
selection logic on multi-unit (board) configurations.

Signed-off-by: default avatarDave Olson <dave.olson@qlogic.com>
Signed-off-by: default avatarBryan O'Sullivan <bryan.osullivan@qlogic.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 662af581

drivers/infiniband/hw/ipath/ipath_file_ops.c

+5 −4
Original line number Diff line number Diff line
@@ -1592,15 +1592,16 @@ static int find_best_unit(struct file *fp, 
	 */

	if (!cpus_empty(current->cpus_allowed) &&

	    !cpus_full(current->cpus_allowed)) {

		int ncpus = num_online_cpus(), curcpu = -1;

		int ncpus = num_online_cpus(), curcpu = -1, nset = 0;

		for (i = 0; i < ncpus; i++)

			if (cpu_isset(i, current->cpus_allowed)) {

				ipath_cdbg(PROC, "%s[%u] affinity set for "

					   "cpu %d\n", current->comm,

					   current->pid, i);

					   "cpu %d/%d\n", current->comm,

					   current->pid, i, ncpus);

				curcpu = i;

				nset++;

			}

		if (curcpu != -1) {

		if (curcpu != -1 && nset != ncpus) {

			if (npresent) {

				prefunit = curcpu / (ncpus / npresent);

				ipath_cdbg(PROC,"%s[%u] %d chips, %d cpus, "