forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'kvm-s390-next-5.19-1' of git://git.kernel.org/pub/scm/linu…
…x/kernel/git/kvms390/linux into HEAD KVM: s390: Fix and feature for 5.19 - ultravisor communication device driver - fix TEID on terminating storage key ops
- Loading branch information
Showing
14 changed files
with
714 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
/* | ||
* Ultravisor Interfaces | ||
* | ||
* Copyright IBM Corp. 2019 | ||
* Copyright IBM Corp. 2019, 2022 | ||
* | ||
* Author(s): | ||
* Vasily Gorbik <[email protected]> | ||
|
@@ -52,6 +52,7 @@ | |
#define UVC_CMD_UNPIN_PAGE_SHARED 0x0342 | ||
#define UVC_CMD_SET_SHARED_ACCESS 0x1000 | ||
#define UVC_CMD_REMOVE_SHARED_ACCESS 0x1001 | ||
#define UVC_CMD_RETR_ATTEST 0x1020 | ||
|
||
/* Bits in installed uv calls */ | ||
enum uv_cmds_inst { | ||
|
@@ -76,6 +77,7 @@ enum uv_cmds_inst { | |
BIT_UVC_CMD_UNSHARE_ALL = 20, | ||
BIT_UVC_CMD_PIN_PAGE_SHARED = 21, | ||
BIT_UVC_CMD_UNPIN_PAGE_SHARED = 22, | ||
BIT_UVC_CMD_RETR_ATTEST = 28, | ||
}; | ||
|
||
enum uv_feat_ind { | ||
|
@@ -219,6 +221,25 @@ struct uv_cb_share { | |
u64 reserved28; | ||
} __packed __aligned(8); | ||
|
||
/* Retrieve Attestation Measurement */ | ||
struct uv_cb_attest { | ||
struct uv_cb_header header; /* 0x0000 */ | ||
u64 reserved08[2]; /* 0x0008 */ | ||
u64 arcb_addr; /* 0x0018 */ | ||
u64 cont_token; /* 0x0020 */ | ||
u8 reserved28[6]; /* 0x0028 */ | ||
u16 user_data_len; /* 0x002e */ | ||
u8 user_data[256]; /* 0x0030 */ | ||
u32 reserved130[3]; /* 0x0130 */ | ||
u32 meas_len; /* 0x013c */ | ||
u64 meas_addr; /* 0x0140 */ | ||
u8 config_uid[16]; /* 0x0148 */ | ||
u32 reserved158; /* 0x0158 */ | ||
u32 add_data_len; /* 0x015c */ | ||
u64 add_data_addr; /* 0x0160 */ | ||
u64 reserved168[4]; /* 0x0168 */ | ||
} __packed __aligned(8); | ||
|
||
static inline int __uv_call(unsigned long r1, unsigned long r2) | ||
{ | ||
int cc; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | ||
/* | ||
* Copyright IBM Corp. 2022 | ||
* Author(s): Steffen Eiden <[email protected]> | ||
*/ | ||
#ifndef __S390_ASM_UVDEVICE_H | ||
#define __S390_ASM_UVDEVICE_H | ||
|
||
#include <linux/types.h> | ||
|
||
struct uvio_ioctl_cb { | ||
__u32 flags; | ||
__u16 uv_rc; /* UV header rc value */ | ||
__u16 uv_rrc; /* UV header rrc value */ | ||
__u64 argument_addr; /* Userspace address of uvio argument */ | ||
__u32 argument_len; | ||
__u8 reserved14[0x40 - 0x14]; /* must be zero */ | ||
}; | ||
|
||
#define UVIO_ATT_USER_DATA_LEN 0x100 | ||
#define UVIO_ATT_UID_LEN 0x10 | ||
struct uvio_attest { | ||
__u64 arcb_addr; /* 0x0000 */ | ||
__u64 meas_addr; /* 0x0008 */ | ||
__u64 add_data_addr; /* 0x0010 */ | ||
__u8 user_data[UVIO_ATT_USER_DATA_LEN]; /* 0x0018 */ | ||
__u8 config_uid[UVIO_ATT_UID_LEN]; /* 0x0118 */ | ||
__u32 arcb_len; /* 0x0128 */ | ||
__u32 meas_len; /* 0x012c */ | ||
__u32 add_data_len; /* 0x0130 */ | ||
__u16 user_data_len; /* 0x0134 */ | ||
__u16 reserved136; /* 0x0136 */ | ||
}; | ||
|
||
/* | ||
* The following max values define an upper length for the IOCTL in/out buffers. | ||
* However, they do not represent the maximum the Ultravisor allows which is | ||
* often way smaller. By allowing larger buffer sizes we hopefully do not need | ||
* to update the code with every machine update. It is therefore possible for | ||
* userspace to request more memory than actually used by kernel/UV. | ||
*/ | ||
#define UVIO_ATT_ARCB_MAX_LEN 0x100000 | ||
#define UVIO_ATT_MEASUREMENT_MAX_LEN 0x8000 | ||
#define UVIO_ATT_ADDITIONAL_MAX_LEN 0x8000 | ||
|
||
#define UVIO_DEVICE_NAME "uv" | ||
#define UVIO_TYPE_UVC 'u' | ||
|
||
#define UVIO_IOCTL_ATT _IOWR(UVIO_TYPE_UVC, 0x01, struct uvio_ioctl_cb) | ||
|
||
#endif /* __S390_ASM_UVDEVICE_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.