LU-6261 gnilnd: Add ability to bind scheduler threads to cpus.

[fs/lustre-release.git] / lnet / klnds / gnilnd / gnilnd_aries.h

diff --git a/lnet/klnds/gnilnd/gnilnd_aries.h b/lnet/klnds/gnilnd/gnilnd_aries.h
index d0a1e69..ce187ed 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd_aries.h
+++ b/lnet/klnds/gnilnd/gnilnd_aries.h
@@ -1,7 +1,8 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * Copyright (C) 2009-2012 Cray, Inc.
+ *
+ * Copyright (c) 2014, Intel Corporation.
+ *
  *   Author: Nic Henke <nic@cray.com>, James Shimek <jshimek@cray.com>
  *
  *   This file is part of Lustre, http://www.lustre.org.
@@ -23,8 +24,8 @@
 #ifndef _GNILND_ARIES_H
 #define _GNILND_ARIES_H
 
-/* for libcfs_ipif_query */
-#include <libcfs/libcfs.h>
+/* for lnet_ipif_query */
+#include <lnet/lib-lnet.h>
 
 #ifndef _GNILND_HSS_OPS_H
 # error "must include gnilnd_hss_ops.h first"
@@ -50,8 +51,12 @@
 #else
 #define GNILND_REVERSE_RDMA        GNILND_REVERSE_GET
 #define GNILND_RDMA_DLVR_OPTION    GNI_DLVMODE_PERFORMANCE
+#define GNILND_SCHED_THREADS       7             /* scheduler threads */
 #endif
 
+/* Thread-safe kgni implemented in minor ver 45, code rev 0xb9 */
+#define GNILND_KGNI_TS_MINOR_VER 0x45
+
 /* plug in our functions for use on the simulator */
 #if !defined(GNILND_USE_RCA)
 
@@ -74,7 +79,8 @@ kgnilnd_nid_to_nicaddrs(__u32 nid, int numnic, __u32 *nicaddr)
                return -EINVAL;
        }
        if (nid < kgnilnd_data.kgn_nid_trans_private) {
-               CERROR("Request for invalid nid translation %u, minimum %Lu\n",
+               CERROR("Request for invalid nid translation %u,"
+                      "minimum "LPU64"\n",
                       nid, kgnilnd_data.kgn_nid_trans_private);
                return -ESRCH;
        }
@@ -103,7 +109,7 @@ kgnilnd_setup_nic_translation(__u32 device_id)
 
        LCONSOLE_INFO("using Aries SIM IP info for RCA translation\n");
 
-       rc = libcfs_ipif_query(if_name, &up, &ipaddr, &netmask);
+       rc = lnet_ipif_query(if_name, &up, &ipaddr, &netmask);
        if (rc != 0) {
                CERROR ("can't get IP interface for %s: %d\n", if_name, rc);
                return rc;