Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package CoreFreq for openSUSE:Factory 
checked in at 2024-09-22 11:05:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/CoreFreq (Old)
 and      /work/SRC/openSUSE:Factory/.CoreFreq.new.29891 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "CoreFreq"

Sun Sep 22 11:05:59 2024 rev:37 rq:1202218 version:1.98.4

Changes:
--------
--- /work/SRC/openSUSE:Factory/CoreFreq/CoreFreq.changes        2024-08-30 
13:33:24.909060751 +0200
+++ /work/SRC/openSUSE:Factory/.CoreFreq.new.29891/CoreFreq.changes     
2024-09-22 11:06:15.753202868 +0200
@@ -1,0 +2,9 @@
+Fri Sep 20 13:22:21 UTC 2024 - Michael Pujos <pujos.mich...@gmail.com>
+
+- Update to 1.98.4
+  * [Build]
+    - Prevent a collision with macro WRMSRNS within kernel 6.11
+  * [x86_64]
+    - [Virtualization] Switch to the HCF or VP_RUNTIME counters depending on 
the detected hypervisor
+
+-------------------------------------------------------------------

Old:
----
  CoreFreq-1.98.3.tar.gz

New:
----
  CoreFreq-1.98.4.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ CoreFreq.spec ++++++
--- /var/tmp/diff_new_pack.s8892M/_old  2024-09-22 11:06:16.237222860 +0200
+++ /var/tmp/diff_new_pack.s8892M/_new  2024-09-22 11:06:16.237222860 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           CoreFreq
-Version:        1.98.3
+Version:        1.98.4
 Release:        0
 Summary:        CPU monitoring software for 64-bit processors
 License:        GPL-2.0-or-later

++++++ CoreFreq-1.98.3.tar.gz -> CoreFreq-1.98.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/CoreFreq-1.98.3/Makefile new/CoreFreq-1.98.4/Makefile
--- old/CoreFreq-1.98.3/Makefile        2024-08-25 13:09:07.000000000 +0200
+++ new/CoreFreq-1.98.4/Makefile        2024-09-19 19:28:20.000000000 +0200
@@ -4,7 +4,7 @@
 
 COREFREQ_MAJOR = 1
 COREFREQ_MINOR = 98
-COREFREQ_REV = 3
+COREFREQ_REV = 4
 HW = $(shell uname -m)
 CC ?= cc
 WARNING = -Wall -Wfatal-errors
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/CoreFreq-1.98.3/x86_64/corefreq-cli-json.c 
new/CoreFreq-1.98.4/x86_64/corefreq-cli-json.c
--- old/CoreFreq-1.98.3/x86_64/corefreq-cli-json.c      2024-08-25 
13:09:07.000000000 +0200
+++ new/CoreFreq-1.98.4/x86_64/corefreq-cli-json.c      2024-09-19 
19:28:20.000000000 +0200
@@ -952,7 +952,7 @@
                                        json_key(&s, "LKGS");
                                        json_literal(&s, "%u", (unsigned) 
RO(Shm)->Proc.Features.ExtFeature_Leaf1_EAX.LKGS);
                                        json_key(&s, "WRMSRNS");
-                                       json_literal(&s, "%u", (unsigned) 
RO(Shm)->Proc.Features.ExtFeature_Leaf1_EAX.WRMSRNS);
+                                       json_literal(&s, "%u", (unsigned) 
RO(Shm)->Proc.Features.ExtFeature_Leaf1_EAX.WRMSRNS_Inst);
                                        json_key(&s, "AMX_FP16");
                                        json_literal(&s, "%u", (unsigned) 
RO(Shm)->Proc.Features.ExtFeature_Leaf1_EAX.AMX_FP16);
                                        json_key(&s, "HRESET");
@@ -962,7 +962,7 @@
                                        json_key(&s, "LAM");
                                        json_literal(&s, "%u", (unsigned) 
RO(Shm)->Proc.Features.ExtFeature_Leaf1_EAX.LAM);
                                        json_key(&s, "RDMSRLIST");
-                                       json_literal(&s, "%u", (unsigned) 
RO(Shm)->Proc.Features.ExtFeature_Leaf1_EAX.RDMSRLIST);
+                                       json_literal(&s, "%u", (unsigned) 
RO(Shm)->Proc.Features.ExtFeature_Leaf1_EAX.RDMSRLIST_Inst);
 
                                        json_end_object(&s);
                                }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/CoreFreq-1.98.3/x86_64/corefreqk.c 
