s390x/pci: zPCI interpretation support
Subsystems (3)
v8 cover s390x/pci: zPCI interpretation support
Now that the kernel series [1] is merged and the freeze is over, here is a refresh of the zPCI interpretation series.
For QEMU, the majority of the work in enabling instruction interpretation is handled via SHM bit settings (to indicate to firmware whether or not interpretive execution facilities are to be used) + a new KVM ioctl is used to setup firmware-interpreted forwarding of Adapter Event Notifications.
This series also adds a new, optional 'interpret' parameter to zpci which can be used to disable interpretation support (interpret=off) as well as an 'forwarding_assist' parameter to determine whether or not the firmware assist will be used for adapter event delivery (default when interpretation is in use) or whether the host will be responsible for delivering all adapter event notifications (forwarding_assist=off).
The zpcii-disable machine property is added to allow disabling use of zPCI interpretation facilities for a guest. This property is set to on for older (pre-7.2 compat machines), but defaults to off for 7.2 and newer. This allows newer machines to use interpretation by default if the necessary kernel interfaces and hardware facilities are available, but also provides a mechanism for disabling interpretation completely for debug purposes.
As a consequence of implementing zPCI interpretation, ISM devices now become eligible for passthrough (but only when zPCI interpretation is available).
From the perspective of guest configuration, you passthrough zPCI devices in the same manner as before, with intepretation support being used by default if available in kernel+qemu.
Changelog v7->v8:
- Rebase onto 7.1.0
- Move compat machine changes for patch 8
- Refresh kernel header sync to 6.0-rc3
[1] https://lore.kernel.org/kvm/[email protected]/
Matthew Rosato (8):
linux-headers: update to 6.0-rc3
s390x/pci: add routine to get host function handle from CLP info s390x/pci: enable for load/store intepretation
s390x/pci: don't fence interpreted devices without MSI-X s390x/pci: enable adapter event notification for interpreted devices s390x/pci: let intercept devices have separate PCI groups s390x/pci: reflect proper maxstbl for groups of interpreted devices s390x/s390-virtio-ccw: add zpcii-disable machine property
hw/s390x/meson.build | 1 + hw/s390x/s390-pci-bus.c | 111 ++++++++++- hw/s390x/s390-pci-inst.c | 56 +++++- hw/s390x/s390-pci-kvm.c | 54 ++++++ hw/s390x/s390-pci-vfio.c | 129 +++++++++++-- hw/s390x/s390-virtio-ccw.c | 25 +++ include/hw/s390x/s390-pci-bus.h | 8 +- include/hw/s390x/s390-pci-kvm.h | 38 ++++ include/hw/s390x/s390-pci-vfio.h | 5 + include/hw/s390x/s390-virtio-ccw.h | 1 + include/standard-headers/asm-x86/bootparam.h | 7 +- include/standard-headers/drm/drm_fourcc.h | 73 +++++++- include/standard-headers/linux/ethtool.h | 29 +-- include/standard-headers/linux/input.h | 12 +- include/standard-headers/linux/pci_regs.h | 30 ++- include/standard-headers/linux/vhost_types.h | 17 +- include/standard-headers/linux/virtio_9p.h | 2 +- .../standard-headers/linux/virtio_config.h | 7 +- include/standard-headers/linux/virtio_ids.h | 14 +- include/standard-headers/linux/virtio_net.h | 34 +++- include/standard-headers/linux/virtio_pci.h | 2 + include/standard-headers/linux/virtio_ring.h | 16 +- linux-headers/asm-arm64/kvm.h | 33 +++- linux-headers/asm-generic/unistd.h | 4 +- linux-headers/asm-riscv/kvm.h | 22 +++ linux-headers/asm-riscv/unistd.h | 3 +- linux-headers/asm-s390/kvm.h | 1 + linux-headers/asm-x86/kvm.h | 33 ++-- linux-headers/asm-x86/mman.h | 14 -- linux-headers/linux/kvm.h | 172 +++++++++++++++++- linux-headers/linux/userfaultfd.h | 10 +- linux-headers/linux/vduse.h | 47 +++++ linux-headers/linux/vfio.h | 4 +- linux-headers/linux/vfio_zdev.h | 7 + linux-headers/linux/vhost.h | 35 +++- qemu-options.hx | 8 +- target/s390x/kvm/kvm.c | 7 + target/s390x/kvm/kvm_s390x.h | 1 + util/qemu-config.c | 4 + 39 files changed, 955 insertions(+), 121 deletions(-) create mode 100644 hw/s390x/s390-pci-kvm.c create mode 100644 include/hw/s390x/s390-pci-kvm.h
Signature · 1 line
2.37.2
PATCH v8 1/8 linux-headers: update to 6.0-rc3
--- include/standard-headers/asm-x86/bootparam.h | 7 +- include/standard-headers/drm/drm_fourcc.h | 73 +++++++- include/standard-headers/linux/ethtool.h | 29 +-- include/standard-headers/linux/input.h | 12 +- include/standard-headers/linux/pci_regs.h | 30 ++- include/standard-headers/linux/vhost_types.h | 17 +- include/standard-headers/linux/virtio_9p.h | 2 +- .../standard-headers/linux/virtio_config.h | 7 +- include/standard-headers/linux/virtio_ids.h | 14 +- include/standard-headers/linux/virtio_net.h | 34 +++- include/standard-headers/linux/virtio_pci.h | 2 + include/standard-headers/linux/virtio_ring.h | 16 +- linux-headers/asm-arm64/kvm.h | 33 +++- linux-headers/asm-generic/unistd.h | 4 +- linux-headers/asm-riscv/kvm.h | 22 +++ linux-headers/asm-riscv/unistd.h | 3 +- linux-headers/asm-s390/kvm.h | 1 + linux-headers/asm-x86/kvm.h | 33 ++-- linux-headers/asm-x86/mman.h | 14 -- linux-headers/linux/kvm.h | 172 +++++++++++++++++- linux-headers/linux/userfaultfd.h | 10 +- linux-headers/linux/vduse.h | 47 +++++ linux-headers/linux/vfio.h | 4 +- linux-headers/linux/vfio_zdev.h | 7 + linux-headers/linux/vhost.h | 35 +++- 25 files changed, 538 insertions(+), 90 deletions(-)
include/standard-headers/asm-x86/bootparam.h +4 -3
@@ -10,12 +10,13 @@#define SETUP_EFI 4#define SETUP_APPLE_PROPERTIES 5#define SETUP_JAILHOUSE 6 +#define SETUP_CC_BLOB 7 +#define SETUP_IMA 8#define SETUP_RNG_SEED 9 +#define SETUP_ENUM_MAX SETUP_RNG_SEED#define SETUP_INDIRECT (1<<31) - -/* SETUP_INDIRECT | max(SETUP_*) */ -#define SETUP_TYPE_MAX (SETUP_INDIRECT | SETUP_JAILHOUSE) +#define SETUP_TYPE_MAX (SETUP_ENUM_MAX | SETUP_INDIRECT)/* ram_size flags */ #define RAMDISK_IMAGE_START_MASK 0x07FF
include/standard-headers/drm/drm_fourcc.h +72 -1
103 lines not on this page · raw message
include/standard-headers/linux/ethtool.h +15 -14
@@ -257,7 +257,7 @@ struct ethtool_tunable {uint32_t id;uint32_t type_id;uint32_t len; -void *data[0 ]; +void *data[]; };#define DOWNSHIFT_DEV_DEFAULT_COUNT 0xff
@@ -322,7 +322,7 @@ struct ethtool_regs {uint32_t cmd;uint32_t version;uint32_t len; -uint8_t data[0 ]; +uint8_t data[]; };/**
@@ -348,7 +348,7 @@ struct ethtool_eeprom {uint32_t magic;uint32_t offset;uint32_t len; -uint8_t data[0 ]; +uint8_t data[]; };/**
@@ -752,7 +752,7 @@ struct ethtool_gstrings {uint32_t cmd;uint32_t string_set;uint32_t len; -uint8_t data[0 ]; +uint8_t data[]; };/**
@@ -777,7 +777,7 @@ struct ethtool_sset_info {uint32_t cmd;uint32_t reserved;uint64_t sset_mask; -uint32_t data[0 ]; +uint32_t data[]; };/**
@@ -817,7 +817,7 @@ struct ethtool_test {uint32_t flags;uint32_t reserved;uint32_t len; -uint64_t data[0 ]; +uint64_t data[]; };/**
@@ -834,7 +834,7 @@ struct ethtool_test {struct ethtool_stats {uint32_t cmd;uint32_t n_stats; -uint64_t data[0 ]; +uint64_t data[]; };/**
@@ -851,7 +851,7 @@ struct ethtool_stats {struct ethtool_perm_addr {uint32_t cmd;uint32_t size; -uint8_t data[0 ]; +uint8_t data[]; };/* boolean flags controlling per-interface behavior characteristics.
@@ -1160,7 +1160,7 @@ struct ethtool_rxnfc {struct ethtool_rxfh_indir {uint32_t cmd;uint32_t size; -uint32_t ring_index[0 ]; +uint32_t ring_index[]; };/**
@@ -1201,7 +1201,7 @@ struct ethtool_rxfh {uint8_t hfunc;uint8_t rsvd8[3 ];uint32_t rsvd32; -uint32_t rss_config[0 ]; +uint32_t rss_config[]; };#define ETH_RXFH_CONTEXT_ALLOC 0xffffffff#define ETH_RXFH_INDIR_NO_CHANGE 0xffffffff
@@ -1286,7 +1286,7 @@ struct ethtool_dump {uint32_t version;uint32_t flag;uint32_t len; -uint8_t data[0 ]; +uint8_t data[]; };#define ETH_FW_DUMP_DISABLE 0
@@ -1318,7 +1318,7 @@ struct ethtool_get_features_block {struct ethtool_gfeatures {uint32_t cmd;uint32_t size; -struct ethtool_get_features_block features[0 ]; +struct ethtool_get_features_block features[]; };/**
@@ -1340,7 +1340,7 @@ struct ethtool_set_features_block {struct ethtool_sfeatures {uint32_t cmd;uint32_t size; -struct ethtool_set_features_block features[0 ]; +struct ethtool_set_features_block features[]; };/**
@@ -1691,6 +1691,7 @@ enum ethtool_link_mode_bit_indices { ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT =89 , ETHTOOL_LINK_MODE_100baseFX_Half_BIT =90 , ETHTOOL_LINK_MODE_100baseFX_Full_BIT =91 , + ETHTOOL_LINK_MODE_10baseT1L_Full_BIT =92 ,/* must be last entry */ __ETHTOOL_LINK_MODE_MASK_NBITS };
@@ -2086,7 +2087,7 @@ struct ethtool_link_settings {uint8_t master_slave_state;uint8_t reserved1[1 ];uint32_t reserved[7 ]; -uint32_t link_mode_masks[0 ]; +uint32_t link_mode_masks[];/* layout of link_mode_masks fields: * uint32_t map_supported[link_mode_masks_nwords]; * uint32_t map_advertising[link_mode_masks_nwords];
include/standard-headers/linux/input.h +8 -4
@@ -75,10 +75,13 @@ struct input_id {* Note that input core does not clamp reported values to the * [minimum, maximum] limits, such task is left to userspace. * -* The default resolution for main axes (ABS_X, ABS_Y, ABS_Z) -* is reported in units per millimeter (units/mm), resolution -* for rotational axes (ABS_RX, ABS_RY, ABS_RZ) is reported -* in units per radian. +* The default resolution for main axes (ABS_X, ABS_Y, ABS_Z, +* ABS_MT_POSITION_X, ABS_MT_POSITION_Y) is reported in units +* per millimeter (units/mm), resolution for rotational axes +* (ABS_RX, ABS_RY, ABS_RZ) is reported in units per radian. +* The resolution for the size axes (ABS_MT_TOUCH_MAJOR, +* ABS_MT_TOUCH_MINOR, ABS_MT_WIDTH_MAJOR, ABS_MT_WIDTH_MINOR) +* is reported in units per millimeter (units/mm). * When INPUT_PROP_ACCELEROMETER is set the resolution changes. * The main axes (ABS_X, ABS_Y, ABS_Z) are then reported in * units per g (units/g) and in units per degree per second
@@ -268,6 +271,7 @@ struct input_mask {#define BUS_RMI 0x1D#define BUS_CEC 0x1E#define BUS_INTEL_ISHTP 0x1F +#define BUS_AMD_SFH 0x20/* * MT_TOOL types
include/standard-headers/linux/pci_regs.h +29 -1
@@ -616,6 +616,7 @@#define PCI_EXP_SLTCTL_PWR_OFF 0x0400/* Power Off */ #define PCI_EXP_SLTCTL_EIC 0x0800/* Electromechanical Interlock Control */ #define PCI_EXP_SLTCTL_DLLSCE 0x1000/* Data Link Layer State Changed Enable */ +#define PCI_EXP_SLTCTL_ASPL_DISABLE 0x2000/* Auto Slot Power Limit Disable */ #define PCI_EXP_SLTCTL_IBPD_DISABLE 0x4000/* In-band PD disable */ #define PCI_EXP_SLTSTA 0x1a/* Slot Status */ #define PCI_EXP_SLTSTA_ABP 0x0001/* Attention Button Pressed */
@@ -736,7 +737,8 @@#define PCI_EXT_CAP_ID_DVSEC 0x23/* Designated Vendor-Specific */ #define PCI_EXT_CAP_ID_DLF 0x25/* Data Link Feature */ #define PCI_EXT_CAP_ID_PL_16GT 0x26/* Physical Layer 16.0 GT/s */ -#define PCI_EXT_CAP_ID_MAX PCI_EXT_CAP_ID_PL_16GT +#define PCI_EXT_CAP_ID_DOE 0x2E/* Data Object Exchange */ +#define PCI_EXT_CAP_ID_MAX PCI_EXT_CAP_ID_DOE#define PCI_EXT_CAP_DSN_SIZEOF 12#define PCI_EXT_CAP_MCAST_ENDPOINT_SIZEOF 40
@@ -1102,4 +1104,30 @@#define PCI_PL_16GT_LE_CTRL_USP_TX_PRESET_MASK 0x000000F0#define PCI_PL_16GT_LE_CTRL_USP_TX_PRESET_SHIFT 4 +/* Data Object Exchange */ +#define PCI_DOE_CAP 0x04/* DOE Capabilities Register */ +#define PCI_DOE_CAP_INT_SUP 0x00000001/* Interrupt Support */ +#define PCI_DOE_CAP_INT_MSG_NUM 0x00000ffe/* Interrupt Message Number */ +#define PCI_DOE_CTRL 0x08/* DOE Control Register */ +#define PCI_DOE_CTRL_ABORT 0x00000001/* DOE Abort */ +#define PCI_DOE_CTRL_INT_EN 0x00000002/* DOE Interrupt Enable */ +#define PCI_DOE_CTRL_GO 0x80000000/* DOE Go */ +#define PCI_DOE_STATUS 0x0c/* DOE Status Register */ +#define PCI_DOE_STATUS_BUSY 0x00000001/* DOE Busy */ +#define PCI_DOE_STATUS_INT_STATUS 0x00000002/* DOE Interrupt Status */ +#define PCI_DOE_STATUS_ERROR 0x00000004/* DOE Error */ +#define PCI_DOE_STATUS_DATA_OBJECT_READY 0x80000000/* Data Object Ready */ +#define PCI_DOE_WRITE 0x10/* DOE Write Data Mailbox Register */ +#define PCI_DOE_READ 0x14/* DOE Read Data Mailbox Register */ + +/* DOE Data Object - note not actually registers */ +#define PCI_DOE_DATA_OBJECT_HEADER_1_VID 0x0000ffff +#define PCI_DOE_DATA_OBJECT_HEADER_1_TYPE 0x00ff0000 +#define PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH 0x0003ffff + +#define PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX 0x000000ff +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID 0x0000ffff +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL 0x00ff0000 +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX 0xff000000 +#endif /* LINUX_PCI_REGS_H */
include/standard-headers/linux/vhost_types.h +14 -3
@@ -87,7 +87,7 @@ struct vhost_msg {struct vhost_msg_v2 {uint32_t type; -uint32_t reserved; +uint32_t asid;union {struct vhost_iotlb_msg iotlb;uint8_t padding[64 ];
@@ -107,7 +107,7 @@ struct vhost_memory_region {struct vhost_memory {uint32_t nregions;uint32_t padding; -struct vhost_memory_region regions[0 ]; +struct vhost_memory_region regions[]; };/* VHOST_SCSI specific definitions */
@@ -135,7 +135,7 @@ struct vhost_scsi_target {struct vhost_vdpa_config {uint32_t off;uint32_t len; -uint8_t buf[0 ]; +uint8_t buf[]; };/* vhost vdpa IOVA range
@@ -153,4 +153,15 @@ struct vhost_vdpa_iova_range {/* vhost-net should add virtio_net_hdr for RX, and strip for TX packets. */ #define VHOST_NET_F_VIRTIO_NET_HDR 27 +/* Use message type V2 */ +#define VHOST_BACKEND_F_IOTLB_MSG_V2 0x1 +/* IOTLB can accept batching hints */ +#define VHOST_BACKEND_F_IOTLB_BATCH 0x2 +/* IOTLB can accept address space identifier through V2 type of IOTLB +* message +*/ +#define VHOST_BACKEND_F_IOTLB_ASID 0x3 +/* Device can be suspended */ +#define VHOST_BACKEND_F_SUSPEND 0x4 +#endif
include/standard-headers/linux/virtio_9p.h +1 -1
@@ -38,7 +38,7 @@ struct virtio_9p_config {/* length of the tag name */ __virtio16 tag_len;/* non-NULL terminated tag name */ - uint8_t tag[0]; + uint8_t tag[]; }QEMU_PACKED ;#endif /* _LINUX_VIRTIO_9P_H */
include/standard-headers/linux/virtio_config.h +6 -1
@@ -52,7 +52,7 @@* rest are per-device feature bits. */ #define VIRTIO_TRANSPORT_F_START 28 -#define VIRTIO_TRANSPORT_F_END 38 +#define VIRTIO_TRANSPORT_F_END 41#ifndef VIRTIO_CONFIG_NO_LEGACY /* Do we get callbacks when the ring is completely used, even if we've
@@ -96,4 +96,9 @@* Does the device support Single Root I/O Virtualization? */ #define VIRTIO_F_SR_IOV 37 + +/* +* This feature indicates that the driver can reset a queue individually. +*/ +#define VIRTIO_F_RING_RESET 40#endif /* _LINUX_VIRTIO_CONFIG_H */
include/standard-headers/linux/virtio_ids.h +7 -7
@@ -73,12 +73,12 @@* Virtio Transitional IDs */ -#define VIRTIO_TRANS_ID_NET 1000/* transitional virtio net */ -#define VIRTIO_TRANS_ID_BLOCK 1001/* transitional virtio block */ -#define VIRTIO_TRANS_ID_BALLOON 1002/* transitional virtio balloon */ -#define VIRTIO_TRANS_ID_CONSOLE 1003/* transitional virtio console */ -#define VIRTIO_TRANS_ID_SCSI 1004/* transitional virtio SCSI */ -#define VIRTIO_TRANS_ID_RNG 1005/* transitional virtio rng */ -#define VIRTIO_TRANS_ID_9P 1009/* transitional virtio 9p console */ +#define VIRTIO_TRANS_ID_NET 0x1000/* transitional virtio net */ +#define VIRTIO_TRANS_ID_BLOCK 0x1001/* transitional virtio block */ +#define VIRTIO_TRANS_ID_BALLOON 0x1002/* transitional virtio balloon */ +#define VIRTIO_TRANS_ID_CONSOLE 0x1003/* transitional virtio console */ +#define VIRTIO_TRANS_ID_SCSI 0x1004/* transitional virtio SCSI */ +#define VIRTIO_TRANS_ID_RNG 0x1005/* transitional virtio rng */ +#define VIRTIO_TRANS_ID_9P 0x1009/* transitional virtio 9p console */ #endif /* _LINUX_VIRTIO_IDS_H */
include/standard-headers/linux/virtio_net.h +33 -1
@@ -56,7 +56,7 @@#define VIRTIO_NET_F_MQ 22/* Device supports Receive Flow * Steering */ #define VIRTIO_NET_F_CTRL_MAC_ADDR 23/* Set MAC address */ - +#define VIRTIO_NET_F_NOTF_COAL 53/* Guest can handle notifications coalescing */ #define VIRTIO_NET_F_HASH_REPORT 57/* Supports hash report */ #define VIRTIO_NET_F_RSS 60/* Supports RSS RX steering */ #define VIRTIO_NET_F_RSC_EXT 61/* extended coalescing info */
@@ -355,4 +355,36 @@ struct virtio_net_hash_config {#define VIRTIO_NET_CTRL_GUEST_OFFLOADS 5#define VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET 0 +/* +* Control notifications coalescing. +* +* Request the device to change the notifications coalescing parameters. +* +* Available with the VIRTIO_NET_F_NOTF_COAL feature bit. +*/ +#define VIRTIO_NET_CTRL_NOTF_COAL 6 +/* +* Set the tx-usecs/tx-max-packets patameters. +* tx-usecs - Maximum number of usecs to delay a TX notification. +* tx-max-packets - Maximum number of packets to send before a TX notification. +*/ +struct virtio_net_ctrl_coal_tx { +uint32_t tx_max_packets; +uint32_t tx_usecs; +}; + +#define VIRTIO_NET_CTRL_NOTF_COAL_TX_SET 0 + +/* +* Set the rx-usecs/rx-max-packets patameters. +* rx-usecs - Maximum number of usecs to delay a RX notification. +* rx-max-frames - Maximum number of packets to receive before a RX notification. +*/ +struct virtio_net_ctrl_coal_rx { +uint32_t rx_max_packets; +uint32_t rx_usecs; +}; + +#define VIRTIO_NET_CTRL_NOTF_COAL_RX_SET 1 +#endif /* _LINUX_VIRTIO_NET_H */
include/standard-headers/linux/virtio_pci.h +2 -0
@@ -202,6 +202,8 @@ struct virtio_pci_cfg_cap {#define VIRTIO_PCI_COMMON_Q_AVAILHI 44#define VIRTIO_PCI_COMMON_Q_USEDLO 48#define VIRTIO_PCI_COMMON_Q_USEDHI 52 +#define VIRTIO_PCI_COMMON_Q_NDATA 56 +#define VIRTIO_PCI_COMMON_Q_RESET 58#endif /* VIRTIO_PCI_NO_MODERN */
include/standard-headers/linux/virtio_ring.h +11 -5
@@ -91,15 +91,21 @@#define VRING_USED_ALIGN_SIZE 4#define VRING_DESC_ALIGN_SIZE 16 -/* Virtio ring descriptors: 16 bytes. These can chain together via "next". */ +/** +* struct vring_desc - Virtio ring descriptors, +* 16 bytes long. These can chain together via @next. +* +* @addr: buffer address (guest-physical) +* @len: buffer length +* @flags: descriptor flags +* @next: index of the next descriptor in the chain, +* if the VRING_DESC_F_NEXT flag is set. We chain unused +* descriptors via this, too. +*/ struct vring_desc { -/* Address (guest-physical). */ __virtio64 addr; -/* Length. */ __virtio32 len; -/* The flags as indicated above. */ __virtio16 flags; -/* We chain unused descriptors via this, too */ __virtio16 next; };
linux-headers/asm-arm64/kvm.h +31 -2
@@ -75,9 +75,11 @@ struct kvm_regs {/* KVM_ARM_SET_DEVICE_ADDR ioctl id encoding */ #define KVM_ARM_DEVICE_TYPE_SHIFT 0 -#define KVM_ARM_DEVICE_TYPE_MASK (0xffff << KVM_ARM_DEVICE_TYPE_SHIFT) +#define KVM_ARM_DEVICE_TYPE_MASK GENMASK(KVM_ARM_DEVICE_TYPE_SHIFT + 15, \ + KVM_ARM_DEVICE_TYPE_SHIFT)#define KVM_ARM_DEVICE_ID_SHIFT 16 -#define KVM_ARM_DEVICE_ID_MASK (0xffff << KVM_ARM_DEVICE_ID_SHIFT) +#define KVM_ARM_DEVICE_ID_MASK GENMASK(KVM_ARM_DEVICE_ID_SHIFT + 15, \ + KVM_ARM_DEVICE_ID_SHIFT)/* Supported device IDs */ #define KVM_ARM_DEVICE_VGIC_V2 0
@@ -139,8 +141,10 @@ struct kvm_guest_debug_arch {__u64 dbg_wvr[KVM_ARM_MAX_DBG_REGS ]; }; +#define KVM_DEBUG_ARCH_HSR_HIGH_VALID (1 << 0)struct kvm_debug_exit_arch {__u32 hsr; +__u32 hsr_high;/* ESR_EL2[61:32] */ __u64 far;/* used for watchpoints */ };
@@ -332,6 +336,31 @@ struct kvm_arm_copy_mte_tags {#define KVM_ARM64_SVE_VLS_WORDS \ ((KVM_ARM64_SVE_VQ_MAX - KVM_ARM64_SVE_VQ_MIN) / 64 + 1) +/* Bitmap feature firmware registers */ +#define KVM_REG_ARM_FW_FEAT_BMAP (0x0016 << KVM_REG_ARM_COPROC_SHIFT) +#define KVM_REG_ARM_FW_FEAT_BMAP_REG (r) (KVM_REG_ARM64 | KVM_REG_SIZE_U64 | \ + KVM_REG_ARM_FW_FEAT_BMAP | \ + ((r) & 0xffff)) + +#define KVM_REG_ARM_STD_BMAP KVM_REG_ARM_FW_FEAT_BMAP_REG(0) + +enum { +KVM_REG_ARM_STD_BIT_TRNG_V1_0 =0 , +}; + +#define KVM_REG_ARM_STD_HYP_BMAP KVM_REG_ARM_FW_FEAT_BMAP_REG(1) + +enum { +KVM_REG_ARM_STD_HYP_BIT_PV_TIME =0 , +}; + +#define KVM_REG_ARM_VENDOR_HYP_BMAP KVM_REG_ARM_FW_FEAT_BMAP_REG(2) + +enum { +KVM_REG_ARM_VENDOR_HYP_BIT_FUNC_FEAT =0 , +KVM_REG_ARM_VENDOR_HYP_BIT_PTP =1 , +}; +/* Device Control API: ARM VGIC */ #define KVM_DEV_ARM_VGIC_GRP_ADDR 0#define KVM_DEV_ARM_VGIC_GRP_DIST_REGS 1
linux-headers/asm-generic/unistd.h +2 -2
@@ -383,7 +383,7 @@ __SYSCALL(__NR_syslog, sys_syslog)/* kernel/ptrace.c */ #define __NR_ptrace 117 -__SYSCALL (__NR_ptrace, sys_ptrace) +__SC_COMP (__NR_ptrace, sys_ptrace, compat_sys_ptrace) /* kernel/sched/core.c */#define __NR_sched_setparam 118
@@ -779,7 +779,7 @@ __SYSCALL(__NR_rseq, sys_rseq)#define __NR_kexec_file_load 294__SYSCALL (__NR_kexec_file_load, sys_kexec_file_load) /* 295 through 402 are unassigned to sync up with generic numbers, don't use */ -#if __BITS_PER_LONG ==32 +#if defined(__SYSCALL_COMPAT) || __BITS_PER_LONG ==32 #define __NR_clock_gettime64 403 __SYSCALL(__NR_clock_gettime64, sys_clock_gettime)#define __NR_clock_settime64 404
linux-headers/asm-riscv/kvm.h +22 -0
@@ -82,6 +82,25 @@ struct kvm_riscv_timer {__u64 state; }; +/* +* ISA extension IDs specific to KVM. This is not the same as the host ISA +* extension IDs as that is internal to the host and should not be exposed +* to the guest. This should always be contiguous to keep the mapping simple +* in KVM implementation. +*/ +enum KVM_RISCV_ISA_EXT_ID { +KVM_RISCV_ISA_EXT_A =0 , +KVM_RISCV_ISA_EXT_C , +KVM_RISCV_ISA_EXT_D , +KVM_RISCV_ISA_EXT_F , +KVM_RISCV_ISA_EXT_H , +KVM_RISCV_ISA_EXT_I , +KVM_RISCV_ISA_EXT_M , +KVM_RISCV_ISA_EXT_SVPBMT , +KVM_RISCV_ISA_EXT_SSTC , +KVM_RISCV_ISA_EXT_MAX , +}; +/* Possible states for kvm_riscv_timer */ #define KVM_RISCV_TIMER_STATE_OFF 0#define KVM_RISCV_TIMER_STATE_ON 1
@@ -123,6 +142,9 @@ struct kvm_riscv_timer {#define KVM_REG_RISCV_FP_D_REG (name) \ (offsetof(struct __riscv_d_ext_state, name) / sizeof(__u64)) +/* ISA Extension registers are mapped as type 7 */ +#define KVM_REG_RISCV_ISA_EXT (0x07 << KVM_REG_RISCV_TYPE_SHIFT) +#endif #endif /* __LINUX_KVM_RISCV_H */
linux-headers/asm-riscv/unistd.h +2 -1
@@ -15,12 +15,13 @@* along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#ifdef __LP64__ +#if defined(__LP64__) && !defined(__SYSCALL_COMPAT)#define __ARCH_WANT_NEW_STAT#define __ARCH_WANT_SET_GET_RLIMIT#endif /* __LP64__ */ #define __ARCH_WANT_SYS_CLONE3 +#define __ARCH_WANT_MEMFD_SECRET#include <asm-generic/unistd.h>
linux-headers/asm-s390/kvm.h +1 -0
@@ -74,6 +74,7 @@ struct kvm_s390_io_adapter_req {#define KVM_S390_VM_CRYPTO 2#define KVM_S390_VM_CPU_MODEL 3#define KVM_S390_VM_MIGRATION 4 +#define KVM_S390_VM_CPU_TOPOLOGY 5/* kvm attributes for mem_ctrl */ #define KVM_S390_VM_MEM_ENABLE_CMMA 0
linux-headers/asm-x86/kvm.h +20 -13
@@ -198,13 +198,13 @@ struct kvm_msrs {__u32 nmsrs;/* number of msrs in entries */ __u32 pad; -struct kvm_msr_entry entries[0 ]; +struct kvm_msr_entry entries[]; };/* for KVM_GET_MSR_INDEX_LIST */ struct kvm_msr_list {__u32 nmsrs;/* number of msrs in entries */ -__u32 indices[0 ]; +__u32 indices[]; };/* Maximum size of any access bitmap in bytes */
@@ -241,7 +241,7 @@ struct kvm_cpuid_entry {struct kvm_cpuid {__u32 nent;__u32 padding; -struct kvm_cpuid_entry entries[0 ]; +struct kvm_cpuid_entry entries[]; };struct kvm_cpuid_entry2 {
@@ -263,7 +263,7 @@ struct kvm_cpuid_entry2 {struct kvm_cpuid2 {__u32 nent;__u32 padding; -struct kvm_cpuid_entry2 entries[0 ]; +struct kvm_cpuid_entry2 entries[]; };/* for KVM_GET_PIT and KVM_SET_PIT */
@@ -306,7 +306,8 @@ struct kvm_pit_state {struct kvm_pit_channel_state channels[3 ]; }; -#define KVM_PIT_FLAGS_HPET_LEGACY 0x00000001 +#define KVM_PIT_FLAGS_HPET_LEGACY 0x00000001 +#define KVM_PIT_FLAGS_SPEAKER_DATA_ON 0x00000002struct kvm_pit_state2 {struct kvm_pit_channel_state channels[3 ];
@@ -325,6 +326,7 @@ struct kvm_reinject_control {#define KVM_VCPUEVENT_VALID_SHADOW 0x00000004#define KVM_VCPUEVENT_VALID_SMM 0x00000008#define KVM_VCPUEVENT_VALID_PAYLOAD 0x00000010 +#define KVM_VCPUEVENT_VALID_TRIPLE_FAULT 0x00000020/* Interrupt shadow states */ #define KVM_X86_SHADOW_INT_MOV_SS 0x01
@@ -359,7 +361,10 @@ struct kvm_vcpu_events {__u8 smm_inside_nmi;__u8 latched_init; } smi; -__u8 reserved[27 ]; +struct { +__u8 pending; + } triple_fault; +__u8 reserved[26 ];__u8 exception_has_payload;__u64 exception_payload; };
@@ -389,7 +394,7 @@ struct kvm_xsave {* the contents of CPUID leaf 0xD on the host. */ __u32 region[1024 ]; -__u32 extra[0 ]; +__u32 extra[]; };#define KVM_MAX_XCRS 16
@@ -428,11 +433,13 @@ struct kvm_sync_regs {struct kvm_vcpu_events events; }; -#define KVM_X86_QUIRK_LINT0_REENABLED (1 << 0) -#define KVM_X86_QUIRK_CD_NW_CLEARED (1 << 1) -#define KVM_X86_QUIRK_LAPIC_MMIO_HOLE (1 << 2) -#define KVM_X86_QUIRK_OUT_7E_INC_RIP (1 << 3) -#define KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT (1 << 4) +#define KVM_X86_QUIRK_LINT0_REENABLED (1 << 0) +#define KVM_X86_QUIRK_CD_NW_CLEARED (1 << 1) +#define KVM_X86_QUIRK_LAPIC_MMIO_HOLE (1 << 2) +#define KVM_X86_QUIRK_OUT_7E_INC_RIP (1 << 3) +#define KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT (1 << 4) +#define KVM_X86_QUIRK_FIX_HYPERCALL_INSN (1 << 5) +#define KVM_X86_QUIRK_MWAIT_NEVER_UD_FAULTS (1 << 6)#define KVM_STATE_NESTED_FORMAT_VMX 0#define KVM_STATE_NESTED_FORMAT_SVM 1
@@ -515,7 +522,7 @@ struct kvm_pmu_event_filter {__u32 fixed_counter_bitmap;__u32 flags;__u32 pad[4 ]; -__u64 events[0 ]; +__u64 events[]; };#define KVM_PMU_EVENT_ALLOW 0
linux-headers/asm-x86/mman.h +0 -14
@@ -5,20 +5,6 @@#define MAP_32BIT 0x40/* only give out 32bit addresses */ #ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS -/* -* Take the 4 protection key bits out of the vma->vm_flags -* value and turn them in to the bits that we can put in -* to a pte. -* -* Only override these if Protection Keys are available -* (which is only on 64-bit). -*/ -#define arch_vm_get_page_prot (vm_flags) __pgprot( \ - ((vm_flags) & VM_PKEY_BIT0 ? _PAGE_PKEY_BIT0 : 0) | \ - ((vm_flags) & VM_PKEY_BIT1 ? _PAGE_PKEY_BIT1 : 0) | \ - ((vm_flags) & VM_PKEY_BIT2 ? _PAGE_PKEY_BIT2 : 0) | \ - ((vm_flags) & VM_PKEY_BIT3 ? _PAGE_PKEY_BIT3 : 0)) -#define arch_calc_vm_prot_bits (prot, key) ( \ ((key) & 0x1 ? VM_PKEY_BIT0 : 0) | \ ((key) & 0x2 ? VM_PKEY_BIT1 : 0) | \
linux-headers/linux/kvm.h +165 -7
290 lines not on this page · raw message
linux-headers/linux/userfaultfd.h +8 -2
@@ -33,7 +33,8 @@ UFFD_FEATURE_THREAD_ID | \ UFFD_FEATURE_MINOR_HUGETLBFS | \ UFFD_FEATURE_MINOR_SHMEM | \ - UFFD_FEATURE_EXACT_ADDRESS) + UFFD_FEATURE_EXACT_ADDRESS | \ + UFFD_FEATURE_WP_HUGETLBFS_SHMEM)#define UFFD_API_IOCTLS \ ((__u64)1 << _UFFDIO_REGISTER | \ (__u64)1 << _UFFDIO_UNREGISTER | \
@@ -47,7 +48,8 @@#define UFFD_API_RANGE_IOCTLS_BASIC \ ((__u64)1 << _UFFDIO_WAKE | \ (__u64)1 << _UFFDIO_COPY | \ - (__u64)1 << _UFFDIO_CONTINUE) + (__u64)1 << _UFFDIO_CONTINUE | \ + (__u64)1 << _UFFDIO_WRITEPROTECT)/* * Valid ioctl command number range with this API is from 0x00 to
@@ -194,6 +196,9 @@ struct uffdio_api {* UFFD_FEATURE_EXACT_ADDRESS indicates that the exact address of page * faults would be provided and the offset within the page would not be * masked. +* +* UFFD_FEATURE_WP_HUGETLBFS_SHMEM indicates that userfaultfd +* write-protection mode is supported on both shmem and hugetlbfs. */ #define UFFD_FEATURE_PAGEFAULT_FLAG_WP (1<<0)#define UFFD_FEATURE_EVENT_FORK (1<<1)
@@ -207,6 +212,7 @@ struct uffdio_api {#define UFFD_FEATURE_MINOR_HUGETLBFS (1<<9)#define UFFD_FEATURE_MINOR_SHMEM (1<<10)#define UFFD_FEATURE_EXACT_ADDRESS (1<<11) +#define UFFD_FEATURE_WP_HUGETLBFS_SHMEM (1<<12)__u64 features;__u64 ioctls;
linux-headers/linux/vduse.h +47 -0
53 lines not on this page · raw message
linux-headers/linux/vfio.h +2 -2
@@ -643,7 +643,7 @@ enum { };/** -* VFIO_DEVICE_GET_PCI_HOT_RESET_INFO - _IORW(VFIO_TYPE, VFIO_BASE + 12, +* VFIO_DEVICE_GET_PCI_HOT_RESET_INFO - _IOWR(VFIO_TYPE, VFIO_BASE + 12, * struct vfio_pci_hot_reset_info) * * Return: 0 on success, -errno on failure:
@@ -770,7 +770,7 @@ struct vfio_device_ioeventfd {#define VFIO_DEVICE_IOEVENTFD _IO(VFIO_TYPE, VFIO_BASE + 16)/** -* VFIO_DEVICE_FEATURE - _IORW(VFIO_TYPE, VFIO_BASE + 17, +* VFIO_DEVICE_FEATURE - _IOWR(VFIO_TYPE, VFIO_BASE + 17, * struct vfio_device_feature) * * Get, set, or probe feature data of the device. The feature is selected
linux-headers/linux/vfio_zdev.h +7 -0
@@ -29,6 +29,9 @@ struct vfio_device_info_cap_zpci_base {__u16 fmb_length;/* Measurement Block Length (in bytes) */ __u8 pft;/* PCI Function Type */ __u8 gid;/* PCI function group ID */ +/* End of version 1 */ +__u32 fh;/* PCI function handle */ +/* End of version 2 */ };/**
@@ -47,6 +50,10 @@ struct vfio_device_info_cap_zpci_group {__u16 noi;/* Maximum number of MSIs */ __u16 maxstbl;/* Maximum Store Block Length */ __u8 version;/* Supported PCI Version */ +/* End of version 1 */ +__u8 reserved; +__u16 imaxstbl;/* Maximum Interpreted Store Block Length */ +/* End of version 2 */ };/**
linux-headers/linux/vhost.h +29 -6
@@ -89,11 +89,6 @@/* Set or get vhost backend capability */ -/* Use message type V2 */ -#define VHOST_BACKEND_F_IOTLB_MSG_V2 0x1 -/* IOTLB can accept batching hints */ -#define VHOST_BACKEND_F_IOTLB_BATCH 0x2 -#define VHOST_SET_BACKEND_FEATURES _IOW(VHOST_VIRTIO, 0x25, __u64)#define VHOST_GET_BACKEND_FEATURES _IOR(VHOST_VIRTIO, 0x26, __u64)
@@ -150,11 +145,39 @@/* Get the valid iova range */ #define VHOST_VDPA_GET_IOVA_RANGE _IOR(VHOST_VIRTIO, 0x78, \ struct vhost_vdpa_iova_range) -/* Get the config size */ #define VHOST_VDPA_GET_CONFIG_SIZE _IOR(VHOST_VIRTIO, 0x79, __u32)/* Get the count of all virtqueues */ #define VHOST_VDPA_GET_VQS_COUNT _IOR(VHOST_VIRTIO, 0x80, __u32) +/* Get the number of virtqueue groups. */ +#define VHOST_VDPA_GET_GROUP_NUM _IOR(VHOST_VIRTIO, 0x81, __u32) + +/* Get the number of address spaces. */ +#define VHOST_VDPA_GET_AS_NUM _IOR(VHOST_VIRTIO, 0x7A, unsigned int) + +/* Get the group for a virtqueue: read index, write group in num, +* The virtqueue index is stored in the index field of +* vhost_vring_state. The group for this specific virtqueue is +* returned via num field of vhost_vring_state. +*/ +#define VHOST_VDPA_GET_VRING_GROUP _IOWR(VHOST_VIRTIO, 0x7B, \ + struct vhost_vring_state) +/* Set the ASID for a virtqueue group. The group index is stored in +* the index field of vhost_vring_state, the ASID associated with this +* group is stored at num field of vhost_vring_state. +*/ +#define VHOST_VDPA_SET_GROUP_ASID _IOW(VHOST_VIRTIO, 0x7C, \ + struct vhost_vring_state) + +/* Suspend a device so it does not process virtqueue requests anymore +* +* After the return of ioctl the device must preserve all the necessary state +* (the virtqueue vring base plus the possible device specific states) that is +* required for restoring in the future. The device must not change its +* configuration after that point. +*/ +#define VHOST_VDPA_SUSPEND _IO(VHOST_VIRTIO, 0x7D) +#endif
Signature · 1 line
2.37.2
Re: [PATCH v8 1/8] linux-headers: update to 6.0-rc3
Quoted 2 lines · Matthew Rosato
Signed-off-by Matthew Rosato <[email protected]>---
...
linux-headers/asm-x86/kvm.h struct kvm_msrs { · line 202
Quoted 11 lines
linux-headers/asm-x86/kvm.h +1
-1@@ -198,13 +198,13 @@ struct kvm_msrs {__u32 nmsrs;/* number of msrs in entries */ __u32 pad; -struct kvm_msr_entry entries[0 ]; +struct kvm_msr_entry entries[]; };
Yuck, this fails to compile with Clang:
https://gitlab.com/thuth/qemu/-/jobs/3084427423#L2206
../target/i386/kvm/kvm.c:470:25: error: field 'info' with variable sized
type 'struct kvm_msrs' not at the end of a struct or class is a GNU extension [-Werror,-Wgnu-variable-sized-type-not-at-end]
struct kvm_msrs info;
^Anybody any ideas how to fix this best? Simply disable the compiler warning in QEMU?
Thomas
Re: [PATCH v8 1/8] linux-headers: update to 6.0-rc3
Quoted 21 lines · Thomas Huth
Quoted 2 lines · Matthew Rosato
Signed-off-by Matthew Rosato <[email protected]>---
...
linux-headers/asm-x86/kvm.h struct kvm_msrs { · line 202
Quoted 11 lines
linux-headers/asm-x86/kvm.h +1
-1@@ -198,13 +198,13 @@ struct kvm_msrs {__u32 nmsrs;/* number of msrs in entries */ __u32 pad; -struct kvm_msr_entry entries[0 ]; +struct kvm_msr_entry entries[]; };Yuck, this fails to compile with Clang:
Quoted 8 lines
../target/i386/kvm/kvm.c:470:25: error: field 'info' with variable sized
type 'structkvm_msrs' not at the end of a struct or class is a GNU extension [-Werror,-Wgnu-variable-sized-type-not-at-end]struct kvm_msrs info; ^Anybody any ideas how to fix this best? Simply disable the compiler warning in QEMU?
There's already a patchset on list that does that:
https://patchew.org/QEMU/[email protected]/
thanks
-- PMM
Re: [PATCH v8 1/8] linux-headers: update to 6.0-rc3
Quoted 28 lines · Peter Maydell
Quoted 27 lines · Thomas Huth
Quoted 2 lines · Matthew Rosato
Signed-off-by Matthew Rosato <[email protected]>---
...
linux-headers/asm-x86/kvm.h struct kvm_msrs { · line 202
Quoted 11 lines
linux-headers/asm-x86/kvm.h +1
-1@@ -198,13 +198,13 @@ struct kvm_msrs {__u32 nmsrs;/* number of msrs in entries */ __u32 pad; -struct kvm_msr_entry entries[0 ]; +struct kvm_msr_entry entries[]; };Yuck, this fails to compile with Clang:
https://gitlab.com/thuth/qemu/-/jobs/3084427423#L2206
../target/i386/kvm/kvm.c:470:25: error: field 'info' with variable sized
type 'structkvm_msrs' not at the end of a struct or class is a GNU extension [-Werror,-Wgnu-variable-sized-type-not-at-end]struct kvm_msrs info; ^
Quoted 5 lines
Quoted 2 lines
Anybody any ideas how to fix this best? Simply disable the compiler warning in QEMU?
There's already a patchset on list that does that:
https://patchew.org/QEMU/[email protected]/
Perfect, that's exactly what I need, thanks! I'll add those patches to my queue.
Thomas
PATCH v8 2/8 s390x/pci: add routine to get host function handle from CLP info
In reply to Matthew RosatoIn order to interface with the underlying host zPCI device, we need to know it's function handle. Add a routine to grab this from the vfio CLP capabilities chain.
--- hw/s390x/s390-pci-vfio.c | 83 ++++++++++++++++++++++++++------ include/hw/s390x/s390-pci-vfio.h | 5 ++ 2 files changed, 72 insertions(+), 16 deletions(-)
hw/s390x/s390-pci-vfio.c +67 -16
@@ -124,6 +124,27 @@ static void s390_pci_read_base(S390PCIBusDevice *pbdev, pbdev->zpci_fn.pft =0 ; } +static bool get_host_fh (S390PCIBusDevice *pbdev,struct vfio_device_info *info, +uint32_t *fh) +{ +struct vfio_info_cap_header *hdr; +struct vfio_device_info_cap_zpci_base *cap; +VFIOPCIDevice *vpci =container_of (pbdev->pdev, VFIOPCIDevice, pdev); + + hdr =vfio_get_device_info_cap (info,VFIO_DEVICE_INFO_CAP_ZPCI_BASE ); + +/* Can only get the host fh with version 2 or greater */ +if (hdr ==NULL || hdr->version <2 ) { +trace_s390_pci_clp_cap (vpci->vbasedev.name, +VFIO_DEVICE_INFO_CAP_ZPCI_BASE ); +return false; + } + cap = (void *) hdr; + + *fh = cap->fh; +return true; +} +static void s390_pci_read_group (S390PCIBusDevice *pbdev,struct vfio_device_info *info) {
@@ -217,25 +238,13 @@ static void s390_pci_read_pfip(S390PCIBusDevice *pbdev,memcpy (pbdev->zpci_fn.pfip, cap->pfip,CLP_PFIP_NR_SEGMENTS ); } -/* -* This function will issue the VFIO_DEVICE_GET_INFO ioctl and look for -* capabilities that contain information about CLP features provided by the -* underlying host. -* On entry, defaults have already been placed into the guest CLP response -* buffers. On exit, defaults will have been overwritten for any CLP features -* found in the capability chain; defaults will remain for any CLP features not -* found in the chain. -*/ -void s390_pci_get_clp_info (S390PCIBusDevice *pbdev) +static struct vfio_device_info *get_device_info (S390PCIBusDevice *pbdev, +uint32_t argsz) { - g_autofree struct vfio_device_info *info = NULL; +struct vfio_device_info *info =g_malloc0 (argsz);VFIOPCIDevice *vfio_pci; -uint32_t argsz;int fd; - argsz =sizeof (*info); - info =g_malloc0 (argsz); - vfio_pci =container_of (pbdev->pdev, VFIOPCIDevice, pdev); fd = vfio_pci->vbasedev.fd;
@@ -250,7 +259,8 @@ retry:if (ioctl (fd,VFIO_DEVICE_GET_INFO , info)) {trace_s390_pci_clp_dev_info (vfio_pci->vbasedev.name); -return ; +free (info); +return NULL ; }if (info->argsz > argsz) {
@@ -259,6 +269,47 @@ retry: goto retry; } +return info; +} + +/* +* Get the host function handle from the vfio CLP capabilities chain. Returns +* true if a fh value was placed into the provided buffer. Returns false +* if a fh could not be obtained (ioctl failed or capabilitiy version does +* not include the fh) +*/ +bool s390_pci_get_host_fh (S390PCIBusDevice *pbdev,uint32_t *fh) +{ + g_autofree struct vfio_device_info *info = NULL; + +assert (fh); + + info =get_device_info (pbdev,sizeof (*info)); +if (!info) { +return false; + } + +return get_host_fh (pbdev, info, fh); +} + +/* +* This function will issue the VFIO_DEVICE_GET_INFO ioctl and look for +* capabilities that contain information about CLP features provided by the +* underlying host. +* On entry, defaults have already been placed into the guest CLP response +* buffers. On exit, defaults will have been overwritten for any CLP features +* found in the capability chain; defaults will remain for any CLP features not +* found in the chain. +*/ +void s390_pci_get_clp_info (S390PCIBusDevice *pbdev) +{ + g_autofree struct vfio_device_info *info = NULL; + + info =get_device_info (pbdev,sizeof (*info)); +if (!info) { +return ; + } +/* * Find the CLP features provided and fill in the guest CLP responses. * Always call s390_pci_read_base first as information from this could
include/hw/s390x/s390-pci-vfio.h +5 -0
@@ -20,6 +20,7 @@ bool s390_pci_update_dma_avail(int fd, unsigned int *avail);S390PCIDMACount *s390_pci_start_dma_count (S390pciState *s,S390PCIBusDevice *pbdev);void s390_pci_end_dma_count (S390pciState *s,S390PCIDMACount *cnt); +bool s390_pci_get_host_fh (S390PCIBusDevice *pbdev,uint32_t *fh);void s390_pci_get_clp_info (S390PCIBusDevice *pbdev);#else static inline bool s390_pci_update_dma_avail (int fd,unsigned int *avail)
@@ -33,6 +34,10 @@ static inline S390PCIDMACount *s390_pci_start_dma_count(S390pciState *s, }static inline void s390_pci_end_dma_count (S390pciState *s,S390PCIDMACount *cnt) { } +static inline bool s390_pci_get_host_fh (S390PCIBusDevice *pbdev,uint32_t *fh) +{ +return false; +}static inline void s390_pci_get_clp_info (S390PCIBusDevice *pbdev) { }#endif
Signature · 1 line
2.37.2
Re: [PATCH v8 2/8] s390x/pci: add routine to get host function handle from CLP info
Quoted 2 lines · Matthew Rosato
In order to interface with the underlying host zPCI device, we need to know it's function handle. Add a routine to grab this from the
Nit: s/it's/its/
Quoted 14 lines
vfio CLP capabilities chain.
Reviewed-by Pierre Morel <[email protected]>Signed-off-by Matthew Rosato <[email protected]>--- hw/s390x/s390-pci-vfio.c | 83 ++++++++++++++++++++++++++------ include/hw/s390x/s390-pci-vfio.h | 5 ++ 2 files changed, 72 insertions(+), 16 deletions(-)hw/s390x/s390-pci-vfio.c +0
-0
hw/s390x/s390-pci-vfio.c static void s390_pci_read_base(S390PCIBusDevice *pbdev, · line 132
Quoted 9 lines
hw/s390x/s390-pci-vfio.c +6
-0@@ -124,6 +124,27 @@ static void s390_pci_read_base(S390PCIBusDevice *pbdev, pbdev->zpci_fn.pft =0 ; } +static bool get_host_fh (S390PCIBusDevice *pbdev,struct vfio_device_info *info, +uint32_t *fh) +{ +struct vfio_info_cap_header *hdr; +struct vfio_device_info_cap_zpci_base *cap; +VFIOPCIDevice *vpci =container_of (pbdev->pdev, VFIOPCIDevice, pdev);
Nit: two spaces after the "="
Quoted 47 lines
hw/s390x/s390-pci-vfio.c +17
-15+ hdr =vfio_get_device_info_cap (info,VFIO_DEVICE_INFO_CAP_ZPCI_BASE ); + +/* Can only get the host fh with version 2 or greater */ +if (hdr ==NULL || hdr->version <2 ) { +trace_s390_pci_clp_cap (vpci->vbasedev.name, +VFIO_DEVICE_INFO_CAP_ZPCI_BASE ); +return false; + } + cap = (void *) hdr; + + *fh = cap->fh; +return true; +} +static void s390_pci_read_group (S390PCIBusDevice *pbdev,struct vfio_device_info *info) {@@ -217,25 +238,13 @@ static void s390_pci_read_pfip(S390PCIBusDevice *pbdev,memcpy (pbdev->zpci_fn.pfip, cap->pfip,CLP_PFIP_NR_SEGMENTS ); } -/* -* This function will issue the VFIO_DEVICE_GET_INFO ioctl and look for -* capabilities that contain information about CLP features provided by the -* underlying host. -* On entry, defaults have already been placed into the guest CLP response -* buffers. On exit, defaults will have been overwritten for any CLP features -* found in the capability chain; defaults will remain for any CLP features not -* found in the chain. -*/ -void s390_pci_get_clp_info (S390PCIBusDevice *pbdev) +static struct vfio_device_info *get_device_info (S390PCIBusDevice *pbdev, +uint32_t argsz) { - g_autofree struct vfio_device_info *info = NULL; +struct vfio_device_info *info =g_malloc0 (argsz);VFIOPCIDevice *vfio_pci; -uint32_t argsz;int fd; - argsz =sizeof (*info); - info =g_malloc0 (argsz); - vfio_pci =container_of (pbdev->pdev, VFIOPCIDevice, pdev); fd = vfio_pci->vbasedev.fd;
hw/s390x/s390-pci-vfio.c retry: · line 262
Quoted 5 lines
hw/s390x/s390-pci-vfio.c +1
-1@@ -250,7 +259,8 @@ retry:if (ioctl (fd,VFIO_DEVICE_GET_INFO , info)) {trace_s390_pci_clp_dev_info (vfio_pci->vbasedev.name); -return ; +free (info);
Nit: Please use g_free() for things that you've allocated with g_malloc0().
hw/s390x/s390-pci-vfio.c retry: · line 273
Quoted 10 lines
hw/s390x/s390-pci-vfio.c +3
-0+return NULL ; }if (info->argsz > argsz) {@@ -259,6 +269,47 @@ retry: goto retry; } +return info; +}
...
Apart from the nits, the patch looks fine to me.
Thomas
PATCH v8 3/8 s390x/pci: enable for load/store intepretation
In reply to Matthew RosatoIf the ZPCI_OP ioctl reports that is is available and usable, then the underlying KVM host will enable load/store intepretation for any guest device without a SHM bit in the guest function handle. For a device that will be using interpretation support, ensure the guest function handle matches the host function handle; this value is re-checked every time the guest issues a SET PCI FN to enable the guest device as it is the only opportunity to reflect function handle changes.
By default, unless interpret=off is specified, interpretation support will always be assumed and exploited if the necessary ioctl and features are available on the host kernel. When these are unavailable, we will silently revert to the interception model; this allows existing guest configurations to work unmodified on hosts with and without zPCI interpretation support, allowing QEMU to choose the best support model available.
--- hw/s390x/meson.build | 1 + hw/s390x/s390-pci-bus.c | 66 ++++++++++++++++++++++++++++++++- hw/s390x/s390-pci-inst.c | 16 ++++++++ hw/s390x/s390-pci-kvm.c | 22 +++++++++++ include/hw/s390x/s390-pci-bus.h | 1 + include/hw/s390x/s390-pci-kvm.h | 24 ++++++++++++ target/s390x/kvm/kvm.c | 7 ++++ target/s390x/kvm/kvm_s390x.h | 1 + 8 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 hw/s390x/s390-pci-kvm.c create mode 100644 include/hw/s390x/s390-pci-kvm.h
hw/s390x/meson.build +1 -0
@@ -23,6 +23,7 @@ s390x_ss.add(when: 'CONFIG_KVM', if_true: files( 's390-skeys-kvm.c', 's390-stattrib-kvm.c', 'pv.c', + 's390-pci-kvm.c', )) s390x_ss.add(when: 'CONFIG_TCG', if_true: files( 'tod-tcg.c',
hw/s390x/s390-pci-bus.c +65 -1
101 lines not on this page · raw message
hw/s390x/s390-pci-inst.c +16 -0
@@ -18,6 +18,8 @@#include "sysemu/hw_accel.h" #include "hw/s390x/s390-pci-inst.h" #include "hw/s390x/s390-pci-bus.h" +#include "hw/s390x/s390-pci-kvm.h" +#include "hw/s390x/s390-pci-vfio.h" #include "hw/s390x/tod.h" #ifndef DEBUG_S390PCI_INST
@@ -246,6 +248,20 @@ int clp_service_call(S390CPU *cpu, uint8_t r2, uintptr_t ra) goto out; } +/* +* Take this opportunity to make sure we still have an accurate +* host fh. It's possible part of the handle changed while the +* device was disabled to the guest (e.g. vfio hot reset for +* ISM during plug) +*/ +if (pbdev->interp) { +/* Take this opportunity to make sure we are sync'd with host */ +if (!s390_pci_get_host_fh (pbdev, &pbdev->fh) || + !(pbdev->fh &FH_MASK_ENABLE )) { +stw_p (&ressetpci->hdr.rsp,CLP_RC_SETPCIFN_FH ); + goto out; + } + } pbdev->fh |=FH_MASK_ENABLE ; pbdev->state =ZPCI_FS_ENABLED ;stl_p (&ressetpci->fh, pbdev->fh);
hw/s390x/s390-pci-kvm.c new file +22 -0
@@ -0,0 +1,22 @@ +/* +* s390 zPCI KVM interfaces +* +* Copyright 2022 IBM Corp. +* Author(s): Matthew Rosato <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2 or (at +* your option) any later version. See the COPYING file in the top-level +* directory. +*/ + +#include "qemu/osdep.h" + +#include "kvm/kvm_s390x.h" +#include "hw/s390x/pv.h" +#include "hw/s390x/s390-pci-kvm.h" +#include "cpu_models.h" + +bool s390_pci_kvm_interp_allowed (void ) +{ +return kvm_s390_get_zpci_op () && !s390_is_pv (); +}
include/hw/s390x/s390-pci-bus.h +1 -0
@@ -350,6 +350,7 @@ struct S390PCIBusDevice {IndAddr *indicator;bool pci_unplug_request_processed;bool unplug_requested; +bool interp;QTAILQ_ENTRY (S390PCIBusDevice) link; };
include/hw/s390x/s390-pci-kvm.h new file +24 -0
@@ -0,0 +1,24 @@ +/* +* s390 PCI KVM interfaces +* +* Copyright 2022 IBM Corp. +* Author(s): Matthew Rosato <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2 or (at +* your option) any later version. See the COPYING file in the top-level +* directory. +*/ + +#ifndef HW_S390_PCI_KVM_H +#define HW_S390_PCI_KVM_H + +#ifdef CONFIG_KVM +bool s390_pci_kvm_interp_allowed (void ); +#else +static inline bool s390_pci_kvm_interp_allowed (void ) +{ +return false; +} +#endif + +#endif
target/s390x/kvm/kvm.c +7 -0
@@ -157,6 +157,7 @@ static int cap_ri;static int cap_hpage_1m;static int cap_vcpu_resets;static int cap_protected; +static int cap_zpci_op;static bool mem_op_storage_key_support;
@@ -362,6 +363,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s) cap_s390_irq =kvm_check_extension (s,KVM_CAP_S390_INJECT_IRQ ); cap_vcpu_resets =kvm_check_extension (s,KVM_CAP_S390_VCPU_RESETS ); cap_protected =kvm_check_extension (s,KVM_CAP_S390_PROTECTED ); + cap_zpci_op =kvm_check_extension (s,KVM_CAP_S390_ZPCI_OP );kvm_vm_enable_cap (s,KVM_CAP_S390_USER_SIGP ,0 );kvm_vm_enable_cap (s,KVM_CAP_S390_VECTOR_REGISTERS ,0 );
@@ -2574,3 +2576,8 @@ bool kvm_arch_cpu_check_are_resettable(void) {return true; } + +int kvm_s390_get_zpci_op (void ) +{ +return cap_zpci_op; +}
target/s390x/kvm/kvm_s390x.h +1 -0
@@ -27,6 +27,7 @@ void kvm_s390_vcpu_interrupt_pre_save(S390CPU *cpu);int kvm_s390_vcpu_interrupt_post_load (S390CPU *cpu);int kvm_s390_get_hpage_1m (void );int kvm_s390_get_ri (void ); +int kvm_s390_get_zpci_op (void );int kvm_s390_get_clock (uint8_t *tod_high,uint64_t *tod_clock);int kvm_s390_get_clock_ext (uint8_t *tod_high,uint64_t *tod_clock);int kvm_s390_set_clock (uint8_t tod_high,uint64_t tod_clock);
Signature · 1 line
2.37.2
Re: [PATCH v8 3/8] s390x/pci: enable for load/store intepretation
Quoted 26 lines · Matthew Rosato
If the
ZPCI_OPioctl reports that is is available and usable, then the underlying KVM host will enable load/store intepretation for any guest device without a SHM bit in the guest function handle. For a device that will be using interpretation support, ensure the guest function handle matches the host function handle; this value is re-checked every time the guest issues a SET PCI FN to enable the guest device as it is the only opportunity to reflect function handle changes.By default, unless interpret=off is specified, interpretation support will always be assumed and exploited if the necessary ioctl and features are available on the host kernel. When these are unavailable, we will silently revert to the interception model; this allows existing guest configurations to work unmodified on hosts with and without zPCI interpretation support, allowing QEMU to choose the best support model available.
Signed-off-by Matthew Rosato <[email protected]>--- hw/s390x/meson.build | 1 + hw/s390x/s390-pci-bus.c | 66 ++++++++++++++++++++++++++++++++- hw/s390x/s390-pci-inst.c | 16 ++++++++ hw/s390x/s390-pci-kvm.c | 22 +++++++++++ include/hw/s390x/s390-pci-bus.h | 1 + include/hw/s390x/s390-pci-kvm.h | 24 ++++++++++++ target/s390x/kvm/kvm.c | 7 ++++ target/s390x/kvm/kvm_s390x.h | 1 + 8 files changed, 137 insertions(+), 1 deletion(-)
Quoted 2 lines
create mode 100644
hw/s390x/s390-pci-kvm.ccreate mode 100644include/hw/s390x/s390-pci-kvm.h
Looks sane to me.
PATCH v8 4/8 s390x/pci: don't fence interpreted devices without MSI-X
In reply to Matthew RosatoLack of MSI-X support is not an issue for interpreted passthrough devices, so let's let these in. This will allow, for example, ISM devices to be passed through -- but only when interpretation is available and being used.
--- hw/s390x/s390-pci-bus.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
hw/s390x/s390-pci-bus.c +5 -1
@@ -881,6 +881,10 @@ static int s390_pci_msix_init(S390PCIBusDevice *pbdev)static void s390_pci_msix_free (S390PCIBusDevice *pbdev) { +if (pbdev->msix.entries ==0 ) { +return ; + } +memory_region_del_subregion (&pbdev->iommu->mr, &pbdev->msix_notify_mr);object_unparent (OBJECT (&pbdev->msix_notify_mr)); }
@@ -1093,7 +1097,7 @@ static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev, pbdev->interp = false; } -if (s390_pci_msix_init (pbdev)) { +if (s390_pci_msix_init (pbdev) && !pbdev->interp) {error_setg (errp,"MSI-X support is mandatory " "in the S390 architecture" );return ;
Signature · 1 line
2.37.2
PATCH v8 5/8 s390x/pci: enable adapter event notification for interpreted devices
In reply to Matthew RosatoUse the associated kvm ioctl operation to enable adapter event notification and forwarding for devices when requested. This feature will be set up with or without firmware assist based upon the 'forwarding_assist' setting.
--- hw/s390x/s390-pci-bus.c | 20 ++++++++++++++--- hw/s390x/s390-pci-inst.c | 40 +++++++++++++++++++++++++++++++-- hw/s390x/s390-pci-kvm.c | 30 +++++++++++++++++++++++++ include/hw/s390x/s390-pci-bus.h | 1 + include/hw/s390x/s390-pci-kvm.h | 14 ++++++++++++ 5 files changed, 100 insertions(+), 5 deletions(-)
hw/s390x/s390-pci-bus.c +17 -3
@@ -190,7 +190,10 @@ void s390_pci_sclp_deconfigure(SCCB *sccb) rc =SCLP_RC_NO_ACTION_REQUIRED ;break ;default : -if (pbdev->summary_ind) { +if (pbdev->interp && (pbdev->fh &FH_MASK_ENABLE )) { +/* Interpreted devices were using interrupt forwarding */ +s390_pci_kvm_aif_disable (pbdev); + }else if (pbdev->summary_ind) {pci_dereg_irqs (pbdev); }if (pbdev->iommu->enabled) {
@@ -1082,6 +1085,7 @@ static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev, }else {DPRINTF ("zPCI interpretation facilities missing.\n" ); pbdev->interp = false; + pbdev->forwarding_assist = false; } } pbdev->iommu->dma_limit =s390_pci_start_dma_count (s, pbdev);
@@ -1090,11 +1094,13 @@ static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev,if (!pbdev->interp) {/* Do vfio passthrough but intercept for I/O */ pbdev->fh |=FH_SHM_VFIO ; + pbdev->forwarding_assist = false; } }else { pbdev->fh |=FH_SHM_EMUL ;/* Always intercept emulated devices */ pbdev->interp = false; + pbdev->forwarding_assist = false; }if (s390_pci_msix_init (pbdev) && !pbdev->interp) {
@@ -1244,7 +1250,10 @@ static void s390_pcihost_reset(DeviceState *dev)/* Process all pending unplug requests */ QTAILQ_FOREACH_SAFE(pbdev, &s->zpci_devs, link, next) {if (pbdev->unplug_requested) { -if (pbdev->summary_ind) { +if (pbdev->interp && (pbdev->fh &FH_MASK_ENABLE )) { +/* Interpreted devices were using interrupt forwarding */ +s390_pci_kvm_aif_disable (pbdev); + }else if (pbdev->summary_ind) {pci_dereg_irqs (pbdev); }if (pbdev->iommu->enabled) {
@@ -1382,7 +1391,10 @@ static void s390_pci_device_reset(DeviceState *dev)break ; } -if (pbdev->summary_ind) { +if (pbdev->interp && (pbdev->fh &FH_MASK_ENABLE )) { +/* Interpreted devices were using interrupt forwarding */ +s390_pci_kvm_aif_disable (pbdev); + }else if (pbdev->summary_ind) {pci_dereg_irqs (pbdev); }if (pbdev->iommu->enabled) {
@@ -1428,6 +1440,8 @@ static Property s390_pci_device_properties[] = {DEFINE_PROP_S390_PCI_FID ("fid" , S390PCIBusDevice, fid),DEFINE_PROP_STRING ("target" , S390PCIBusDevice, target),DEFINE_PROP_BOOL ("interpret" , S390PCIBusDevice, interp, true), +DEFINE_PROP_BOOL ("forwarding_assist" , S390PCIBusDevice, forwarding_assist, + true), DEFINE_PROP_END_OF_LIST(), };
hw/s390x/s390-pci-inst.c +38 -2
@@ -1066,6 +1066,32 @@ static void fmb_update(void *opaque)timer_mod (pbdev->fmb_timer, t + pbdev->pci_group->zpci_group.mui); } +static int mpcifc_reg_int_interp (S390PCIBusDevice *pbdev,ZpciFib *fib) +{ +int rc; + + rc =s390_pci_kvm_aif_enable (pbdev, fib, pbdev->forwarding_assist); +if (rc) { +DPRINTF ("Failed to enable interrupt forwarding\n" ); +return rc; + } + +return 0 ; +} + +static int mpcifc_dereg_int_interp (S390PCIBusDevice *pbdev,ZpciFib *fib) +{ +int rc; + + rc =s390_pci_kvm_aif_disable (pbdev); +if (rc) { +DPRINTF ("Failed to disable interrupt forwarding\n" ); +return rc; + } + +return 0 ; +} +int mpcifc_service_call (S390CPU *cpu,uint8_t r1,uint64_t fiba,uint8_t ar,uintptr_t ra) {
@@ -1120,7 +1146,12 @@ int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar,switch (oc) {case ZPCI_MOD_FC_REG_INT : -if (pbdev->summary_ind) { +if (pbdev->interp) { +if (mpcifc_reg_int_interp (pbdev, &fib)) { + cc =ZPCI_PCI_LS_ERR ; +s390_set_status_code (env, r1,ZPCI_MOD_ST_SEQUENCE ); + } + }else if (pbdev->summary_ind) { cc =ZPCI_PCI_LS_ERR ;s390_set_status_code (env, r1,ZPCI_MOD_ST_SEQUENCE ); }else if (reg_irqs (env, pbdev, fib)) {
@@ -1129,7 +1160,12 @@ int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar, }break ;case ZPCI_MOD_FC_DEREG_INT : -if (!pbdev->summary_ind) { +if (pbdev->interp) { +if (mpcifc_dereg_int_interp (pbdev, &fib)) { + cc =ZPCI_PCI_LS_ERR ; +s390_set_status_code (env, r1,ZPCI_MOD_ST_SEQUENCE ); + } + }else if (!pbdev->summary_ind) { cc =ZPCI_PCI_LS_ERR ;s390_set_status_code (env, r1,ZPCI_MOD_ST_SEQUENCE ); }else {
hw/s390x/s390-pci-kvm.c +30 -0
@@ -11,12 +11,42 @@#include "qemu/osdep.h" +#include <linux/kvm.h> +#include "kvm/kvm_s390x.h" #include "hw/s390x/pv.h" +#include "hw/s390x/s390-pci-bus.h" #include "hw/s390x/s390-pci-kvm.h" +#include "hw/s390x/s390-pci-inst.h" #include "cpu_models.h" bool s390_pci_kvm_interp_allowed (void ) {return kvm_s390_get_zpci_op () && !s390_is_pv (); } + +int s390_pci_kvm_aif_enable (S390PCIBusDevice *pbdev,ZpciFib *fib,bool assist) +{ +struct kvm_s390_zpci_op args = { + .fh = pbdev->fh, + .op =KVM_S390_ZPCIOP_REG_AEN , + .u.reg_aen.ibv = fib->aibv, + .u.reg_aen.sb = fib->aisb, + .u.reg_aen.noi =FIB_DATA_NOI (fib->data), + .u.reg_aen.isc =FIB_DATA_ISC (fib->data), + .u.reg_aen.sbo =FIB_DATA_AISBO (fib->data), + .u.reg_aen.flags = (assist) ?0 :KVM_S390_ZPCIOP_REGAEN_HOST + }; + +return kvm_vm_ioctl (kvm_state,KVM_S390_ZPCI_OP , &args); +} + +int s390_pci_kvm_aif_disable (S390PCIBusDevice *pbdev) +{ +struct kvm_s390_zpci_op args = { + .fh = pbdev->fh, + .op =KVM_S390_ZPCIOP_DEREG_AEN + }; + +return kvm_vm_ioctl (kvm_state,KVM_S390_ZPCI_OP , &args); +}
include/hw/s390x/s390-pci-bus.h +1 -0
@@ -351,6 +351,7 @@ struct S390PCIBusDevice {bool pci_unplug_request_processed;bool unplug_requested;bool interp; +bool forwarding_assist;QTAILQ_ENTRY (S390PCIBusDevice) link; };
include/hw/s390x/s390-pci-kvm.h +14 -0
@@ -12,13 +12,27 @@#ifndef HW_S390_PCI_KVM_H #define HW_S390_PCI_KVM_H +#include "hw/s390x/s390-pci-bus.h" +#include "hw/s390x/s390-pci-inst.h" +#ifdef CONFIG_KVM bool s390_pci_kvm_interp_allowed (void ); +int s390_pci_kvm_aif_enable (S390PCIBusDevice *pbdev,ZpciFib *fib,bool assist); +int s390_pci_kvm_aif_disable (S390PCIBusDevice *pbdev);#else static inline bool s390_pci_kvm_interp_allowed (void ) {return false; } +static inline int s390_pci_kvm_aif_enable (S390PCIBusDevice *pbdev,ZpciFib *fib, +bool assist) +{ +return -EINVAL ; +} +static inline int s390_pci_kvm_aif_disable (S390PCIBusDevice *pbdev) +{ +return -EINVAL ; +}#endif #endif
Signature · 1 line
2.37.2
Re: [PATCH v8 5/8] s390x/pci: enable adapter event notification for interpreted devices
Quoted 10 lines · Matthew Rosato
Use the associated kvm ioctl operation to enable adapter event notification and forwarding for devices when requested. This feature will be set up with or without firmware assist based upon the '
forwarding_assist' setting.Signed-off-by Matthew Rosato <[email protected]>---
hw/s390x/s390-pci-bus.c +0
-0
...
hw/s390x/s390-pci-bus.c static Property s390_pci_device_properties[] = { · line 1446
Quoted 8 lines
hw/s390x/s390-pci-bus.c +2
-0@@ -1428,6 +1440,8 @@ static Property s390_pci_device_properties[] = {DEFINE_PROP_S390_PCI_FID ("fid" , S390PCIBusDevice, fid),DEFINE_PROP_STRING ("target" , S390PCIBusDevice, target),DEFINE_PROP_BOOL ("interpret" , S390PCIBusDevice, interp, true), +DEFINE_PROP_BOOL ("forwarding_assist" , S390PCIBusDevice, forwarding_assist, + true), DEFINE_PROP_END_OF_LIST(), };
It seems to be more common to use "-" as separator in property names than to use "_" :
$ grep -r DEFINE_PROP_BOOL * | sed -e 's/^.*("//' -e 's/".*//' | grep _ | wc -l
39
$ grep -r DEFINE_PROP_BOOL * | sed -e 's/^.*("//' -e 's/".*//' | grep - | wc -l
169... so maybe rename "forwarding_assist" to "forwarding-assist" ?
Thomas
PATCH v8 6/8 s390x/pci: let intercept devices have separate PCI groups
In reply to Matthew RosatoLet's use the reserved pool of simulated PCI groups to allow intercept devices to have separate groups from interpreted devices as some group values may be different. If we run out of simulated PCI groups, subsequent intercept devices just get the default group.
Furthermore, if we encounter any PCI groups from hostdevs that are marked as simulated, let's just assign them to the default group to avoid conflicts between host simulated groups and our own simulated groups.
--- hw/s390x/s390-pci-bus.c | 19 ++++++++++++++-- hw/s390x/s390-pci-vfio.c | 40 ++++++++++++++++++++++++++++++--- include/hw/s390x/s390-pci-bus.h | 6 ++++- 3 files changed, 59 insertions(+), 6 deletions(-)
hw/s390x/s390-pci-bus.c +17 -2
@@ -748,13 +748,14 @@ static void s390_pci_iommu_free(S390pciState *s, PCIBus *bus, int32_t devfn)object_unref (OBJECT (iommu)); } -S390PCIGroup *s390_group_create (int id) +S390PCIGroup *s390_group_create (int id,int host_id) {S390PCIGroup *group;S390pciState *s =s390_get_phb (); group =g_new0 (S390PCIGroup,1 ); group->id = id; + group->host_id = host_id;QTAILQ_INSERT_TAIL (&s->zpci_groups, group, link);return group; }
@@ -772,12 +773,25 @@ S390PCIGroup *s390_group_find(int id)return NULL ; } +S390PCIGroup *s390_group_find_host_sim (int host_id) +{ +S390PCIGroup *group; +S390pciState *s =s390_get_phb (); + + QTAILQ_FOREACH(group, &s->zpci_groups, link) { +if (group->id >=ZPCI_SIM_GRP_START && group->host_id == host_id) { +return group; + } + } +return NULL ; +} +static void s390_pci_init_default_group (void ) {S390PCIGroup *group;ClpRspQueryPciGrp *resgrp; - group =s390_group_create (ZPCI_DEFAULT_FN_GRP ); + group =s390_group_create (ZPCI_DEFAULT_FN_GRP ,ZPCI_DEFAULT_FN_GRP ); resgrp = &group->zpci_group; resgrp->fr =1 ; resgrp->dasm =0 ;
@@ -825,6 +839,7 @@ static void s390_pcihost_realize(DeviceState *dev, Error **errp) NULL, g_free); s->zpci_table =g_hash_table_new_full (g_int_hash, g_int_equal,NULL ,NULL ); s->bus_no =0 ; + s->next_sim_grp =ZPCI_SIM_GRP_START ;QTAILQ_INIT (&s->pending_sei);QTAILQ_INIT (&s->zpci_devs);QTAILQ_INIT (&s->zpci_dma_limit);
hw/s390x/s390-pci-vfio.c +37 -3
@@ -150,13 +150,18 @@ static void s390_pci_read_group(S390PCIBusDevice *pbdev, {struct vfio_info_cap_header *hdr;struct vfio_device_info_cap_zpci_group *cap; +S390pciState *s =s390_get_phb ();ClpRspQueryPciGrp *resgrp;VFIOPCIDevice *vpci =container_of (pbdev->pdev, VFIOPCIDevice, pdev); +uint8_t start_gid = pbdev->zpci_fn.pfgid; hdr =vfio_get_device_info_cap (info,VFIO_DEVICE_INFO_CAP_ZPCI_GROUP ); -/* If capability not provided, just use the default group */ -if (hdr ==NULL ) { +/* +* If capability not provided or the underlying hostdev is simulated, just +* use the default group. +*/ +if (hdr ==NULL || pbdev->zpci_fn.pfgid >=ZPCI_SIM_GRP_START ) {trace_s390_pci_clp_cap (vpci->vbasedev.name,VFIO_DEVICE_INFO_CAP_ZPCI_GROUP ); pbdev->zpci_fn.pfgid =ZPCI_DEFAULT_FN_GRP ;
@@ -165,11 +170,40 @@ static void s390_pci_read_group(S390PCIBusDevice *pbdev, } cap = (void *) hdr; +/* +* For an intercept device, let's use an existing simulated group if one +* one was already created for other intercept devices in this group. +* If not, create a new simulated group if any are still available. +* If all else fails, just fall back on the default group. +*/ +if (!pbdev->interp) { + pbdev->pci_group =s390_group_find_host_sim (pbdev->zpci_fn.pfgid); +if (pbdev->pci_group) { +/* Use existing simulated group */ + pbdev->zpci_fn.pfgid = pbdev->pci_group->id; +return ; + }else { +if (s->next_sim_grp ==ZPCI_DEFAULT_FN_GRP ) { +/* All out of simulated groups, use default */ +trace_s390_pci_clp_cap (vpci->vbasedev.name, +VFIO_DEVICE_INFO_CAP_ZPCI_GROUP ); + pbdev->zpci_fn.pfgid =ZPCI_DEFAULT_FN_GRP ; + pbdev->pci_group =s390_group_find (ZPCI_DEFAULT_FN_GRP ); +return ; + }else { +/* We can assign a new simulated group */ + pbdev->zpci_fn.pfgid = s->next_sim_grp; + s->next_sim_grp++; +/* Fall through to create the new sim group using CLP info */ + } + } + } +/* See if the PCI group is already defined, create if not */ pbdev->pci_group =s390_group_find (pbdev->zpci_fn.pfgid);if (!pbdev->pci_group) { - pbdev->pci_group =s390_group_create (pbdev->zpci_fn.pfgid); + pbdev->pci_group =s390_group_create (pbdev->zpci_fn.pfgid, start_gid); resgrp = &pbdev->pci_group->zpci_group;if (cap->flags &VFIO_DEVICE_INFO_ZPCI_FLAG_REFRESH ) {
include/hw/s390x/s390-pci-bus.h +5 -1
@@ -315,13 +315,16 @@ typedef struct ZpciFmb {QEMU_BUILD_BUG_MSG (offsetof(ZpciFmb , fmt0) !=48 ,"padding in ZpciFmb" );#define ZPCI_DEFAULT_FN_GRP 0xFF +#define ZPCI_SIM_GRP_START 0xF0typedef struct S390PCIGroup {ClpRspQueryPciGrp zpci_group;int id; +int host_id;QTAILQ_ENTRY (S390PCIGroup) link; }S390PCIGroup ; -S390PCIGroup *s390_group_create (int id); +S390PCIGroup *s390_group_create (int id,int host_id);S390PCIGroup *s390_group_find (int id); +S390PCIGroup *s390_group_find_host_sim (int host_id);struct S390PCIBusDevice {DeviceState qdev;
@@ -370,6 +373,7 @@ struct S390pciState { QTAILQ_HEAD(, S390PCIBusDevice) zpci_devs; QTAILQ_HEAD(, S390PCIDMACount) zpci_dma_limit; QTAILQ_HEAD(, S390PCIGroup) zpci_groups; +uint8_t next_sim_grp; };S390pciState *s390_get_phb (void );
Signature · 1 line
2.37.2
PATCH v8 7/8 s390x/pci: reflect proper maxstbl for groups of interpreted devices
In reply to Matthew RosatoThe maximum supported store block length might be different depending on whether the instruction is interpretively executed (firmware-reported maximum) or handled via userspace intercept (host kernel API maximum). Choose the best available value during group creation.
--- hw/s390x/s390-pci-vfio.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
hw/s390x/s390-pci-vfio.c +5 -1
@@ -213,7 +213,11 @@ static void s390_pci_read_group(S390PCIBusDevice *pbdev, resgrp->msia = cap->msi_addr; resgrp->mui = cap->mui; resgrp->i = cap->noi; - resgrp->maxstbl = cap->maxstbl; +if (pbdev->interp && hdr->version >=2 ) { + resgrp->maxstbl = cap->imaxstbl; + }else { + resgrp->maxstbl = cap->maxstbl; + } resgrp->version = cap->version; resgrp->dtsm =ZPCI_DTSM ; }
Signature · 1 line
2.37.2
PATCH v8 8/8 s390x/s390-virtio-ccw: add zpcii-disable machine property
In reply to Matthew RosatoThe zpcii-disable machine property can be used to force-disable the use of zPCI interpretation facilities for a VM. By default, this setting will be off for machine 7.2 and newer.
--- hw/s390x/s390-pci-kvm.c | 4 +++- hw/s390x/s390-virtio-ccw.c | 25 +++++++++++++++++++++++++ include/hw/s390x/s390-virtio-ccw.h | 1 + qemu-options.hx | 8 +++++++- util/qemu-config.c | 4 ++++ 5 files changed, 40 insertions(+), 2 deletions(-)
hw/s390x/s390-pci-kvm.c +3 -1
@@ -22,7 +22,9 @@bool s390_pci_kvm_interp_allowed (void ) { -return kvm_s390_get_zpci_op () && !s390_is_pv (); +return (kvm_s390_get_zpci_op () && !s390_is_pv () && + !object_property_get_bool (OBJECT (qdev_get_machine ()), +"zpcii-disable" ,NULL )); }int s390_pci_kvm_aif_enable (S390PCIBusDevice *pbdev,ZpciFib *fib,bool assist)
hw/s390x/s390-virtio-ccw.c +25 -0
@@ -645,6 +645,21 @@ static inline void machine_set_dea_key_wrap(Object *obj, bool value, ms->dea_key_wrap = value; } +static inline bool machine_get_zpcii_disable (Object *obj,Error **errp) +{ +S390CcwMachineState *ms =S390_CCW_MACHINE (obj); + +return ms->zpcii_disable; +} + +static inline void machine_set_zpcii_disable (Object *obj,bool value, +Error **errp) +{ +S390CcwMachineState *ms =S390_CCW_MACHINE (obj); + + ms->zpcii_disable = value; +} +static S390CcwMachineClass *current_mc;/*
@@ -740,6 +755,13 @@ static inline void s390_machine_initfn(Object *obj)"Up to 8 chars in set of [A-Za-z0-9. ] (lower case chars converted" " to upper case) to pass to machine loader, boot manager," " and guest kernel"); + +object_property_add_bool (obj,"zpcii-disable" , + machine_get_zpcii_disable, + machine_set_zpcii_disable); +object_property_set_description (obj,"zpcii-disable" , +"disable zPCI interpretation facilties" ); +object_property_set_bool (obj,"zpcii-disable" , false,NULL ); }static const TypeInfo ccw_machine_info = {
@@ -803,8 +825,11 @@ DEFINE_CCW_MACHINE(7_2, "7.2", true);static void ccw_machine_7_1_instance_options (MachineState *machine) { +S390CcwMachineState *ms =S390_CCW_MACHINE (machine); +ccw_machine_7_2_instance_options (machine);s390_cpudef_featoff_greater (16 ,1 ,S390_FEAT_PAIE ); + ms->zpcii_disable = true; }static void ccw_machine_7_1_class_options (MachineClass *mc)
include/hw/s390x/s390-virtio-ccw.h +1 -0
@@ -27,6 +27,7 @@ struct S390CcwMachineState {bool aes_key_wrap;bool dea_key_wrap;bool pv; +bool zpcii_disable;uint8_t loadparm[8 ]; };
qemu-options.hx +7 -1
@@ -37,7 +37,8 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " memory-encryption=@var{} memory encryption object to use (default=none)\n" " hmat=on|off controls ACPI HMAT support (default=off)\n" " memory-backend='backend-id' specifies explicitly provided backend for main RAM (default=none)\n" - " cxl-fmw.0.targets.0=firsttarget,cxl-fmw.0.targets.1=secondtarget,cxl-fmw.0.size=size[,cxl-fmw.0.interleave-granularity=granularity]\n", + " cxl-fmw.0.targets.0=firsttarget,cxl-fmw.0.targets.1=secondtarget,cxl-fmw.0.size=size[,cxl-fmw.0.interleave-granularity=granularity]\n" + " zpcii-disable=on|off disables zPCI interpretation facilities (default=off)\n", QEMU_ARCH_ALL) SRST ``-machine [type=]name[,prop=value[,...]]``
@@ -157,6 +158,11 @@ SRST :: -machine cxl-fmw.0.targets.0=cxl.0,cxl-fmw.0.targets.1=cxl.1,cxl-fmw.0.size=128G,cxl-fmw.0.interleave-granularity=512k + + ``zpcii-disable=on|off`` + Disables zPCI interpretation facilties on s390-ccw hosts. + This feature can be used to disable hardware virtual assists + related to zPCI devices. The default is off. ERST DEF("M", HAS_ARG, QEMU_OPTION_M,
util/qemu-config.c +4 -0
@@ -236,6 +236,10 @@ static QemuOptsList machine_opts = { .help = "Up to 8 chars in set of [A-Za-z0-9. ](lower case chars" " converted to upper case) to pass to machine" " loader, boot manager, and guest kernel", + },{ + .name = "zpcii-disable", + .type = QEMU_OPT_BOOL, + .help = "disable zPCI interpretation facilities", }, {/* End of list */ } }
Signature · 1 line
2.37.2
Re: [PATCH v8 8/8] s390x/s390-virtio-ccw: add zpcii-disable machine property
Quoted 123 lines · Matthew Rosato
The zpcii-disable machine property can be used to force-disable the use of zPCI interpretation facilities for a VM. By default, this setting will be off for machine 7.2 and newer.
Signed-off-by Matthew Rosato <[email protected]>--- hw/s390x/s390-pci-kvm.c | 4 +++- hw/s390x/s390-virtio-ccw.c | 25 +++++++++++++++++++++++++ include/hw/s390x/s390-virtio-ccw.h | 1 + qemu-options.hx | 8 +++++++- util/qemu-config.c | 4 ++++ 5 files changed, 40 insertions(+), 2 deletions(-)hw/s390x/s390-pci-kvm.c +3
-1@@ -22,7 +22,9 @@bool s390_pci_kvm_interp_allowed (void ) { -return kvm_s390_get_zpci_op () && !s390_is_pv (); +return (kvm_s390_get_zpci_op () && !s390_is_pv () && + !object_property_get_bool (OBJECT (qdev_get_machine ()), +"zpcii-disable" ,NULL )); }int s390_pci_kvm_aif_enable (S390PCIBusDevice *pbdev,ZpciFib *fib,bool assist)hw/s390x/s390-virtio-ccw.c +25
-0@@ -645,6 +645,21 @@ static inline void machine_set_dea_key_wrap(Object *obj, bool value, ms->dea_key_wrap = value; } +static inline bool machine_get_zpcii_disable (Object *obj,Error **errp) +{ +S390CcwMachineState *ms =S390_CCW_MACHINE (obj); + +return ms->zpcii_disable; +} + +static inline void machine_set_zpcii_disable (Object *obj,bool value, +Error **errp) +{ +S390CcwMachineState *ms =S390_CCW_MACHINE (obj); + + ms->zpcii_disable = value; +} +static S390CcwMachineClass *current_mc;/* @@ -740,6 +755,13 @@ static inline void s390_machine_initfn(Object *obj)"Up to 8 chars in set of [A-Za-z0-9. ] (lower case chars converted" " to upper case) to pass to machine loader, boot manager," " and guest kernel"); + +object_property_add_bool (obj,"zpcii-disable" , + machine_get_zpcii_disable, + machine_set_zpcii_disable); +object_property_set_description (obj,"zpcii-disable" , +"disable zPCI interpretation facilties" ); +object_property_set_bool (obj,"zpcii-disable" , false,NULL ); }static const TypeInfo ccw_machine_info = {@@ -803,8 +825,11 @@ DEFINE_CCW_MACHINE(7_2, "7.2", true);static void ccw_machine_7_1_instance_options (MachineState *machine) { +S390CcwMachineState *ms =S390_CCW_MACHINE (machine); +ccw_machine_7_2_instance_options (machine);s390_cpudef_featoff_greater (16 ,1 ,S390_FEAT_PAIE ); + ms->zpcii_disable = true; }static void ccw_machine_7_1_class_options (MachineClass *mc)include/hw/s390x/s390-virtio-ccw.h +1
-0@@ -27,6 +27,7 @@ struct S390CcwMachineState {bool aes_key_wrap;bool dea_key_wrap;bool pv; +bool zpcii_disable;uint8_t loadparm[8 ]; };qemu-options.hx +7
-1@@ -37,7 +37,8 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " memory-encryption=@var{} memory encryption object to use (default=none)\n" " hmat=on|off controls ACPI HMAT support (default=off)\n" " memory-backend='backend-id' specifies explicitly provided backend for main RAM (default=none)\n" - " cxl-fmw.0.targets.0=firsttarget,cxl-fmw.0.targets.1=secondtarget,cxl-fmw.0.size=size[,cxl-fmw.0.interleave-granularity=granularity]\n", + " cxl-fmw.0.targets.0=firsttarget,cxl-fmw.0.targets.1=secondtarget,cxl-fmw.0.size=size[,cxl-fmw.0.interleave-granularity=granularity]\n" + " zpcii-disable=on|off disables zPCI interpretation facilities (default=off)\n", QEMU_ARCH_ALL) SRST ``-machine [type=]name[,prop=value[,...]]``@@ -157,6 +158,11 @@ SRST :: -machine cxl-fmw.0.targets.0=cxl.0,cxl-fmw.0.targets.1=cxl.1,cxl-fmw.0.size=128G,cxl-fmw.0.interleave-granularity=512k + + ``zpcii-disable=on|off`` + Disables zPCI interpretation facilties on s390-ccw hosts. + This feature can be used to disable hardware virtual assists + related to zPCI devices. The default is off. ERST DEF("M", HAS_ARG, QEMU_OPTION_M,util/qemu-config.c +0
-0
util/qemu-config.c static QemuOptsList machine_opts = { · line 245
Quoted 10 lines
util/qemu-config.c +4
-0@@ -236,6 +236,10 @@ static QemuOptsList machine_opts = { .help = "Up to 8 chars in set of [A-Za-z0-9. ](lower case chars" " converted to upper case) to pass to machine" " loader, boot manager, and guest kernel", + },{ + .name = "zpcii-disable", + .type = QEMU_OPT_BOOL, + .help = "disable zPCI interpretation facilities", }, {/* End of list */ } }
Re: [PATCH v8 8/8] s390x/s390-virtio-ccw: add zpcii-disable machine property
In reply to Matthew RosatoHello,
Quoted 3 lines · Matthew Rosato
The zpcii-disable machine property can be used to force-disable the use of zPCI interpretation facilities for a VM. By default, this setting will be off for machine 7.2 and newer.
KVM will tell if the zPCI interpretation feature is available for the VM depending on the host capabilities and activation can be handled with the "interpret" property at the device level.
For migration compatibility, zPCI interpretation can be globally deactivated with a compat property. So, I don't understand how the "zpcii-disable" machine option is useful.
The patch could possibly be reverted for 7.2 and replaced with :
@@ -921,9 +921,13 @@ static void ccw_machine_7_1_instance_opt
static void ccw_machine_7_1_class_options(MachineClass *mc)
{
S390CcwMachineClass *s390mc = S390_CCW_MACHINE_CLASS(mc); + static GlobalProperty compat[] = {
+ { TYPE_S390_PCI_DEVICE, "interpret", "off", },
+ };
ccw_machine_7_2_class_options(mc);
compat_props_add(mc->compat_props, hw_compat_7_1, hw_compat_7_1_len);
+ compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
s390mc->max_threads = S390_MAX_CPUS;
s390mc->topology_capable = false;}
Thanks,
C.
Quoted 130 lines
Signed-off-by Matthew Rosato <[email protected]>--- hw/s390x/s390-pci-kvm.c | 4 +++- hw/s390x/s390-virtio-ccw.c | 25 +++++++++++++++++++++++++ include/hw/s390x/s390-virtio-ccw.h | 1 + qemu-options.hx | 8 +++++++- util/qemu-config.c | 4 ++++ 5 files changed, 40 insertions(+), 2 deletions(-)hw/s390x/s390-pci-kvm.c +3
-1@@ -22,7 +22,9 @@bool s390_pci_kvm_interp_allowed (void ) { -return kvm_s390_get_zpci_op () && !s390_is_pv (); +return (kvm_s390_get_zpci_op () && !s390_is_pv () && + !object_property_get_bool (OBJECT (qdev_get_machine ()), +"zpcii-disable" ,NULL )); }int s390_pci_kvm_aif_enable (S390PCIBusDevice *pbdev,ZpciFib *fib,bool assist)hw/s390x/s390-virtio-ccw.c +25
-0@@ -645,6 +645,21 @@ static inline void machine_set_dea_key_wrap(Object *obj, bool value, ms->dea_key_wrap = value; } +static inline bool machine_get_zpcii_disable (Object *obj,Error **errp) +{ +S390CcwMachineState *ms =S390_CCW_MACHINE (obj); + +return ms->zpcii_disable; +} + +static inline void machine_set_zpcii_disable (Object *obj,bool value, +Error **errp) +{ +S390CcwMachineState *ms =S390_CCW_MACHINE (obj); + + ms->zpcii_disable = value; +} +static S390CcwMachineClass *current_mc;/* @@ -740,6 +755,13 @@ static inline void s390_machine_initfn(Object *obj)"Up to 8 chars in set of [A-Za-z0-9. ] (lower case chars converted" " to upper case) to pass to machine loader, boot manager," " and guest kernel"); + +object_property_add_bool (obj,"zpcii-disable" , + machine_get_zpcii_disable, + machine_set_zpcii_disable); +object_property_set_description (obj,"zpcii-disable" , +"disable zPCI interpretation facilties" ); +object_property_set_bool (obj,"zpcii-disable" , false,NULL ); }static const TypeInfo ccw_machine_info = {@@ -803,8 +825,11 @@ DEFINE_CCW_MACHINE(7_2, "7.2", true);static void ccw_machine_7_1_instance_options (MachineState *machine) { +S390CcwMachineState *ms =S390_CCW_MACHINE (machine); +ccw_machine_7_2_instance_options (machine);s390_cpudef_featoff_greater (16 ,1 ,S390_FEAT_PAIE ); + ms->zpcii_disable = true; }static void ccw_machine_7_1_class_options (MachineClass *mc)include/hw/s390x/s390-virtio-ccw.h +1
-0@@ -27,6 +27,7 @@ struct S390CcwMachineState {bool aes_key_wrap;bool dea_key_wrap;bool pv; +bool zpcii_disable;uint8_t loadparm[8 ]; };qemu-options.hx +7
-1@@ -37,7 +37,8 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " memory-encryption=@var{} memory encryption object to use (default=none)\n" " hmat=on|off controls ACPI HMAT support (default=off)\n" " memory-backend='backend-id' specifies explicitly provided backend for main RAM (default=none)\n" - " cxl-fmw.0.targets.0=firsttarget,cxl-fmw.0.targets.1=secondtarget,cxl-fmw.0.size=size[,cxl-fmw.0.interleave-granularity=granularity]\n", + " cxl-fmw.0.targets.0=firsttarget,cxl-fmw.0.targets.1=secondtarget,cxl-fmw.0.size=size[,cxl-fmw.0.interleave-granularity=granularity]\n" + " zpcii-disable=on|off disables zPCI interpretation facilities (default=off)\n", QEMU_ARCH_ALL) SRST ``-machine [type=]name[,prop=value[,...]]``@@ -157,6 +158,11 @@ SRST :: -machine cxl-fmw.0.targets.0=cxl.0,cxl-fmw.0.targets.1=cxl.1,cxl-fmw.0.size=128G,cxl-fmw.0.interleave-granularity=512k + + ``zpcii-disable=on|off`` + Disables zPCI interpretation facilties on s390-ccw hosts. + This feature can be used to disable hardware virtual assists + related to zPCI devices. The default is off. ERST DEF("M", HAS_ARG, QEMU_OPTION_M,util/qemu-config.c +4
-0@@ -236,6 +236,10 @@ static QemuOptsList machine_opts = { .help = "Up to 8 chars in set of [A-Za-z0-9. ](lower case chars" " converted to upper case) to pass to machine" " loader, boot manager, and guest kernel", + },{ + .name = "zpcii-disable", + .type = QEMU_OPT_BOOL, + .help = "disable zPCI interpretation facilities", }, {/* End of list */ } }
Re: [PATCH v8 8/8] s390x/s390-virtio-ccw: add zpcii-disable machine property
Quoted 30 lines · Cédric Le Goater
Hello,
Quoted 3 lines · Matthew Rosato
The zpcii-disable machine property can be used to force-disable the use of zPCI interpretation facilities for a VM. By default, this setting will be off for machine 7.2 and newer.
KVM will tell if the zPCI interpretation feature is available for the VM depending on the host capabilities and activation can be handled with the "interpret" property at the device level.
For migration compatibility, zPCI interpretation can be globally deactivated with a compat property. So, I don't understand how the "zpcii-disable" machine option is useful.
The patch could possibly be reverted for 7.2 and replaced with :
@@ -921,9 +921,13 @@ static void
ccw_machine_7_1_instance_optstatic voidccw_machine_7_1_class_options(MachineClass *mc)
{
S390CcwMachineClass *s390mc =S390_CCW_MACHINE_CLASS(mc); + static GlobalProperty compat[] = {
+ {TYPE_S390_PCI_DEVICE, "interpret", "off", },
+ };
ccw_machine_7_2_class_options(mc);compat_props_add(mc->compat_props, hw_compat_7_1, hw_compat_7_1_len); +compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));s390mc->max_threads=S390_MAX_CPUS;s390mc->topology_capable= false;
Quoted 1 line
}
Thinking about this twice, I'm not sure whether we would need it at all since zpci cannot be migrated at all (see the "unmigratable = 1" in hw/s390x/s390-pci-bus.c) ... OTOH, doing it via the compat_props also does not really hurt.
Anyway, the zpcii-disable switch really does not seem to be necessary... Matthew, do you think it's ok if we revert "zpcii-disable" patch?
Thomas
Quoted 37 lines · Matthew Rosato
Now that the kernel series [1] is merged and the freeze is over, here is a refresh of the zPCI interpretation series.
For QEMU, the majority of the work in enabling instruction interpretation is handled via SHM bit settings (to indicate to firmware whether or not interpretive execution facilities are to be used) + a new KVM ioctl is used to setup firmware-interpreted forwarding of Adapter Event Notifications.
This series also adds a new, optional 'interpret' parameter to zpci which can be used to disable interpretation support (interpret=off) as well as an '
forwarding_assist' parameter to determine whether or not the firmware assist will be used for adapter event delivery (default when interpretation is in use) or whether the host will be responsible for delivering all adapter event notifications (forwarding_assist=off).The zpcii-disable machine property is added to allow disabling use of zPCI interpretation facilities for a guest. This property is set to on for older (pre-7.2 compat machines), but defaults to off for 7.2 and newer. This allows newer machines to use interpretation by default if the necessary kernel interfaces and hardware facilities are available, but also provides a mechanism for disabling interpretation completely for debug purposes.
As a consequence of implementing zPCI interpretation, ISM devices now become eligible for passthrough (but only when zPCI interpretation is available).
From the perspective of guest configuration, you passthrough zPCI devices
in the same manner as before, with intepretation support being used by default if available in kernel+qemu.Changelog
v7->v8:
- Rebase onto 7.1.0
- Move compat machine changes for patch 8
- Refresh kernel header sync to 6.0-rc3
Quoted 6 lines
[1] https://lore.kernel.org/kvm/[email protected]/
Matthew Rosato (8):
linux-headers: update to 6.0-rc3
s390x/pci: add routine to get host function handle from CLP info s390x/pci: enable for load/store intepretation
Typo in that subject, should be "interpretation" instead of "intepretation".
Quoted 5 lines
s390x/pci: don't fence interpreted devices without MSI-X s390x/pci: enable adapter event notification for interpreted devices s390x/pci: let intercept devices have separate PCI groups s390x/pci: reflect proper maxstbl for groups of interpreted devices s390x/s390-virtio-ccw: add zpcii-disable machine property
Thanks, patch series looks basically fine to me now. Some nits here and there, so if you could still fix those up and send a v9, that would be great! (If you are completely out of spare time for that, let me know, then I can also try to fix those up on my own when picking up the patches)
Thomas