diff --git a/opensm.conf b/opensm.conf index 27897d6..ff7c3c1 100644 --- a/opensm.conf +++ b/opensm.conf @@ -10,6 +10,9 @@ m_key 0x0000000000000000 # The lease period used for the M_Key on this subnet in [sec] m_key_lease_period 0 +# The protection level used for the M_Key on this subnet +m_key_protection_level 0 + # SM_Key value of the SM used for SM authentication sm_key 0x0000000000000001 @@ -114,9 +117,24 @@ use_mfttop TRUE # Partition configuration file to be used partition_config_file /etc/rdma/partitions.conf -# Disable partition enforcement by switches +# Disable partition enforcement by switches (DEPRECATED) +# This option is DEPRECATED. Please use part_enforce instead no_partition_enforcement FALSE +# Partition enforcement type (for switches) +# Values are both, out, in and off +# Default is both (outbound and inbound enforcement) +part_enforce both + +# Allow both full and limited membership on the same partition +allow_both_pkeys FALSE + +# SM assigned GUID byte where GUID is formed from OpenFabrics OUI +# followed by 40 bits xy 00 ab cd ef where xy is the SM assigned GUID byte +# and ab cd ef is an SM autogenerated 24 bits +# SM assigned GUID byte should be configured as subnet unique +sm_assigned_guid 0x00 + # # SWEEP OPTIONS # @@ -153,7 +171,7 @@ port_search_ordering_file (null) # commas so that specific ordering of routing algorithms will # be tried if earlier routing engines fail. # Supported engines: minhop, updn, dnup, file, ftree, lash, -# dor, torus-2QoS +# dor, torus-2QoS, dfsssp, sssp routing_engine (null) # Connect roots (use FALSE if unsure) @@ -291,6 +309,13 @@ perfmgr_sweep_time_s 180 # Max outstanding queries perfmgr_max_outstanding_queries 500 +perfmgr_ignore_cas FALSE + +# Remove missing nodes from DB +perfmgr_rm_nodes TRUE + +# Log error counters to opensm.log +perfmgr_log_errors TRUE # # Event DB Options @@ -331,6 +356,13 @@ log_max_size 0 # If TRUE will accumulate the log over multiple OpenSM sessions accum_log_file TRUE +# Per module logging configuration file +# Each line in config file contains +# where module_name is file name including .c +# separator is either = , space, or tab +# log_flags is the same flags as used in the coarse/overall logging +per_module_logging_file /etc/rdma/per-module-logging.conf + # The directory to hold the file OpenSM dumps dump_files_dir /var/log/ @@ -397,6 +429,104 @@ qos_rtr_vlarb_high (null) qos_rtr_vlarb_low (null) qos_rtr_sl2vl (null) +# +# Congestion Control OPTIONS (EXPERIMENTAL) +# + +# Enable Congestion Control Configuration +congestion_control FALSE + +# CCKey to use when configuring congestion control +# note that this does not configure a new CCkey, only the CCkey to use +cc_key 0x0000000000000000 + +# Congestion Control Max outstanding MAD +cc_max_outstanding_mads 500 + +# +# Congestion Control SwitchCongestionSetting options +# +# Control Map - bitmask indicating which of the following attributes are to be used +# bit 0 - victim mask +# bit 1 - credit mask +# bit 2 - threshold + packet size +# bit 3 - credit starvation threshold + return delay valid +# bit 4 - marking rate valid +cc_sw_cong_setting_control_map 0x0 + +# Victim Mask - 256 bit mask representing switch ports, mark packets with FECN +# whether they are the source or victim of congestion +# bit 0 - port 0 (enhanced port) +# bit 1 - port 1 +# ... +# bit 254 - port 254 +# bit 255 - reserved +cc_sw_cong_setting_victim_mask 0x0000000000000000000000000000000000000000000000000000000000000000 + +# Credit Mask - 256 bit mask representing switch ports to apply credit starvation +# bit 0 - port 0 (enhanced port) +# bit 1 - port 1 +# ... +# bit 254 - port 254 +# bit 255 - reserved +cc_sw_cong_setting_credit_mask 0x0000000000000000000000000000000000000000000000000000000000000000 + +# Threshold - value indicating aggressiveness of congestion marking +# 0x0 - none, 0x1 - loose, ..., 0xF - aggressive +cc_sw_cong_setting_threshold 0x00 + +# Packet Size - any packet less than this size will not be marked with a FECN +# units are in credits +cc_sw_cong_setting_packet_size 0 + +# Credit Starvation Threshold - value indicating aggressiveness of credit starvation +# 0x0 - none, 0x1 - loose, ..., 0xF - aggressive +cc_sw_cong_setting_credit_starvation_threshold 0x00 + +# Credit Starvation Return Delay - in CCT entry shift:multiplier format, see IB spec +cc_sw_cong_setting_credit_starvation_return_delay 0:0 + +# Marking Rate - mean number of packets between markings +cc_sw_cong_setting_marking_rate 0 + +# +# Congestion Control CA Congestion Setting options +# +# Port Control +# bit 0 = 0, QP based congestion control +# bit 0 = 1, SL/port based congestion control +cc_ca_cong_setting_port_control 0x0000 + +# Control Map - 16 bit bitmask indicating which SLs should be configured +cc_ca_cong_setting_control_map 0x0000 + +# +# CA Congestion Setting Entries +# +# Each of congestion control settings below configures the CA Congestion +# Settings for an individual SL. The SL must be specified before the value. +# These options may be specified multiple times to configure different values +# for different SLs. +# +# ccti timer - when expires decrements 1 from the CCTI +# ccti increase - number to be added to the table index on receipt of a BECN +# trigger threshold - when the ccti is equal to this, an event is logged +# ccti min - the minimum value for the ccti. This imposes a minimum rate +# on the injection rate + +# SL = 0 +cc_ca_cong_setting_ccti_timer 0 0 +cc_ca_cong_setting_ccti_increase 0 0 +cc_ca_cong_setting_trigger_threshold 0 0 +cc_ca_cong_setting_ccti_min 0 0 + +# +# Congestion Control Table +# +# Comma separated list of CCT entries representing CCT. +# Format is shift:multipler,shift_multiplier,shift:multiplier,... +cc_cct (null) + # Prefix routes file name prefix_routes_file /etc/rdma/prefix-routes.conf diff --git a/opensm.rwtab b/opensm.rwtab new file mode 100644 index 0000000..c298bac --- /dev/null +++ b/opensm.rwtab @@ -0,0 +1 @@ +empty /var/cache/opensm diff --git a/opensm.spec b/opensm.spec index 95ccf8f..3f8ea73 100644 --- a/opensm.spec +++ b/opensm.spec @@ -1,6 +1,6 @@ Name: opensm Version: 3.3.15 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OpenIB InfiniBand Subnet Manager and management utilities Group: System Environment/Daemons License: GPLv2 or BSD @@ -12,6 +12,7 @@ Source3: opensm.initd Source4: opensm.sysconfig Source5: opensm.service Source6: opensm.launch +Source7: opensm.rwtab Patch0: opensm-3.3.13-prefix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libibmad-devel = 1.3.9, libtool, bison, flex, byacc, systemd @@ -84,6 +85,7 @@ install -D -m755 %{SOURCE3} %{buildroot}%{_initddir}/opensm install -D -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/opensm install -D -m644 %{SOURCE5} %{buildroot}%{_unitdir}/opensm.service install -D -m755 %{SOURCE6} %{buildroot}%{_libexecdir}/opensm-launch +install -D -m644 %{SOURCE7} %{buildroot}%{_sysconfdir}/rwtab.d/opensm mkdir -p ${RPM_BUILD_ROOT}/var/cache/opensm %clean @@ -134,6 +136,7 @@ fi %config(noreplace) %{_sysconfdir}/logrotate.d/opensm %config(noreplace) %{_sysconfdir}/rdma/opensm.conf %config(noreplace) %{_sysconfdir}/sysconfig/opensm +%{_sysconfdir}/rwtab.d/opensm %doc AUTHORS COPYING ChangeLog INSTALL README NEWS %files sysv @@ -154,6 +157,11 @@ fi %{_libdir}/lib*.a %changelog +* Wed Dec 05 2012 Doug Ledford - 3.3.15-3 +- Fix startup on read only root +- Update default config file +- Resolves: bz817591 + * Wed Dec 05 2012 Doug Ledford - 3.3.15-2 - More tweaks to systemd setup (proper scriptlets now) - More tweaks to old sysv init script support (fix Requires)