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 2026-06-30 15:11:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/msr-safe (Old) and /work/SRC/openSUSE:Factory/.msr-safe.new.11887 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "msr-safe" Tue Jun 30 15:11:55 2026 rev:4 rq:1362486 version:1.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/msr-safe/msr-safe.changes 2023-08-28 17:16:36.091637706 +0200 +++ /work/SRC/openSUSE:Factory/.msr-safe.new.11887/msr-safe.changes 2026-06-30 15:12:30.106149694 +0200 @@ -1,0 +2,5 @@ +Mon Jun 29 08:22:23 UTC 2026 - Jiri Slaby <[email protected]> + +- add kernel-7.2.patch to fix kernel 7.2. + +------------------------------------------------------------------- New: ---- kernel-7.2.patch ----------(New B)---------- New: - add kernel-7.2.patch to fix kernel 7.2. ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ msr-safe.spec ++++++ --- /var/tmp/diff_new_pack.wP9OPr/_old 2026-06-30 15:12:30.842174601 +0200 +++ /var/tmp/diff_new_pack.wP9OPr/_new 2026-06-30 15:12:30.846174736 +0200 @@ -1,7 +1,7 @@ # # spec file for package msr-safe # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,13 +31,14 @@ Source5: system-user-msr.conf Patch1: Fix-the-layout-changes-after-linux-6.patch Patch2: Fixup-for-commit-1aaba11da9aa-driver-core-class-remo.patch +Patch3: kernel-7.2.patch BuildRequires: %{kernel_module_package_buildreqs} BuildRequires: kernel-default-devel BuildRequires: systemd-rpm-macros BuildRequires: sysuser-tools Requires(post): fillup Requires(post): udev -Requires(postun):udev +Requires(postun): udev # Only supported on intel architectures ExclusiveArch: %{ix86} x86_64 %kernel_module_package ++++++ kernel-7.2.patch ++++++ From: Jiri Slaby <[email protected]> Subject: Fix for kernel 7.2 rdmsr_safe_on_cpu() and wrmsr_safe_on_cpu() were dropped in favor of rdmsrq_safe_on_cpu() and wrmsrq_safe_on_cpu() by commits: d2eb65a9aa06 ("x86/msr: Remove rdmsr_safe_on_cpu()") cdd2c4133ad2 ("x86/msr: Remove wrmsr_safe_on_cpu()") Adapt to that by using the saner variants. Signed-off-by: Jiri Slaby <[email protected]> --- msr_entry.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) --- a/msr_entry.c +++ b/msr_entry.c @@ -97,7 +97,11 @@ static loff_t msr_seek(struct file *file static ssize_t msr_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) { u32 __user *tmp = (u32 __user *) buf; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(7,2,0) + u64 data; +#else u32 data[2]; +#endif u32 reg = *ppos; int cpu = iminor(file->f_path.dentry->d_inode); int err = 0; @@ -112,7 +116,11 @@ static ssize_t msr_read(struct file *fil return -EACCES; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(7,2,0) + err = rdmsrq_safe_on_cpu(cpu, reg, &data); +#else err = rdmsr_safe_on_cpu(cpu, reg, &data[0], &data[1]); +#endif if (err) { return err; @@ -129,8 +137,13 @@ static ssize_t msr_read(struct file *fil static ssize_t msr_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { const u32 __user *tmp = (const u32 __user *)buf; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(7,2,0) + u64 curdata; + u64 data; +#else u32 curdata[2]; u32 data[2]; +#endif u32 reg = *ppos; u64 mask; int cpu = iminor(file->f_path.dentry->d_inode); @@ -155,18 +168,31 @@ static ssize_t msr_write(struct file *fi if (mask != 0xffffffffffffffff) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(7,2,0) + err = rdmsrq_safe_on_cpu(cpu, reg, &curdata); +#else err = rdmsr_safe_on_cpu(cpu, reg, &curdata[0], &curdata[1]); +#endif if (err) { return err; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(7,2,0) + data &= mask; + data |= (curdata & ~mask); +#else *(u64 *)&curdata[0] &= ~mask; *(u64 *)&data[0] &= mask; *(u64 *)&data[0] |= *(u64 *)&curdata[0]; +#endif } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(7,2,0) + err = wrmsrq_safe_on_cpu(cpu, reg, data); +#else err = wrmsr_safe_on_cpu(cpu, reg, data[0], data[1]); +#endif if (err) { return err;
