opensm: Add support for partition enforcement types
PATCH 1/1 opensm: Add support for partition enforcement types
Partition enforcement types are in, out, and both. Prior to this support, both was being used so that is the default.
---
include/opensm/osm_subnet.h +13 -0
@@ -68,6 +68,17 @@ BEGIN_C_DECLS#define OSM_SUBNET_VECTOR_MIN_SIZE 0#define OSM_SUBNET_VECTOR_GROW_SIZE 1#define OSM_SUBNET_VECTOR_CAPACITY 256 + +#define OSM_PARTITION_ENFORCE_BOTH "both" +#define OSM_PARTITION_ENFORCE_IN "in" +#define OSM_PARTITION_ENFORCE_OUT "out" + +typedef enum _osm_partition_enforce_type_enum { +OSM_PARTITION_ENFORCE_TYPE_BOTH , +OSM_PARTITION_ENFORCE_TYPE_IN , +OSM_PARTITION_ENFORCE_TYPE_OUT +}osm_partition_enforce_type_enum ; +struct osm_opensm ;struct osm_qos_policy ;
@@ -182,6 +193,8 @@ typedef struct osm_subn_opt {unsigned long log_max_size;char *partition_config_file;boolean_t no_partition_enforcement; +char *part_enforce_type; +osm_partition_enforce_type_enum part_enforce_type_enum;boolean_t qos;char *qos_policy_file;boolean_t accum_log_file;
man/opensm.8.in +7 -1
@@ -1,4 +1,4 @@ -.TH OPENSM 8 "November 3, 2010" "OpenIB" "OpenIB Management" +.TH OPENSM 8 "July 5, 2011" "OpenIB" "OpenIB Management" .SH NAME opensm \- InfiniBand subnet manager and administration (SM/SA)
@@ -45,6 +45,7 @@ opensm \- InfiniBand subnet manager and administration (SM/SA) [\-L | \-\-log_limit <size in MB>] [\-e(rase_log_file)] [\-P(config) <partition config file> ] [\-N | \-\-no_part_enforce] +[\-Z | \-\-part_enforce_type [both | out | in ]] [\-Q | \-\-qos [\-Y | \-\-qos_policy_file <file name>]] [\-y | \-\-stay_on_fatal] [\-B | \-\-daemon]
@@ -366,6 +367,11 @@ configuring QoS policy via this file. \fB\-N\fR, \fB\-\-no_part_enforce\fR This option disables partition enforcement on switch external ports. .TP +\fB\-Z\fR, \fB\-\-part_enforce_type\fR [both | in | out] +This option indicates the partition enforcement type (for switches). +Enforcement type can be inbound only (in), outbound only (out), +or both. Default is both. +.TP \fB\-y\fR, \fB\-\-stay_on_fatal\fR This option will cause SM not to exit on fatal initialization issues: if SM discovers duplicated guids or a 12x link with
opensm/main.c +23 -2
@@ -1,6 +1,6 @@/* * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved. -* Copyright (c) 2002-2009 Mellanox Technologies LTD. All rights reserved. +* Copyright (c) 2002-2011 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. * Copyright (c) 2009 HNR Consulting. All rights reserved. * Copyright (c) 2009 System Fabric Works, Inc. All rights reserved.
@@ -320,6 +320,10 @@ static void show_usage(void) OSM_DEFAULT_PARTITION_CONFIG_FILE "\'.\n\n");printf ("--no_part_enforce, -N\n" " This option disables partition enforcement on switch external ports.\n\n" ); +printf ("--part_enforce_type, -Z [both, in, out]\n" +" This option indicates the partition enforcement type (for switches)\n" +" Enforcement type can be outbound only (out), inbound only (in), or both.\n" +" Default is both.\n\n" );printf ("--qos, -Q\n" " This option enables QoS setup.\n\n" );printf ("--qos_policy_file, -Y <QoS-policy-file>\n" " This option defines the optional QoS policy file.\n"
@@ -566,7 +570,7 @@ int main(int argc, char *argv[])char *conf_template =NULL , *config_file =NULL ;uint32_t val;const char *const short_option = -"F:c:i:w:O:f:ed:D:g:l:L:s:t:a:u:m:X:R:zM:U:S:P:Y:ANBIQvVhoryxp:n:q:k:C:G:H:" ; +"F:c:i:w:O:f:ed:D:g:l:L:s:t:a:u:m:X:R:zM:U:S:P:Y:ANBIQvVhoryxp:n:q:k:C:G:H:Z:" ;/* In the array below, the 2nd parameter specifies the number
@@ -595,6 +599,7 @@ int main(int argc, char *argv[]) {"erase_log_file", 0, NULL, 'e'}, {"Pconfig", 1, NULL, 'P'}, {"no_part_enforce", 0, NULL, 'N'}, + {"part_enforce_type", 1, NULL, 'Z'}, {"qos", 0, NULL, 'Q'}, {"qos_policy_file", 1, NULL, 'Y'}, {"maxsmps", 1, NULL, 'n'},
@@ -870,6 +875,22 @@ int main(int argc, char *argv[]) opt.no_partition_enforcement = TRUE;break ; +case 'Z' : +if (strcmp (optarg,OSM_PARTITION_ENFORCE_BOTH ) ==0 + ||strcmp (optarg,OSM_PARTITION_ENFORCE_IN ) ==0 + ||strcmp (optarg,OSM_PARTITION_ENFORCE_OUT ) ==0 ) { +SET_STR_OPT (opt.part_enforce_type, optarg); +if (strcmp (optarg,OSM_PARTITION_ENFORCE_BOTH ) ==0 ) + opt.part_enforce_type_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH ; +else if (strcmp (optarg,OSM_PARTITION_ENFORCE_IN ) ==0 ) + opt.part_enforce_type_enum =OSM_PARTITION_ENFORCE_TYPE_IN ; +else + opt.part_enforce_type_enum =OSM_PARTITION_ENFORCE_TYPE_OUT ; + }else +printf ("-part_enforce_type %s option not understood\n" , + optarg); +break ; +case 'Q' : opt.qos = TRUE;break ;
opensm/osm_pkey_mgr.c +21 -11
@@ -1,6 +1,6 @@/* * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved. -* Copyright (c) 2002-2010 Mellanox Technologies LTD. All rights reserved. +* Copyright (c) 2002-2011 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. *
@@ -182,16 +182,25 @@ pkey_mgr_update_pkey_entry(IN osm_sm_t * sm,static ib_api_status_t pkey_mgr_enforce_partition(IN osm_log_t * p_log, osm_sm_t * sm, - IN osm_physp_t * p_physp, IN const boolean_t enforce) + IN osm_physp_t * p_physp, IN const boolean_t enforce, + IN osm_partition_enforce_type_enum enforce_type) {osm_madw_context_t context;uint8_t payload[IB_SMP_DATA_SIZE ];ib_port_info_t *p_pi;ib_api_status_t status; +uint8_t enforce_bits; p_pi = &p_physp->port_info; -if ((p_pi->vl_enforce &0xc ) == (0xc ) * (enforce == TRUE)) { +if (enforce_type ==OSM_PARTITION_ENFORCE_TYPE_BOTH ) + enforce_bits =0xc ; +else if (enforce_type ==OSM_PARTITION_ENFORCE_TYPE_IN ) + enforce_bits =0x8 ; +else + enforce_bits =0x4 ; + +if ((p_pi->vl_enforce &0xc ) == enforce_bits * (enforce == TRUE)) { OSM_LOG(p_log, OSM_LOG_DEBUG, "No need to update PortInfo for " "node 0x%016" PRIx64 " port %u (%s)\n",
@@ -207,10 +216,9 @@ pkey_mgr_enforce_partition(IN osm_log_t * p_log, osm_sm_t * sm, IB_SMP_DATA_SIZE - sizeof(ib_port_info_t)); p_pi = (ib_port_info_t *) payload; + p_pi->vl_enforce &= ~0xc ;if (enforce == TRUE) - p_pi->vl_enforce |=0xc ; -else - p_pi->vl_enforce &= ~0xc ; + p_pi->vl_enforce |= enforce_bits; p_pi->state_info2 =0 ;ib_port_info_set_port_state (p_pi,IB_LINK_NO_CHANGE );
@@ -436,7 +444,8 @@ static int update_peer_block(osm_log_t * p_log, osm_sm_t * sm,static int pkey_mgr_update_peer_port (osm_log_t * p_log,osm_sm_t * sm,const osm_subn_t * p_subn,const osm_port_t *const p_port, -boolean_t enforce) +boolean_t enforce, +osm_partition_enforce_type_enum enforce_type) {osm_physp_t *p_physp, *peer;osm_node_t *p_node;
@@ -462,7 +471,7 @@ static int pkey_mgr_update_peer_port(osm_log_t * p_log, osm_sm_t * sm,return 0 ;if (enforce == FALSE) { -pkey_mgr_enforce_partition (p_log, sm, peer, FALSE); +pkey_mgr_enforce_partition (p_log, sm, peer, FALSE, enforce_type);return ret; }
@@ -545,7 +554,7 @@ static int pkey_mgr_update_peer_port(osm_log_t * p_log, osm_sm_t * sm,cl_ntoh64 (osm_node_get_node_guid (p_node)), osm_physp_get_port_num(peer), p_node->print_desc); -if (pkey_mgr_enforce_partition (p_log, sm, peer, enforce)) +if (pkey_mgr_enforce_partition (p_log, sm, peer, enforce, enforce_type)) ret =-1 ;return ret;
@@ -600,7 +609,8 @@ int osm_pkey_mgr_process(IN osm_opensm_t * p_osm) &&pkey_mgr_update_peer_port (&p_osm->log, &p_osm->sm, &p_osm->subn, p_port, !p_osm->subn.opt. - no_partition_enforcement)) + no_partition_enforcement, + p_osm->subn.opt.part_enforce_type_enum)) ret = -1; }
@@ -624,7 +634,7 @@ int osm_pkey_mgr_process(IN osm_opensm_t * p_osm)continue ;/* clear partition enforcement */ -if (pkey_mgr_enforce_partition (&p_osm->log, &p_osm->sm, p_physp, FALSE)) +if (pkey_mgr_enforce_partition (&p_osm->log, &p_osm->sm, p_physp, FALSE, p_osm->subn.opt.part_enforce_type_enum)) ret =-1 ; } }
opensm/osm_subnet.c +24 -2
@@ -342,6 +342,7 @@ static const opt_rec_t opt_tbl[] = { { "accum_log_file", OPT_OFFSET(accum_log_file), opts_parse_boolean, opts_setup_accum_log_file, 1 }, { "partition_config_file", OPT_OFFSET(partition_config_file), opts_parse_charp, NULL, 0 }, { "no_partition_enforcement", OPT_OFFSET(no_partition_enforcement), opts_parse_boolean, NULL, 1 }, + { "part_enforce_type", OPT_OFFSET(part_enforce_type), opts_parse_charp, NULL, 1 }, { "qos", OPT_OFFSET(qos), opts_parse_boolean, NULL, 1 }, { "qos_policy_file", OPT_OFFSET(qos_policy_file), opts_parse_charp, NULL, 0 }, { "dump_files_dir", OPT_OFFSET(dump_files_dir), opts_parse_charp, NULL, 0 },
@@ -761,6 +762,7 @@ void osm_subn_set_default_opt(IN osm_subn_opt_t * p_opt) p_opt->log_max_size =0 ; p_opt->partition_config_file =strdup (OSM_DEFAULT_PARTITION_CONFIG_FILE ); p_opt->no_partition_enforcement = FALSE; + p_opt->part_enforce_type =OSM_PARTITION_ENFORCE_BOTH ; p_opt->qos = FALSE; p_opt->qos_policy_file =strdup (OSM_DEFAULT_QOS_POLICY_FILE ); p_opt->accum_log_file = TRUE;
@@ -1129,6 +1131,21 @@ int osm_subn_verify_config(IN osm_subn_opt_t * p_opts) p_opts->console =OSM_DEFAULT_CONSOLE ; } +if (strcmp (p_opts->part_enforce_type,OSM_PARTITION_ENFORCE_BOTH ) ==0 ) + p_opts->part_enforce_type_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH ; +else if (strcmp (p_opts->part_enforce_type,OSM_PARTITION_ENFORCE_IN ) ==0 ) + p_opts->part_enforce_type_enum =OSM_PARTITION_ENFORCE_TYPE_IN ; +else if (strcmp (p_opts->part_enforce_type,OSM_PARTITION_ENFORCE_OUT ) ==0 ) + p_opts->part_enforce_type_enum =OSM_PARTITION_ENFORCE_TYPE_OUT ; +else { +log_report (" Invalid Cached Option Value:part_enforce_type = %s" +", Using Default:%s\n" , + p_opts->part_enforce_type =OSM_PARTITION_ENFORCE_BOTH ); + p_opts->part_enforce_type =OSM_PARTITION_ENFORCE_BOTH ; + p_opts->part_enforce_type_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH +; + } +if (p_opts->qos) {subn_verify_qos_set (&p_opts->qos_options,"qos" );subn_verify_qos_set (&p_opts->qos_ca_options,"qos_ca" );
@@ -1372,9 +1389,14 @@ int osm_subn_output_conf(FILE *out, IN osm_subn_opt_t * p_opts)"# Partition configuration file to be used\n" "partition_config_file %s\n\n" "# Disable partition enforcement by switches\n" -"no_partition_enforcement %s\n\n" , +"no_partition_enforcement %s\n\n" +"# Partition enforcement type (for switches)\n" +"# Values are both, out, and in\n" +"# Default is both (outbound and inbound enforcement)\n" +"part_enforce_type %s\n\n" , p_opts->partition_config_file, - p_opts->no_partition_enforcement ? "TRUE" : "FALSE"); + p_opts->no_partition_enforcement ?"TRUE" :"FALSE" , + p_opts->part_enforce_type);fprintf (out, "#\n# SWEEP OPTIONS\n#\n"
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Hal,
Quoted 6 lines · Hal Rosenstock
Partition enforcement types are in, out, and both. Prior to this support, both was being used so that is the default.
---
Now we end up with two parameters for same functionality:no_part_enforce - you define whether the enforcement is disabled or enabled. part_enforcement_type - you define enforcement type: in/out/both.
When no_part_enforce is disabled, part_enforcement_type has no meaning.
Don't you find it simpler if we had only one option for partition enforcement with 4 options: disabled/in/out/both(default)?
-- Alex
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Alex,
Quoted 7 lines · Alex Netes
Hi Hal,
Quoted 4 lines · Hal Rosenstock
Partition enforcement types are in, out, and both. Prior to this support, both was being used so that is the default.
Quoted 8 lines
Quoted 2 lines
---
Now we end up with two parameters for same functionality:
no_part_enforce- you define whether the enforcement is disabled or enabled.part_enforcement_type- you define enforcement type: in/out/both.When
no_part_enforceis disabled,part_enforcement_typehas no meaning.
Yes.
Quoted 2 lines
Don't you find it simpler if we had only one option for partition enforcement with 4 options: disabled/in/out/both(default)?
I didn't want to break backward compatibility with existing command line or option file.
If we were starting from scratch, it would be one option.
-- Hal
Quoted 2 lines
-- Alex
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Hal,
Quoted 21 lines · Hal Rosenstock
Hi Alex,
Quoted 7 lines · Alex Netes
Hi Hal,
Quoted 4 lines · Hal Rosenstock
Partition enforcement types are in, out, and both. Prior to this support, both was being used so that is the default.
Quoted 8 lines
Quoted 2 lines
---
Now we end up with two parameters for same functionality:
no_part_enforce- you define whether the enforcement is disabled or enabled.part_enforcement_type- you define enforcement type: in/out/both.When
no_part_enforceis disabled,part_enforcement_typehas no meaning.Yes.
Quoted 7 lines
Quoted 2 lines
Don't you find it simpler if we had only one option for partition enforcement with 4 options: disabled/in/out/both(default)?
I didn't want to break backward compatibility with existing command line or option file.
If we were starting from scratch, it would be one option.
I think that besides backward compatibility, the usage should be kept simple. Someone who is not familiar with opensm, may find this confusing. Maybe we can replace no_part_enforce, with the new option for future versions while marking it as deprecated meanwhile?
Bellow is mine suggestion.
--- include/opensm/osm_subnet.h | 15 +++++++++++++++ man/opensm.8.in | 13 ++++++++++--- opensm/main.c | 31 ++++++++++++++++++++++++++++--- opensm/osm_pkey_mgr.c | 40 ++++++++++++++++++++++++---------------- opensm/osm_subnet.c | 32 ++++++++++++++++++++++++++++++-- 5 files changed, 107 insertions(+), 24 deletions(-)
include/opensm/osm_subnet.h +15 -0
@@ -68,6 +68,19 @@ BEGIN_C_DECLS#define OSM_SUBNET_VECTOR_MIN_SIZE 0#define OSM_SUBNET_VECTOR_GROW_SIZE 1#define OSM_SUBNET_VECTOR_CAPACITY 256 + +#define OSM_PARTITION_ENFORCE_BOTH "both" +#define OSM_PARTITION_ENFORCE_IN "in" +#define OSM_PARTITION_ENFORCE_OUT "out" +#define OSM_PARTITION_ENFORCE_OFF "off" + +typedef enum _osm_partition_enforce_type_enum { +OSM_PARTITION_ENFORCE_TYPE_BOTH , +OSM_PARTITION_ENFORCE_TYPE_IN , +OSM_PARTITION_ENFORCE_TYPE_OUT , +OSM_PARTITION_ENFORCE_TYPE_OFF +}osm_partition_enforce_type_enum ; +struct osm_opensm ;struct osm_qos_policy ;
@@ -182,6 +195,8 @@ typedef struct osm_subn_opt {unsigned long log_max_size;char *partition_config_file;boolean_t no_partition_enforcement; +char *part_enforce; +osm_partition_enforce_type_enum part_enforce_enum;boolean_t qos;char *qos_policy_file;boolean_t accum_log_file;
man/opensm.8.in +10 -3
@@ -1,4 +1,4 @@ -.TH OPENSM 8 "November 3, 2010" "OpenIB" "OpenIB Management" +.TH OPENSM 8 "July 5, 2011" "OpenIB" "OpenIB Management" .SH NAME opensm \- InfiniBand subnet manager and administration (SM/SA)
@@ -44,7 +44,8 @@ opensm \- InfiniBand subnet manager and administration (SM/SA) [\-f <log file path> | \-\-log_file <log file path> ] [\-L | \-\-log_limit <size in MB>] [\-e(rase_log_file)] [\-P(config) <partition config file> ] -[\-N | \-\-no_part_enforce] +[\-N | \-\-no_part_enforce] (DEPRECATED) +[\-Z | \-\-part_enforce [both | in | out | off]] [\-Q | \-\-qos [\-Y | \-\-qos_policy_file <file name>]] [\-y | \-\-stay_on_fatal] [\-B | \-\-daemon]
@@ -363,9 +364,15 @@ name is \fB\%@OPENSM_CONFIG_DIR@/@QOS_POLICY_FILE@\fP. See QoS_management_in_OpenSM.txt in opensm doc for more information on configuring QoS policy via this file. .TP -\fB\-N\fR, \fB\-\-no_part_enforce\fR +\fB\-N\fR, \fB\-\-no_part_enforce\fR \fB(DEPRECATED)\fR +This is a deprecated flag. Please use \fB\-\-part_enforce\fR instead. This option disables partition enforcement on switch external ports. .TP +\fB\-Z\fR, \fB\-\-part_enforce\fR [both | in | out | off] +This option indicates the partition enforcement type (for switches). +Enforcement type can be inbound only (in), outbound only (out), +both or disabled (off). Default is both. +.TP \fB\-y\fR, \fB\-\-stay_on_fatal\fR This option will cause SM not to exit on fatal initialization issues: if SM discovers duplicated guids or a 12x link with
opensm/main.c +28 -3
@@ -1,6 +1,6 @@/* * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved. -* Copyright (c) 2002-2009 Mellanox Technologies LTD. All rights reserved. +* Copyright (c) 2002-2011 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. * Copyright (c) 2009 HNR Consulting. All rights reserved. * Copyright (c) 2009 System Fabric Works, Inc. All rights reserved.
@@ -318,8 +318,13 @@ static void show_usage(void)" This option defines the optional partition configuration file.\n" " The default name is \'" OSM_DEFAULT_PARTITION_CONFIG_FILE "\'.\n\n"); -printf ("--no_part_enforce, -N\n" +printf ("--no_part_enforce, -N (DEPRECATED)\n" +" Use --part_enforce instead.\n" " This option disables partition enforcement on switch external ports.\n\n" ); +printf ("--part_enforce, -Z [both, in, out, off]\n" +" This option indicates the partition enforcement type (for switches)\n" +" Enforcement type can be outbound only (out), inbound only (in), both or\n" +" disabled (off). Default is both.\n\n" );printf ("--qos, -Q\n" " This option enables QoS setup.\n\n" );printf ("--qos_policy_file, -Y <QoS-policy-file>\n" " This option defines the optional QoS policy file.\n"
@@ -566,7 +571,7 @@ int main(int argc, char *argv[])char *conf_template =NULL , *config_file =NULL ;uint32_t val;const char *const short_option = -"F:c:i:w:O:f:ed:D:g:l:L:s:t:a:u:m:X:R:zM:U:S:P:Y:ANBIQvVhoryxp:n:q:k:C:G:H:" ; +"F:c:i:w:O:f:ed:D:g:l:L:s:t:a:u:m:X:R:zM:U:S:P:Y:ANBIQvVhoryxp:n:q:k:C:G:H:Z:" ;/* In the array below, the 2nd parameter specifies the number
@@ -595,6 +600,7 @@ int main(int argc, char *argv[]) {"erase_log_file", 0, NULL, 'e'}, {"Pconfig", 1, NULL, 'P'}, {"no_part_enforce", 0, NULL, 'N'}, + {"part_enforce", 1, NULL, 'Z'}, {"qos", 0, NULL, 'Q'}, {"qos_policy_file", 1, NULL, 'Y'}, {"maxsmps", 1, NULL, 'n'},
@@ -870,6 +876,25 @@ int main(int argc, char *argv[]) opt.no_partition_enforcement = TRUE;break ; +case 'Z' : +if (strcmp (optarg,OSM_PARTITION_ENFORCE_BOTH ) ==0 + ||strcmp (optarg,OSM_PARTITION_ENFORCE_IN ) ==0 + ||strcmp (optarg,OSM_PARTITION_ENFORCE_OUT ) ==0 + ||strcmp (optarg,OSM_PARTITION_ENFORCE_OFF ) ==0 ) { +SET_STR_OPT (opt.part_enforce, optarg); +if (strcmp (optarg,OSM_PARTITION_ENFORCE_BOTH ) ==0 ) + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH ; +else if (strcmp (optarg,OSM_PARTITION_ENFORCE_IN ) ==0 ) + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_IN ; +else if (strcmp (optarg,OSM_PARTITION_ENFORCE_OUT ) ==0 ) + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OUT ; +else + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OFF ; + }else +printf ("-part_enforce %s option not understood\n" , + optarg); +break ; +case 'Q' : opt.qos = TRUE;break ;
opensm/osm_pkey_mgr.c +24 -16
@@ -1,6 +1,6 @@/* * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved. -* Copyright (c) 2002-2010 Mellanox Technologies LTD. All rights reserved. +* Copyright (c) 2002-2011 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. *
@@ -182,16 +182,26 @@ pkey_mgr_update_pkey_entry(IN osm_sm_t * sm,static ib_api_status_t pkey_mgr_enforce_partition(IN osm_log_t * p_log, osm_sm_t * sm, - IN osm_physp_t * p_physp, IN const boolean_t enforce) + IN osm_physp_t * p_physp, + IN osm_partition_enforce_type_enum enforce_type) {osm_madw_context_t context;uint8_t payload[IB_SMP_DATA_SIZE ];ib_port_info_t *p_pi;ib_api_status_t status; +uint8_t enforce_bits; p_pi = &p_physp->port_info; -if ((p_pi->vl_enforce &0xc ) == (0xc ) * (enforce == TRUE)) { +if (enforce_type ==OSM_PARTITION_ENFORCE_TYPE_BOTH ) + enforce_bits =0xc ; +else if (enforce_type ==OSM_PARTITION_ENFORCE_TYPE_IN ) + enforce_bits =0x8 ; +else + enforce_bits =0x4 ; + +if ((p_pi->vl_enforce &0xc ) == enforce_bits * + (enforce_type !=OSM_PARTITION_ENFORCE_TYPE_OFF )) { OSM_LOG(p_log, OSM_LOG_DEBUG, "No need to update PortInfo for " "node 0x%016" PRIx64 " port %u (%s)\n",
@@ -207,10 +217,9 @@ pkey_mgr_enforce_partition(IN osm_log_t * p_log, osm_sm_t * sm, IB_SMP_DATA_SIZE - sizeof(ib_port_info_t)); p_pi = (ib_port_info_t *) payload; -if (enforce == TRUE) - p_pi->vl_enforce |=0xc ; -else - p_pi->vl_enforce &= ~0xc ; + p_pi->vl_enforce &= ~0xc ; +if (enforce_type !=OSM_PARTITION_ENFORCE_TYPE_OFF ) + p_pi->vl_enforce |= enforce_bits; p_pi->state_info2 =0 ;ib_port_info_set_port_state (p_pi,IB_LINK_NO_CHANGE );
@@ -436,7 +445,7 @@ static int update_peer_block(osm_log_t * p_log, osm_sm_t * sm,static int pkey_mgr_update_peer_port (osm_log_t * p_log,osm_sm_t * sm,const osm_subn_t * p_subn,const osm_port_t *const p_port, -boolean_t enforce) +osm_partition_enforce_type_enum enforce_type) {osm_physp_t *p_physp, *peer;osm_node_t *p_node;
@@ -461,8 +470,8 @@ static int pkey_mgr_update_peer_port(osm_log_t * p_log, osm_sm_t * sm,if (!p_node->sw || !p_node->sw->switch_info.enforce_cap)return 0 ; -if (enforce == FALSE) { -pkey_mgr_enforce_partition (p_log, sm, peer, FALSE); +if (enforce_type !=OSM_PARTITION_ENFORCE_TYPE_OFF ) { +pkey_mgr_enforce_partition (p_log, sm, peer,OSM_PARTITION_ENFORCE_TYPE_OFF );return ret; }
@@ -528,14 +537,14 @@ static int pkey_mgr_update_peer_port(osm_log_t * p_log, osm_sm_t * sm,cl_ntoh64 (osm_node_get_node_guid (p_node)),osm_physp_get_port_num (peer), p_node->print_desc); - enforce = FALSE; + enforce_type =OSM_PARTITION_ENFORCE_TYPE_OFF ; ret =-1 ; } } } }else { p_peer_pkey_tbl->used_blocks = peer_max_blocks; - enforce = FALSE; + enforce_type =OSM_PARTITION_ENFORCE_TYPE_OFF ; }if (!ret)
@@ -545,7 +554,7 @@ static int pkey_mgr_update_peer_port(osm_log_t * p_log, osm_sm_t * sm,cl_ntoh64 (osm_node_get_node_guid (p_node)), osm_physp_get_port_num(peer), p_node->print_desc); -if (pkey_mgr_enforce_partition (p_log, sm, peer, enforce)) +if (pkey_mgr_enforce_partition (p_log, sm, peer, enforce_type)) ret =-1 ;return ret;
@@ -599,8 +608,7 @@ int osm_pkey_mgr_process(IN osm_opensm_t * p_osm)if ((osm_node_get_type (p_port->p_node) !=IB_NODE_TYPE_SWITCH ) &&pkey_mgr_update_peer_port (&p_osm->log, &p_osm->sm, &p_osm->subn, p_port, - !p_osm->subn.opt. - no_partition_enforcement)) + p_osm->subn.opt.part_enforce_enum)) ret =-1 ; }
@@ -624,7 +632,7 @@ int osm_pkey_mgr_process(IN osm_opensm_t * p_osm)continue ;/* clear partition enforcement */ -if (pkey_mgr_enforce_partition (&p_osm->log, &p_osm->sm, p_physp, FALSE)) +if (pkey_mgr_enforce_partition (&p_osm->log, &p_osm->sm, p_physp,OSM_PARTITION_ENFORCE_TYPE_OFF )) ret =-1 ; } }
opensm/osm_subnet.c +30 -2
@@ -342,6 +342,7 @@ static const opt_rec_t opt_tbl[] = { { "accum_log_file", OPT_OFFSET(accum_log_file), opts_parse_boolean, opts_setup_accum_log_file, 1 }, { "partition_config_file", OPT_OFFSET(partition_config_file), opts_parse_charp, NULL, 0 }, { "no_partition_enforcement", OPT_OFFSET(no_partition_enforcement), opts_parse_boolean, NULL, 1 }, + { "part_enforce", OPT_OFFSET(part_enforce), opts_parse_charp, NULL, 1 }, { "qos", OPT_OFFSET(qos), opts_parse_boolean, NULL, 1 }, { "qos_policy_file", OPT_OFFSET(qos_policy_file), opts_parse_charp, NULL, 0 }, { "dump_files_dir", OPT_OFFSET(dump_files_dir), opts_parse_charp, NULL, 0 },
@@ -761,6 +762,7 @@ void osm_subn_set_default_opt(IN osm_subn_opt_t * p_opt) p_opt->log_max_size =0 ; p_opt->partition_config_file =strdup (OSM_DEFAULT_PARTITION_CONFIG_FILE ); p_opt->no_partition_enforcement = FALSE; + p_opt->part_enforce =OSM_PARTITION_ENFORCE_BOTH ; p_opt->qos = FALSE; p_opt->qos_policy_file =strdup (OSM_DEFAULT_QOS_POLICY_FILE ); p_opt->accum_log_file = TRUE;
@@ -1129,6 +1131,27 @@ int osm_subn_verify_config(IN osm_subn_opt_t * p_opts) p_opts->console =OSM_DEFAULT_CONSOLE ; } +if (p_opts->no_partition_enforcement == TRUE) { +strcpy (p_opts->part_enforce,OSM_PARTITION_ENFORCE_OFF ); + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OFF ; + }else { +if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_BOTH ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH ; +else if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_IN ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_IN ; +else if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_OUT ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OUT ; +else if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_OFF ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OFF ; +else { +log_report (" Invalid Cached Option Value:part_enforce = %s" +", Using Default:%s\n" , + p_opts->part_enforce =OSM_PARTITION_ENFORCE_BOTH ); + p_opts->part_enforce =OSM_PARTITION_ENFORCE_BOTH ; + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH ; + } + } +if (p_opts->qos) {subn_verify_qos_set (&p_opts->qos_options,"qos" );subn_verify_qos_set (&p_opts->qos_ca_options,"qos_ca" );
@@ -1372,9 +1395,14 @@ int osm_subn_output_conf(FILE *out, IN osm_subn_opt_t * p_opts)"# Partition configuration file to be used\n" "partition_config_file %s\n\n" "# Disable partition enforcement by switches\n" -"no_partition_enforcement %s\n\n" , +"no_partition_enforcement %s\n\n" +"# Partition enforcement type (for switches)\n" +"# Values are both, out, and in\n" +"# Default is both (outbound and inbound enforcement)\n" +"part_enforce %s\n\n" , p_opts->partition_config_file, - p_opts->no_partition_enforcement ? "TRUE" : "FALSE"); + p_opts->no_partition_enforcement ?"TRUE" :"FALSE" , + p_opts->part_enforce);fprintf (out, "#\n# SWEEP OPTIONS\n#\n"
Signature · 6 lines
1.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Alex,
Quoted 30 lines · Alex Netes
Hi Hal,
Quoted 27 lines · Hal Rosenstock
Hi Alex,
Quoted 7 lines · Alex Netes
Hi Hal,
Quoted 4 lines · Hal Rosenstock
Partition enforcement types are in, out, and both. Prior to this support, both was being used so that is the default.
Quoted 8 lines
Quoted 2 lines
---
Now we end up with two parameters for same functionality:
no_part_enforce- you define whether the enforcement is disabled or enabled.part_enforcement_type- you define enforcement type: in/out/both.When
no_part_enforceis disabled,part_enforcement_typehas no meaning.Yes.
Quoted 2 lines
Don't you find it simpler if we had only one option for partition enforcement with 4 options: disabled/in/out/both(default)?
I didn't want to break backward compatibility with existing command line or option file.
Quoted 7 lines
Quoted 1 line
If we were starting from scratch, it would be one option.
I think that besides backward compatibility, the usage should be kept simple. Someone who is not familiar with opensm, may find this confusing. Maybe we can replace
no_part_enforce, with the new option for future versions while marking it as deprecated meanwhile?
Bellow is mine suggestion.
Thanks!
Looks pretty good to me. One question and one code nit below:
Quoted 290 lines
--- include/opensm/osm_subnet.h | 15 +++++++++++++++ man/opensm.8.in | 13 ++++++++++--- opensm/main.c | 31 ++++++++++++++++++++++++++++--- opensm/osm_pkey_mgr.c | 40 ++++++++++++++++++++++++---------------- opensm/osm_subnet.c | 32 ++++++++++++++++++++++++++++++-- 5 files changed, 107 insertions(+), 24 deletions(-)include/opensm/osm_subnet.h +15
-0@@ -68,6 +68,19 @@ BEGIN_C_DECLS#define OSM_SUBNET_VECTOR_MIN_SIZE 0#define OSM_SUBNET_VECTOR_GROW_SIZE 1#define OSM_SUBNET_VECTOR_CAPACITY 256 + +#define OSM_PARTITION_ENFORCE_BOTH "both" +#define OSM_PARTITION_ENFORCE_IN "in" +#define OSM_PARTITION_ENFORCE_OUT "out" +#define OSM_PARTITION_ENFORCE_OFF "off" + +typedef enum _osm_partition_enforce_type_enum { +OSM_PARTITION_ENFORCE_TYPE_BOTH , +OSM_PARTITION_ENFORCE_TYPE_IN , +OSM_PARTITION_ENFORCE_TYPE_OUT , +OSM_PARTITION_ENFORCE_TYPE_OFF +}osm_partition_enforce_type_enum ; +struct osm_opensm ;struct osm_qos_policy ;@@ -182,6 +195,8 @@ typedef struct osm_subn_opt {unsigned long log_max_size;char *partition_config_file;boolean_t no_partition_enforcement; +char *part_enforce; +osm_partition_enforce_type_enum part_enforce_enum;boolean_t qos;char *qos_policy_file;boolean_t accum_log_file;man/opensm.8.in +10
-3@@ -1,4 +1,4 @@ -.TH OPENSM 8 "November 3, 2010" "OpenIB" "OpenIB Management" +.TH OPENSM 8 "July 5, 2011" "OpenIB" "OpenIB Management" .SH NAME opensm \- InfiniBand subnet manager and administration (SM/SA)@@ -44,7 +44,8 @@ opensm \- InfiniBand subnet manager and administration (SM/SA) [\-f <log file path> | \-\-log_file <log file path> ] [\-L | \-\-log_limit <size in MB>] [\-e(rase_log_file)] [\-P(config) <partition config file> ] -[\-N | \-\-no_part_enforce] +[\-N | \-\-no_part_enforce] (DEPRECATED) +[\-Z | \-\-part_enforce [both | in | out | off]] [\-Q | \-\-qos [\-Y | \-\-qos_policy_file <file name>]] [\-y | \-\-stay_on_fatal] [\-B | \-\-daemon]@@ -363,9 +364,15 @@ name is \fB\%@OPENSM_CONFIG_DIR@/@QOS_POLICY_FILE@\fP. See QoS_management_in_OpenSM.txt in opensm doc for more information on configuring QoS policy via this file. .TP -\fB\-N\fR, \fB\-\-no_part_enforce\fR +\fB\-N\fR, \fB\-\-no_part_enforce\fR \fB(DEPRECATED)\fR +This is a deprecated flag. Please use \fB\-\-part_enforce\fR instead. This option disables partition enforcement on switch external ports. .TP +\fB\-Z\fR, \fB\-\-part_enforce\fR [both | in | out | off] +This option indicates the partition enforcement type (for switches). +Enforcement type can be inbound only (in), outbound only (out), +both or disabled (off). Default is both. +.TP \fB\-y\fR, \fB\-\-stay_on_fatal\fR This option will cause SM not to exit on fatal initialization issues: if SM discovers duplicated guids or a 12x link withopensm/main.c +28
-3@@ -1,6 +1,6 @@/* * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved. -* Copyright (c) 2002-2009 Mellanox Technologies LTD. All rights reserved. +* Copyright (c) 2002-2011 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. * Copyright (c) 2009 HNR Consulting. All rights reserved. * Copyright (c) 2009 System Fabric Works, Inc. All rights reserved. @@ -318,8 +318,13 @@ static void show_usage(void)" This option defines the optional partition configuration file.\n" " The default name is \'" OSM_DEFAULT_PARTITION_CONFIG_FILE "\'.\n\n"); -printf ("--no_part_enforce, -N\n" +printf ("--no_part_enforce, -N (DEPRECATED)\n" +" Use --part_enforce instead.\n" " This option disables partition enforcement on switch external ports.\n\n" ); +printf ("--part_enforce, -Z [both, in, out, off]\n" +" This option indicates the partition enforcement type (for switches)\n" +" Enforcement type can be outbound only (out), inbound only (in), both or\n" +" disabled (off). Default is both.\n\n" );printf ("--qos, -Q\n" " This option enables QoS setup.\n\n" );printf ("--qos_policy_file, -Y <QoS-policy-file>\n" " This option defines the optional QoS policy file.\n"@@ -566,7 +571,7 @@ int main(int argc, char *argv[])char *conf_template =NULL , *config_file =NULL ;uint32_t val;const char *const short_option = -"F:c:i:w:O:f:ed:D:g:l:L:s:t:a:u:m:X:R:zM:U:S:P:Y:ANBIQvVhoryxp:n:q:k:C:G:H:" ; +"F:c:i:w:O:f:ed:D:g:l:L:s:t:a:u:m:X:R:zM:U:S:P:Y:ANBIQvVhoryxp:n:q:k:C:G:H:Z:" ;/* In the array below, the 2nd parameter specifies the number @@ -595,6 +600,7 @@ int main(int argc, char *argv[]) {"erase_log_file", 0, NULL, 'e'}, {"Pconfig", 1, NULL, 'P'}, {"no_part_enforce", 0, NULL, 'N'}, + {"part_enforce", 1, NULL, 'Z'}, {"qos", 0, NULL, 'Q'}, {"qos_policy_file", 1, NULL, 'Y'}, {"maxsmps", 1, NULL, 'n'},@@ -870,6 +876,25 @@ int main(int argc, char *argv[]) opt.no_partition_enforcement = TRUE;break ; +case 'Z' : +if (strcmp (optarg,OSM_PARTITION_ENFORCE_BOTH ) ==0 + ||strcmp (optarg,OSM_PARTITION_ENFORCE_IN ) ==0 + ||strcmp (optarg,OSM_PARTITION_ENFORCE_OUT ) ==0 + ||strcmp (optarg,OSM_PARTITION_ENFORCE_OFF ) ==0 ) { +SET_STR_OPT (opt.part_enforce, optarg); +if (strcmp (optarg,OSM_PARTITION_ENFORCE_BOTH ) ==0 ) + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH ; +else if (strcmp (optarg,OSM_PARTITION_ENFORCE_IN ) ==0 ) + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_IN ; +else if (strcmp (optarg,OSM_PARTITION_ENFORCE_OUT ) ==0 ) + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OUT ; +else + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OFF ; + }else +printf ("-part_enforce %s option not understood\n" , + optarg); +break ; +case 'Q' : opt.qos = TRUE;break ;opensm/osm_pkey_mgr.c +24
-16@@ -1,6 +1,6 @@/* * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved. -* Copyright (c) 2002-2010 Mellanox Technologies LTD. All rights reserved. +* Copyright (c) 2002-2011 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * @@ -182,16 +182,26 @@ pkey_mgr_update_pkey_entry(IN osm_sm_t * sm,static ib_api_status_t pkey_mgr_enforce_partition(IN osm_log_t * p_log, osm_sm_t * sm, - IN osm_physp_t * p_physp, IN const boolean_t enforce) + IN osm_physp_t * p_physp, + IN osm_partition_enforce_type_enum enforce_type) {osm_madw_context_t context;uint8_t payload[IB_SMP_DATA_SIZE ];ib_port_info_t *p_pi;ib_api_status_t status; +uint8_t enforce_bits; p_pi = &p_physp->port_info; -if ((p_pi->vl_enforce &0xc ) == (0xc ) * (enforce == TRUE)) { +if (enforce_type ==OSM_PARTITION_ENFORCE_TYPE_BOTH ) + enforce_bits =0xc ; +else if (enforce_type ==OSM_PARTITION_ENFORCE_TYPE_IN ) + enforce_bits =0x8 ; +else + enforce_bits =0x4 ; + +if ((p_pi->vl_enforce &0xc ) == enforce_bits * + (enforce_type !=OSM_PARTITION_ENFORCE_TYPE_OFF )) { OSM_LOG(p_log, OSM_LOG_DEBUG, "No need to update PortInfo for " "node 0x%016" PRIx64 " port %u (%s)\n",@@ -207,10 +217,9 @@ pkey_mgr_enforce_partition(IN osm_log_t * p_log, osm_sm_t * sm, IB_SMP_DATA_SIZE - sizeof(ib_port_info_t)); p_pi = (ib_port_info_t *) payload; -if (enforce == TRUE) - p_pi->vl_enforce |=0xc ; -else - p_pi->vl_enforce &= ~0xc ; + p_pi->vl_enforce &= ~0xc ; +if (enforce_type !=OSM_PARTITION_ENFORCE_TYPE_OFF ) + p_pi->vl_enforce |= enforce_bits; p_pi->state_info2 =0 ;ib_port_info_set_port_state (p_pi,IB_LINK_NO_CHANGE );@@ -436,7 +445,7 @@ static int update_peer_block(osm_log_t * p_log, osm_sm_t * sm,static int pkey_mgr_update_peer_port (osm_log_t * p_log,osm_sm_t * sm,const osm_subn_t * p_subn,const osm_port_t *const p_port, -boolean_t enforce) +osm_partition_enforce_type_enum enforce_type) {osm_physp_t *p_physp, *peer;osm_node_t *p_node;@@ -461,8 +470,8 @@ static int pkey_mgr_update_peer_port(osm_log_t * p_log, osm_sm_t * sm,if (!p_node->sw || !p_node->sw->switch_info.enforce_cap)return 0 ; -if (enforce == FALSE) { -pkey_mgr_enforce_partition (p_log, sm, peer, FALSE); +if (enforce_type !=OSM_PARTITION_ENFORCE_TYPE_OFF ) { +pkey_mgr_enforce_partition (p_log, sm, peer,OSM_PARTITION_ENFORCE_TYPE_OFF );return ret; }@@ -528,14 +537,14 @@ static int pkey_mgr_update_peer_port(osm_log_t * p_log, osm_sm_t * sm,cl_ntoh64 (osm_node_get_node_guid (p_node)),osm_physp_get_port_num (peer), p_node->print_desc); - enforce = FALSE; + enforce_type =OSM_PARTITION_ENFORCE_TYPE_OFF ; ret =-1 ; } } } }else { p_peer_pkey_tbl->used_blocks = peer_max_blocks; - enforce = FALSE; + enforce_type =OSM_PARTITION_ENFORCE_TYPE_OFF ; }if (!ret)@@ -545,7 +554,7 @@ static int pkey_mgr_update_peer_port(osm_log_t * p_log, osm_sm_t * sm,cl_ntoh64 (osm_node_get_node_guid (p_node)), osm_physp_get_port_num(peer), p_node->print_desc); -if (pkey_mgr_enforce_partition (p_log, sm, peer, enforce)) +if (pkey_mgr_enforce_partition (p_log, sm, peer, enforce_type)) ret =-1 ;return ret;@@ -599,8 +608,7 @@ int osm_pkey_mgr_process(IN osm_opensm_t * p_osm)if ((osm_node_get_type (p_port->p_node) !=IB_NODE_TYPE_SWITCH ) &&pkey_mgr_update_peer_port (&p_osm->log, &p_osm->sm, &p_osm->subn, p_port, - !p_osm->subn.opt. - no_partition_enforcement)) + p_osm->subn.opt.part_enforce_enum)) ret =-1 ; }@@ -624,7 +632,7 @@ int osm_pkey_mgr_process(IN osm_opensm_t * p_osm)continue ;/* clear partition enforcement */ -if (pkey_mgr_enforce_partition (&p_osm->log, &p_osm->sm, p_physp, FALSE)) +if (pkey_mgr_enforce_partition (&p_osm->log, &p_osm->sm, p_physp,OSM_PARTITION_ENFORCE_TYPE_OFF )) ret =-1 ; } }opensm/osm_subnet.c +2
-0@@ -342,6 +342,7 @@ static const opt_rec_t opt_tbl[] = { { "accum_log_file", OPT_OFFSET(accum_log_file), opts_parse_boolean, opts_setup_accum_log_file, 1 }, { "partition_config_file", OPT_OFFSET(partition_config_file), opts_parse_charp, NULL, 0 }, { "no_partition_enforcement", OPT_OFFSET(no_partition_enforcement), opts_parse_boolean, NULL, 1 }, + { "part_enforce", OPT_OFFSET(part_enforce), opts_parse_charp, NULL, 1 }, { "qos", OPT_OFFSET(qos), opts_parse_boolean, NULL, 1 }, { "qos_policy_file", OPT_OFFSET(qos_policy_file), opts_parse_charp, NULL, 0 }, { "dump_files_dir", OPT_OFFSET(dump_files_dir), opts_parse_charp, NULL, 0 },@@ -761,6 +762,7 @@ void osm_subn_set_default_opt(IN osm_subn_opt_t * p_opt) p_opt->log_max_size =0 ; p_opt->partition_config_file =strdup (OSM_DEFAULT_PARTITION_CONFIG_FILE ); p_opt->no_partition_enforcement = FALSE; + p_opt->part_enforce =OSM_PARTITION_ENFORCE_BOTH ; p_opt->qos = FALSE; p_opt->qos_policy_file =strdup (OSM_DEFAULT_QOS_POLICY_FILE ); p_opt->accum_log_file = TRUE;
opensm/osm_subnet.c int osm_subn_verify_config(IN osm_subn_opt_t * p_opts) · line 1136
Quoted 6 lines
opensm/osm_subnet.c +3
-0@@ -1129,6 +1131,27 @@ int osm_subn_verify_config(IN osm_subn_opt_t * p_opts) p_opts->console =OSM_DEFAULT_CONSOLE ; } +if (p_opts->no_partition_enforcement == TRUE) { +strcpy (p_opts->part_enforce,OSM_PARTITION_ENFORCE_OFF ); + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OFF ;
So, in the short term, if no_part_enforce is specified as TRUE, then this superceeds a part_enforce_type other than off. Should it be the other way around ? In either case, it should be documented in the conf file and the man page.
Quoted 22 lines
opensm/osm_subnet.c +18
-0+ }else { +if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_BOTH ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH ; +else if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_IN ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_IN ; +else if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_OUT ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OUT ; +else if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_OFF ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OFF ; +else { +log_report (" Invalid Cached Option Value:part_enforce = %s" +", Using Default:%s\n" , + p_opts->part_enforce =OSM_PARTITION_ENFORCE_BOTH ); + p_opts->part_enforce =OSM_PARTITION_ENFORCE_BOTH ; + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH ; + } + } +if (p_opts->qos) {subn_verify_qos_set (&p_opts->qos_options,"qos" );subn_verify_qos_set (&p_opts->qos_ca_options,"qos_ca" );
opensm/osm_subnet.c int osm_subn_output_conf(FILE *out, IN osm_subn_opt_t * p_opts) · line 1400
Quoted 7 lines
opensm/osm_subnet.c +3
-1@@ -1372,9 +1395,14 @@ int osm_subn_output_conf(FILE *out, IN osm_subn_opt_t * p_opts)"# Partition configuration file to be used\n" "partition_config_file %s\n\n" "# Disable partition enforcement by switches\n" - "no_partition_enforcement %s\n\n", +"no_partition_enforcement %s\n\n" +"# Partition enforcement type (for switches)\n" +"# Values are both, out, and in\n"
Also off here too...
-- Hal
opensm/osm_subnet.c int osm_subn_output_conf(FILE *out, IN osm_subn_opt_t * p_opts) · line 1408
Quoted 9 lines
opensm/osm_subnet.c +4
-1+"# Default is both (outbound and inbound enforcement)\n" +"part_enforce %s\n\n" , p_opts->partition_config_file, - p_opts->no_partition_enforcement ? "TRUE" : "FALSE"); + p_opts->no_partition_enforcement ?"TRUE" :"FALSE" , + p_opts->part_enforce);fprintf (out, "#\n# SWEEP OPTIONS\n#\n"
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
to accomodate IBA extended link speeds
Also, some other cosmetic changes (formatting, etc.)
--
Changes since v2: Added comments in man, conf file and help
--- include/opensm/osm_subnet.h | 15 +++++++++++++++ man/opensm.8.in | 13 ++++++++++--- opensm/main.c | 31 ++++++++++++++++++++++++++++--- opensm/osm_pkey_mgr.c | 40 ++++++++++++++++++++++++---------------- opensm/osm_subnet.c | 32 ++++++++++++++++++++++++++++++-- 5 files changed, 107 insertions(+), 24 deletions(-)
include/opensm/osm_subnet.h +15 -0
@@ -68,6 +68,19 @@ BEGIN_C_DECLS#define OSM_SUBNET_VECTOR_MIN_SIZE 0#define OSM_SUBNET_VECTOR_GROW_SIZE 1#define OSM_SUBNET_VECTOR_CAPACITY 256 + +#define OSM_PARTITION_ENFORCE_BOTH "both" +#define OSM_PARTITION_ENFORCE_IN "in" +#define OSM_PARTITION_ENFORCE_OUT "out" +#define OSM_PARTITION_ENFORCE_OFF "off" + +typedef enum _osm_partition_enforce_type_enum { +OSM_PARTITION_ENFORCE_TYPE_BOTH , +OSM_PARTITION_ENFORCE_TYPE_IN , +OSM_PARTITION_ENFORCE_TYPE_OUT , +OSM_PARTITION_ENFORCE_TYPE_OFF +}osm_partition_enforce_type_enum ; +struct osm_opensm ;struct osm_qos_policy ;
@@ -182,6 +195,8 @@ typedef struct osm_subn_opt {unsigned long log_max_size;char *partition_config_file;boolean_t no_partition_enforcement; +char *part_enforce; +osm_partition_enforce_type_enum part_enforce_enum;boolean_t qos;char *qos_policy_file;boolean_t accum_log_file;
man/opensm.8.in +10 -3
@@ -1,4 +1,4 @@ -.TH OPENSM 8 "November 3, 2010" "OpenIB" "OpenIB Management" +.TH OPENSM 8 "July 5, 2011" "OpenIB" "OpenIB Management" .SH NAME opensm \- InfiniBand subnet manager and administration (SM/SA)
@@ -44,7 +44,8 @@ opensm \- InfiniBand subnet manager and administration (SM/SA) [\-f <log file path> | \-\-log_file <log file path> ] [\-L | \-\-log_limit <size in MB>] [\-e(rase_log_file)] [\-P(config) <partition config file> ] -[\-N | \-\-no_part_enforce] +[\-N | \-\-no_part_enforce] (DEPRECATED) +[\-Z | \-\-part_enforce [both | in | out | off]] [\-Q | \-\-qos [\-Y | \-\-qos_policy_file <file name>]] [\-y | \-\-stay_on_fatal] [\-B | \-\-daemon]
@@ -363,9 +364,15 @@ name is \fB\%@OPENSM_CONFIG_DIR@/@QOS_POLICY_FILE@\fP. See QoS_management_in_OpenSM.txt in opensm doc for more information on configuring QoS policy via this file. .TP -\fB\-N\fR, \fB\-\-no_part_enforce\fR +\fB\-N\fR, \fB\-\-no_part_enforce\fR \fB(DEPRECATED)\fR +This is a deprecated flag. Please use \fB\-\-part_enforce\fR instead. This option disables partition enforcement on switch external ports. .TP +\fB\-Z\fR, \fB\-\-part_enforce\fR [both | in | out | off] +This option indicates the partition enforcement type (for switches). +Enforcement type can be inbound only (in), outbound only (out), +both or disabled (off). Default is both. +.TP \fB\-y\fR, \fB\-\-stay_on_fatal\fR This option will cause SM not to exit on fatal initialization issues: if SM discovers duplicated guids or a 12x link with
opensm/main.c +28 -3
@@ -1,6 +1,6 @@/* * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved. -* Copyright (c) 2002-2009 Mellanox Technologies LTD. All rights reserved. +* Copyright (c) 2002-2011 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. * Copyright (c) 2009 HNR Consulting. All rights reserved. * Copyright (c) 2009 System Fabric Works, Inc. All rights reserved.
@@ -318,8 +318,13 @@ static void show_usage(void)" This option defines the optional partition configuration file.\n" " The default name is \'" OSM_DEFAULT_PARTITION_CONFIG_FILE "\'.\n\n"); -printf ("--no_part_enforce, -N\n" +printf ("--no_part_enforce, -N (DEPRECATED)\n" +" Use --part_enforce instead.\n" " This option disables partition enforcement on switch external ports.\n\n" ); +printf ("--part_enforce, -Z [both, in, out, off]\n" +" This option indicates the partition enforcement type (for switches)\n" +" Enforcement type can be outbound only (out), inbound only (in), both or\n" +" disabled (off). Default is both.\n\n" );printf ("--qos, -Q\n" " This option enables QoS setup.\n\n" );printf ("--qos_policy_file, -Y <QoS-policy-file>\n" " This option defines the optional QoS policy file.\n"
@@ -566,7 +571,7 @@ int main(int argc, char *argv[])char *conf_template =NULL , *config_file =NULL ;uint32_t val;const char *const short_option = -"F:c:i:w:O:f:ed:D:g:l:L:s:t:a:u:m:X:R:zM:U:S:P:Y:ANBIQvVhoryxp:n:q:k:C:G:H:" ; +"F:c:i:w:O:f:ed:D:g:l:L:s:t:a:u:m:X:R:zM:U:S:P:Y:ANBIQvVhoryxp:n:q:k:C:G:H:Z:" ;/* In the array below, the 2nd parameter specifies the number
@@ -595,6 +600,7 @@ int main(int argc, char *argv[]) {"erase_log_file", 0, NULL, 'e'}, {"Pconfig", 1, NULL, 'P'}, {"no_part_enforce", 0, NULL, 'N'}, + {"part_enforce", 1, NULL, 'Z'}, {"qos", 0, NULL, 'Q'}, {"qos_policy_file", 1, NULL, 'Y'}, {"maxsmps", 1, NULL, 'n'},
@@ -870,6 +876,25 @@ int main(int argc, char *argv[]) opt.no_partition_enforcement = TRUE;break ; +case 'Z' : +if (strcmp (optarg,OSM_PARTITION_ENFORCE_BOTH ) ==0 + ||strcmp (optarg,OSM_PARTITION_ENFORCE_IN ) ==0 + ||strcmp (optarg,OSM_PARTITION_ENFORCE_OUT ) ==0 + ||strcmp (optarg,OSM_PARTITION_ENFORCE_OFF ) ==0 ) { +SET_STR_OPT (opt.part_enforce, optarg); +if (strcmp (optarg,OSM_PARTITION_ENFORCE_BOTH ) ==0 ) + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH ; +else if (strcmp (optarg,OSM_PARTITION_ENFORCE_IN ) ==0 ) + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_IN ; +else if (strcmp (optarg,OSM_PARTITION_ENFORCE_OUT ) ==0 ) + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OUT ; +else + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OFF ; + }else +printf ("-part_enforce %s option not understood\n" , + optarg); +break ; +case 'Q' : opt.qos = TRUE;break ;
opensm/osm_pkey_mgr.c +24 -16
@@ -1,6 +1,6 @@/* * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved. -* Copyright (c) 2002-2010 Mellanox Technologies LTD. All rights reserved. +* Copyright (c) 2002-2011 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. *
@@ -182,16 +182,26 @@ pkey_mgr_update_pkey_entry(IN osm_sm_t * sm,static ib_api_status_t pkey_mgr_enforce_partition(IN osm_log_t * p_log, osm_sm_t * sm, - IN osm_physp_t * p_physp, IN const boolean_t enforce) + IN osm_physp_t * p_physp, + IN osm_partition_enforce_type_enum enforce_type) {osm_madw_context_t context;uint8_t payload[IB_SMP_DATA_SIZE ];ib_port_info_t *p_pi;ib_api_status_t status; +uint8_t enforce_bits; p_pi = &p_physp->port_info; -if ((p_pi->vl_enforce &0xc ) == (0xc ) * (enforce == TRUE)) { +if (enforce_type ==OSM_PARTITION_ENFORCE_TYPE_BOTH ) + enforce_bits =0xc ; +else if (enforce_type ==OSM_PARTITION_ENFORCE_TYPE_IN ) + enforce_bits =0x8 ; +else + enforce_bits =0x4 ; + +if ((p_pi->vl_enforce &0xc ) == enforce_bits * + (enforce_type !=OSM_PARTITION_ENFORCE_TYPE_OFF )) { OSM_LOG(p_log, OSM_LOG_DEBUG, "No need to update PortInfo for " "node 0x%016" PRIx64 " port %u (%s)\n",
@@ -207,10 +217,9 @@ pkey_mgr_enforce_partition(IN osm_log_t * p_log, osm_sm_t * sm, IB_SMP_DATA_SIZE - sizeof(ib_port_info_t)); p_pi = (ib_port_info_t *) payload; -if (enforce == TRUE) - p_pi->vl_enforce |=0xc ; -else - p_pi->vl_enforce &= ~0xc ; + p_pi->vl_enforce &= ~0xc ; +if (enforce_type !=OSM_PARTITION_ENFORCE_TYPE_OFF ) + p_pi->vl_enforce |= enforce_bits; p_pi->state_info2 =0 ;ib_port_info_set_port_state (p_pi,IB_LINK_NO_CHANGE );
@@ -436,7 +445,7 @@ static int update_peer_block(osm_log_t * p_log, osm_sm_t * sm,static int pkey_mgr_update_peer_port (osm_log_t * p_log,osm_sm_t * sm,const osm_subn_t * p_subn,const osm_port_t *const p_port, -boolean_t enforce) +osm_partition_enforce_type_enum enforce_type) {osm_physp_t *p_physp, *peer;osm_node_t *p_node;
@@ -461,8 +470,8 @@ static int pkey_mgr_update_peer_port(osm_log_t * p_log, osm_sm_t * sm,if (!p_node->sw || !p_node->sw->switch_info.enforce_cap)return 0 ; -if (enforce == FALSE) { -pkey_mgr_enforce_partition (p_log, sm, peer, FALSE); +if (enforce_type !=OSM_PARTITION_ENFORCE_TYPE_OFF ) { +pkey_mgr_enforce_partition (p_log, sm, peer,OSM_PARTITION_ENFORCE_TYPE_OFF );return ret; }
@@ -528,14 +537,14 @@ static int pkey_mgr_update_peer_port(osm_log_t * p_log, osm_sm_t * sm,cl_ntoh64 (osm_node_get_node_guid (p_node)),osm_physp_get_port_num (peer), p_node->print_desc); - enforce = FALSE; + enforce_type =OSM_PARTITION_ENFORCE_TYPE_OFF ; ret =-1 ; } } } }else { p_peer_pkey_tbl->used_blocks = peer_max_blocks; - enforce = FALSE; + enforce_type =OSM_PARTITION_ENFORCE_TYPE_OFF ; }if (!ret)
@@ -545,7 +554,7 @@ static int pkey_mgr_update_peer_port(osm_log_t * p_log, osm_sm_t * sm,cl_ntoh64 (osm_node_get_node_guid (p_node)), osm_physp_get_port_num(peer), p_node->print_desc); -if (pkey_mgr_enforce_partition (p_log, sm, peer, enforce)) +if (pkey_mgr_enforce_partition (p_log, sm, peer, enforce_type)) ret =-1 ;return ret;
@@ -599,8 +608,7 @@ int osm_pkey_mgr_process(IN osm_opensm_t * p_osm)if ((osm_node_get_type (p_port->p_node) !=IB_NODE_TYPE_SWITCH ) &&pkey_mgr_update_peer_port (&p_osm->log, &p_osm->sm, &p_osm->subn, p_port, - !p_osm->subn.opt. - no_partition_enforcement)) + p_osm->subn.opt.part_enforce_enum)) ret =-1 ; }
@@ -624,7 +632,7 @@ int osm_pkey_mgr_process(IN osm_opensm_t * p_osm)continue ;/* clear partition enforcement */ -if (pkey_mgr_enforce_partition (&p_osm->log, &p_osm->sm, p_physp, FALSE)) +if (pkey_mgr_enforce_partition (&p_osm->log, &p_osm->sm, p_physp,OSM_PARTITION_ENFORCE_TYPE_OFF )) ret =-1 ; } }
opensm/osm_subnet.c +30 -2
@@ -342,6 +342,7 @@ static const opt_rec_t opt_tbl[] = { { "accum_log_file", OPT_OFFSET(accum_log_file), opts_parse_boolean, opts_setup_accum_log_file, 1 }, { "partition_config_file", OPT_OFFSET(partition_config_file), opts_parse_charp, NULL, 0 }, { "no_partition_enforcement", OPT_OFFSET(no_partition_enforcement), opts_parse_boolean, NULL, 1 }, + { "part_enforce", OPT_OFFSET(part_enforce), opts_parse_charp, NULL, 1 }, { "qos", OPT_OFFSET(qos), opts_parse_boolean, NULL, 1 }, { "qos_policy_file", OPT_OFFSET(qos_policy_file), opts_parse_charp, NULL, 0 }, { "dump_files_dir", OPT_OFFSET(dump_files_dir), opts_parse_charp, NULL, 0 },
@@ -761,6 +762,7 @@ void osm_subn_set_default_opt(IN osm_subn_opt_t * p_opt) p_opt->log_max_size =0 ; p_opt->partition_config_file =strdup (OSM_DEFAULT_PARTITION_CONFIG_FILE ); p_opt->no_partition_enforcement = FALSE; + p_opt->part_enforce =OSM_PARTITION_ENFORCE_BOTH ; p_opt->qos = FALSE; p_opt->qos_policy_file =strdup (OSM_DEFAULT_QOS_POLICY_FILE ); p_opt->accum_log_file = TRUE;
@@ -1129,6 +1131,27 @@ int osm_subn_verify_config(IN osm_subn_opt_t * p_opts) p_opts->console =OSM_DEFAULT_CONSOLE ; } +if (p_opts->no_partition_enforcement == TRUE) { +strcpy (p_opts->part_enforce,OSM_PARTITION_ENFORCE_OFF ); + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OFF ; + }else { +if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_BOTH ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH ; +else if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_IN ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_IN ; +else if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_OUT ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OUT ; +else if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_OFF ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OFF ; +else { +log_report (" Invalid Cached Option Value:part_enforce = %s" +", Using Default:%s\n" , + p_opts->part_enforce =OSM_PARTITION_ENFORCE_BOTH ); + p_opts->part_enforce =OSM_PARTITION_ENFORCE_BOTH ; + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH ; + } + } +if (p_opts->qos) {subn_verify_qos_set (&p_opts->qos_options,"qos" );subn_verify_qos_set (&p_opts->qos_ca_options,"qos_ca" );
@@ -1372,9 +1395,14 @@ int osm_subn_output_conf(FILE *out, IN osm_subn_opt_t * p_opts)"# Partition configuration file to be used\n" "partition_config_file %s\n\n" "# Disable partition enforcement by switches\n" -"no_partition_enforcement %s\n\n" , +"no_partition_enforcement %s\n\n" +"# Partition enforcement type (for switches)\n" +"# Values are both, out, and in\n" +"# Default is both (outbound and inbound enforcement)\n" +"part_enforce %s\n\n" , p_opts->partition_config_file, - p_opts->no_partition_enforcement ? "TRUE" : "FALSE"); + p_opts->no_partition_enforcement ?"TRUE" :"FALSE" , + p_opts->part_enforce);fprintf (out, "#\n# SWEEP OPTIONS\n#\n"
Signature · 6 lines
1.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
This should be the correct patch. Sorry for the mess.
Partition enforcement types are in, out, and both. Prior to this support, both was being used so that is the default.
---
Changes since v2: Added comments in man, conf file and help
---
include/opensm/osm_subnet.h | 15 +++++++++++++++ man/opensm.8.in | 14 +++++++++++--- opensm/main.c | 32 +++++++++++++++++++++++++++++--- opensm/osm_pkey_mgr.c | 40 ++++++++++++++++++++++++---------------- opensm/osm_subnet.c | 34 ++++++++++++++++++++++++++++++++-- 5 files changed, 111 insertions(+), 24 deletions(-)
include/opensm/osm_subnet.h +15 -0
@@ -68,6 +68,19 @@ BEGIN_C_DECLS#define OSM_SUBNET_VECTOR_MIN_SIZE 0#define OSM_SUBNET_VECTOR_GROW_SIZE 1#define OSM_SUBNET_VECTOR_CAPACITY 256 + +#define OSM_PARTITION_ENFORCE_BOTH "both" +#define OSM_PARTITION_ENFORCE_IN "in" +#define OSM_PARTITION_ENFORCE_OUT "out" +#define OSM_PARTITION_ENFORCE_OFF "off" + +typedef enum _osm_partition_enforce_type_enum { +OSM_PARTITION_ENFORCE_TYPE_BOTH , +OSM_PARTITION_ENFORCE_TYPE_IN , +OSM_PARTITION_ENFORCE_TYPE_OUT , +OSM_PARTITION_ENFORCE_TYPE_OFF +}osm_partition_enforce_type_enum ; +struct osm_opensm ;struct osm_qos_policy ;
@@ -182,6 +195,8 @@ typedef struct osm_subn_opt {unsigned long log_max_size;char *partition_config_file;boolean_t no_partition_enforcement; +char *part_enforce; +osm_partition_enforce_type_enum part_enforce_enum;boolean_t qos;char *qos_policy_file;boolean_t accum_log_file;
man/opensm.8.in +11 -3
@@ -1,4 +1,4 @@ -.TH OPENSM 8 "November 3, 2010" "OpenIB" "OpenIB Management" +.TH OPENSM 8 "July 5, 2011" "OpenIB" "OpenIB Management" .SH NAME opensm \- InfiniBand subnet manager and administration (SM/SA)
@@ -44,7 +44,8 @@ opensm \- InfiniBand subnet manager and administration (SM/SA) [\-f <log file path> | \-\-log_file <log file path> ] [\-L | \-\-log_limit <size in MB>] [\-e(rase_log_file)] [\-P(config) <partition config file> ] -[\-N | \-\-no_part_enforce] +[\-N | \-\-no_part_enforce] (DEPRECATED) +[\-Z | \-\-part_enforce [both | in | out | off]] [\-Q | \-\-qos [\-Y | \-\-qos_policy_file <file name>]] [\-y | \-\-stay_on_fatal] [\-B | \-\-daemon]
@@ -363,9 +364,16 @@ name is \fB\%@OPENSM_CONFIG_DIR@/@QOS_POLICY_FILE@\fP. See QoS_management_in_OpenSM.txt in opensm doc for more information on configuring QoS policy via this file. .TP -\fB\-N\fR, \fB\-\-no_part_enforce\fR +\fB\-N\fR, \fB\-\-no_part_enforce\fR \fB(DEPRECATED)\fR +This is a deprecated flag. Please use \fB\-\-part_enforce\fR instead. This option disables partition enforcement on switch external ports. .TP +\fB\-Z\fR, \fB\-\-part_enforce\fR [both | in | out | off] +This option indicates the partition enforcement type (for switches). +Enforcement type can be inbound only (in), outbound only (out), +both or disabled (off). Default is both. When \fB\-\-no_part_enforce\fR +is TRUE, partition enforcement is off. +.TP \fB\-y\fR, \fB\-\-stay_on_fatal\fR This option will cause SM not to exit on fatal initialization issues: if SM discovers duplicated guids or a 12x link with
opensm/main.c +29 -3
@@ -1,6 +1,6 @@/* * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved. -* Copyright (c) 2002-2009 Mellanox Technologies LTD. All rights reserved. +* Copyright (c) 2002-2011 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. * Copyright (c) 2009 HNR Consulting. All rights reserved. * Copyright (c) 2009 System Fabric Works, Inc. All rights reserved.
@@ -318,8 +318,14 @@ static void show_usage(void)" This option defines the optional partition configuration file.\n" " The default name is \'" OSM_DEFAULT_PARTITION_CONFIG_FILE "\'.\n\n"); -printf ("--no_part_enforce, -N\n" +printf ("--no_part_enforce, -N (DEPRECATED)\n" +" Use --part_enforce instead.\n" " This option disables partition enforcement on switch external ports.\n\n" ); +printf ("--part_enforce, -Z [both, in, out, off]\n" +" This option indicates the partition enforcement type (for switches)\n" +" Enforcement type can be outbound only (out), inbound only (in), both or\n" +" disabled (off). Default is both. When --no_part_enforce is TRUE, partition\n" +" is off\n\n" );printf ("--qos, -Q\n" " This option enables QoS setup.\n\n" );printf ("--qos_policy_file, -Y <QoS-policy-file>\n" " This option defines the optional QoS policy file.\n"
@@ -566,7 +572,7 @@ int main(int argc, char *argv[])char *conf_template =NULL , *config_file =NULL ;uint32_t val;const char *const short_option = -"F:c:i:w:O:f:ed:D:g:l:L:s:t:a:u:m:X:R:zM:U:S:P:Y:ANBIQvVhoryxp:n:q:k:C:G:H:" ; +"F:c:i:w:O:f:ed:D:g:l:L:s:t:a:u:m:X:R:zM:U:S:P:Y:ANBIQvVhoryxp:n:q:k:C:G:H:Z:" ;/* In the array below, the 2nd parameter specifies the number
@@ -595,6 +601,7 @@ int main(int argc, char *argv[]) {"erase_log_file", 0, NULL, 'e'}, {"Pconfig", 1, NULL, 'P'}, {"no_part_enforce", 0, NULL, 'N'}, + {"part_enforce", 1, NULL, 'Z'}, {"qos", 0, NULL, 'Q'}, {"qos_policy_file", 1, NULL, 'Y'}, {"maxsmps", 1, NULL, 'n'},
@@ -870,6 +877,25 @@ int main(int argc, char *argv[]) opt.no_partition_enforcement = TRUE;break ; +case 'Z' : +if (strcmp (optarg,OSM_PARTITION_ENFORCE_BOTH ) ==0 + ||strcmp (optarg,OSM_PARTITION_ENFORCE_IN ) ==0 + ||strcmp (optarg,OSM_PARTITION_ENFORCE_OUT ) ==0 + ||strcmp (optarg,OSM_PARTITION_ENFORCE_OFF ) ==0 ) { +SET_STR_OPT (opt.part_enforce, optarg); +if (strcmp (optarg,OSM_PARTITION_ENFORCE_BOTH ) ==0 ) + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH ; +else if (strcmp (optarg,OSM_PARTITION_ENFORCE_IN ) ==0 ) + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_IN ; +else if (strcmp (optarg,OSM_PARTITION_ENFORCE_OUT ) ==0 ) + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OUT ; +else + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OFF ; + }else +printf ("-part_enforce %s option not understood\n" , + optarg); +break ; +case 'Q' : opt.qos = TRUE;break ;
opensm/osm_pkey_mgr.c +24 -16
@@ -1,6 +1,6 @@/* * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved. -* Copyright (c) 2002-2010 Mellanox Technologies LTD. All rights reserved. +* Copyright (c) 2002-2011 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. *
@@ -182,16 +182,26 @@ pkey_mgr_update_pkey_entry(IN osm_sm_t * sm,static ib_api_status_t pkey_mgr_enforce_partition(IN osm_log_t * p_log, osm_sm_t * sm, - IN osm_physp_t * p_physp, IN const boolean_t enforce) + IN osm_physp_t * p_physp, + IN osm_partition_enforce_type_enum enforce_type) {osm_madw_context_t context;uint8_t payload[IB_SMP_DATA_SIZE ];ib_port_info_t *p_pi;ib_api_status_t status; +uint8_t enforce_bits; p_pi = &p_physp->port_info; -if ((p_pi->vl_enforce &0xc ) == (0xc ) * (enforce == TRUE)) { +if (enforce_type ==OSM_PARTITION_ENFORCE_TYPE_BOTH ) + enforce_bits =0xc ; +else if (enforce_type ==OSM_PARTITION_ENFORCE_TYPE_IN ) + enforce_bits =0x8 ; +else + enforce_bits =0x4 ; + +if ((p_pi->vl_enforce &0xc ) == enforce_bits * + (enforce_type !=OSM_PARTITION_ENFORCE_TYPE_OFF )) { OSM_LOG(p_log, OSM_LOG_DEBUG, "No need to update PortInfo for " "node 0x%016" PRIx64 " port %u (%s)\n",
@@ -207,10 +217,9 @@ pkey_mgr_enforce_partition(IN osm_log_t * p_log, osm_sm_t * sm, IB_SMP_DATA_SIZE - sizeof(ib_port_info_t)); p_pi = (ib_port_info_t *) payload; -if (enforce == TRUE) - p_pi->vl_enforce |=0xc ; -else - p_pi->vl_enforce &= ~0xc ; + p_pi->vl_enforce &= ~0xc ; +if (enforce_type !=OSM_PARTITION_ENFORCE_TYPE_OFF ) + p_pi->vl_enforce |= enforce_bits; p_pi->state_info2 =0 ;ib_port_info_set_port_state (p_pi,IB_LINK_NO_CHANGE );
@@ -436,7 +445,7 @@ static int update_peer_block(osm_log_t * p_log, osm_sm_t * sm,static int pkey_mgr_update_peer_port (osm_log_t * p_log,osm_sm_t * sm,const osm_subn_t * p_subn,const osm_port_t *const p_port, -boolean_t enforce) +osm_partition_enforce_type_enum enforce_type) {osm_physp_t *p_physp, *peer;osm_node_t *p_node;
@@ -461,8 +470,8 @@ static int pkey_mgr_update_peer_port(osm_log_t * p_log, osm_sm_t * sm,if (!p_node->sw || !p_node->sw->switch_info.enforce_cap)return 0 ; -if (enforce == FALSE) { -pkey_mgr_enforce_partition (p_log, sm, peer, FALSE); +if (enforce_type !=OSM_PARTITION_ENFORCE_TYPE_OFF ) { +pkey_mgr_enforce_partition (p_log, sm, peer,OSM_PARTITION_ENFORCE_TYPE_OFF );return ret; }
@@ -528,14 +537,14 @@ static int pkey_mgr_update_peer_port(osm_log_t * p_log, osm_sm_t * sm,cl_ntoh64 (osm_node_get_node_guid (p_node)),osm_physp_get_port_num (peer), p_node->print_desc); - enforce = FALSE; + enforce_type =OSM_PARTITION_ENFORCE_TYPE_OFF ; ret =-1 ; } } } }else { p_peer_pkey_tbl->used_blocks = peer_max_blocks; - enforce = FALSE; + enforce_type =OSM_PARTITION_ENFORCE_TYPE_OFF ; }if (!ret)
@@ -545,7 +554,7 @@ static int pkey_mgr_update_peer_port(osm_log_t * p_log, osm_sm_t * sm,cl_ntoh64 (osm_node_get_node_guid (p_node)), osm_physp_get_port_num(peer), p_node->print_desc); -if (pkey_mgr_enforce_partition (p_log, sm, peer, enforce)) +if (pkey_mgr_enforce_partition (p_log, sm, peer, enforce_type)) ret =-1 ;return ret;
@@ -599,8 +608,7 @@ int osm_pkey_mgr_process(IN osm_opensm_t * p_osm)if ((osm_node_get_type (p_port->p_node) !=IB_NODE_TYPE_SWITCH ) &&pkey_mgr_update_peer_port (&p_osm->log, &p_osm->sm, &p_osm->subn, p_port, - !p_osm->subn.opt. - no_partition_enforcement)) + p_osm->subn.opt.part_enforce_enum)) ret =-1 ; }
@@ -624,7 +632,7 @@ int osm_pkey_mgr_process(IN osm_opensm_t * p_osm)continue ;/* clear partition enforcement */ -if (pkey_mgr_enforce_partition (&p_osm->log, &p_osm->sm, p_physp, FALSE)) +if (pkey_mgr_enforce_partition (&p_osm->log, &p_osm->sm, p_physp,OSM_PARTITION_ENFORCE_TYPE_OFF )) ret =-1 ; } }
opensm/osm_subnet.c +32 -2
@@ -342,6 +342,7 @@ static const opt_rec_t opt_tbl[] = { { "accum_log_file", OPT_OFFSET(accum_log_file), opts_parse_boolean, opts_setup_accum_log_file, 1 }, { "partition_config_file", OPT_OFFSET(partition_config_file), opts_parse_charp, NULL, 0 }, { "no_partition_enforcement", OPT_OFFSET(no_partition_enforcement), opts_parse_boolean, NULL, 1 }, + { "part_enforce", OPT_OFFSET(part_enforce), opts_parse_charp, NULL, 1 }, { "qos", OPT_OFFSET(qos), opts_parse_boolean, NULL, 1 }, { "qos_policy_file", OPT_OFFSET(qos_policy_file), opts_parse_charp, NULL, 0 }, { "dump_files_dir", OPT_OFFSET(dump_files_dir), opts_parse_charp, NULL, 0 },
@@ -761,6 +762,7 @@ void osm_subn_set_default_opt(IN osm_subn_opt_t * p_opt) p_opt->log_max_size =0 ; p_opt->partition_config_file =strdup (OSM_DEFAULT_PARTITION_CONFIG_FILE ); p_opt->no_partition_enforcement = FALSE; + p_opt->part_enforce =OSM_PARTITION_ENFORCE_BOTH ; p_opt->qos = FALSE; p_opt->qos_policy_file =strdup (OSM_DEFAULT_QOS_POLICY_FILE ); p_opt->accum_log_file = TRUE;
@@ -1129,6 +1131,27 @@ int osm_subn_verify_config(IN osm_subn_opt_t * p_opts) p_opts->console =OSM_DEFAULT_CONSOLE ; } +if (p_opts->no_partition_enforcement == TRUE) { +strcpy (p_opts->part_enforce,OSM_PARTITION_ENFORCE_OFF ); + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OFF ; + }else { +if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_BOTH ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH ; +else if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_IN ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_IN ; +else if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_OUT ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OUT ; +else if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_OFF ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OFF ; +else { +log_report (" Invalid Cached Option Value:part_enforce = %s" +", Using Default:%s\n" , + p_opts->part_enforce =OSM_PARTITION_ENFORCE_BOTH ); + p_opts->part_enforce =OSM_PARTITION_ENFORCE_BOTH ; + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH ; + } + } +if (p_opts->qos) {subn_verify_qos_set (&p_opts->qos_options,"qos" );subn_verify_qos_set (&p_opts->qos_ca_options,"qos_ca" );
@@ -1372,9 +1395,16 @@ int osm_subn_output_conf(FILE *out, IN osm_subn_opt_t * p_opts)"# Partition configuration file to be used\n" "partition_config_file %s\n\n" "# Disable partition enforcement by switches\n" -"no_partition_enforcement %s\n\n" , +"no_partition_enforcement %s\n\n" +"# Partition enforcement type (for switches)\n" +"# Values are both, out, in and off\n" +"# Default is both (outbound and inbound enforcement)\n" +"# When no_partition_enforcement is TRUE, partition\n" +"# enforcement is off\n" +"part_enforce %s\n\n" , p_opts->partition_config_file, - p_opts->no_partition_enforcement ? "TRUE" : "FALSE"); + p_opts->no_partition_enforcement ?"TRUE" :"FALSE" , + p_opts->part_enforce);fprintf (out, "#\n# SWEEP OPTIONS\n#\n"
Signature · 6 lines
1.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 1 line · Alex Netes
This should be the correct patch. Sorry for the mess.
Looks good to me; just a couple of nits below...
Quoted 1 line
Partition enforcement types are in, out, and both.
in, out, both and off.
Quoted 100 lines
Prior to this support, both was being used so that is the default.
---
Changes since v2: Added comments in man, conf file and help
---include/opensm/osm_subnet.h | 15 +++++++++++++++ man/opensm.8.in | 14 +++++++++++--- opensm/main.c | 32 +++++++++++++++++++++++++++++--- opensm/osm_pkey_mgr.c | 40 ++++++++++++++++++++++++---------------- opensm/osm_subnet.c | 34 ++++++++++++++++++++++++++++++++-- 5 files changed, 111 insertions(+), 24 deletions(-)include/opensm/osm_subnet.h +15
-0@@ -68,6 +68,19 @@ BEGIN_C_DECLS#define OSM_SUBNET_VECTOR_MIN_SIZE 0#define OSM_SUBNET_VECTOR_GROW_SIZE 1#define OSM_SUBNET_VECTOR_CAPACITY 256 + +#define OSM_PARTITION_ENFORCE_BOTH "both" +#define OSM_PARTITION_ENFORCE_IN "in" +#define OSM_PARTITION_ENFORCE_OUT "out" +#define OSM_PARTITION_ENFORCE_OFF "off" + +typedef enum _osm_partition_enforce_type_enum { +OSM_PARTITION_ENFORCE_TYPE_BOTH , +OSM_PARTITION_ENFORCE_TYPE_IN , +OSM_PARTITION_ENFORCE_TYPE_OUT , +OSM_PARTITION_ENFORCE_TYPE_OFF +}osm_partition_enforce_type_enum ; +struct osm_opensm ;struct osm_qos_policy ;@@ -182,6 +195,8 @@ typedef struct osm_subn_opt {unsigned long log_max_size;char *partition_config_file;boolean_t no_partition_enforcement; +char *part_enforce; +osm_partition_enforce_type_enum part_enforce_enum;boolean_t qos;char *qos_policy_file;boolean_t accum_log_file;man/opensm.8.in +11
-3@@ -1,4 +1,4 @@ -.TH OPENSM 8 "November 3, 2010" "OpenIB" "OpenIB Management" +.TH OPENSM 8 "July 5, 2011" "OpenIB" "OpenIB Management" .SH NAME opensm \- InfiniBand subnet manager and administration (SM/SA)@@ -44,7 +44,8 @@ opensm \- InfiniBand subnet manager and administration (SM/SA) [\-f <log file path> | \-\-log_file <log file path> ] [\-L | \-\-log_limit <size in MB>] [\-e(rase_log_file)] [\-P(config) <partition config file> ] -[\-N | \-\-no_part_enforce] +[\-N | \-\-no_part_enforce] (DEPRECATED) +[\-Z | \-\-part_enforce [both | in | out | off]] [\-Q | \-\-qos [\-Y | \-\-qos_policy_file <file name>]] [\-y | \-\-stay_on_fatal] [\-B | \-\-daemon]@@ -363,9 +364,16 @@ name is \fB\%@OPENSM_CONFIG_DIR@/@QOS_POLICY_FILE@\fP. See QoS_management_in_OpenSM.txt in opensm doc for more information on configuring QoS policy via this file. .TP -\fB\-N\fR, \fB\-\-no_part_enforce\fR +\fB\-N\fR, \fB\-\-no_part_enforce\fR \fB(DEPRECATED)\fR +This is a deprecated flag. Please use \fB\-\-part_enforce\fR instead. This option disables partition enforcement on switch external ports. .TP +\fB\-Z\fR, \fB\-\-part_enforce\fR [both | in | out | off] +This option indicates the partition enforcement type (for switches). +Enforcement type can be inbound only (in), outbound only (out), +both or disabled (off). Default is both. When \fB\-\-no_part_enforce\fR +is TRUE, partition enforcement is off. +.TP \fB\-y\fR, \fB\-\-stay_on_fatal\fR This option will cause SM not to exit on fatal initialization issues: if SM discovers duplicated guids or a 12x link withopensm/main.c +1
-1@@ -1,6 +1,6 @@/* * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved. -* Copyright (c) 2002-2009 Mellanox Technologies LTD. All rights reserved. +* Copyright (c) 2002-2011 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. * Copyright (c) 2009 HNR Consulting. All rights reserved. * Copyright (c) 2009 System Fabric Works, Inc. All rights reserved. @@ -318,8 +318,14 @@ static void show_usage(void)" This option defines the optional partition configuration file.\n" " The default name is \'"
opensm/main.c static void show_usage(void) · line 328
Quoted 10 lines
opensm/main.c +7
-1OSM_DEFAULT_PARTITION_CONFIG_FILE "\'.\n\n"); -printf ("--no_part_enforce, -N\n" +printf ("--no_part_enforce, -N (DEPRECATED)\n" +" Use --part_enforce instead.\n" " This option disables partition enforcement on switch external ports.\n\n" ); +printf ("--part_enforce, -Z [both, in, out, off]\n" +" This option indicates the partition enforcement type (for switches)\n" +" Enforcement type can be outbound only (out), inbound only (in), both or\n" +" disabled (off). Default is both. When --no_part_enforce is TRUE, partition\n" +" is off\n\n" );
enforcement is off
-- Hal
Quoted 223 lines
opensm/main.c +21
-1printf ("--qos, -Q\n" " This option enables QoS setup.\n\n" );printf ("--qos_policy_file, -Y <QoS-policy-file>\n" " This option defines the optional QoS policy file.\n"@@ -566,7 +572,7 @@ int main(int argc, char *argv[])char *conf_template =NULL , *config_file =NULL ;uint32_t val;const char *const short_option = -"F:c:i:w:O:f:ed:D:g:l:L:s:t:a:u:m:X:R:zM:U:S:P:Y:ANBIQvVhoryxp:n:q:k:C:G:H:" ; +"F:c:i:w:O:f:ed:D:g:l:L:s:t:a:u:m:X:R:zM:U:S:P:Y:ANBIQvVhoryxp:n:q:k:C:G:H:Z:" ;/* In the array below, the 2nd parameter specifies the number @@ -595,6 +601,7 @@ int main(int argc, char *argv[]) {"erase_log_file", 0, NULL, 'e'}, {"Pconfig", 1, NULL, 'P'}, {"no_part_enforce", 0, NULL, 'N'}, + {"part_enforce", 1, NULL, 'Z'}, {"qos", 0, NULL, 'Q'}, {"qos_policy_file", 1, NULL, 'Y'}, {"maxsmps", 1, NULL, 'n'},@@ -870,6 +877,25 @@ int main(int argc, char *argv[]) opt.no_partition_enforcement = TRUE;break ; +case 'Z' : +if (strcmp (optarg,OSM_PARTITION_ENFORCE_BOTH ) ==0 + ||strcmp (optarg,OSM_PARTITION_ENFORCE_IN ) ==0 + ||strcmp (optarg,OSM_PARTITION_ENFORCE_OUT ) ==0 + ||strcmp (optarg,OSM_PARTITION_ENFORCE_OFF ) ==0 ) { +SET_STR_OPT (opt.part_enforce, optarg); +if (strcmp (optarg,OSM_PARTITION_ENFORCE_BOTH ) ==0 ) + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH ; +else if (strcmp (optarg,OSM_PARTITION_ENFORCE_IN ) ==0 ) + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_IN ; +else if (strcmp (optarg,OSM_PARTITION_ENFORCE_OUT ) ==0 ) + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OUT ; +else + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OFF ; + }else +printf ("-part_enforce %s option not understood\n" , + optarg); +break ; +case 'Q' : opt.qos = TRUE;break ;opensm/osm_pkey_mgr.c +24
-16@@ -1,6 +1,6 @@/* * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved. -* Copyright (c) 2002-2010 Mellanox Technologies LTD. All rights reserved. +* Copyright (c) 2002-2011 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * @@ -182,16 +182,26 @@ pkey_mgr_update_pkey_entry(IN osm_sm_t * sm,static ib_api_status_t pkey_mgr_enforce_partition(IN osm_log_t * p_log, osm_sm_t * sm, - IN osm_physp_t * p_physp, IN const boolean_t enforce) + IN osm_physp_t * p_physp, + IN osm_partition_enforce_type_enum enforce_type) {osm_madw_context_t context;uint8_t payload[IB_SMP_DATA_SIZE ];ib_port_info_t *p_pi;ib_api_status_t status; +uint8_t enforce_bits; p_pi = &p_physp->port_info; -if ((p_pi->vl_enforce &0xc ) == (0xc ) * (enforce == TRUE)) { +if (enforce_type ==OSM_PARTITION_ENFORCE_TYPE_BOTH ) + enforce_bits =0xc ; +else if (enforce_type ==OSM_PARTITION_ENFORCE_TYPE_IN ) + enforce_bits =0x8 ; +else + enforce_bits =0x4 ; + +if ((p_pi->vl_enforce &0xc ) == enforce_bits * + (enforce_type !=OSM_PARTITION_ENFORCE_TYPE_OFF )) { OSM_LOG(p_log, OSM_LOG_DEBUG, "No need to update PortInfo for " "node 0x%016" PRIx64 " port %u (%s)\n",@@ -207,10 +217,9 @@ pkey_mgr_enforce_partition(IN osm_log_t * p_log, osm_sm_t * sm, IB_SMP_DATA_SIZE - sizeof(ib_port_info_t)); p_pi = (ib_port_info_t *) payload; -if (enforce == TRUE) - p_pi->vl_enforce |=0xc ; -else - p_pi->vl_enforce &= ~0xc ; + p_pi->vl_enforce &= ~0xc ; +if (enforce_type !=OSM_PARTITION_ENFORCE_TYPE_OFF ) + p_pi->vl_enforce |= enforce_bits; p_pi->state_info2 =0 ;ib_port_info_set_port_state (p_pi,IB_LINK_NO_CHANGE );@@ -436,7 +445,7 @@ static int update_peer_block(osm_log_t * p_log, osm_sm_t * sm,static int pkey_mgr_update_peer_port (osm_log_t * p_log,osm_sm_t * sm,const osm_subn_t * p_subn,const osm_port_t *const p_port, -boolean_t enforce) +osm_partition_enforce_type_enum enforce_type) {osm_physp_t *p_physp, *peer;osm_node_t *p_node;@@ -461,8 +470,8 @@ static int pkey_mgr_update_peer_port(osm_log_t * p_log, osm_sm_t * sm,if (!p_node->sw || !p_node->sw->switch_info.enforce_cap)return 0 ; -if (enforce == FALSE) { -pkey_mgr_enforce_partition (p_log, sm, peer, FALSE); +if (enforce_type !=OSM_PARTITION_ENFORCE_TYPE_OFF ) { +pkey_mgr_enforce_partition (p_log, sm, peer,OSM_PARTITION_ENFORCE_TYPE_OFF );return ret; }@@ -528,14 +537,14 @@ static int pkey_mgr_update_peer_port(osm_log_t * p_log, osm_sm_t * sm,cl_ntoh64 (osm_node_get_node_guid (p_node)),osm_physp_get_port_num (peer), p_node->print_desc); - enforce = FALSE; + enforce_type =OSM_PARTITION_ENFORCE_TYPE_OFF ; ret =-1 ; } } } }else { p_peer_pkey_tbl->used_blocks = peer_max_blocks; - enforce = FALSE; + enforce_type =OSM_PARTITION_ENFORCE_TYPE_OFF ; }if (!ret)@@ -545,7 +554,7 @@ static int pkey_mgr_update_peer_port(osm_log_t * p_log, osm_sm_t * sm,cl_ntoh64 (osm_node_get_node_guid (p_node)), osm_physp_get_port_num(peer), p_node->print_desc); -if (pkey_mgr_enforce_partition (p_log, sm, peer, enforce)) +if (pkey_mgr_enforce_partition (p_log, sm, peer, enforce_type)) ret =-1 ;return ret;@@ -599,8 +608,7 @@ int osm_pkey_mgr_process(IN osm_opensm_t * p_osm)if ((osm_node_get_type (p_port->p_node) !=IB_NODE_TYPE_SWITCH ) &&pkey_mgr_update_peer_port (&p_osm->log, &p_osm->sm, &p_osm->subn, p_port, - !p_osm->subn.opt. - no_partition_enforcement)) + p_osm->subn.opt.part_enforce_enum)) ret =-1 ; }@@ -624,7 +632,7 @@ int osm_pkey_mgr_process(IN osm_opensm_t * p_osm)continue ;/* clear partition enforcement */ -if (pkey_mgr_enforce_partition (&p_osm->log, &p_osm->sm, p_physp, FALSE)) +if (pkey_mgr_enforce_partition (&p_osm->log, &p_osm->sm, p_physp,OSM_PARTITION_ENFORCE_TYPE_OFF )) ret =-1 ; } }opensm/osm_subnet.c +27
-1@@ -342,6 +342,7 @@ static const opt_rec_t opt_tbl[] = { { "accum_log_file", OPT_OFFSET(accum_log_file), opts_parse_boolean, opts_setup_accum_log_file, 1 }, { "partition_config_file", OPT_OFFSET(partition_config_file), opts_parse_charp, NULL, 0 }, { "no_partition_enforcement", OPT_OFFSET(no_partition_enforcement), opts_parse_boolean, NULL, 1 }, + { "part_enforce", OPT_OFFSET(part_enforce), opts_parse_charp, NULL, 1 }, { "qos", OPT_OFFSET(qos), opts_parse_boolean, NULL, 1 }, { "qos_policy_file", OPT_OFFSET(qos_policy_file), opts_parse_charp, NULL, 0 }, { "dump_files_dir", OPT_OFFSET(dump_files_dir), opts_parse_charp, NULL, 0 },@@ -761,6 +762,7 @@ void osm_subn_set_default_opt(IN osm_subn_opt_t * p_opt) p_opt->log_max_size =0 ; p_opt->partition_config_file =strdup (OSM_DEFAULT_PARTITION_CONFIG_FILE ); p_opt->no_partition_enforcement = FALSE; + p_opt->part_enforce =OSM_PARTITION_ENFORCE_BOTH ; p_opt->qos = FALSE; p_opt->qos_policy_file =strdup (OSM_DEFAULT_QOS_POLICY_FILE ); p_opt->accum_log_file = TRUE;@@ -1129,6 +1131,27 @@ int osm_subn_verify_config(IN osm_subn_opt_t * p_opts) p_opts->console =OSM_DEFAULT_CONSOLE ; } +if (p_opts->no_partition_enforcement == TRUE) { +strcpy (p_opts->part_enforce,OSM_PARTITION_ENFORCE_OFF ); + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OFF ; + }else { +if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_BOTH ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH ; +else if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_IN ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_IN ; +else if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_OUT ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OUT ; +else if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_OFF ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OFF ; +else { +log_report (" Invalid Cached Option Value:part_enforce = %s" +", Using Default:%s\n" , + p_opts->part_enforce =OSM_PARTITION_ENFORCE_BOTH ); + p_opts->part_enforce =OSM_PARTITION_ENFORCE_BOTH ; + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH ; + } + } +if (p_opts->qos) {subn_verify_qos_set (&p_opts->qos_options,"qos" );subn_verify_qos_set (&p_opts->qos_ca_options,"qos_ca" );@@ -1372,9 +1395,16 @@ int osm_subn_output_conf(FILE *out, IN osm_subn_opt_t * p_opts)"# Partition configuration file to be used\n" "partition_config_file %s\n\n" "# Disable partition enforcement by switches\n" - "no_partition_enforcement %s\n\n", +"no_partition_enforcement %s\n\n" +"# Partition enforcement type (for switches)\n" +"# Values are both, out, in and off\n" +"# Default is both (outbound and inbound enforcement)\n"
opensm/osm_subnet.c int osm_subn_output_conf(FILE *out, IN osm_subn_opt_t * p_opts) · line 1410
Quoted 10 lines
opensm/osm_subnet.c +5
-1+"# When no_partition_enforcement is TRUE, partition\n" +"# enforcement is off\n" +"part_enforce %s\n\n" , p_opts->partition_config_file, - p_opts->no_partition_enforcement ? "TRUE" : "FALSE"); + p_opts->no_partition_enforcement ?"TRUE" :"FALSE" , + p_opts->part_enforce);fprintf (out, "#\n# SWEEP OPTIONS\n#\n"
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 1/1 opensm: Add support for partition enforcement types
In reply to a message not in the archivePartition enforcement types are in, out, and both. Prior to this support, both was being used so that is the default.
--
Changes since v2:
Cosmetic changes
Added comments in man, conf file and help
--- include/opensm/osm_subnet.h | 15 +++++++++++++++ man/opensm.8.in | 11 +++++++++-- opensm/main.c | 31 ++++++++++++++++++++++++++++--- opensm/osm_pkey_mgr.c | 41 +++++++++++++++++++++++++---------------- opensm/osm_subnet.c | 31 ++++++++++++++++++++++++++++++- 5 files changed, 107 insertions(+), 22 deletions(-)
include/opensm/osm_subnet.h +15 -0
@@ -68,6 +68,19 @@ BEGIN_C_DECLS#define OSM_SUBNET_VECTOR_MIN_SIZE 0#define OSM_SUBNET_VECTOR_GROW_SIZE 1#define OSM_SUBNET_VECTOR_CAPACITY 256 + +#define OSM_PARTITION_ENFORCE_BOTH "both" +#define OSM_PARTITION_ENFORCE_IN "in" +#define OSM_PARTITION_ENFORCE_OUT "out" +#define OSM_PARTITION_ENFORCE_OFF "off" + +typedef enum _osm_partition_enforce_type_enum { +OSM_PARTITION_ENFORCE_TYPE_BOTH , +OSM_PARTITION_ENFORCE_TYPE_IN , +OSM_PARTITION_ENFORCE_TYPE_OUT , +OSM_PARTITION_ENFORCE_TYPE_OFF +}osm_partition_enforce_type_enum ; +struct osm_opensm ;struct osm_qos_policy ;
@@ -184,6 +197,8 @@ typedef struct osm_subn_opt {unsigned long log_max_size;char *partition_config_file;boolean_t no_partition_enforcement; +char *part_enforce; +osm_partition_enforce_type_enum part_enforce_enum;boolean_t allow_both_pkeys;uint8_t sm_assigned_guid;boolean_t qos;
man/opensm.8.in +9 -2
@@ -44,7 +44,8 @@ opensm \- InfiniBand subnet manager and administration (SM/SA) [\-f <log file path> | \-\-log_file <log file path> ] [\-L | \-\-log_limit <size in MB>] [\-e(rase_log_file)] [\-P(config) <partition config file> ] -[\-N | \-\-no_part_enforce] +[\-N | \-\-no_part_enforce] (DEPRECATED) +[\-Z | \-\-part_enforce [both | in | out | off]] [\-W | \-\-allow_both_pkeys] [\-Q | \-\-qos [\-Y | \-\-qos_policy_file <file name>]] [\-y | \-\-stay_on_fatal]
@@ -367,9 +368,15 @@ name is \fB\%@OPENSM_CONFIG_DIR@/@QOS_POLICY_FILE@\fP. See QoS_management_in_OpenSM.txt in opensm doc for more information on configuring QoS policy via this file. .TP -\fB\-N\fR, \fB\-\-no_part_enforce\fR +\fB\-N\fR, \fB\-\-no_part_enforce\fR \fB(DEPRECATED)\fR +This is a deprecated flag. Please use \fB\-\-part_enforce\fR instead. This option disables partition enforcement on switch external ports. .TP +\fB\-Z\fR, \fB\-\-part_enforce\fR [both | in | out | off] +This option indicates the partition enforcement type (for switches). +Enforcement type can be inbound only (in), outbound only (out), +both or disabled (off). Default is both. +.TP \fB\-W\fR, \fB\-\-allow_both_pkeys\fR This option indicates whether both full and limited membership on the same partition can be configured in the PKeyTable. Default is not
opensm/main.c +28 -3
@@ -1,6 +1,6 @@/* * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved. -* Copyright (c) 2002-2009 Mellanox Technologies LTD. All rights reserved. +* Copyright (c) 2002-2011 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. * Copyright (c) 2009 HNR Consulting. All rights reserved. * Copyright (c) 2009 System Fabric Works, Inc. All rights reserved.
@@ -321,8 +321,13 @@ static void show_usage(void)" This option defines the optional partition configuration file.\n" " The default name is \'" OSM_DEFAULT_PARTITION_CONFIG_FILE "\'.\n\n"); -printf ("--no_part_enforce, -N\n" +printf ("--no_part_enforce, -N (DEPRECATED)\n" +" Use --part_enforce instead.\n" " This option disables partition enforcement on switch external ports.\n\n" ); +printf ("--part_enforce, -Z [both, in, out, off]\n" +" This option indicates the partition enforcement type (for switches)\n" +" Enforcement type can be outbound only (out), inbound only (in), both or\n" +" disabled (off). Default is both.\n\n" );printf ("--allow_both_pkeys, -W\n" " This option indicates whether both full and limited membership\n" " on the same partition can be configured in the PKeyTable.\n"
@@ -573,7 +578,7 @@ int main(int argc, char *argv[])char *conf_template =NULL , *config_file =NULL ;uint32_t val;const char *const short_option = -"F:c:i:w:O:f:ed:D:g:l:L:s:t:a:u:m:X:R:zM:U:S:P:Y:ANWBIQvVhoryxp:n:q:k:C:G:H:" ; +"F:c:i:w:O:f:ed:D:g:l:L:s:t:a:u:m:X:R:zM:U:S:P:Y:ANZ:WBIQvVhoryxp:n:q:k:C:G:H:" ;/* In the array below, the 2nd parameter specifies the number
@@ -602,6 +607,7 @@ int main(int argc, char *argv[]) {"erase_log_file", 0, NULL, 'e'}, {"Pconfig", 1, NULL, 'P'}, {"no_part_enforce", 0, NULL, 'N'}, + {"part_enforce", 1, NULL, 'Z'}, {"allow_both_pkeys", 0, NULL, 'W'}, {"qos", 0, NULL, 'Q'}, {"qos_policy_file", 1, NULL, 'Y'},
@@ -879,6 +885,25 @@ int main(int argc, char *argv[]) opt.no_partition_enforcement = TRUE;break ; +case 'Z' : +if (strcmp (optarg,OSM_PARTITION_ENFORCE_BOTH ) ==0 + ||strcmp (optarg,OSM_PARTITION_ENFORCE_IN ) ==0 + ||strcmp (optarg,OSM_PARTITION_ENFORCE_OUT ) ==0 + ||strcmp (optarg,OSM_PARTITION_ENFORCE_OFF ) ==0 ) { +SET_STR_OPT (opt.part_enforce, optarg); +if (strcmp (optarg,OSM_PARTITION_ENFORCE_BOTH ) ==0 ) + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH ; +else if (strcmp (optarg,OSM_PARTITION_ENFORCE_IN ) ==0 ) + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_IN ; +else if (strcmp (optarg,OSM_PARTITION_ENFORCE_OUT ) ==0 ) + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OUT ; +else + opt.part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OFF ; + }else +printf ("-part_enforce %s option not understood\n" , + optarg); +break ; +case 'W' : opt.allow_both_pkeys = TRUE;break ;
opensm/osm_pkey_mgr.c +25 -16
108 lines not on this page · raw message
opensm/osm_subnet.c +30 -1
@@ -345,6 +345,7 @@ static const opt_rec_t opt_tbl[] = { { "accum_log_file", OPT_OFFSET(accum_log_file), opts_parse_boolean, opts_setup_accum_log_file, 1 }, { "partition_config_file", OPT_OFFSET(partition_config_file), opts_parse_charp, NULL, 0 }, { "no_partition_enforcement", OPT_OFFSET(no_partition_enforcement), opts_parse_boolean, NULL, 1 }, + { "part_enforce", OPT_OFFSET(part_enforce), opts_parse_charp, NULL, 1 }, { "allow_both_pkeys", OPT_OFFSET(allow_both_pkeys), opts_parse_boolean, NULL, 1 }, { "sm_assigned_guid", OPT_OFFSET(sm_assigned_guid), opts_parse_uint8, NULL, 1 }, { "qos", OPT_OFFSET(qos), opts_parse_boolean, NULL, 1 },
@@ -879,6 +880,7 @@ void osm_subn_set_default_opt(IN osm_subn_opt_t * p_opt) p_opt->log_max_size =0 ; p_opt->partition_config_file =strdup (OSM_DEFAULT_PARTITION_CONFIG_FILE ); p_opt->no_partition_enforcement = FALSE; + p_opt->part_enforce =OSM_PARTITION_ENFORCE_BOTH ; p_opt->allow_both_pkeys = FALSE; p_opt->sm_assigned_guid =0 ; p_opt->qos = FALSE;
@@ -1264,6 +1266,27 @@ int osm_subn_verify_config(IN osm_subn_opt_t * p_opts) p_opts->console =strdup (OSM_DEFAULT_CONSOLE ); } +if (p_opts->no_partition_enforcement == TRUE) { +strcpy (p_opts->part_enforce,OSM_PARTITION_ENFORCE_OFF ); + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OFF ; + }else { +if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_BOTH ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH ; +else if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_IN ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_IN ; +else if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_OUT ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OUT ; +else if (strcmp (p_opts->part_enforce,OSM_PARTITION_ENFORCE_OFF ) ==0 ) + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_OFF ; +else { +log_report (" Invalid Cached Option Value:part_enforce = %s" +", Using Default:%s\n" , + p_opts->part_enforce =OSM_PARTITION_ENFORCE_BOTH ); + p_opts->part_enforce =OSM_PARTITION_ENFORCE_BOTH ; + p_opts->part_enforce_enum =OSM_PARTITION_ENFORCE_TYPE_BOTH ; + } + } +if (p_opts->qos) {subn_verify_qos_set (&p_opts->qos_options,"qos" );subn_verify_qos_set (&p_opts->qos_ca_options,"qos_ca" );
@@ -1551,8 +1574,13 @@ int osm_subn_output_conf(FILE *out, IN osm_subn_opt_t * p_opts)"#\n# PARTITIONING OPTIONS\n#\n" "# Partition configuration file to be used\n" "partition_config_file %s\n\n" -"# Disable partition enforcement by switches\n" +"# Disable partition enforcement by switches (DEPRECATED)\n" +"# This option is DEPRECATED. Please use part_enforce instead\n" "no_partition_enforcement %s\n\n" +"# Partition enforcement type (for switches)\n" +"# Values are both, out, in and off\n" +"# Default is both (outbound and inbound enforcement)\n" +"part_enforce %s\n\n" "# Allow both full and limited membership on the same partition\n" "allow_both_pkeys %s\n\n" "# SM assigned GUID byte where GUID is formed from OpenFabrics OUI\n"
@@ -1562,6 +1590,7 @@ int osm_subn_output_conf(FILE *out, IN osm_subn_opt_t * p_opts)"sm_assigned_guid 0x%02x\n\n" , p_opts->partition_config_file, p_opts->no_partition_enforcement ?"TRUE" :"FALSE" , + p_opts->part_enforce, p_opts->allow_both_pkeys ?"TRUE" :"FALSE" , p_opts->sm_assigned_guid);
Signature · 6 lines
1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html