Skip to content

Commit 88fe352

Browse files
committed
Merge branch 'sparc64-ADI'
Khalid Aziz says: ==================== Application Data Integrity feature introduced by SPARC M7 V12 changes: This series is same as v10 and v11 and was simply rebased on 4.16-rc2 kernel and patch 11 was added to update signal delivery code to use the new helper functions added by Eric Biederman. Can mm maintainers please review patches 2, 7, 8 and 9 which are arch independent, and include/linux/mm.h and mm/ksm.c changes in patch 10 and ack these if everything looks good? SPARC M7 processor adds additional metadata for memory address space that can be used to secure access to regions of memory. This additional metadata is implemented as a 4-bit tag attached to each cacheline size block of memory. A task can set a tag on any number of such blocks. Access to such block is granted only if the virtual address used to access that block of memory has the tag encoded in the uppermost 4 bits of VA. Since sparc processor does not implement all 64 bits of VA, top 4 bits are available for ADI tags. Any mismatch between tag encoded in VA and tag set on the memory block results in a trap. Tags are verified in the VA presented to the MMU and tags are associated with the physical page VA maps on to. If a memory page is swapped out and page frame gets reused for another task, the tags are lost and hence must be saved when swapping or migrating the page. A userspace task enables ADI through mprotect(). This patch series adds a page protection bit PROT_ADI and a corresponding VMA flag VM_SPARC_ADI. VM_SPARC_ADI is used to trigger setting TTE.mcd bit in the sparc pte that enables ADI checking on the corresponding page. MMU validates the tag embedded in VA for every page that has TTE.mcd bit set in its pte. After enabling ADI on a memory range, the userspace task can set ADI version tags using stxa instruction with ASI_MCD_PRIMARY or ASI_MCD_ST_BLKINIT_PRIMARY ASI. Once userspace task calls mprotect() with PROT_ADI, kernel takes following overall steps: 1. Find the VMAs covering the address range passed in to mprotect and set VM_SPARC_ADI flag. If address range covers a subset of a VMA, the VMA will be split. 2. When a page is allocated for a VA and the VMA covering this VA has VM_SPARC_ADI flag set, set the TTE.mcd bit so MMU will check the vwersion tag. 3. Userspace can now set version tags on the memory it has enabled ADI on. Userspace accesses ADI enabled memory using a virtual address that has the version tag embedded in the high bits. MMU validates this version tag against the actual tag set on the memory. If tag matches, MMU performs the VA->PA translation and access is granted. If there is a mismatch, hypervisor sends a data access exception or precise memory corruption detected exception depending upon whether precise exceptions are enabled or not (controlled by MCDPERR register). Kernel sends SIGSEGV to the task with appropriate si_code. 4. If a page is being swapped out or migrated, kernel must save any ADI tags set on the page. Kernel maintains a page worth of tag storage descriptors. Each descriptors pointsto a tag storage space and the address range it covers. If the page being swapped out or migrated has ADI enabled on it, kernel finds a tag storage descriptor that covers the address range for the page or allocates a new descriptor if none of the existing descriptors cover the address range. Kernel saves tags from the page into the tag storage space descriptor points to. 5. When the page is swapped back in or reinstantiated after migration, kernel restores the version tags on the new physical page by retrieving the original tag from tag storage pointed to by a tag storage descriptor for the virtual address range for new page. User task can disable ADI by calling mprotect() again on the memory range with PROT_ADI bit unset. Kernel clears the VM_SPARC_ADI flag in VMAs, merges adjacent VMAs if necessary, and clears TTE.mcd bit in the corresponding ptes. IOMMU does not support ADI checking. Any version tags embedded in the top bits of VA meant for IOMMU, are cleared and replaced with sign extension of the first non-version tag bit (bit 59 for SPARC M7) for IOMMU addresses. This patch series adds support for this feature in 11 patches: Patch 1/11 Tag mismatch on access by a task results in a trap from hypervisor as data access exception or a precide memory corruption detected exception. As part of handling these exceptions, kernel sends a SIGSEGV to user process with special si_code to indicate which fault occurred. This patch adds three new si_codes to differentiate between various mismatch errors. Patch 2/11 When a page is swapped or migrated, metadata associated with the page must be saved so it can be restored later. This patch adds a new function that saves/restores this metadata when updating pte upon a swap/migration. Patch 3/11 SPARC M7 processor adds new fields to control registers to support ADI feature. It also adds a new exception for precise traps on tag mismatch. This patch adds definitions for the new control register fields, new ASIs for ADI and an exception handler for the precise trap on tag mismatch. Patch 4/11 New hypervisor fault types were added by sparc M7 processor to support ADI feature. This patch adds code to handle these fault types for data access exception handler. Patch 5/11 When ADI is in use for a page and a tag mismatch occurs, processor raises "Memory corruption Detected" trap. This patch adds a handler for this trap. Patch 6/11 ADI usage is governed by ADI properties on a platform. These properties are provided to kernel by firmware. Thsi patch adds new auxiliary vectors that provide these values to userpsace. Patch 7/11 arch_validate_prot() is used to validate the new protection bits asked for by the userspace app. Validating protection bits may need the context of address space the bits are being applied to. One such example is PROT_ADI bit on sparc processor that enables ADI protection on an address range. ADI protection applies only to addresses covered by physical RAM and not other PFN mapped addresses or device addresses. This patch adds "address" to the parameters being passed to arch_validate_prot() to provide that context. Patch 8/11 When protection bits are changed on a page, kernel carries forward all protection bits except for read/write/exec. Additional code was added to allow kernel to clear PKEY bits on x86 but this requirement to clear other bits is not unique to x86. This patch extends the existing code to allow other architectures to clear any other protection bits as well on protection bit change. Patch 9/11 When a processor supports additional metadata on memory pages, that additional metadata needs to be copied to new memory pages when those pages are moved. This patch allows architecture specific code to replace the default copy_highpage() routine with arch specific version that copies the metadata as well besides the data on the page. Patch 10/11 This patch adds support for a user space task to enable ADI and enable tag checking for subsets of its address space. As part of enabling this feature, this patch adds to support manipulation of precise exception for memory corruption detection, adds code to save and restore tags on page swap and migration, and adds code to handle ADI tagged addresses for DMA. Patch 11/11 Update signal delivery code in arch/sparc/kernel/traps_64.c to use the new helper function force_sig_fault() added by commit f8ec660 ("signal: Add send_sig_fault and force_sig_fault"). Changelog v12: - Rebased to 4.16-rc2 - Added patch 11 to update signal delivery functions Changelog v11: - Rebased to 4.15 Changelog v10: - Patch 1/10: Updated si_codes definitions for SEGV to match 4.14 - Patch 2/10: No changes - Patch 3/10: Updated copyright - Patch 4/10: No changes - Patch 5/10: No changes - Patch 6/10: Updated copyright - Patch 7/10: No changes - Patch 8/10: No changes - Patch 9/10: No changes - Patch 10/10: Added code to return from kernel path to set PSTATE.mcde if kernel continues execution in another thread (Suggested by Anthony) Changelog v9: - Patch 1/10: No changes - Patch 2/10: No changes - Patch 3/10: No changes - Patch 4/10: No changes - Patch 5/10: No changes - Patch 6/10: No changes - Patch 7/10: No changes - Patch 8/10: No changes - Patch 9/10: New patch - Patch 10/10: Patch 9 from v8. Added code to copy ADI tags when pages are migrated. Updated code to detect overflow and underflow of addresses when allocating tag storage. Changelog v8: - Patch 1/9: No changes - Patch 2/9: Fixed and erroneous "}" - Patch 3/9: Minor print formatting change - Patch 4/9: No changes - Patch 5/9: No changes - Patch 6/9: Added AT_ADI_UEONADI back - Patch 7/9: Added addr parameter to powerpc arch_validate_prot() - Patch 8/9: No changes - Patch 9/9: - Documentation updates - Added an IPI on mprotect(...PROT_ADI...) call and restore of TSTATE.MCDE on context switch - Removed restriction on enabling ADI on read-only memory - Changed kzalloc() for tag storage to use GFP_NOWAIT - Added code to handle overflow and underflow when allocating tag storage - Replaced sun_m7_patch_1insn_range() with sun4v_patch_1insn_range() - Added membar after restoring ADI tags in copy_user_highpage() Changelog v7: - Patch 1/9: No changes - Patch 2/9: Updated parameters to arch specific swap in/out handlers - Patch 3/9: No changes - Patch 4/9: new patch split off from patch 4/4 in v6 - Patch 5/9: new patch split off from patch 4/4 in v6 - Patch 6/9: new patch split off from patch 4/4 in v6 - Patch 7/9: new patch - Patch 8/9: new patch - Patch 9/9: - Enhanced arch_validate_prot() to enable ADI only on writable addresses backed by physical RAM - Added support for saving/restoring ADI tags for each ADI block size address range on a page on swap in/out - copy ADI tags on COW - Updated values for auxiliary vectors to not conflict with values on other architectures to avoid conflict in glibc - Disable same page merging on ADI enabled pages - Enable ADI only on writable addresses backed by physical RAM - Split parts of patch off into separate patches Changelog v6: - Patch 1/4: No changes - Patch 2/4: No changes - Patch 3/4: Added missing nop in the delay slot in sun4v_mcd_detect_precise - Patch 4/4: Eliminated instructions to read and write PSTATE as well as MCDPER and PMCDPER on every access to userspace addresses by setting PSTATE and PMCDPER correctly upon entry into kernel Changelog v5: - Patch 1/4: No changes - Patch 2/4: Replaced set_swp_pte_at() with new architecture functions arch_do_swap_page() and arch_unmap_one() that suppoprt architecture specific actions to be taken on page swap and migration - Patch 3/4: Fixed indentation issues in assembly code - Patch 4/4: - Fixed indentation issues and instrcuctions in assembly code - Removed CONFIG_SPARC64 from mdesc.c - Changed to maintain state of MCDPER register in thread info flags as opposed to in mm context. MCDPER is a per-thread state and belongs in thread info flag as opposed to mm context which is shared across threads. Added comments to clarify this is a lazily maintained state and must be updated on context switch and copy_process() - Updated code to use the new arch_do_swap_page() and arch_unmap_one() functions Testing: - All functionality was tested with 8K normal pages as well as hugepages using malloc, mmap and shm. - Multiple long duration stress tests were run using hugepages over 2+ months. Normal pages were tested with shorter duration stress tests. - Tested swapping with malloc and shm by reducing max memory and allocating three times the available system memory by active processes using ADI on allocated memory. Ran through multiple hours long runs of this test. - Tested page migration with malloc and shm by migrating data pages of active ADI test process using migratepages, back and forth between two nodes every few seconds over an hour long run. Verified page migration through /proc/<pid>/numa_maps. - Tested COW support using test that forks children that read from ADI enabled pages shared with parent and other children and write to them as well forcing COW. ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 8f5fd92 + b9fa036 commit 88fe352

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1446
-25
lines changed

