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

Commit 69d3990c authored by Dmitry Eremin's avatar Dmitry Eremin Committed by Greg Kroah-Hartman
Browse files

staging: lustre: libcfs: fix error messages 



Don't treat unability to set CPU partition affinity as error.
Improve those warning messages.

Signed-off-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-8703
Reviewed-on: https://review.whamcloud.com/23307


Reviewed-by: default avatarPatrick Farrell <paf@cray.com>
Reviewed-by: default avatarDoug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3ff31517

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c

+1 −1
Original line number Diff line number Diff line
@@ -3546,7 +3546,7 @@ kiblnd_scheduler(void *arg) 


	rc = cfs_cpt_bind(lnet_cpt_table(), sched->ibs_cpt);

	if (rc) {

		CWARN("Failed to bind on CPT %d, please verify whether all CPUs are healthy and reload modules if necessary, otherwise your system might under risk of low performance\n",

		CWARN("Unable to bind on CPU partition %d, please verify whether all CPUs are healthy and reload modules if necessary, otherwise your system might under risk of low performance\n",

		      sched->ibs_cpt);

	}

drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c

+2 −2
Original line number Diff line number Diff line
@@ -1414,7 +1414,7 @@ int ksocknal_scheduler(void *arg) 


	rc = cfs_cpt_bind(lnet_cpt_table(), info->ksi_cpt);

	if (rc) {

		CERROR("Can't set CPT affinity to %d: %d\n",

		CWARN("Can't set CPU partition affinity to %d: %d\n",

		      info->ksi_cpt, rc);

	}

drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c

+3 −2
Original line number Diff line number Diff line
@@ -1082,8 +1082,9 @@ cfs_cpu_init(void) 
	}

	spin_unlock(&cpt_data.cpt_lock);



	LCONSOLE(0, "HW CPU cores: %d, npartitions: %d\n",

		 num_online_cpus(), cfs_cpt_number(cfs_cpt_table));

	LCONSOLE(0, "HW nodes: %d, HW CPU cores: %d, npartitions: %d\n",

		 num_online_nodes(), num_online_cpus(),

		 cfs_cpt_number(cfs_cpt_table));

	return 0;



 failed:

drivers/staging/lustre/lnet/libcfs/workitem.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static int cfs_wi_scheduler(void *arg) 
	/* CPT affinity scheduler? */

	if (sched->ws_cptab)

		if (cfs_cpt_bind(sched->ws_cptab, sched->ws_cpt))

			CWARN("Failed to bind %s on CPT %d\n",

			CWARN("Unable to bind %s on CPU partition %d\n",

			      sched->ws_name, sched->ws_cpt);



	spin_lock(&cfs_wi_data.wi_glock);

drivers/staging/lustre/lnet/selftest/module.c

+2 −1
Original line number Diff line number Diff line
@@ -112,7 +112,8 @@ lnet_selftest_init(void) 
		rc = cfs_wi_sched_create("lst_t", lnet_cpt_table(), i,

					 nthrs, &lst_sched_test[i]);

		if (rc) {

			CERROR("Failed to create CPT affinity WI scheduler %d for LST\n", i);

			CWARN("Failed to create CPU partition affinity WI scheduler %d for LST\n",

			      i);

			goto error;

		}

	}