LU-8703 libcfs: fix error messages

Don't treat unability to set CPU partition affinity as error.

Change-Id: I9ccbef76e05f1a5f75b648610b5a71389ed0d6e1
Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-on: https://review.whamcloud.com/23307
Reviewed-by: Patrick Farrell <paf@cray.com>
Reviewed-by: Doug Oucharek <doug.s.oucharek@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/libcfs/libcfs/linux/linux-cpu.c b/libcfs/libcfs/linux/linux-cpu.c
index dca5d37..f9c2206 100644 (file)
--- a/libcfs/libcfs/linux/linux-cpu.c
+++ b/libcfs/libcfs/linux/linux-cpu.c
@@ -1120,8 +1120,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:

diff --git a/libcfs/libcfs/workitem.c b/libcfs/libcfs/workitem.c
index fd47899..40d5331 100644 (file)
--- a/libcfs/libcfs/workitem.c
+++ b/libcfs/libcfs/workitem.c
@@ -212,7 +212,7 @@ cfs_wi_scheduler(void *arg)
        /* CPT affinity scheduler? */
        if (sched->ws_cptab != NULL)
                if (cfs_cpt_bind(sched->ws_cptab, sched->ws_cpt) != 0)
-                       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);

diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c
index b1277f4..51ecf7b 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -3517,10 +3517,10 @@ kiblnd_scheduler(void *arg)
 
        rc = cfs_cpt_bind(lnet_cpt_table(), sched->ibs_cpt);
        if (rc != 0) {
-               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", sched->ibs_cpt);
+               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);
        }
 
        spin_lock_irqsave(&sched->ibs_lock, flags);

diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c
index 77dde23..a813cdd 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_cb.c
+++ b/lnet/klnds/socklnd/socklnd_cb.c
@@ -1402,8 +1402,8 @@ int ksocknal_scheduler(void *arg)
 
        rc = cfs_cpt_bind(lnet_cpt_table(), info->ksi_cpt);
        if (rc != 0) {
-               CERROR("Can't set CPT affinity to %d: %d\n",
-                      info->ksi_cpt, rc);
+               CWARN("Can't set CPU partition affinity to %d: %d\n",
+                       info->ksi_cpt, rc);
        }
 
        spin_lock_bh(&sched->kss_lock);

diff --git a/lnet/selftest/module.c b/lnet/selftest/module.c
index 2d616e9..a34aae8 100644 (file)
--- a/lnet/selftest/module.c
+++ b/lnet/selftest/module.c
@@ -124,8 +124,8 @@ lnet_selftest_init(void)
                rc = cfs_wi_sched_create("lst_t", lnet_cpt_table(), i,
                                         nthrs, &lst_sched_test[i]);
                if (rc != 0) {
-                       CERROR("Failed to create CPT affinity WI scheduler "
-                              "%d for LST\n", i);
+                       CERROR("Failed to create CPU partition affinity WI "
+                              "scheduler %d for LST\n", i);
                        goto error;
                }
        }