Documentation/sparc/adi.txt

Lines changed: 278 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,278 @@
1+
Application Data Integrity (ADI)
2+
================================
3+
4+
SPARC M7 processor adds the Application Data Integrity (ADI) feature.
5+
ADI allows a task to set version tags on any subset of its address
6+
space. Once ADI is enabled and version tags are set for ranges of
7+
address space of a task, the processor will compare the tag in pointers
8+
to memory in these ranges to the version set by the application
9+
previously. Access to memory is granted only if the tag in given pointer
10+
matches the tag set by the application. In case of mismatch, processor
11+
raises an exception.
12+
13+
Following steps must be taken by a task to enable ADI fully:
14+
15+
1. Set the user mode PSTATE.mcde bit. This acts as master switch for
16+
the task's entire address space to enable/disable ADI for the task.
17+
18+
2. Set TTE.mcd bit on any TLB entries that correspond to the range of
19+
addresses ADI is being enabled on. MMU checks the version tag only
20+
on the pages that have TTE.mcd bit set.
21+
22+
3. Set the version tag for virtual addresses using stxa instruction
23+
and one of the MCD specific ASIs. Each stxa instruction sets the
24+
given tag for one ADI block size number of bytes. This step must
25+
be repeated for entire page to set tags for entire page.
26+
27+
ADI block size for the platform is provided by the hypervisor to kernel
28+
in machine description tables. Hypervisor also provides the number of
29+
top bits in the virtual address that specify the version tag. Once
30+
version tag has been set for a memory location, the tag is stored in the
31+
physical memory and the same tag must be present in the ADI version tag
32+
bits of the virtual address being presented to the MMU. For example on
33+
SPARC M7 processor, MMU uses bits 63-60 for version tags and ADI block
34+
size is same as cacheline size which is 64 bytes. A task that sets ADI
35+
version to, say 10, on a range of memory, must access that memory using
36+
virtual addresses that contain 0xa in bits 63-60.
37+
38+
ADI is enabled on a set of pages using mprotect() with PROT_ADI flag.
39+
When ADI is enabled on a set of pages by a task for the first time,
40+
kernel sets the PSTATE.mcde bit fot the task. Version tags for memory
41+
addresses are set with an stxa instruction on the addresses using
42+
ASI_MCD_PRIMARY or ASI_MCD_ST_BLKINIT_PRIMARY. ADI block size is
43+
provided by the hypervisor to the kernel. Kernel returns the value of
44+
ADI block size to userspace using auxiliary vector along with other ADI
45+
info. Following auxiliary vectors are provided by the kernel:
46+
47+
AT_ADI_BLKSZ ADI block size. This is the granularity and
48+
alignment, in bytes, of ADI versioning.
49+
AT_ADI_NBITS Number of ADI version bits in the VA
50+
51+
52+
IMPORTANT NOTES:
53+
54+
- Version tag values of 0x0 and 0xf are reserved. These values match any
55+
tag in virtual address and never generate a mismatch exception.
56+
57+
- Version tags are set on virtual addresses from userspace even though
58+
tags are stored in physical memory. Tags are set on a physical page
59+
after it has been allocated to a task and a pte has been created for
60+
it.
61+
62+
- When a task frees a memory page it had set version tags on, the page
63+
goes back to free page pool. When this page is re-allocated to a task,
64+
kernel clears the page using block initialization ASI which clears the
65+
version tags as well for the page. If a page allocated to a task is
66+
freed and allocated back to the same task, old version tags set by the
67+
task on that page will no longer be present.
68+
69+
- ADI tag mismatches are not detected for non-faulting loads.
70+
71+
- Kernel does not set any tags for user pages and it is entirely a
72+
task's responsibility to set any version tags. Kernel does ensure the
73+
version tags are preserved if a page is swapped out to the disk and
74+
swapped back in. It also preserves that version tags if a page is
75+
migrated.
76+
77+
- ADI works for any size pages. A userspace task need not be aware of
78+
page size when using ADI. It can simply select a virtual address
79+
range, enable ADI on the range using mprotect() and set version tags
80+
for the entire range. mprotect() ensures range is aligned to page size
81+
and is a multiple of page size.
82+
83+
- ADI tags can only be set on writable memory. For example, ADI tags can
84+
not be set on read-only mappings.
85+
86+
87+
88+
ADI related traps
89+
-----------------
90+
91+
With ADI enabled, following new traps may occur:
92+
93+
Disrupting memory corruption
94+
95+
When a store accesses a memory localtion that has TTE.mcd=1,
96+
the task is running with ADI enabled (PSTATE.mcde=1), and the ADI
97+
tag in the address used (bits 63:60) does not match the tag set on
98+
the corresponding cacheline, a memory corruption trap occurs. By
99+
default, it is a disrupting trap and is sent to the hypervisor
100+
first. Hypervisor creates a sun4v error report and sends a
101+
resumable error (TT=0x7e) trap to the kernel. The kernel sends
102+
a SIGSEGV to the task that resulted in this trap with the following
103+
info:
104+
105+
siginfo.si_signo = SIGSEGV;
106+
siginfo.errno = 0;
107+
siginfo.si_code = SEGV_ADIDERR;
108+
siginfo.si_addr = addr; /* PC where first mismatch occurred */
109+
siginfo.si_trapno = 0;
110+
111+
112+
Precise memory corruption
113+
114+
When a store accesses a memory location that has TTE.mcd=1,
115+
the task is running with ADI enabled (PSTATE.mcde=1), and the ADI
116+
tag in the address used (bits 63:60) does not match the tag set on
117+
the corresponding cacheline, a memory corruption trap occurs. If
118+
MCD precise exception is enabled (MCDPERR=1), a precise
119+
exception is sent to the kernel with TT=0x1a. The kernel sends
120+
a SIGSEGV to the task that resulted in this trap with the following
121+
info:
122+
123+
siginfo.si_signo = SIGSEGV;
124+
siginfo.errno = 0;
125+
siginfo.si_code = SEGV_ADIPERR;
126+
siginfo.si_addr = addr; /* address that caused trap */
127+
siginfo.si_trapno = 0;
128+
129+
NOTE: ADI tag mismatch on a load always results in precise trap.
130+
131+
132+
MCD disabled
133+
134+
When a task has not enabled ADI and attempts to set ADI version
135+
on a memory address, processor sends an MCD disabled trap. This
136+
trap is handled by hypervisor first and the hypervisor vectors this
137+
trap through to the kernel as Data Access Exception trap with
138+
fault type set to 0xa (invalid ASI). When this occurs, the kernel
139+
sends the task SIGSEGV signal with following info:
140+
141+
siginfo.si_signo = SIGSEGV;
142+
siginfo.errno = 0;
143+
siginfo.si_code = SEGV_ACCADI;
144+
siginfo.si_addr = addr; /* address that caused trap */
145+
siginfo.si_trapno = 0;
146+
147+
148+
Sample program to use ADI
149+
-------------------------
150+
151+
Following sample program is meant to illustrate how to use the ADI
152+
functionality.
153+
154+
#include <unistd.h>
155+
#include <stdio.h>
156+
#include <stdlib.h>
157+
#include <elf.h>
158+
#include <sys/ipc.h>
159+
#include <sys/shm.h>
160+
#include <sys/mman.h>
161+
#include <asm/asi.h>
162+
163+
#ifndef AT_ADI_BLKSZ
164+
#define AT_ADI_BLKSZ 48
165+
#endif
166+
#ifndef AT_ADI_NBITS
167+
#define AT_ADI_NBITS 49
168+
#endif
169+
170+
#ifndef PROT_ADI
171+
#define PROT_ADI 0x10
172+
#endif
173+
174+
#define BUFFER_SIZE 32*1024*1024UL
175+
176+
main(int argc, char* argv[], char* envp[])
177+
{
178+
unsigned long i, mcde, adi_blksz, adi_nbits;
179+
char *shmaddr, *tmp_addr, *end, *veraddr, *clraddr;
180+
int shmid, version;
181+
Elf64_auxv_t *auxv;
182+
183+
adi_blksz = 0;
184+
185+
while(*envp++ != NULL);
186+
for (auxv = (Elf64_auxv_t *)envp; auxv->a_type != AT_NULL; auxv++) {
187+
switch (auxv->a_type) {
188+
case AT_ADI_BLKSZ:
189+
adi_blksz = auxv->a_un.a_val;
190+
break;
191+
case AT_ADI_NBITS:
192+
adi_nbits = auxv->a_un.a_val;
193+
break;
194+
}
195+
}
196+
if (adi_blksz == 0) {
197+
fprintf(stderr, "Oops! ADI is not supported\n");
198+
exit(1);
199+
}
200+
201+
printf("ADI capabilities:\n");
202+
printf("\tBlock size = %ld\n", adi_blksz);
203+
printf("\tNumber of bits = %ld\n", adi_nbits);
204+
205+
if ((shmid = shmget(2, BUFFER_SIZE,
206+
IPC_CREAT | SHM_R | SHM_W)) < 0) {
207+
perror("shmget failed");
208+
exit(1);
209+
}
210+
211+
shmaddr = shmat(shmid, NULL, 0);
212+
if (shmaddr == (char *)-1) {
213+
perror("shm attach failed");
214+
shmctl(shmid, IPC_RMID, NULL);
215+
exit(1);
216+
}
217+
218+
if (mprotect(shmaddr, BUFFER_SIZE, PROT_READ|PROT_WRITE|PROT_ADI)) {
219+
perror("mprotect failed");
220+
goto err_out;
221+
}
222+
223+
/* Set the ADI version tag on the shm segment
224+
*/
225+
version = 10;
226+
tmp_addr = shmaddr;
227+
end = shmaddr + BUFFER_SIZE;
228+
while (tmp_addr < end) {
229+
asm volatile(
230+
"stxa %1, [%0]0x90\n\t"
231+
:
232+
: "r" (tmp_addr), "r" (version));
233+
tmp_addr += adi_blksz;
234+
}
235+
asm volatile("membar #Sync\n\t");
236+
237+
/* Create a versioned address from the normal address by placing
238+
* version tag in the upper adi_nbits bits
239+
*/
240+
tmp_addr = (void *) ((unsigned long)shmaddr << adi_nbits);
241+
tmp_addr = (void *) ((unsigned long)tmp_addr >> adi_nbits);
242+
veraddr = (void *) (((unsigned long)version << (64-adi_nbits))
243+
| (unsigned long)tmp_addr);
244+
245+
printf("Starting the writes:\n");
246+
for (i = 0; i < BUFFER_SIZE; i++) {
247+
veraddr[i] = (char)(i);
248+
if (!(i % (1024 * 1024)))
249+
printf(".");
250+
}
251+
printf("\n");
252+
253+
printf("Verifying data...");
254+
fflush(stdout);
255+
for (i = 0; i < BUFFER_SIZE; i++)
256+
if (veraddr[i] != (char)i)
257+
printf("\nIndex %lu mismatched\n", i);
258+
printf("Done.\n");
259+
260+
/* Disable ADI and clean up
261+
*/
262+
if (mprotect(shmaddr, BUFFER_SIZE, PROT_READ|PROT_WRITE)) {
263+
perror("mprotect failed");
264+
goto err_out;
265+
}
266+
267+
if (shmdt((const void *)shmaddr) != 0)
268+
perror("Detach failure");
269+
shmctl(shmid, IPC_RMID, NULL);
270+
271+
exit(0);
272+
273+
err_out:
274+
if (shmdt((const void *)shmaddr) != 0)
275+
perror("Detach failure");
276+
shmctl(shmid, IPC_RMID, NULL);
277+
exit(1);
278+
}

