From 75be25758d26cbc41ed9f3f5233ad4dfaabb77d1 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Wed, 1 Aug 2018 10:02:19 -0400 Subject: [PATCH] Internal restructuring of stx-integ Create new directories: ceph config config-files filesystem kernel kernel/kernel-modules ldap logging strorage-drivers tools utilities virt Retire directories: connectivity core devtools support extended Delete two packages: tgt irqbalance Relocated packages: base/ dhcp initscripts libevent lighttpd linuxptp memcached net-snmp novnc ntp openssh pam procps sanlock shadow sudo systemd util-linux vim watchdog ceph/ python-cephclient config/ facter puppet-4.8.2 puppet-modules filesystem/ e2fsprogs nfs-utils nfscheck kernel/ kernel-std kernel-rt kernel/kernel-modules/ mlnx-ofa_kernel ldap/ nss-pam-ldapd openldap logging/ syslog-ng logrotate networking/ lldpd iproute mellanox python-ryu mlx4-config python/ python-2.7.5 python-django python-gunicorn python-setuptools python-smartpm python-voluptuous security/ shim-signed shim-unsigned tboot strorage-drivers/ python-3parclient python-lefthandclient virt/ cloud-init libvirt libvirt-python qemu tools/ storage-topology vm-topology utilities/ tis-extensions namespace-utils nova-utils update-motd Change-Id: I37ade764d873c701b35eac5881eb40412ba64a86 Story: 2002801 Task: 22687 Signed-off-by: Scott Little --- mlx4-config/centos/build_srpm.data | 4 + mlx4-config/centos/mlx4-config.spec | 48 ++++++ mlx4-config/files/LICENSE | 202 +++++++++++++++++++++++ mlx4-config/files/mlx4-config.service | 12 ++ mlx4-config/files/mlx4-configure.sh | 119 +++++++++++++ mlx4-config/files/mlx4_core_config.sh | 24 +++ mlx4-config/files/mlx4_core_goenabled.sh | 27 +++ 7 files changed, 436 insertions(+) create mode 100644 mlx4-config/centos/build_srpm.data create mode 100644 mlx4-config/centos/mlx4-config.spec create mode 100644 mlx4-config/files/LICENSE create mode 100644 mlx4-config/files/mlx4-config.service create mode 100644 mlx4-config/files/mlx4-configure.sh create mode 100644 mlx4-config/files/mlx4_core_config.sh create mode 100644 mlx4-config/files/mlx4_core_goenabled.sh diff --git a/mlx4-config/centos/build_srpm.data b/mlx4-config/centos/build_srpm.data new file mode 100644 index 0000000..57d0e0e --- /dev/null +++ b/mlx4-config/centos/build_srpm.data @@ -0,0 +1,4 @@ +COPY_LIST=" \ + $PKG_BASE/files/* \ +" +TIS_PATCH_VER=2 diff --git a/mlx4-config/centos/mlx4-config.spec b/mlx4-config/centos/mlx4-config.spec new file mode 100644 index 0000000..6197766 --- /dev/null +++ b/mlx4-config/centos/mlx4-config.spec @@ -0,0 +1,48 @@ +Summary: Wind River Mellanox port-type configuration scripts +Name: mlx4-config +Version: 1.0.0 +Release: %{tis_patch_ver}%{?_tis_dist} +License: Apache-2.0 +Group: base +Packager: Wind River +URL: unknown + +Source1: mlx4-configure.sh +Source2: mlx4-config.service +Source3: LICENSE +Source4: mlx4_core_goenabled.sh +Source5: mlx4_core_config.sh + +BuildRequires: chkconfig +BuildRequires: systemd-devel + +%description +Wind River Mellanox port-type configuration scripts + +%install +%{__install} -d %{buildroot}%{_sysconfdir}/init.d +%{__install} -d %{buildroot}%{_unitdir} +%{__install} -d %{buildroot}%{_sysconfdir}/goenabled.d +%{__install} -d %{buildroot}%{_bindir} +%{__install} -m 755 %SOURCE1 %{buildroot}%{_sysconfdir}/init.d/ +%{__install} -m 644 %SOURCE2 %{buildroot}%{_unitdir}/ +%{__install} -m 555 %SOURCE4 %{buildroot}%{_sysconfdir}/goenabled.d/ +%{__install} -m 755 %SOURCE5 %{buildroot}%{_bindir}/ + +%clean +%{__rm} -rf %{buildroot} + +%post +/bin/systemctl enable mlx4-config.service >/dev/null 2>&1 + +%preun +/bin/systemctl disable mlx4-config.service >/dev/null 2>&1 + + +%files +%license ../SOURCES/LICENSE +%defattr(-,root,root,-) +%{_sysconfdir}/init.d/mlx4-configure.sh +%{_unitdir}/mlx4-config.service +%{_sysconfdir}/goenabled.d/mlx4_core_goenabled.sh +%{_bindir}/mlx4_core_config.sh diff --git a/mlx4-config/files/LICENSE b/mlx4-config/files/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/mlx4-config/files/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/mlx4-config/files/mlx4-config.service b/mlx4-config/files/mlx4-config.service new file mode 100644 index 0000000..5a834f2 --- /dev/null +++ b/mlx4-config/files/mlx4-config.service @@ -0,0 +1,12 @@ +[Unit] +Description=Wind River Mellanox port-type configuration scripts +Before=network.target + +[Service] +Type=oneshot +User=root +ExecStart=/etc/init.d/mlx4-configure.sh start +ExecStop=/etc/init.d/mlx4-configure.sh stop + +[Install] +WantedBy=multi-user.target diff --git a/mlx4-config/files/mlx4-configure.sh b/mlx4-config/files/mlx4-configure.sh new file mode 100644 index 0000000..0953f07 --- /dev/null +++ b/mlx4-config/files/mlx4-configure.sh @@ -0,0 +1,119 @@ +#!/bin/bash +################################################################################ +# Copyright (c) 2015 Wind River Systems, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# +################################################################################ + +PROGNAME=$(basename $0) +VENDOR_MLX4="0x15b3" +SYSFS_PCI_DEVICES=/sys/bus/pci/devices +DEBUG=${DEBUG:-0} + +# enable complex pattern matching so that in "configure_device()" we can get +# all files beginning in "mlx4_port" and ending in one or more digits. +shopt -s extglob + +function log() +{ + local MSG="${PROGNAME}: $1" + if [ ${DEBUG} -ne 0 ]; then + echo "${MSG}" + fi + echo "${MSG}" >> /var/log/mlx4-configure.log +} + +function configure_device() +{ + local DEVICE=$1 + local DEVICE_PATH=${SYSFS_PCI_DEVICES}/${DEVICE} + + if [ ! -d ${DEVICE_PATH} ]; then + log "device path ${DEVICE_PATH} not present for ${DEVICE}" + return 1 + fi + + local PORTS=$(ls -v1 ${DEVICE_PATH}/mlx4_port+([0-9])) + + local RESULT=0 + for PORT in ${PORTS}; do + local PORT_NAME=$(basename ${PORT}) + local PORT_TYPE=$(cat ${PORT}) + + if [ "${PORT_TYPE}" != "eth" ]; then + echo "eth" > ${PORT} + if [ $? -ne 0 ]; then + log "failed to change ${DEVICE}/${PORT_NAME} port type from \"${PORT_TYPE}\" to \"eth\"" + RESULT=1 + else + log "successfully changed ${DEVICE}/${PORT_NAME} port type from \"${PORT_TYPE}\" to \"eth\"" + fi + else + log "port type already set to \"eth\" for ${DEVICE}/${PORT_NAME}" + fi + done + + return ${RESULT} +} + + +function scan_devices() +{ + local DEVICES=$(ls -1 ${SYSFS_PCI_DEVICES}) + + for DEVICE in ${DEVICES}; do + local VENDOR=$(cat ${SYSFS_PCI_DEVICES}/${DEVICE}/vendor) + local CLASS=$(cat ${SYSFS_PCI_DEVICES}/${DEVICE}/class) + + if ((((${CLASS} & 0xff0000)) != 0x020000)); then + ## Not a networking controller + continue + fi + + if [ "${VENDOR}" != "${VENDOR_MLX4}" ]; then + ## Not a Mellanox device + continue + fi + + configure_device ${DEVICE} + done + + return 0 +} + + +function start() +{ + scan_devices + return $? +} + +function stop() +{ + return 0 +} + +function status() +{ + return 0 +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + status) + status + ;; + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 +esac diff --git a/mlx4-config/files/mlx4_core_config.sh b/mlx4-config/files/mlx4_core_config.sh new file mode 100644 index 0000000..94816bf --- /dev/null +++ b/mlx4-config/files/mlx4_core_config.sh @@ -0,0 +1,24 @@ +#!/bin/bash +################################################################################ +# Copyright (c) 2015-2016 Wind River Systems, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# +################################################################################ +# +# Purpose: +# create /var/run/.mlx4_cx3_reboot_required to indicate a reboot is required +# this way newly generated mlx4_core kernel options can be applied +# inject /etc/modprobe.d/mlx4_sriov.conf into initramfs, since when the system +# is booted, the mlx4_core kernel module in initramfs will be used, so we need +# to inject the newly created modprobe conf file into initramfs +# +# Usage: /usr/bin/mlx4_core_config.sh +# +# Define minimal path +PATH=/bin:/usr/bin:/usr/local/bin + +/usr/sbin/touch /var/run/.mlx4_cx3_reboot_required +/usr/bin/dracut --include /etc/modprobe.d/mlx4_sriov.conf /etc/modprobe.d/mlx4_sriov.conf --force + +exit 0 diff --git a/mlx4-config/files/mlx4_core_goenabled.sh b/mlx4-config/files/mlx4_core_goenabled.sh new file mode 100644 index 0000000..c1a3592 --- /dev/null +++ b/mlx4-config/files/mlx4_core_goenabled.sh @@ -0,0 +1,27 @@ +#!/bin/bash +# +# Copyright (c) 2014 Wind River Systems, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# + +# mlx4_core options "goenabled" check. +# If a /etc/modprobe.d/mlx_sriov.conf has been modified/created on this node, it should be rebooted to apply this options. + +NAME=$(basename $0) +OPTIONS_CHANGED_FLAG=/var/run/.mlx4_cx3_reboot_required +COMPUTE_CONFIG_COMPLETE=/var/run/.compute_config_complete + +function LOG() +{ + logger "$NAME: $*" +} + +if [ -f $OPTIONS_CHANGED_FLAG ] && [ -f $COMPUTE_CONFIG_COMPLETE ] +then + LOG "mlx4_core options has been changed. Failing goenabled check." + exit 1 +fi + +exit 0 +