new/CoreFreq-1.98.4/x86_64/corefreqk.c
--- old/CoreFreq-1.98.3/x86_64/corefreqk.c      2024-08-25 13:09:07.000000000 
+0200
+++ new/CoreFreq-1.98.4/x86_64/corefreqk.c      2024-09-19 19:28:20.000000000 
+0200
@@ -14925,11 +14925,22 @@
 
 #define Counters_VirtualMachine(Core, T)                               \
 ({                                                                     \
-       if (!PUBLIC(RO(Proc))->Features.AdvPower.EDX.Inv_TSC) {         \
-               RDTSC64(Core->Counter[T].TSC);                          \
-       } else {                                                        \
-               RDTSCP64(Core->Counter[T].TSC);                         \
-       }                                                               \
+    if (!PUBLIC(RO(Proc))->Features.AdvPower.EDX.Inv_TSC) {            \
+       RDTSC64(Core->Counter[T].TSC);                                  \
+    } else {                                                           \
+       RDTSCP64(Core->Counter[T].TSC);                                 \
+    }                                                                  \
+    switch (PUBLIC(RO(Proc))->Features.Info.Hypervisor.CRC) {          \
+    HCF_MSR:                                                           \
+    case CRC_VBOX:                                                     \
+    case CRC_KBOX:                                                     \
+    default:                                                           \
+       RDCOUNTER(Core->Counter[T].C0.UCC, MSR_CORE_PERF_UCC);          \
+       RDCOUNTER(Core->Counter[T].C0.URC, MSR_CORE_PERF_URC);          \
+       break;                                                          \
+    case CRC_KVM:                                                      \
+    case CRC_VMWARE:                                                   \
+    case CRC_HYPERV:                                                   \
        /* HV_PARTITION_PRIVILEGE_MASK: AccessVpRunTimeReg      */      \
        if (BITVAL(Core->CpuID[                                         \
                        CPUID_40000003_00000000_HYPERVISOR_FEATURES     \
@@ -14941,7 +14952,10 @@
                 * PUBLIC(RO(Proc))->Features.Factory.Ratio * 10;       \
                                                                        \
                Core->Counter[T].C0.UCC = Core->Counter[T].C0.URC;      \
-       }                                                               \
+       } else                                                          \
+               goto HCF_MSR;                                           \
+       break;                                                          \
+    }                                                                  \
        /* Derive C1: */                                                \
        Core->Counter[T].C1 =                                           \
            (Core->Counter[T].TSC > Core->Counter[T].C0.URC) ?          \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/CoreFreq-1.98.3/x86_64/coretypes.h 
new/CoreFreq-1.98.4/x86_64/coretypes.h
--- old/CoreFreq-1.98.3/x86_64/coretypes.h      2024-08-25 13:09:07.000000000 
+0200
+++ new/CoreFreq-1.98.4/x86_64/coretypes.h      2024-09-19 19:28:20.000000000 
+0200
@@ -1468,14 +1468,14 @@
                Reserved3       : 17-13,
                FRED            : 18-17, /* Flexible Return and Event Delivery*/
                LKGS            : 19-18, /* Load Kernel GS segment register */
-               WRMSRNS         : 20-19, /* Sierra Forest, Grand Ridge  */
+               WRMSRNS_Inst    : 20-19, /* Sierra Forest, Grand Ridge  */
                NMI_SRC         : 21-20, /* NMI-source reporting        */
                AMX_FP16        : 22-21, /* Granite Rapids              */
                HRESET          : 23-22, /* History Reset instruction   */
                AVX_IFMA        : 24-23, /* Sierra Forest, Grand Ridge  */
                Reserved4       : 26-24,
                LAM             : 27-26, /* Linear Address Masking      */
-               RDMSRLIST       : 28-27, /* Sierra Forest, Grand Ridge  */
+               RDMSRLIST_Inst  : 28-27, /* Sierra Forest, Grand Ridge  */
                Reserved5       : 30-28,
                INVD_DISABLE    : 31-30,
                Reserved6       : 32-31;

Reply via email to