arch/powerpc/include/asm/mman.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
4343
}
4444
#define arch_vm_get_page_prot(vm_flags) arch_vm_get_page_prot(vm_flags)
4545

46-
static inline bool arch_validate_prot(unsigned long prot)
46+
static inline bool arch_validate_prot(unsigned long prot, unsigned long addr)
4747
{
4848
if (prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC | PROT_SEM | PROT_SAO))
4949
return false;
5050
if ((prot & PROT_SAO) && !cpu_has_feature(CPU_FTR_SAO))
5151
return false;
5252
return true;
5353
}
54-
#define arch_validate_prot(prot) arch_validate_prot(prot)
54+
#define arch_validate_prot arch_validate_prot
5555

5656
#endif /* CONFIG_PPC64 */
5757
#endif /* _ASM_POWERPC_MMAN_H */

arch/powerpc/kernel/syscalls.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ static inline long do_mmap2(unsigned long addr, size_t len,
4848
{
4949
long ret = -EINVAL;
5050

51-
if (!arch_validate_prot(prot))
51+
if (!arch_validate_prot(prot, addr))
5252
goto out;
5353

5454
if (shift) {

arch/sparc/include/asm/adi.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#ifndef ___ASM_SPARC_ADI_H
2+
#define ___ASM_SPARC_ADI_H
3+
#if defined(__sparc__) && defined(__arch64__)
4+
#include <asm/adi_64.h>
5+
#endif
6+
#endif

arch/sparc/include/asm/adi_64.h

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/* adi_64.h: ADI related data structures
2+
*
3+
* Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
4+
* Author: Khalid Aziz ([email protected])
5+
*
6+
* This work is licensed under the terms of the GNU GPL, version 2.
7+
*/
8+
#ifndef __ASM_SPARC64_ADI_H
9+
#define __ASM_SPARC64_ADI_H
10+
11+
#include <linux/types.h>
12+
13+
#ifndef __ASSEMBLY__
14+
15+
struct adi_caps {
16+
__u64 blksz;
17+
__u64 nbits;
18+
__u64 ue_on_adi;
19+
};
20+
21+
struct adi_config {
22+
bool enabled;
23+
struct adi_caps caps;
24+
};
25+
26+
extern struct adi_config adi_state;
27+
28+
extern void mdesc_adi_init(void);
29+
30+
static inline bool adi_capable(void)
31+
{
32+
return adi_state.enabled;
33+
}
34+
35+
static inline unsigned long adi_blksize(void)
36+
{
37+
return adi_state.caps.blksz;
38+
}
39+
40+
static inline unsigned long adi_nbits(void)
41+
{
42+
return adi_state.caps.nbits;
43+
}
44+
45+
#endif /* __ASSEMBLY__ */
46+
47+
#endif /* !(__ASM_SPARC64_ADI_H) */

arch/sparc/include/asm/elf_64.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <asm/processor.h>
1111
#include <asm/extable_64.h>
1212
#include <asm/spitfire.h>
13+
#include <asm/adi.h>
1314

1415
/*
1516
* Sparc section types
@@ -215,9 +216,13 @@ extern unsigned int vdso_enabled;
215216

216217
#define ARCH_DLINFO \
217218
do { \
219+
extern struct adi_config adi_state; \
218220
if (vdso_enabled) \
219221
NEW_AUX_ENT(AT_SYSINFO_EHDR, \
220222
(unsigned long)current->mm->context.vdso); \
223+
NEW_AUX_ENT(AT_ADI_BLKSZ, adi_state.caps.blksz); \
224+
NEW_AUX_ENT(AT_ADI_NBITS, adi_state.caps.nbits); \
225+
NEW_AUX_ENT(AT_ADI_UEONADI, adi_state.caps.ue_on_adi); \
221226
} while (0)
222227

223228
struct linux_binprm;

arch/sparc/include/asm/hypervisor.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,8 @@ struct hv_fault_status {
570570
#define HV_FAULT_TYPE_RESV1 13
571571
#define HV_FAULT_TYPE_UNALIGNED 14
572572
#define HV_FAULT_TYPE_INV_PGSZ 15
573+
#define HV_FAULT_TYPE_MCD 17
574+
#define HV_FAULT_TYPE_MCD_DIS 18
573575
/* Values 16 --> -2 are reserved. */
574576
#define HV_FAULT_TYPE_MULTIPLE -1
575577

0 commit comments

Comments
 (0)