[PATCH] Add Zhaoxin support to enable tsc_reliable and arch_random features

[PATCH] Add Zhaoxin support to enable tsc_reliable and arch_random features

[Runa Guo-oc]

Signed-off-by: Runa Guo-oc <RunaGuo-oc@zhaoxin.com>
---
 arch/arch-x86-common.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arch-x86-common.h b/arch/arch-x86-common.h
index f32835cc..ac26126a 100644
--- a/arch/arch-x86-common.h
+++ b/arch/arch-x86-common.h
@@ -68,7 +68,8 @@ static inline void arch_init(char *envp[])
 			 (unsigned int *) &str[4]);
 
 	str[12] = '\0';
-	if (!strcmp(str, "GenuineIntel"))
+	if (!strcmp(str, "GenuineIntel") || !strcmp(str, "  Shanghai  ") ||
+	    !strcmp(str, "CentaurHauls"))
 		arch_init_intel();
 	else if (!strcmp(str, "AuthenticAMD") || !strcmp(str, "HygonGenuine"))
 		arch_init_amd();
-- 
2.17.1

Re: [PATCH] Add Zhaoxin support to enable tsc_reliable and arch_random features

[fiotestbot]

[-- Attachment #1: Type: text/plain, Size: 146 bytes --]


The result of fio's continuous integration tests was: cancelled

For more details see https://github.com/fiotestbot/fio/actions/runs/15200130502

Re: [PATCH] Add Zhaoxin support to enable tsc_reliable and arch_random features

[Vincent Fu]

On 5/23/25 3:38 AM, fiotestbot@gmail.com wrote:
> 
> The result of fio's continuous integration tests was: cancelled
> 
> For more details see https://github.com/fiotestbot/fio/actions/runs/15200130502

The first test attempt was cancelled because Test 13 had not completed 
after nearly 6 hours. This is a longstanding issue that occurs from time 
to time and unrelated to this patch. I re-ran the failing platform and 
this second attempt passed.

Vincent

Re: [PATCH] Add Zhaoxin support to enable tsc_reliable and arch_random features

[Jens Axboe]

On Thu, 22 May 2025 18:40:32 +0800, Runa Guo-oc wrote:
> 


Applied, thanks!

[1/1] Add Zhaoxin support to enable tsc_reliable and arch_random features
      commit: c348db31ccce60f2808dd84c1f43f36a1556141a

Best regards,
-- 
Jens Axboe

[PATCH] Add Zhaoxin support to enable tsc_reliable and arch_random features

[Runa Guo-oc]

Signed-off-by: Runa Guo-oc <RunaGuo-oc@zhaoxin.com>
---
 arch/arch-x86-common.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arch-x86-common.h b/arch/arch-x86-common.h
index f32835cc..bd329c32 100644
--- a/arch/arch-x86-common.h
+++ b/arch/arch-x86-common.h
@@ -68,7 +68,8 @@ static inline void arch_init(char *envp[])
 			 (unsigned int *) &str[4]);
 
 	str[12] = '\0';
-	if (!strcmp(str, "GenuineIntel"))
+	if (!strcmp(str, "GenuineIntel")) || (!strcmp(str, "  Shanghai  ") ||
+	    !strcmp(str, "CentaurHauls"))
 		arch_init_intel();
 	else if (!strcmp(str, "AuthenticAMD") || !strcmp(str, "HygonGenuine"))
 		arch_init_amd();
-- 
2.17.1

Re: [PATCH] Add Zhaoxin support to enable tsc_reliable and arch_random features

[fiotestbot]

