Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package msr-safe for openSUSE:Factory checked in at 2023-04-01 19:32:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/msr-safe (Old) and /work/SRC/openSUSE:Factory/.msr-safe.new.9019 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "msr-safe" Sat Apr 1 19:32:37 2023 rev:2 rq:1076624 version:1.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/msr-safe/msr-safe.changes 2020-07-08 19:15:54.067712505 +0200 +++ /work/SRC/openSUSE:Factory/.msr-safe.new.9019/msr-safe.changes 2023-04-01 19:32:52.905548949 +0200 @@ -1,0 +2,16 @@ +Sat Apr 1 03:37:38 UTC 2023 - Jeffrey Cheung <jche...@suse.com> + +- Update to v1.7.0 +- Fix the layout changes after linux 6 + + New patch: 0000-msr_allowlist-diff.patch + New patch: 0001-msr_batch-diff.patch + New patch: 0002-msr_entry-diff.patch + New patch: 0003-msr_version-diff.patch + +------------------------------------------------------------------- +Fri Sep 30 23:57:41 UTC 2022 - Alejandro Vilches <alejandro.vilc...@intel.com> + +- Update to v1.6.0 + +------------------------------------------------------------------- Old: ---- v1.4.0.tar.gz New: ---- 0000-msr_allowlist-diff.patch 0001-msr_batch-diff.patch 0002-msr_entry-diff.patch 0003-msr_version-diff.patch v1.7.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ msr-safe.spec ++++++ --- /var/tmp/diff_new_pack.jrzwgr/_old 2023-04-01 19:32:53.417551637 +0200 +++ /var/tmp/diff_new_pack.jrzwgr/_new 2023-04-01 19:32:53.425551679 +0200 @@ -1,7 +1,7 @@ # # spec file for package msr-safe # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,27 +15,33 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: msr-safe -Version: 1.4.0 +Version: 1.7.0 Release: 0 Summary: Kernel module and utility to control MSR access License: GPL-3.0-or-later +Group: System/Fhs URL: https://github.com/LLNL/msr-safe Source0: https://github.com/LLNL/msr-safe/archive/v%{version}.tar.gz -Group: System/Fhs Source1: msr-safe.service Source2: msr-safe.sysconfig Source3: 10-msr-safe.rules Source4: msr-safe.sh Source5: system-user-msr.conf +Patch0: 0000-msr_allowlist-diff.patch +Patch1: 0001-msr_batch-diff.patch +Patch2: 0002-msr_entry-diff.patch +Patch3: 0003-msr_version-diff.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %kernel_module_package_buildreqs +BuildRequires: kernel-default-devel BuildRequires: systemd-rpm-macros BuildRequires: sysuser-tools -BuildRequires: kernel-default-devel Requires(post): fillup Requires(post): udev Requires(postun): udev + %kernel_module_package # Only supported on intel architectures @@ -52,7 +58,7 @@ %description KMP A kernel module which provides new /dev nodes for accessing Model -Speicific Registers in CPUs, and which offers a whitelist to control +Speicific Registers in CPUs, and which offers an allowlist to control which exact MSRs may be read. %package -n system-user-msr @@ -80,8 +86,8 @@ mkdir -p %{buildroot}%{_sysusersdir} mkdir -p %{buildroot}%{_sysconfdir}/msr make install DESTDIR=%{buildroot} prefix=%{_prefix} sbindir=%{_sbindir} mandir=%{_mandir} -install -d %{buildroot}/%{_datadir}/msr-safe/whitelists -install -m 0644 whitelists/* %{buildroot}%{_datadir}/msr-safe/whitelists/ +install -d %{buildroot}/%{_datadir}/msr-safe/allowlists +install -m 0644 allowlists/* %{buildroot}%{_datadir}/msr-safe/allowlists/ install -Dm 0644 %{SOURCE1} %{buildroot}%{_unitdir}/msr-safe.service install -Dm 0644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.msr-safe install -Dm 0644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/10-msr-safe.rules @@ -118,8 +124,8 @@ %{_fillupdir}/sysconfig.msr-safe %dir %{_datadir}/msr-safe -%dir %{_datadir}/msr-safe/whitelists -%{_datadir}/msr-safe/whitelists/* +%dir %{_datadir}/msr-safe/allowlists +%{_datadir}/msr-safe/allowlists/* %{_unitdir}/msr-safe.service %{_udevrulesdir}/10-msr-safe.rules %{_sbindir}/msrsave ++++++ 0000-msr_allowlist-diff.patch ++++++ --- msr_allowlist.c 2023-02-01 04:45:13.000000000 +0800 +++ new-msr_allowlist.c 2023-03-30 22:40:14.000000000 +0800 @@ -362,7 +362,11 @@ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,39) static char *msr_allowlist_nodename(struct device *dev, mode_t *mode) #else +#if LINUX_VERSION_CODE <= KERNEL_VERSION(6,2,0) static char *msr_allowlist_nodename(struct device *dev, umode_t *mode) +#else +static char *msr_allowlist_nodename(const struct device *dev, umode_t *mode) +#endif #endif { return kasprintf(GFP_KERNEL, "cpu/msr_allowlist"); ++++++ 0001-msr_batch-diff.patch ++++++ --- msr_batch.c 2023-02-01 04:45:13.000000000 +0800 +++ new-msr_batch.c 2023-03-30 22:18:01.000000000 +0800 @@ -183,7 +183,11 @@ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,39) static char *msrbatch_nodename(struct device *dev, mode_t *mode) #else +#if LINUX_VERSION_CODE <= KERNEL_VERSION(6,2,0) static char *msrbatch_nodename(struct device *dev, umode_t *mode) +#else +static char *msrbatch_nodename(const struct device *dev, umode_t *mode) +#endif #endif { return kasprintf(GFP_KERNEL, "cpu/msr_batch"); ++++++ 0002-msr_entry-diff.patch ++++++ --- msr_entry.c 2023-02-01 04:45:13.000000000 +0800 +++ new-msr_entry.c 2023-03-30 22:44:24.000000000 +0800 @@ -257,7 +257,11 @@ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,39) static char *msr_devnode(struct device *dev, mode_t *mode) #else +#if LINUX_VERSION_CODE <= KERNEL_VERSION(6,2,0) static char *msr_devnode(struct device *dev, umode_t *mode) +#else +static char *msr_devnode(const struct device *dev, umode_t *mode) +#endif #endif { return kasprintf(GFP_KERNEL, "cpu/%u/msr_safe", MINOR(dev->devt)); ++++++ 0003-msr_version-diff.patch ++++++ --- msr_version.c 2023-02-01 04:45:13.000000000 +0800 +++ new-msr_version.c 2023-03-30 21:38:38.000000000 +0800 @@ -53,7 +53,11 @@ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,39) static char *msr_version_nodename(struct device *dev, mode_t *mode) #else +#if LINUX_VERSION_CODE <= KERNEL_VERSION(6,2,0) static char *msr_version_nodename(struct device *dev, umode_t *mode) +#else +static char *msr_version_nodename(const struct device *dev, umode_t *mode) +#endif #endif { if (mode) ++++++ 10-msr-safe.rules ++++++ --- /var/tmp/diff_new_pack.jrzwgr/_old 2023-04-01 19:32:53.513552141 +0200 +++ /var/tmp/diff_new_pack.jrzwgr/_new 2023-04-01 19:32:53.517552162 +0200 @@ -1,4 +1,4 @@ SUBSYSTEM=="msr_safe", GROUP="msr", MODE="0660" SUBSYSTEM=="msr_batch", GROUP="msr", MODE="0660" -SUBSYSTEM=="msr_whitelist", GROUP="msr", MODE="0660" +SUBSYSTEM=="msr_allowlist", GROUP="msr", MODE="0660" ++++++ msr-safe.service ++++++ --- /var/tmp/diff_new_pack.jrzwgr/_old 2023-04-01 19:32:53.541552288 +0200 +++ /var/tmp/diff_new_pack.jrzwgr/_new 2023-04-01 19:32:53.545552308 +0200 @@ -1,11 +1,11 @@ -# /etc/systemd/system/llnl-whitelist.service +# /etc/systemd/system/llnl-allowlist.service # (C) 2015 Steve Sylvester (steve.s.sylvester <at> intel.com) # # msr-safe systemd unit file: -# Set a default MSR whitelist via /dev/cpu/msr_whitelist. +# Set a default MSR allowlist via /dev/cpu/msr_allowlist. [Unit] -Description=Sets default MSR whitelist +Description=Sets default MSR allowlist After=nss-user-lookup.target nslcd.service network.target [Service] ++++++ msr-safe.sh ++++++ --- /var/tmp/diff_new_pack.jrzwgr/_old 2023-04-01 19:32:53.561552392 +0200 +++ /var/tmp/diff_new_pack.jrzwgr/_new 2023-04-01 19:32:53.565552413 +0200 @@ -5,24 +5,24 @@ . /etc/sysconfig/msr-safe -wl_cpu() { - printf 'wl_%.2x%x\n' \ - $( tr -d "\t " < /proc/cpuinfo | grep -m1 'cpufamily:' | cut -f2 -d:) \ - $( tr -d "\t " < /proc/cpuinfo | grep -m1 'model:' | cut -f2 -d:) +al_cpu() { + printf 'al_%.2x%x\n' \ + $(grep -m1 'cpu family' /proc/cpuinfo | cut -f2 -d: | tr -d ' ') \ + $(grep -m1 'model' /proc/cpuinfo | cut -f2 -d: | tr -d ' ') } start() { - if [ -z "${WL_CPU:-}" ]; then - WL_CPU=$(wl_cpu) + if [ -z "${AL_CPU:-}" ]; then + AL_CPU=$(al_cpu) fi - if [ -z "${WHITELIST:-}" ]; then - WHITELIST="/usr/share/msr-safe/whitelists/${WL_CPU}" + if [ -z "${ALLOWLIST:-}" ]; then + ALLOWLIST="/usr/share/msr-safe/allowlists/${AL_CPU}" fi - if [ -f "/usr/share/msr-safe/whitelists/${WL_CPU}" ]; then + if [ -f "${ALLOWLIST}" ]; then /sbin/modprobe msr-safe && \ - cat "${WHITELIST}" > /dev/cpu/msr_whitelist + cat "${ALLOWLIST}" > /dev/cpu/msr_allowlist return $? else @@ -31,7 +31,7 @@ } stop() { - echo > /dev/cpu/msr_whitelist && \ + echo > /dev/cpu/msr_allowlist && \ /sbin/rmmod msr-safe return $? @@ -40,7 +40,6 @@ rc=0 case "${1:-}" in - start) start rc=$? ++++++ msr-safe.sysconfig ++++++ --- /var/tmp/diff_new_pack.jrzwgr/_old 2023-04-01 19:32:53.585552519 +0200 +++ /var/tmp/diff_new_pack.jrzwgr/_new 2023-04-01 19:32:53.589552540 +0200 @@ -1,3 +1,3 @@ -# Override the whitelist -# WHITELIST=/usr/share/msr-safe/whitelists/wl_0655 +# Override the allowlist +# ALLOWLIST=/usr/share/msr-safe/allowlists/al_0655 ++++++ v1.4.0.tar.gz -> v1.7.0.tar.gz ++++++ ++++ 12278 lines of diff (skipped)
