diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/.gitignore diff --git a/.rt-setup.metadata b/.rt-setup.metadata new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/.rt-setup.metadata diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/kernel-is-rt b/SOURCES/kernel-is-rt new file mode 100644 index 0000000..85b644c --- /dev/null +++ b/SOURCES/kernel-is-rt @@ -0,0 +1,2 @@ +#!/bin/sh -e +[ -e /sys/kernel/realtime ] diff --git a/SOURCES/realtime.conf b/SOURCES/realtime.conf new file mode 100644 index 0000000..237f3ed --- /dev/null +++ b/SOURCES/realtime.conf @@ -0,0 +1,10 @@ +# This file specifies reasonable default limits for users +# who should be able to run realtime processes. +# +# Such users must be added to group 'realtime' to be +# affected by these limits. + +@realtime soft cpu unlimited +@realtime - rtprio 99 +@realtime - nice -20 +@realtime - memlock unlimited diff --git a/SOURCES/rhel-rt.rules b/SOURCES/rhel-rt.rules new file mode 100644 index 0000000..2fcf8db --- /dev/null +++ b/SOURCES/rhel-rt.rules @@ -0,0 +1,12 @@ +# udev rules specific to RHEL-RT Realtime kernel + +# insure /dev/rtc points to /dev/rtc0 +# we use PROGRAM rather than SYMLINK because there is +# a (good) possiblity that a /dev/rtc device file +# already exists and we want to replace it (hence the +# ln -sf) +KERNEL=="rtc0", PROGRAM+="/bin/ln -sf rtc0 /dev/rtc" + +# Give permission to the realtime group to write a zero to /dev/cpu_dma_latency +# This will tell the power management system not to tranistion to a high cstate +KERNEL=="cpu_dma_latency", GROUP="realtime" diff --git a/SOURCES/rt-setup-kdump b/SOURCES/rt-setup-kdump new file mode 100644 index 0000000..5f04573 --- /dev/null +++ b/SOURCES/rt-setup-kdump @@ -0,0 +1,171 @@ +#!/bin/sh +# +# script to update /etc/sysconfig/kdump to use the latest +# kernel package as the dump kernel +# +# optional argument --grub causes kdump kernel cmdline to +# be added to rt kernel grub entries +# + +me=$(basename $0) +rpmcmd='rpm -q --last' + +function fatal () { + echo "$me: " $1 + exit -1 +} + +function usage () { + echo "usage: $me [-g|--grub] [-r|--rhel] [-v|--verbose] [-h|--help]" + echo " --grub - add crashkernel arg to rt grub entries" + echo " --rhel - use the RHEL-7.1 kernel as the kdump kernel" + echo " (the default is to use the RHEL-RT kernel)" + echo " --verbose - print out actions" + echo " --help - print this message" + exit -1 +} + +function report() { + [ $verbose -eq 1 ] && echo $1 +} + +# return the latest package version of specified package name +function latest_package_ver() { + local pkg=$1 + local ver=$($rpmcmd $pkg | head -1 | awk '{print $1}') + + if [ $? -ne 0 ]; then + fatal " error fetching version for $pkg" + fi + echo ${ver#$pkg-} + return 0 +} + +# get the kernel version of hhe latest installed kernel +function vmlinux_ver() { + local ver=$1 + local vmver='' + for i in $(cd /boot; echo vmlinuz-*); do + if [ "${i#vmlinuz-$ver}" != "$i" ]; then + vmver=${i#vmlinuz-} + echo $vmver + return 0 + fi + done + return 1 +} + +# find all the grub indexs for installed rhel-rt kernels +# returns a comma-separated list of indices for use +# by the grubby command +function find_rt_kernel_indexes_rhel_rt() { + local awkscript='BEGIN{FS="="; ORS=","} $1 ~ /^index/{idx=$2;} + $2 ~ /.rt.*.el7.x86_64/ && + $1 ~ /^kernel/ {print idx}' + local rt_idx_list=$(/sbin/grubby --info=ALL | /usr/bin/awk "$awkscript") + + echo $rt_idx_list | sed -e 's/,$//' + return 0 +} + +############################################################################# + +# make sure we're root +if [ $UID -ne 0 ]; then + echo " must be root to run $me!" + usage +fi + +# process options +dogrub=0 +userhel=0 +verbose=0 +TEMP=$(getopt --options "grvh" --longoptions="grub,rhel,verbose,help" -- "$@") +if [ $? -ne 0 ]; then + usage +fi +eval set -- "$TEMP" +while true; do + case "$1" in + -g|--grub) + dogrub=1 + shift + ;; + -r|--rhel) + userhel=1 + shift + ;; + -v|--verbose) + verbose=1 + shift + ;; + -h|--help) + usage + ;; + --) shift ; break ;; + *) + echo "internal error!" + usage + ;; + esac +done + +# warn if /etc/sysconfig/kdump does not exist +if [ ! -f /etc/sysconfig/kdump ]; then + echo " File /etc/sysconfig/kdump not found." + echo " Please, check your kexec-tools installation." + exit 1 +fi + +if [ $dogrub = 0 ]; then + echo "Not performing changes to /etc/grub.conf" + echo + # check if there is memory reserved for the kexec kernel + if ! cat /proc/cmdline | grep -e crashkernel > /dev/null; then + echo " Kernel DOES NOT have memory reserved for kdump kernel..." + echo " Use --grub option to enable crashkernel option on kernel command line" + echo + fi +fi + +# select the right kdump kernel +if [ $userhel -eq 1 ]; then + KDUMP_KERNEL="kernel" +else + KDUMP_KERNEL="kernel-rt" +fi +# get the version of the latest installed kernel +kver=$(latest_package_ver $KDUMP_KERNEL) +if [ -z "$kver" ]; then + fatal " Can't find $KDUMP_KERNEL package information!" +fi + +report " making kernel-$kver the kdump kernel" + +# find the vmlinux version info for the latest kernel package +vmlinux_version=$(vmlinux_ver $kver) +if [ -z "$vmlinux_version" ]; then + fatal " Can't get vmlinux version!" +fi + +# now edit the /etc/sysconfig/kdump file +sed -e "s/^KDUMP_KERNELVER.*$/KDUMP_KERNELVER=\"$vmlinux_version\"/" \ + /etc/sysconfig/kdump >/tmp/kdump.$$ +mv /etc/sysconfig/kdump /etc/sysconfig/kdump.save && \ + mv /tmp/kdump.$$ /etc/sysconfig/kdump + +# if requested, update the grub entries for the rt kernels +if [ $dogrub = 1 ]; then + rtver=$(latest_package_ver kernel-rt) + if [ -z "$rtver" ]; then + fatal " Can't find kernel-rt package information!" + fi + # RHEL-RT kernel + kernels=$(find_rt_kernel_indexes_rhel_rt) + if [ ! -z $kernels ]; then + report " adding 'crashkernel=auto' arg to grub entries: $kernels" + /sbin/grubby --update-kernel=$kernels --args="crashkernel=auto" + fi +fi + +exit $? diff --git a/SOURCES/rt-setup.service b/SOURCES/rt-setup.service new file mode 100644 index 0000000..bea403e --- /dev/null +++ b/SOURCES/rt-setup.service @@ -0,0 +1,12 @@ +[Unit] +Description=RHEL-RT environment details setup +After=syslog.target + +## Not a daemon +[Service] +Type=simple +ExecStart=/usr/bin/rt-setup + +[Install] +WantedBy=multi-user.target + diff --git a/SOURCES/rt-setup.sysconfig b/SOURCES/rt-setup.sysconfig new file mode 100644 index 0000000..41e3842 --- /dev/null +++ b/SOURCES/rt-setup.sysconfig @@ -0,0 +1,4 @@ +# +# Decide whether to turn off SLUB cpu_partial support +# +SLUB_CPU_PARTIAL="off" diff --git a/SOURCES/rt-setup.systemd b/SOURCES/rt-setup.systemd new file mode 100755 index 0000000..249a5ac --- /dev/null +++ b/SOURCES/rt-setup.systemd @@ -0,0 +1,35 @@ +#!/bin/sh + +on_rt () { + if [ -f /sys/kernel/realtime ]; then + return 0 + fi + return 1 +} + +prog="rt-setup" + +[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog + +# is this a rhel-rt kernel? +if ! on_rt; then + echo "Not running on a RHEL-RT kernel!" + exit 0 +fi + +# make sure that cpusets are mounted +if ! grep cpuset /proc/mounts >/dev/null 2>&1; then + echo "cpusets not mounted!" + exit 2 +fi + +# if not running, start it up here, usually something like "daemon $exec" +if [ "$SLUB_CPU_PARTIAL" == "off" ]; then + slub_cpu_partial_off + slub_retval=$? +else + slub_retval=0 +fi + +exit $slub_retval + diff --git a/SOURCES/slub_cpu_partial_off b/SOURCES/slub_cpu_partial_off new file mode 100755 index 0000000..2dd7a89 --- /dev/null +++ b/SOURCES/slub_cpu_partial_off @@ -0,0 +1,12 @@ +#!/bin/sh +# +# shell script to turn SLUB cpu_partial logic off +# for improved determinism +# + +if [ "$UID" != "0" ]; then + echo "Must be root to run $(basename $0)" + exit -1 +fi +find /sys/kernel/slab -name 'cpu_partial' -print | \ + while read f; do echo 0 > $f; done diff --git a/SPECS/rt-setup.spec b/SPECS/rt-setup.spec new file mode 100644 index 0000000..26954b1 --- /dev/null +++ b/SPECS/rt-setup.spec @@ -0,0 +1,287 @@ +Name: rt-setup +Version: 1.58 +Release: 2%{?dist} +License: GPL+ +Summary: Setup RHEL-RT environment details +Group: System Environment/Base +Source: realtime.conf +Source1: rt-setup-kdump +Source2: rhel-rt.rules +Source3: kernel-is-rt +Source4: rt-setup.sysconfig +Source5: slub_cpu_partial_off +Source6: rt-setup.service +Source7: rt-setup.systemd + +BuildArch: noarch +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildRequires: gcc +BuildRequires: sqlite +Requires: rtctl +Requires: pam >= 0.99.6.2-3.26 +Requires: /usr/sbin/groupadd +Requires: kexec-tools +Requires: libcgroup +Requires: python-libs + +%description +The 'rt-setup' package configures details required by RHEL-RT environment. + - creates realtime group + - adds realtime limits configuration for PAM + - adds /usr/bin/rt-setup-kdump to config kdump in RT + - disables irqbalance by default + - adds udev specific rules for threaded irqs and /dev/rtc access + - adds /usr/bin/slub_cpu_partial_off to turn off cpu_partials in SLUB + +%prep + +%build + +%install +rm -Rf %{buildroot} +install -m 644 -D %{SOURCE0} %{buildroot}%{_sysconfdir}/security/limits.d/realtime.conf +install -m 755 -D %{SOURCE1} %{buildroot}%{_bindir}/rt-setup-kdump +install -m 755 -D %{SOURCE5} %{buildroot}%{_bindir}/slub_cpu_partial_off +install -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/udev/rules.d/99-rhel-rt.rules +install -m 755 -D %{SOURCE3} %{buildroot}%{_sbindir}/kernel-is-rt +install -m 755 -D %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/rt-setup +install -m 644 -D %{SOURCE6} %{buildroot}%{_sysconfdir}/systemd/system/rt-setup.service +install -m 755 -D %{SOURCE7} %{buildroot}%{_bindir}/rt-setup + +%post +/usr/sbin/groupadd -f -g 71 realtime +systemctl disable irqbalance + +if grep kernel.hung_task_panic /etc/sysctl.conf >/dev/null 2>&1 +then + : +else + sysctl -w kernel.hung_task_panic=0 >/dev/null 2>&1 + cat <>/etc/sysctl.conf +# controls whether the system should reboot if it detects a hung task +# 1 means reboot after hung_task_timeout_secs after a hung task is detected +# default value is 0 +kernel.hung_task_panic = 0 +EOF +fi + +if grep kernel.hung_task_timeout_secs /etc/sysctl.conf >/dev/null 2>&1 +then + : +else + sysctl -w kernel.hung_task_timeout_secs=600 >/dev/null 2>&1 + cat <>/etc/sysctl.conf +# controls how long to reboot after a hung task is detected +# default is 600 seconds. +# note: this only matters if kernel.hung_task_panic=1 +kernel.hung_task_timeout_secs = 600 +EOF +fi + +# turn on the rt-setup startup file +systemctl enable rt-setup + +%preun +if [ "$1" = "0" ] ; then # uninstall +systemctl disable rt-setup +fi + +%clean +rm -rf %{buildroot} + +%files +%defattr(0644,root,root,0755) +%config(noreplace) %{_sysconfdir}/security/limits.d/realtime.conf +%config(noreplace) %{_sysconfdir}/udev/rules.d/99-rhel-rt.rules +%config(noreplace) %{_sysconfdir}/sysconfig/rt-setup +%attr(0755, root, root) %{_bindir}/rt-setup-kdump +%attr(0755, root, root) %{_bindir}/slub_cpu_partial_off +%attr(0755, root, root) %{_sbindir}/kernel-is-rt +%attr(0644, root, root) %{_sysconfdir}/systemd/system/rt-setup.service +%attr(0755, root, root) %{_bindir}/rt-setup + +%changelog +* Mon Dec 29 2014 Luis Claudio R. Goncalves - 1.58-2 +- fixed rt-setup shell script called on startup (1162769) +- removed the unnecessary mrg-rt-firmware logic (1162769) + +* Fri Dec 26 2014 Luis Claudio R. Goncalves - 1.58-1 +- make startup logic work with systemd (1162769) +- product name cleanup (1173312) + +* Fri Nov 28 2014 Luis Claudio R. Goncalves - 1.57-6 +- remove a reference to mrg-rt-release from initscript (1162766) + +* Mon Nov 24 2014 Luis Claudio R. Goncalves - 1.57-5 +- move kernel-is-rt from /sbin to /usr/sbin (1151563) + +* Tue Nov 18 2014 Luis Claudio R. Goncalves - 1.57-4 +- remove the database used by mrg-rt-release (1162766) + +* Tue Nov 11 2014 Luis Claudio R. Goncalves - 1.57-3 +- remove mrg-rt-release (1162766) + +* Tue Nov 04 2014 Luis Claudio R. Goncalves - 1.57-2 +- remove the old dracut rules from RHEL6 (1160440) + +* Wed Oct 29 2014 Clark Williams - 1.57-1 +- added mrg-2.5.8 release to mrg-rt-release database + +* Tue Sep 30 2014 Luis Claudio R. Goncalves - 1.56-2 +- added mrg-2.5.7 release to mrg-rt-release database + +* Wed Aug 20 2014 Clark Williams - 1.56-1 +- added mrg-2.5.6 release to mrg-rt-release database +- removed dracut rule that caused problems when adding firmware to initramfs + +* Fri Jul 25 2014 Clark Williams - 1.55-8 +- added mrg-2.5.2 and mrg-2.5.4 releases to mrg-rt-release database + +* Tue Jun 10 2014 John Kacur - 1.55-7 +- udev: Add udev rule to give group realtime write access to cpu_dma_latency + +* Mon Apr 28 2014 Luis Claudio R. Goncalves - 1.55-6 +- Added mrg-2.5 GA data to the mrg-rt-release database + +* Wed Apr 09 2014 Luis Claudio R. Goncalves - 1.55-5 +- Added mrg-2.4.6 data to the mrg-rt-release database + +* Fri Mar 28 2014 Luis Claudio R. Goncalves - 1.55-4 +- Trim the kernel version when read from uname -rt + +* Tue Feb 18 2014 Luis Claudio R. Goncalves - 1.55-3 +- Added mrg-2.4.5 data to the mrg-rt-release database + +* Wed Jan 22 2014 Luis Claudio R. Goncalves - 1.55-2 +- Added mrg-2.4.3 data to the mrg-rt-release database + +* Tue Dec 10 2013 Clark Williams - 1.55-1 +- First common build for RHEL7 and RHEL6 + +* Thu Nov 28 2013 Luis Claudio R. Goncalves 1.54-2 +- Enhanced update-mrg-rt-release + +* Thu Nov 28 2013 Luis Claudio R. Goncalves 1.54-1 +- Update mrg-rt-release on every boot [848433] + +* Thu Aug 29 2013 Luis Claudio R. Goncalves - 1.53-4 +- add /lib/firmware/$(uname -r) to dracut firmware search path (998920) +- ensure rt-firmware files are on udev firmware search path (998920) + +* Thu Aug 22 2013 Luis Claudio R. Goncalves - 1.53-3 +- removed the dracut config file + +* Tue Aug 20 2013 Luis Claudio R. Goncalves - 1.53-2 +- added configuration file for dracut (998920) +- fixed macro usage on the specfile + +* Thu Apr 25 2013 Clark Williams - 1.53-1 +- turn off cgroup mounting logic +- added Requires for libcgroup + +* Tue Apr 2 2013 Clark Williams - 1.52-1 +- added script slub_cpu_partial_off +- added cgroups to /etc/sysconfig/rt-setup + +* Wed Mar 27 2013 Clark Williams - 1.51-1 +- added code to turn off SLUB cpu_partial at startup + +* Mon Nov 12 2012 Luis Claudio R. Goncalves - 1.50-1 +- rt-setup-kdump: use mrg-2.x as the kdump kernel [868446] [868442] [868329] +- rt-setup-kdump: simplified the script and added --rhel option + +* Tue Mar 6 2012 Clark Williams - 1.11-1 +- removed %%post logic that disables bandwidth limiting [BZ# 791371] +- changed rtprio from 100 to 99 in realtime.conf + +* Thu Oct 13 2011 Clark Williams - 1.10-1 +- fixed thinko by removing firmware download logic + +* Tue Oct 11 2011 Clark Williams - 1.9-1 +- added sysconfig and init script for handling cgroup mounting +- changed script kernel-is-rt to use /sys/kernel/realtime + +* Wed May 11 2011 Clark Williams - 1.8-1 +- simplified mrg-rt-firmware.rules to fix boot time hang on + large core machines (BZ# 698481) + +* Fri Feb 11 2011 Luis Claudio R. Goncalves - 1.7-4 +- Normalized the RHEL6 firmware path search (due to uname -r changes) + +* Thu May 27 2010 John Kacur - 1.7-2 +- set kernel.hung_task_panic=0 (off) by default +- set kernel.hung_task_timeout_secs=600 by default +- used sysctl to set sched_rt_runtime_us at install time, not just boot time + +* Tue May 18 2010 Clark Williams - 1.7-1 +- removed requirement for kernel-rt (circular dependency) +- cleaned up mrg-rt-firmware.rules (added commas between all key/value pairs) + +* Wed Nov 25 2009 Luis Claudio R. Goncalves - 1.6-3 +- rt-setup-kdump: configure kdump on all MRG kernel flavors +- rt-setup-kdump: fix a log entry that was too verbose + +* Wed Nov 25 2009 Luis Claudio R. Goncalves - 1.6-2 +- rt-setup-kdump treats MRG v1 and v2 kernels accordingly (BZ# 517529) + +* Mon Nov 2 2009 Clark Williams - 1.6-1 +- removed "@16" specifier from rt-setup-kdump script (BZ# 517529) + +* Tue Sep 1 2009 Clark Williams - 1.5-2 +- fixed path mismatches reported by Vernon Maury + +* Wed Aug 26 2009 Clark Williams - 1.5-1 +- add udev rules and scripts for handling driver firmware download + +* Thu Jul 9 2009 Clark Williams - 1.4-1 +- blow away rtctl udev rule (compatibility problem with RHEL + version of udev) +- update /dev/rtc udev rule to use PROGRAM rather than SYMLINK + +* Tue Jul 7 2009 Clark Williams - 1.3-1 +- added udev rules file to address: + - BZ 510121 hwclock & /dev/rtc broken in rt-kernel + - BZ 466929 udev rule for hotplug rtctl + +* Thu May 21 2009 Clark Williams - 1.2-1 +- added post section to edit /etc/sysctl.conf and add the + kernel.sched_rt_runtime_us parameter = -1 line to disable + the RT scheduler bandwith limiter + +* Tue Jul 15 2008 Clark Williams - 1.1-6%{dist} +- fixed rt-setup-kdump to handle incorrect arguments (BZ 455536) +- added help argument to rt-setup-kdump + +* Fri Jun 13 2008 Luis Claudio R. Goncalves - 1.1-5%{dist} +- rt-setup-kdump now touches /etc/grub.conf only when requested + +* Tue Jun 03 2008 Luis Claudio R. Goncalves - 1.1-4%{dist} +- /usr/bin/rt-setup-kdump had wrong permissions +- changed rt-setup-kdump: added a few tests for reserved memory and for the + absence of /etc/sysconfig/kdump +- now rt-setup requires kexec-tools + +* Mon May 12 2008 Luis Claudio R. Goncalves - 1.1-3%{dist} +- disables irqbalance as it may hurt determinism in RT +- installs rt-setup-kdump in /usr/bin + +* Tue Apr 22 2008 Clark Williams - 1.1-2%{?dist} +- removed sed script to edit kdump config file (using updated + kexec-tools instead) + +* Mon Apr 21 2008 Clark Williams - 1.1-1%{?dist} +- removed --args-linux from /etc/sysconfig/kdump (BZ# 432378) +- changed BuildArch to noarch + +* Thu Feb 07 2008 Luis Claudio R. Goncalves - 1.0-3%{?dist} +- BZ:399591 - Fixed spec issues pointed by Jeremy Katz +- BZ:399591 - @realtime has gid=71. +- FIXES: BZ399591 + +* Thu Aug 02 2007 Luis Claudio R. Goncalves - 1.0-2%{?dist} +- Fixed package description + +* Mon Jul 30 2007 Luis Claudio R. Goncalves - 1.0-1%{?dist} +- Initial packaging +- Requires all the basic packages for RT +- Requires support for limits.d and no realtime.conf present in PAM package