renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 11:44:01 +08:00
Code

staging: lustre: lnet: add per NI configuration structures

Browse Source 
Currently for LNet all hardware configuration is done with
the modprobe configuration file. These settings are applied
to all hardware instances for a node. That makes it impossible
to configure two different pieces of infiniband hardware that
require very different settings to function. Here we
introduce the infrastructre to allow applying per interface
settings.

Signed-off-by: Amir Shehata <amir.shehata@intel.com>
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-7101
Reviewed-on: http://review.whamcloud.com/16367
Reviewed-by: Doug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: Olaf Weber <olaf@sgi.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Amir Shehata 2016-05-06 21:30:24 -04:00 committed by Greg Kroah-Hartman
parent 27c7f7caa6
commit 243a941c0d
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/staging/lustre/include/linux/lnet/lib-dlc.h
View File

@ -37,10 +37,37 @@
#define LNET_MAX_SHOW_NUM_CPT 128 #define LNET_MAX_SHOW_NUM_CPT 128
#define LNET_UNDEFINED_HOPS ((__u32) -1) #define LNET_UNDEFINED_HOPS ((__u32) -1)
struct lnet_ioctl_config_lnd_cmn_tunables {
__u32 lct_version;
__u32 lct_peer_timeout;
__u32 lct_peer_tx_credits;
__u32 lct_peer_rtr_credits;
__u32 lct_max_tx_credits;
};
struct lnet_ioctl_config_o2iblnd_tunables {
__u32 lnd_version;
__u32 lnd_peercredits_hiw;
__u32 lnd_map_on_demand;
__u32 lnd_concurrent_sends;
__u32 lnd_fmr_pool_size;
__u32 lnd_fmr_flush_trigger;
__u32 lnd_fmr_cache;
__u32 pad;
};
struct lnet_ioctl_config_lnd_tunables {
struct lnet_ioctl_config_lnd_cmn_tunables lt_cmn;
union {
struct lnet_ioctl_config_o2iblnd_tunables lt_o2ib;
} lt_tun_u;
};
struct lnet_ioctl_net_config { struct lnet_ioctl_net_config {
char ni_interfaces[LNET_MAX_INTERFACES][LNET_MAX_STR_LEN]; char ni_interfaces[LNET_MAX_INTERFACES][LNET_MAX_STR_LEN];
__u32 ni_status; __u32 ni_status;
__u32 ni_cpts[LNET_MAX_SHOW_NUM_CPT]; __u32 ni_cpts[LNET_MAX_SHOW_NUM_CPT];
char cfg_bulk[0];
}; };
#define LNET_TINY_BUF_IDX 0 #define LNET_TINY_BUF_IDX 0
@ -81,7 +108,7 @@ struct lnet_ioctl_config_data {
__s32 net_peer_rtr_credits; __s32 net_peer_rtr_credits;
__s32 net_max_tx_credits; __s32 net_max_tx_credits;
__u32 net_cksum_algo; __u32 net_cksum_algo;
__u32 net_pad; __u32 net_interface_count;
} cfg_net; } cfg_net;
struct { struct {
__u32 buf_enable; __u32 buf_enable;

2
drivers/staging/lustre/include/linux/lnet/lib-types.h
View File

@ -273,6 +273,8 @@ typedef struct lnet_ni {
int **ni_refs; /* percpt reference count */ int **ni_refs; /* percpt reference count */
time64_t ni_last_alive;/* when I was last alive */ time64_t ni_last_alive;/* when I was last alive */
lnet_ni_status_t *ni_status; /* my health status */ lnet_ni_status_t *ni_status; /* my health status */
/* per NI LND tunables */
struct lnet_ioctl_config_lnd_tunables *ni_lnd_tunables;
/* equivalent interfaces to use */ /* equivalent interfaces to use */
char *ni_interfaces[LNET_MAX_INTERFACES]; char *ni_interfaces[LNET_MAX_INTERFACES];
} lnet_ni_t; } lnet_ni_t;

3
drivers/staging/lustre/lnet/lnet/config.c
View File

@ -107,6 +107,9 @@ lnet_ni_free(struct lnet_ni *ni)
if (ni->ni_cpts) if (ni->ni_cpts)
cfs_expr_list_values_free(ni->ni_cpts, ni->ni_ncpts); cfs_expr_list_values_free(ni->ni_cpts, ni->ni_ncpts);
if (ni->ni_lnd_tunables)
LIBCFS_FREE(ni->ni_lnd_tunables, sizeof(*ni->ni_lnd_tunables));
for (i = 0; i < LNET_MAX_INTERFACES && ni->ni_interfaces[i]; i++) { for (i = 0; i < LNET_MAX_INTERFACES && ni->ni_interfaces[i]; i++) {
LIBCFS_FREE(ni->ni_interfaces[i], LIBCFS_FREE(ni->ni_interfaces[i],
strlen(ni->ni_interfaces[i]) + 1); strlen(ni->ni_interfaces[i]) + 1);