[-- Attachment #1: Type: text/plain, Size: 144 bytes --]


The result of fio's continuous integration tests was: failure

For more details see https://github.com/fiotestbot/fio/actions/runs/15179641974

Re: [PATCH] Add Zhaoxin support to enable tsc_reliable and arch_random features

[Sitsofe Wheeler]

Hi,

On Thu, 22 May 2025 at 06:55, Runa Guo-oc <RunaGuo-oc@zhaoxin.com> wrote:
>
> Signed-off-by: Runa Guo-oc <RunaGuo-oc@zhaoxin.com>
> ---
>  arch/arch-x86-common.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
<snip>

On Thu, 22 May 2025 at 07:51, <fiotestbot@gmail.com> wrote:
>
>
> The result of fio's continuous integration tests was: failure
>
> For more details see https://github.com/fiotestbot/fio/actions/runs/15179641974

The bot has a point:

crc/../arch/arch-x86-common.h: In function ‘arch_init’:
135crc/../arch/arch-x86-common.h:71:43: error: expected expression
before ‘||’ token
136 71 | if (!strcmp(str, "GenuineIntel")) || (!strcmp(str, " Shanghai ") ||
137 | ^~
138crc/../arch/arch-x86-common.h:71:43: error: expected expression
before ‘||’ token
139 71 | if (!strcmp(str, "GenuineIntel")) || (!strcmp(str, " Shanghai ") ||
140 | ^~
141

Have you compiled and run this change to check it does what you expect?

-- 
Sitsofe

[PATCH] Add Zhaoxin support to enable tsc_reliable and arch_random features

[Runa Guo-oc]

Signed-off-by: Runa Guo-oc <RunaGuo-oc@zhaoxin.com>
---
 arch/arch-x86-common.h | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/arch/arch-x86-common.h b/arch/arch-x86-common.h
index f32835cc..fbbbd62e 100644
--- a/arch/arch-x86-common.h
+++ b/arch/arch-x86-common.h
@@ -56,6 +56,33 @@ static inline void arch_init_amd(void)
 	tsc_reliable = (edx & (1U << 8)) != 0;
 }
 
+static inline void arch_init_zhaoxin(void)
+{
+	unsigned int eax, ebx, ecx = 0, edx;
+
+	/*
+	 * Check for TSC
+	 */
+	eax = 1;
+	do_cpuid(&eax, &ebx, &ecx, &edx);
+	if (!(edx & (1U << 4)))
+		return;
+
+	/*
+	 * Check for constant rate and synced (across cores) TSC
+	 */
+	eax = 0x80000007;
+	do_cpuid(&eax, &ebx, &ecx, &edx);
+	tsc_reliable = (edx & (1U << 8)) != 0;
+
+	/*
+	 * Check for FDRAND
+	 */
+	eax = 0x1;
+	do_cpuid(&eax, &ebx, &ecx, &edx);
+	arch_random = (ecx & (1U << 30)) != 0;
+}
+
 static inline void arch_init(char *envp[])
 {
 	unsigned int level;
@@ -72,6 +99,8 @@ static inline void arch_init(char *envp[])
 		arch_init_intel();
 	else if (!strcmp(str, "AuthenticAMD") || !strcmp(str, "HygonGenuine"))
 		arch_init_amd();
+	else if (!strcmp(str, "  Shanghai  ") || !strcmp(str, "CentaurHauls"))
+		arch_init_zhaoxin();
 }
 
 #endif
-- 
2.17.1

Re: [PATCH] Add Zhaoxin support to enable tsc_reliable and arch_random features

[Jens Axboe]

On 5/20/25 8:04 PM, Runa Guo-oc wrote:
> Signed-off-by: Runa Guo-oc <RunaGuo-oc@zhaoxin.com>

This is literally the same as the intel one, why duplicate all
of that? Just do:

diff --git a/arch/arch-x86-common.h b/arch/arch-x86-common.h
index f32835cce33b..ac26126ae84a 100644
--- a/arch/arch-x86-common.h
+++ b/arch/arch-x86-common.h
@@ -68,7 +68,8 @@ static inline void arch_init(char *envp[])
 			 (unsigned int *) &str[4]);
 
 	str[12] = '\0';
-	if (!strcmp(str, "GenuineIntel"))
+	if (!strcmp(str, "GenuineIntel") || !strcmp(str, "  Shanghai  ") ||
+	    !strcmp(str, "CentaurHauls"))
 		arch_init_intel();
 	else if (!strcmp(str, "AuthenticAMD") || !strcmp(str, "HygonGenuine"))
 		arch_init_amd();

-- 
Jens Axboe

Re: [PATCH] Add Zhaoxin support to enable tsc_reliable and arch_random features

[fiotestbot]

[-- Attachment #1: Type: text/plain, Size: 144 bytes --]


The result of fio's continuous integration tests was: success

For more details see https://github.com/fiotestbot/fio/actions/runs/15164633006