Commit 8ce1248
CKI KWF Bot
Merge: s390/mm: Fix __ptep_rdp() inline assembly
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7616
JIRA: https://issues.redhat.com/browse/RHEL-129168
Conflicts: Code changes necessary to adapt to existing differences to
upstream - no functional change
```
commit 31475b8
Author: Heiko Carstens <hca@linux.ibm.com>
Date: Thu Nov 13 13:21:47 2025 +0100
s390/mm: Fix __ptep_rdp() inline assembly
When a zero ASCE is passed to the __ptep_rdp() inline assembly, the
generated instruction should have the R3 field of the instruction set to
zero. However the inline assembly is written incorrectly: for such cases a
zero is loaded into a register allocated by the compiler and this register
is then used by the instruction.
This means that selected TLB entries may not be flushed since the specified
ASCE does not match the one which was used when the selected TLB entries
were created.
Fix this by removing the asce and opt parameters of __ptep_rdp(), since
all callers always pass zero, and use a hard-coded register zero for
the R3 field.
Fixes: 0807b85 ("s390/mm: add support for RDP (Reset DAT-Protection)")
Cc: stable@vger.kernel.org
Reviewed-by: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
```
Signed-off-by: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Signed-off-by: Mete Durlu <mdurlu@redhat.com>
Approved-by: Steve Best <sbest@redhat.com>
Approved-by: Thomas Huth <thuth@redhat.com>
Approved-by: Rafael Aquini <raquini@redhat.com>
Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>
Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>2 files changed
+7
-9
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1104 | 1104 | | |
1105 | 1105 | | |
1106 | 1106 | | |
1107 | | - | |
1108 | | - | |
1109 | | - | |
| 1107 | + | |
1110 | 1108 | | |
1111 | 1109 | | |
1112 | 1110 | | |
1113 | 1111 | | |
1114 | | - | |
| 1112 | + | |
1115 | 1113 | | |
1116 | | - | |
1117 | | - | |
| 1114 | + | |
| 1115 | + | |
1118 | 1116 | | |
1119 | 1117 | | |
1120 | 1118 | | |
| |||
1298 | 1296 | | |
1299 | 1297 | | |
1300 | 1298 | | |
1301 | | - | |
| 1299 | + | |
1302 | 1300 | | |
1303 | 1301 | | |
1304 | 1302 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
303 | 303 | | |
304 | 304 | | |
305 | 305 | | |
306 | | - | |
| 306 | + | |
307 | 307 | | |
308 | | - | |
| 308 | + | |
309 | 309 | | |
310 | 310 | | |
311 | 311 | | |
| |||
0 commit comments