update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm64/kvm/sys_regs.h
..
..
@@ -1,3 +1,4 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
1
2
 /*
2
3
  * Copyright (C) 2012,2013 - ARM Ltd
3
4
  * Author: Marc Zyngier <marc.zyngier@arm.com>
..
..
@@ -5,18 +6,6 @@
5
6
  * Derived from arch/arm/kvm/coproc.h
6
7
  * Copyright (C) 2012 - Virtual Open Systems and Columbia University
7
8
  * Authors: Christoffer Dall <c.dall@virtualopensystems.com>
8
- *
9
- * This program is free software; you can redistribute it and/or modify
10
- * it under the terms of the GNU General Public License, version 2, as
11
- * published by the Free Software Foundation.
12
- *
13
- * This program is distributed in the hope that it will be useful,
14
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
- * GNU General Public License for more details.
17
- *
18
- * You should have received a copy of the GNU General Public License
19
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
9
  */
21
10
 
22
11
 #ifndef __ARM64_KVM_SYS_REGS_LOCAL_H__
..
..
@@ -30,11 +19,18 @@
30
19
 	u8	Op2;
31
20
 	u64	regval;
32
21
 	bool	is_write;
33
-	bool	is_aarch32;
34
-	bool	is_32bit;	/* Only valid if is_aarch32 is true */
35
22
 };
36
23
 
37
24
 struct sys_reg_desc {
25
+	/* Sysreg string for debug */
26
+	const char *name;
27
+
28
+	enum {
29
+		AA32_ZEROHIGH,
30
+		AA32_LO,
31
+		AA32_HI,
32
+	} aarch32_map;
33
+
38
34
 	/* MRS/MSR instruction which accesses it. */
39
35
 	u8	Op0;
40
36
 	u8	Op1;
..
..
@@ -61,13 +57,33 @@
61
57
 			const struct kvm_one_reg *reg, void __user *uaddr);
62
58
 	int (*set_user)(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd,
63
59
 			const struct kvm_one_reg *reg, void __user *uaddr);
60
+
61
+	/* Return mask of REG_* runtime visibility overrides */
62
+	unsigned int (*visibility)(const struct kvm_vcpu *vcpu,
63
+				   const struct sys_reg_desc *rd);
64
64
 };
65
+
66
+#define REG_HIDDEN		(1 << 0) /* hidden from userspace and guest */
67
+#define REG_RAZ			(1 << 1) /* RAZ from userspace and guest */
68
+
69
+static __printf(2, 3)
70
+inline void print_sys_reg_msg(const struct sys_reg_params *p,
71
+				       char *fmt, ...)
72
+{
73
+	va_list va;
74
+
75
+	va_start(va, fmt);
76
+	/* Look, we even formatted it for you to paste into the table! */
77
+	kvm_pr_unimpl("%pV { Op0(%2u), Op1(%2u), CRn(%2u), CRm(%2u), Op2(%2u), func_%s },\n",
78
+		      &(struct va_format){ fmt, &va },
79
+		      p->Op0, p->Op1, p->CRn, p->CRm, p->Op2, p->is_write ? "write" : "read");
80
+	va_end(va);
81
+}
65
82
 
66
83
 static inline void print_sys_reg_instr(const struct sys_reg_params *p)
67
84
 {
68
-	/* Look, we even formatted it for you to paste into the table! */
69
-	kvm_pr_unimpl(" { Op0(%2u), Op1(%2u), CRn(%2u), CRm(%2u), Op2(%2u), func_%s },\n",
70
-		      p->Op0, p->Op1, p->CRn, p->CRm, p->Op2, p->is_write ? "write" : "read");
85
+	/* GCC warns on an empty format string */
86
+	print_sys_reg_msg(p, "%s", "");
71
87
 }
72
88
 
73
89
 static inline bool ignore_write(struct kvm_vcpu *vcpu,
..
..
@@ -99,6 +115,24 @@
99
115
 	__vcpu_sys_reg(vcpu, r->reg) = r->val;
100
116
 }
101
117
 
118
+static inline bool sysreg_hidden(const struct kvm_vcpu *vcpu,
119
+				 const struct sys_reg_desc *r)
120
+{
121
+	if (likely(!r->visibility))
122
+		return false;
123
+
124
+	return r->visibility(vcpu, r) & REG_HIDDEN;
125
+}
126
+
127
+static inline bool sysreg_visible_as_raz(const struct kvm_vcpu *vcpu,
128
+					 const struct sys_reg_desc *r)
129
+{
130
+	if (likely(!r->visibility))
131
+		return false;
132
+
133
+	return r->visibility(vcpu, r) & REG_RAZ;
134
+}
135
+
102
136
 static inline int cmp_sys_reg(const struct sys_reg_desc *i1,
103
137
 			      const struct sys_reg_desc *i2)
104
138
 {
..
..
@@ -123,6 +157,7 @@
123
157
 					  const struct sys_reg_desc table[],
124
158
 					  unsigned int num);
125
159
 
160
+#define AA32(_x)	.aarch32_map = AA32_##_x
126
161
 #define Op0(_x) 	.Op0 = _x
127
162
 #define Op1(_x) 	.Op1 = _x
128
163
 #define CRn(_x)		.CRn = _x
..
..
@@ -130,6 +165,7 @@
130
165
 #define Op2(_x) 	.Op2 = _x
131
166
 
132
167
 #define SYS_DESC(reg)					\
168
+	.name = #reg,					\
133
169
 	Op0(sys_reg_Op0(reg)), Op1(sys_reg_Op1(reg)),	\
134
170
 	CRn(sys_reg_CRn(reg)), CRm(sys_reg_CRm(reg)),	\
135
171
 	Op2(sys_reg_Op2(reg))