Skip to contentSkip to conversation

s390x/pci: s390-pci updates for kernel 5.10-rc1

PATCH In review Matthew Rosato 3 participants 22 messages Oct 26, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover s390x/pci: s390-pci updates for kernel 5.10-rc1

Combined set of patches that exploit vfio/s390-pci features available in kernel 5.10-rc1. This patch set is a combination of

[PATCH v4 0/5] s390x/pci: Accomodate vfio DMA limiting

and

[PATCH v3 00/10] Retrieve zPCI hardware information from VFIO

with duplicate patches removed and a single header sync. All patches have prior maintainer reviews except for:

- Patch 1 (update-linux-headers change to add new file)
- Patch 2 (header sync against 5.10-rc1)
- Patch 13 - contains a functional (debug) change; I switched from using DPRINTFs to using trace events per Connie's request.

Matthew Rosato (10):
update-linux-headers: Add vfio_zdev.h
linux-headers: update against 5.10-rc1
s390x/pci: Move header files to include/hw/s390x
vfio: Create shared routine for scanning info capabilities
vfio: Find DMA available capability
s390x/pci: Add routine to get the vfio dma available count s390x/pci: Honor DMA limits set by vfio
s390x/pci: clean up s390 PCI groups
vfio: Add routine for finding VFIO_DEVICE_GET_INFO capabilities s390x/pci: get zPCI function info from host

Pierre Morel (3):
s390x/pci: create a header dedicated to PCI CLP
s390x/pci: use a PCI Group structure
s390x/pci: use a PCI Function structure

 MAINTAINERS                                        |   1 +
 hw/s390x/meson.build                               |   1 +
 hw/s390x/s390-pci-bus.c                            |  91 ++++++-
 hw/s390x/s390-pci-inst.c                           |  78 ++++--
 hw/s390x/s390-pci-vfio.c                           | 276 +++++++++++++++++++++
 hw/s390x/s390-virtio-ccw.c                         |   2 +-
 hw/s390x/trace-events                              |   6 +
 hw/vfio/common.c                                   |  62 ++++-
 {hw => include/hw}/s390x/s390-pci-bus.h            |  22 ++
 .../hw/s390x/s390-pci-clp.h                        | 123 +--------
 include/hw/s390x/s390-pci-inst.h                   | 119 +++++++++
 include/hw/s390x/s390-pci-vfio.h                   |  23 ++
 include/hw/vfio/vfio-common.h                      |   4 +
 .../drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h |  14 +-
 .../infiniband/hw/vmw_pvrdma/pvrdma_verbs.h        |   2 +-
 include/standard-headers/linux/ethtool.h           |   2 +
 include/standard-headers/linux/fuse.h              |  50 +++-
 include/standard-headers/linux/input-event-codes.h |   4 +
 include/standard-headers/linux/pci_regs.h          |   6 +-
 include/standard-headers/linux/virtio_fs.h         |   3 +
 include/standard-headers/linux/virtio_gpu.h        |  19 ++
 include/standard-headers/linux/virtio_mmio.h       |  11 +
 include/standard-headers/linux/virtio_pci.h        |  11 +-
 linux-headers/asm-arm64/kvm.h                      |  25 ++
 linux-headers/asm-arm64/mman.h                     |   1 +
 linux-headers/asm-generic/hugetlb_encode.h         |   1 +
 linux-headers/asm-generic/unistd.h                 |  18 +-
 linux-headers/asm-mips/unistd_n32.h                |   1 +
 linux-headers/asm-mips/unistd_n64.h                |   1 +
 linux-headers/asm-mips/unistd_o32.h                |   1 +
 linux-headers/asm-powerpc/unistd_32.h              |   1 +
 linux-headers/asm-powerpc/unistd_64.h              |   1 +
 linux-headers/asm-s390/unistd_32.h                 |   1 +
 linux-headers/asm-s390/unistd_64.h                 |   1 +
 linux-headers/asm-x86/kvm.h                        |  20 ++
 linux-headers/asm-x86/unistd_32.h                  |   1 +
 linux-headers/asm-x86/unistd_64.h                  |   1 +
 linux-headers/asm-x86/unistd_x32.h                 |   1 +
 linux-headers/linux/kvm.h                          |  19 ++
 linux-headers/linux/mman.h                         |   1 +
 linux-headers/linux/vfio.h                         |  29 ++-
 linux-headers/linux/vfio_zdev.h                    |  78 ++++++
 scripts/update-linux-headers.sh                    |   2 +-
 43 files changed, 961 insertions(+), 173 deletions(-)
 create mode 100644 hw/s390x/s390-pci-vfio.c
 rename {hw => include/hw}/s390x/s390-pci-bus.h (94%)
 rename hw/s390x/s390-pci-inst.h => include/hw/s390x/s390-pci-clp.h (59%)
 create mode 100644 include/hw/s390x/s390-pci-inst.h
 create mode 100644 include/hw/s390x/s390-pci-vfio.h
 create mode 100644 linux-headers/linux/vfio_zdev.h
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/13 update-linux-headers: Add vfio_zdev.h

vfio_zdev.h is used by s390x zPCI support to pass device-specific CLP information between host and userspace.

---
 scripts/update-linux-headers.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/update-linux-headers.sh +1 -1
index 29c27f4..9efbaf2 100755
@@ -141,7 +141,7 @@ done
 
 rm -rf "$output/linux-headers/linux"
 mkdir -p "$output/linux-headers/linux"
-for header in kvm.h vfio.h vfio_ccw.h vhost.h \
+for header in kvm.h vfio.h vfio_ccw.h vfio_zdev.h vhost.h \
               psci.h psp-sev.h userfaultfd.h mman.h; do
     cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux"
 done
Signature · 1 line
1.8.3.1
#2 lore raw

PATCH 2/13 linux-headers: update against 5.10-rc1

In reply to Matthew Rosato

commit 3650b228f83adda7e5ee532e2b90429c03f7b9ec

---
 .../drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h | 14 ++--
 .../infiniband/hw/vmw_pvrdma/pvrdma_verbs.h        |  2 +-
 include/standard-headers/linux/ethtool.h           |  2 +
 include/standard-headers/linux/fuse.h              | 50 +++++++++++++-
 include/standard-headers/linux/input-event-codes.h |  4 ++
 include/standard-headers/linux/pci_regs.h          |  6 +-
 include/standard-headers/linux/virtio_fs.h         |  3 +
 include/standard-headers/linux/virtio_gpu.h        | 19 ++++++
 include/standard-headers/linux/virtio_mmio.h       | 11 +++
 include/standard-headers/linux/virtio_pci.h        | 11 ++-
 linux-headers/asm-arm64/kvm.h                      | 25 +++++++
 linux-headers/asm-arm64/mman.h                     |  1 +
 linux-headers/asm-generic/hugetlb_encode.h         |  1 +
 linux-headers/asm-generic/unistd.h                 | 18 ++---
 linux-headers/asm-mips/unistd_n32.h                |  1 +
 linux-headers/asm-mips/unistd_n64.h                |  1 +
 linux-headers/asm-mips/unistd_o32.h                |  1 +
 linux-headers/asm-powerpc/unistd_32.h              |  1 +
 linux-headers/asm-powerpc/unistd_64.h              |  1 +
 linux-headers/asm-s390/unistd_32.h                 |  1 +
 linux-headers/asm-s390/unistd_64.h                 |  1 +
 linux-headers/asm-x86/kvm.h                        | 20 ++++++
 linux-headers/asm-x86/unistd_32.h                  |  1 +
 linux-headers/asm-x86/unistd_64.h                  |  1 +
 linux-headers/asm-x86/unistd_x32.h                 |  1 +
 linux-headers/linux/kvm.h                          | 19 ++++++
 linux-headers/linux/mman.h                         |  1 +
 linux-headers/linux/vfio.h                         | 29 +++++++-
 linux-headers/linux/vfio_zdev.h                    | 78 ++++++++++++++++++++++
 29 files changed, 301 insertions(+), 23 deletions(-)
 create mode 100644 linux-headers/linux/vfio_zdev.h
include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h +7 -7
index 7b4062a..acd4c83 100644
@@ -68,7 +68,7 @@ static inline int pvrdma_idx_valid(uint32_t idx, uint32_t max_elems)
 
 static inline int32_t pvrdma_idx(int *var, uint32_t max_elems)
 {
-	const unsigned int idx = qatomic_read(var);
+	const unsigned int idx = atomic_read(var);
 
 	if (pvrdma_idx_valid(idx, max_elems))
 		return idx & (max_elems - 1);
@@ -77,17 +77,17 @@ static inline int32_t pvrdma_idx(int *var, uint32_t max_elems)
 
 static inline void pvrdma_idx_ring_inc(int *var, uint32_t max_elems)
 {
-	uint32_t idx = qatomic_read(var) + 1;	/* Increment. */
+	uint32_t idx = atomic_read(var) + 1;	/* Increment. */
 
 	idx &= (max_elems << 1) - 1;		/* Modulo size, flip gen. */
-	qatomic_set(var, idx);
+	atomic_set(var, idx);
 }
 
 static inline int32_t pvrdma_idx_ring_has_space(const struct pvrdma_ring *r,
 					      uint32_t max_elems, uint32_t *out_tail)
 {
-	const uint32_t tail = qatomic_read(&r->prod_tail);
-	const uint32_t head = qatomic_read(&r->cons_head);
+	const uint32_t tail = atomic_read(&r->prod_tail);
+	const uint32_t head = atomic_read(&r->cons_head);
 
 	if (pvrdma_idx_valid(tail, max_elems) &&
 	    pvrdma_idx_valid(head, max_elems)) {
@@ -100,8 +100,8 @@ static inline int32_t pvrdma_idx_ring_has_space(const struct pvrdma_ring *r,
 static inline int32_t pvrdma_idx_ring_has_data(const struct pvrdma_ring *r,
 					     uint32_t max_elems, uint32_t *out_head)
 {
-	const uint32_t tail = qatomic_read(&r->prod_tail);
-	const uint32_t head = qatomic_read(&r->cons_head);
+	const uint32_t tail = atomic_read(&r->prod_tail);
+	const uint32_t head = atomic_read(&r->cons_head);
 
 	if (pvrdma_idx_valid(tail, max_elems) &&
 	    pvrdma_idx_valid(head, max_elems)) {
include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h +1 -1
index 1677208..0a8c7c9 100644
@@ -176,7 +176,7 @@ struct pvrdma_port_attr {
 	uint8_t			subnet_timeout;
 	uint8_t			init_type_reply;
 	uint8_t			active_width;
-	uint8_t			active_speed;
+	uint16_t			active_speed;
 	uint8_t			phys_state;
 	uint8_t			reserved[2];
 };
include/standard-headers/linux/ethtool.h +2 -0
index e13eff4..0df22f7 100644
@@ -1617,6 +1617,8 @@ enum ethtool_link_mode_bit_indices {
 	ETHTOOL_LINK_MODE_400000baseLR4_ER4_FR4_Full_BIT = 87,
 	ETHTOOL_LINK_MODE_400000baseDR4_Full_BIT	 = 88,
 	ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT	 = 89,
+	ETHTOOL_LINK_MODE_100baseFX_Half_BIT		 = 90,
+	ETHTOOL_LINK_MODE_100baseFX_Full_BIT		 = 91,
 	/* must be last entry */
 	__ETHTOOL_LINK_MODE_MASK_NBITS
 };
include/standard-headers/linux/fuse.h +47 -3

90 lines not on this page · raw message

include/standard-headers/linux/input-event-codes.h +4 -0
index e740ad9..c403b9c 100644
@@ -515,6 +515,9 @@
 #define KEY_10CHANNELSUP	0x1b8	/* 10 channels up (10+) */
 #define KEY_10CHANNELSDOWN	0x1b9	/* 10 channels down (10-) */
 #define KEY_IMAGES		0x1ba	/* AL Image Browser */
+#define KEY_NOTIFICATION_CENTER	0x1bc	/* Show/hide the notification center */
+#define KEY_PICKUP_PHONE	0x1bd	/* Answer incoming call */
+#define KEY_HANGUP_PHONE	0x1be	/* Decline incoming call */
 
 #define KEY_DEL_EOL		0x1c0
 #define KEY_DEL_EOS		0x1c1
@@ -542,6 +545,7 @@
 #define KEY_FN_F		0x1e2
 #define KEY_FN_S		0x1e3
 #define KEY_FN_B		0x1e4
+#define KEY_FN_RIGHT_SHIFT	0x1e5
 
 #define KEY_BRL_DOT1		0x1f1
 #define KEY_BRL_DOT2		0x1f2
include/standard-headers/linux/pci_regs.h +5 -1
index f970141..a95d55f 100644
@@ -76,6 +76,7 @@
 #define PCI_CACHE_LINE_SIZE	0x0c	/* 8 bits */
 #define PCI_LATENCY_TIMER	0x0d	/* 8 bits */
 #define PCI_HEADER_TYPE		0x0e	/* 8 bits */
+#define  PCI_HEADER_TYPE_MASK		0x7f
 #define  PCI_HEADER_TYPE_NORMAL		0
 #define  PCI_HEADER_TYPE_BRIDGE		1
 #define  PCI_HEADER_TYPE_CARDBUS	2
@@ -246,7 +247,7 @@
 #define  PCI_PM_CAP_PME_D0	0x0800	/* PME# from D0 */
 #define  PCI_PM_CAP_PME_D1	0x1000	/* PME# from D1 */
 #define  PCI_PM_CAP_PME_D2	0x2000	/* PME# from D2 */
-#define  PCI_PM_CAP_PME_D3	0x4000	/* PME# from D3 (hot) */
+#define  PCI_PM_CAP_PME_D3hot	0x4000	/* PME# from D3 (hot) */
 #define  PCI_PM_CAP_PME_D3cold	0x8000	/* PME# from D3 (cold) */
 #define  PCI_PM_CAP_PME_SHIFT	11	/* Start of the PME Mask in PMC */
 #define PCI_PM_CTRL		4	/* PM control and status register */
@@ -532,6 +533,8 @@
 #define  PCI_EXP_LNKCAP_SLS_32_0GB 0x00000005 /* LNKCAP2 SLS Vector bit 4 */
 #define  PCI_EXP_LNKCAP_MLW	0x000003f0 /* Maximum Link Width */
 #define  PCI_EXP_LNKCAP_ASPMS	0x00000c00 /* ASPM Support */
+#define  PCI_EXP_LNKCAP_ASPM_L0S 0x00000400 /* ASPM L0s Support */
+#define  PCI_EXP_LNKCAP_ASPM_L1  0x00000800 /* ASPM L1 Support */
 #define  PCI_EXP_LNKCAP_L0SEL	0x00007000 /* L0s Exit Latency */
 #define  PCI_EXP_LNKCAP_L1EL	0x00038000 /* L1 Exit Latency */
 #define  PCI_EXP_LNKCAP_CLKPM	0x00040000 /* Clock Power Management */
@@ -1056,6 +1059,7 @@
 #define  PCI_L1SS_CTL1_PCIPM_L1_1	0x00000002  /* PCI-PM L1.1 Enable */
 #define  PCI_L1SS_CTL1_ASPM_L1_2	0x00000004  /* ASPM L1.2 Enable */
 #define  PCI_L1SS_CTL1_ASPM_L1_1	0x00000008  /* ASPM L1.1 Enable */
+#define  PCI_L1SS_CTL1_L1_2_MASK	0x00000005
 #define  PCI_L1SS_CTL1_L1SS_MASK	0x0000000f
 #define  PCI_L1SS_CTL1_CM_RESTORE_TIME	0x0000ff00  /* Common_Mode_Restore_Time */
 #define  PCI_L1SS_CTL1_LTR_L12_TH_VALUE	0x03ff0000  /* LTR_L1.2_THRESHOLD_Value */
include/standard-headers/linux/virtio_fs.h +3 -0
index 9d88817..a32fe8a 100644
@@ -16,4 +16,7 @@ struct virtio_fs_config {
 	uint32_t num_request_queues;
 } QEMU_PACKED;
 
+/* For the id field in virtio_pci_shm_cap */
+#define VIRTIO_FS_SHMCAP_ID_CACHE 0
+
 #endif /* _LINUX_VIRTIO_FS_H */
include/standard-headers/linux/virtio_gpu.h +19 -0
index b8fa15f..4183cdc 100644
@@ -50,6 +50,10 @@
  * VIRTIO_GPU_CMD_GET_EDID
  */
 #define VIRTIO_GPU_F_EDID                1
+/*
+ * VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID
+ */
+#define VIRTIO_GPU_F_RESOURCE_UUID       2
 
 enum virtio_gpu_ctrl_type {
 	VIRTIO_GPU_UNDEFINED = 0,
@@ -66,6 +70,7 @@ enum virtio_gpu_ctrl_type {
 	VIRTIO_GPU_CMD_GET_CAPSET_INFO,
 	VIRTIO_GPU_CMD_GET_CAPSET,
 	VIRTIO_GPU_CMD_GET_EDID,
+	VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID,
 
 	/* 3d commands */
 	VIRTIO_GPU_CMD_CTX_CREATE = 0x0200,
@@ -87,6 +92,7 @@ enum virtio_gpu_ctrl_type {
 	VIRTIO_GPU_RESP_OK_CAPSET_INFO,
 	VIRTIO_GPU_RESP_OK_CAPSET,
 	VIRTIO_GPU_RESP_OK_EDID,
+	VIRTIO_GPU_RESP_OK_RESOURCE_UUID,
 
 	/* error responses */
 	VIRTIO_GPU_RESP_ERR_UNSPEC = 0x1200,
@@ -340,4 +346,17 @@ enum virtio_gpu_formats {
 	VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM  = 134,
 };
 
+/* VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID */
+struct virtio_gpu_resource_assign_uuid {
+	struct virtio_gpu_ctrl_hdr hdr;
+	uint32_t resource_id;
+	uint32_t padding;
+};
+
+/* VIRTIO_GPU_RESP_OK_RESOURCE_UUID */
+struct virtio_gpu_resp_resource_uuid {
+	struct virtio_gpu_ctrl_hdr hdr;
+	uint8_t uuid[16];
+};
+
 #endif
include/standard-headers/linux/virtio_mmio.h +11 -0
index c4b0968..0650f91 100644
@@ -122,6 +122,17 @@
 #define VIRTIO_MMIO_QUEUE_USED_LOW	0x0a0
 #define VIRTIO_MMIO_QUEUE_USED_HIGH	0x0a4
 
+/* Shared memory region id */
+#define VIRTIO_MMIO_SHM_SEL             0x0ac
+
+/* Shared memory region length, 64 bits in two halves */
+#define VIRTIO_MMIO_SHM_LEN_LOW         0x0b0
+#define VIRTIO_MMIO_SHM_LEN_HIGH        0x0b4
+
+/* Shared memory region base address, 64 bits in two halves */
+#define VIRTIO_MMIO_SHM_BASE_LOW        0x0b8
+#define VIRTIO_MMIO_SHM_BASE_HIGH       0x0bc
+
 /* Configuration atomicity value */
 #define VIRTIO_MMIO_CONFIG_GENERATION	0x0fc
 
include/standard-headers/linux/virtio_pci.h +10 -1
index 9262acd..db7a8e2 100644
@@ -113,6 +113,8 @@
 #define VIRTIO_PCI_CAP_DEVICE_CFG	4
 /* PCI configuration access */
 #define VIRTIO_PCI_CAP_PCI_CFG		5
+/* Additional shared memory capability */
+#define VIRTIO_PCI_CAP_SHARED_MEMORY_CFG 8
 
 /* This is the PCI capability header: */
 struct virtio_pci_cap {
@@ -121,11 +123,18 @@ struct virtio_pci_cap {
 	uint8_t cap_len;		/* Generic PCI field: capability length */
 	uint8_t cfg_type;		/* Identifies the structure. */
 	uint8_t bar;		/* Where to find it. */
-	uint8_t padding[3];	/* Pad to full dword. */
+	uint8_t id;		/* Multiple capabilities of the same type */
+	uint8_t padding[2];	/* Pad to full dword. */
 	uint32_t offset;		/* Offset within bar. */
 	uint32_t length;		/* Length of the structure, in bytes. */
 };
 
+struct virtio_pci_cap64 {
+	struct virtio_pci_cap cap;
+	uint32_t offset_hi;             /* Most sig 32 bits of offset */
+	uint32_t length_hi;             /* Most sig 32 bits of length */
+};
+
 struct virtio_pci_notify_cap {
 	struct virtio_pci_cap cap;
 	uint32_t notify_off_multiplier;	/* Multiplier for queue_notify_off. */
linux-headers/asm-arm64/kvm.h +25 -0
index 9e34f0f..a72de1a 100644
@@ -159,6 +159,21 @@ struct kvm_sync_regs {
 struct kvm_arch_memory_slot {
 };
 
+/*
+ * PMU filter structure. Describe a range of events with a particular
+ * action. To be used with KVM_ARM_VCPU_PMU_V3_FILTER.
+ */
+struct kvm_pmu_event_filter {
+	__u16	base_event;
+	__u16	nevents;
+
+#define KVM_PMU_EVENT_ALLOW	0
+#define KVM_PMU_EVENT_DENY	1
+
+	__u8	action;
+	__u8	pad[3];
+};
+
 /* for KVM_GET/SET_VCPU_EVENTS */
 struct kvm_vcpu_events {
 	struct {
@@ -242,6 +257,15 @@ struct kvm_vcpu_events {
 #define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_NOT_AVAIL		0
 #define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_AVAIL		1
 #define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1_NOT_REQUIRED	2
+
+/*
+ * Only two states can be presented by the host kernel:
+ * - NOT_REQUIRED: the guest doesn't need to do anything
+ * - NOT_AVAIL: the guest isn't mitigated (it can still use SSBS if available)
+ *
+ * All the other values are deprecated. The host still accepts all
+ * values (they are ABI), but will narrow them to the above two.
+ */
 #define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2	KVM_REG_ARM_FW_REG(2)
 #define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_NOT_AVAIL		0
 #define KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2_UNKNOWN		1
@@ -329,6 +353,7 @@ struct kvm_vcpu_events {
 #define KVM_ARM_VCPU_PMU_V3_CTRL	0
 #define   KVM_ARM_VCPU_PMU_V3_IRQ	0
 #define   KVM_ARM_VCPU_PMU_V3_INIT	1
+#define   KVM_ARM_VCPU_PMU_V3_FILTER	2
 #define KVM_ARM_VCPU_TIMER_CTRL		1
 #define   KVM_ARM_VCPU_TIMER_IRQ_VTIMER		0
 #define   KVM_ARM_VCPU_TIMER_IRQ_PTIMER		1
linux-headers/asm-arm64/mman.h +1 -0
index e94b9af..d0dbfe9 100644
@@ -5,5 +5,6 @@
 #include <asm-generic/mman.h>
 
 #define PROT_BTI	0x10		/* BTI guarded page */
+#define PROT_MTE	0x20		/* Normal Tagged mapping */
 
 #endif /* ! _UAPI__ASM_MMAN_H */
linux-headers/asm-generic/hugetlb_encode.h +1 -0
index b0f8e87..4f3d5aa 100644
@@ -20,6 +20,7 @@
 #define HUGETLB_FLAG_ENCODE_SHIFT	26
 #define HUGETLB_FLAG_ENCODE_MASK	0x3f
 
+#define HUGETLB_FLAG_ENCODE_16KB	(14 << HUGETLB_FLAG_ENCODE_SHIFT)
 #define HUGETLB_FLAG_ENCODE_64KB	(16 << HUGETLB_FLAG_ENCODE_SHIFT)
 #define HUGETLB_FLAG_ENCODE_512KB	(19 << HUGETLB_FLAG_ENCODE_SHIFT)
 #define HUGETLB_FLAG_ENCODE_1MB		(20 << HUGETLB_FLAG_ENCODE_SHIFT)
linux-headers/asm-generic/unistd.h +9 -9
index 995b36c..2056318 100644
@@ -140,7 +140,7 @@ __SYSCALL(__NR_renameat, sys_renameat)
 #define __NR_umount2 39
 __SYSCALL(__NR_umount2, sys_umount)
 #define __NR_mount 40
-__SC_COMP(__NR_mount, sys_mount, compat_sys_mount)
+__SYSCALL(__NR_mount, sys_mount)
 #define __NR_pivot_root 41
 __SYSCALL(__NR_pivot_root, sys_pivot_root)
 
@@ -207,9 +207,9 @@ __SYSCALL(__NR_read, sys_read)
 #define __NR_write 64
 __SYSCALL(__NR_write, sys_write)
 #define __NR_readv 65
-__SC_COMP(__NR_readv, sys_readv, compat_sys_readv)
+__SC_COMP(__NR_readv, sys_readv, sys_readv)
 #define __NR_writev 66
-__SC_COMP(__NR_writev, sys_writev, compat_sys_writev)
+__SC_COMP(__NR_writev, sys_writev, sys_writev)
 #define __NR_pread64 67
 __SC_COMP(__NR_pread64, sys_pread64, compat_sys_pread64)
 #define __NR_pwrite64 68
@@ -237,7 +237,7 @@ __SC_COMP(__NR_signalfd4, sys_signalfd4, compat_sys_signalfd4)
 
 /* fs/splice.c */
 #define __NR_vmsplice 75
-__SC_COMP(__NR_vmsplice, sys_vmsplice, compat_sys_vmsplice)
+__SYSCALL(__NR_vmsplice, sys_vmsplice)
 #define __NR_splice 76
 __SYSCALL(__NR_splice, sys_splice)
 #define __NR_tee 77
@@ -727,11 +727,9 @@ __SYSCALL(__NR_setns, sys_setns)
 #define __NR_sendmmsg 269
 __SC_COMP(__NR_sendmmsg, sys_sendmmsg, compat_sys_sendmmsg)
 #define __NR_process_vm_readv 270
-__SC_COMP(__NR_process_vm_readv, sys_process_vm_readv, \
-          compat_sys_process_vm_readv)
+__SYSCALL(__NR_process_vm_readv, sys_process_vm_readv)
 #define __NR_process_vm_writev 271
-__SC_COMP(__NR_process_vm_writev, sys_process_vm_writev, \
-          compat_sys_process_vm_writev)
+__SYSCALL(__NR_process_vm_writev, sys_process_vm_writev)
 #define __NR_kcmp 272
 __SYSCALL(__NR_kcmp, sys_kcmp)
 #define __NR_finit_module 273
@@ -859,9 +857,11 @@ __SYSCALL(__NR_openat2, sys_openat2)
 __SYSCALL(__NR_pidfd_getfd, sys_pidfd_getfd)
 #define __NR_faccessat2 439
 __SYSCALL(__NR_faccessat2, sys_faccessat2)
+#define __NR_process_madvise 440
+__SYSCALL(__NR_process_madvise, sys_process_madvise)
 
 #undef __NR_syscalls
-#define __NR_syscalls 440
+#define __NR_syscalls 441
 
 /*
  * 32 bit systems traditionally used different
linux-headers/asm-mips/unistd_n32.h +1 -0
index 246fbb6..aba284d 100644
@@ -369,6 +369,7 @@
 #define __NR_openat2	(__NR_Linux + 437)
 #define __NR_pidfd_getfd	(__NR_Linux + 438)
 #define __NR_faccessat2	(__NR_Linux + 439)
+#define __NR_process_madvise	(__NR_Linux + 440)
 
 
 #endif /* _ASM_MIPS_UNISTD_N32_H */
linux-headers/asm-mips/unistd_n64.h +1 -0
index 194d777..0465ab9 100644
@@ -345,6 +345,7 @@
 #define __NR_openat2	(__NR_Linux + 437)
 #define __NR_pidfd_getfd	(__NR_Linux + 438)
 #define __NR_faccessat2	(__NR_Linux + 439)
+#define __NR_process_madvise	(__NR_Linux + 440)
 
 
 #endif /* _ASM_MIPS_UNISTD_N64_H */
linux-headers/asm-mips/unistd_o32.h +1 -0
index 3e093dd..5222a0d 100644
@@ -415,6 +415,7 @@
 #define __NR_openat2	(__NR_Linux + 437)
 #define __NR_pidfd_getfd	(__NR_Linux + 438)
 #define __NR_faccessat2	(__NR_Linux + 439)
+#define __NR_process_madvise	(__NR_Linux + 440)
 
 
 #endif /* _ASM_MIPS_UNISTD_O32_H */
linux-headers/asm-powerpc/unistd_32.h +1 -0
index 0db9481d..21066a3 100644
@@ -422,6 +422,7 @@
 #define __NR_openat2	437
 #define __NR_pidfd_getfd	438
 #define __NR_faccessat2	439
+#define __NR_process_madvise	440
 
 
 #endif /* _ASM_POWERPC_UNISTD_32_H */
linux-headers/asm-powerpc/unistd_64.h +1 -0
index 9f74310..c153da2 100644
@@ -394,6 +394,7 @@
 #define __NR_openat2	437
 #define __NR_pidfd_getfd	438
 #define __NR_faccessat2	439
+#define __NR_process_madvise	440
 
 
 #endif /* _ASM_POWERPC_UNISTD_64_H */
linux-headers/asm-s390/unistd_32.h +1 -0
index 1803cd0..3b4f2dd 100644
@@ -412,5 +412,6 @@
 #define __NR_openat2 437
 #define __NR_pidfd_getfd 438
 #define __NR_faccessat2 439
+#define __NR_process_madvise 440
 
 #endif /* _ASM_S390_UNISTD_32_H */
linux-headers/asm-s390/unistd_64.h +1 -0
index 228d500..030a51f 100644
@@ -360,5 +360,6 @@
 #define __NR_openat2 437
 #define __NR_pidfd_getfd 438
 #define __NR_faccessat2 439
+#define __NR_process_madvise 440
 
 #endif /* _ASM_S390_UNISTD_64_H */
linux-headers/asm-x86/kvm.h +20 -0
index 0780f97..89e5f3d 100644
@@ -192,6 +192,26 @@ struct kvm_msr_list {
 	__u32 indices[0];
 };
 
+/* Maximum size of any access bitmap in bytes */
+#define KVM_MSR_FILTER_MAX_BITMAP_SIZE 0x600
+
+/* for KVM_X86_SET_MSR_FILTER */
+struct kvm_msr_filter_range {
+#define KVM_MSR_FILTER_READ  (1 << 0)
+#define KVM_MSR_FILTER_WRITE (1 << 1)
+	__u32 flags;
+	__u32 nmsrs; /* number of msrs in bitmap */
+	__u32 base;  /* MSR index the bitmap starts at */
+	__u8 *bitmap; /* a 1 bit allows the operations in flags, 0 denies */
+};
+
+#define KVM_MSR_FILTER_MAX_RANGES 16
+struct kvm_msr_filter {
+#define KVM_MSR_FILTER_DEFAULT_ALLOW (0 << 0)
+#define KVM_MSR_FILTER_DEFAULT_DENY  (1 << 0)
+	__u32 flags;
+	struct kvm_msr_filter_range ranges[KVM_MSR_FILTER_MAX_RANGES];
+};
 
 struct kvm_cpuid_entry {
 	__u32 function;
linux-headers/asm-x86/unistd_32.h +1 -0
index 356c12c..cfba368 100644
@@ -430,6 +430,7 @@
 #define __NR_openat2 437
 #define __NR_pidfd_getfd 438
 #define __NR_faccessat2 439
+#define __NR_process_madvise 440
 
 
 #endif /* _ASM_X86_UNISTD_32_H */
linux-headers/asm-x86/unistd_64.h +1 -0
index ef70e1c..61af725 100644
@@ -352,6 +352,7 @@
 #define __NR_openat2 437
 #define __NR_pidfd_getfd 438
 #define __NR_faccessat2 439
+#define __NR_process_madvise 440
 
 
 #endif /* _ASM_X86_UNISTD_64_H */
linux-headers/asm-x86/unistd_x32.h +1 -0
index 84ae8e9..a6890cb 100644
@@ -305,6 +305,7 @@
 #define __NR_openat2 (__X32_SYSCALL_BIT + 437)
 #define __NR_pidfd_getfd (__X32_SYSCALL_BIT + 438)
 #define __NR_faccessat2 (__X32_SYSCALL_BIT + 439)
+#define __NR_process_madvise (__X32_SYSCALL_BIT + 440)
 #define __NR_rt_sigaction (__X32_SYSCALL_BIT + 512)
 #define __NR_rt_sigreturn (__X32_SYSCALL_BIT + 513)
 #define __NR_ioctl (__X32_SYSCALL_BIT + 514)
linux-headers/linux/kvm.h +19 -0
index 43580c7..56ce14a 100644
@@ -248,6 +248,8 @@ struct kvm_hyperv_exit {
 #define KVM_EXIT_IOAPIC_EOI       26
 #define KVM_EXIT_HYPERV           27
 #define KVM_EXIT_ARM_NISV         28
+#define KVM_EXIT_X86_RDMSR        29
+#define KVM_EXIT_X86_WRMSR        30
 
 /* For KVM_EXIT_INTERNAL_ERROR */
 /* Emulate instruction failed. */
@@ -413,6 +415,17 @@ struct kvm_run {
 			__u64 esr_iss;
 			__u64 fault_ipa;
 		} arm_nisv;
+		/* KVM_EXIT_X86_RDMSR / KVM_EXIT_X86_WRMSR */
+		struct {
+			__u8 error; /* user -> kernel */
+			__u8 pad[7];
+#define KVM_MSR_EXIT_REASON_INVAL	(1 << 0)
+#define KVM_MSR_EXIT_REASON_UNKNOWN	(1 << 1)
+#define KVM_MSR_EXIT_REASON_FILTER	(1 << 2)
+			__u32 reason; /* kernel -> user */
+			__u32 index; /* kernel -> user */
+			__u64 data; /* kernel <-> user */
+		} msr;
 		/* Fix the size of the union. */
 		char padding[256];
 	};
@@ -1037,6 +1050,9 @@ struct kvm_ppc_resize_hpt {
 #define KVM_CAP_SMALLER_MAXPHYADDR 185
 #define KVM_CAP_S390_DIAG318 186
 #define KVM_CAP_STEAL_TIME 187
+#define KVM_CAP_X86_USER_SPACE_MSR 188
+#define KVM_CAP_X86_MSR_FILTER 189
+#define KVM_CAP_ENFORCE_PV_FEATURE_CPUID 190
 
 #ifdef KVM_CAP_IRQ_ROUTING
 
@@ -1538,6 +1554,9 @@ struct kvm_pv_cmd {
 /* Available with KVM_CAP_S390_PROTECTED */
 #define KVM_S390_PV_COMMAND		_IOWR(KVMIO, 0xc5, struct kvm_pv_cmd)
 
+/* Available with KVM_CAP_X86_MSR_FILTER */
+#define KVM_X86_SET_MSR_FILTER	_IOW(KVMIO,  0xc6, struct kvm_msr_filter)
+
 /* Secure Encrypted Virtualization command */
 enum sev_cmd_id {
 	/* Guest initialization commands */
linux-headers/linux/mman.h +1 -0
index 51ea363..434986f 100644
@@ -27,6 +27,7 @@
 #define MAP_HUGE_SHIFT	HUGETLB_FLAG_ENCODE_SHIFT
 #define MAP_HUGE_MASK	HUGETLB_FLAG_ENCODE_MASK
 
+#define MAP_HUGE_16KB	HUGETLB_FLAG_ENCODE_16KB
 #define MAP_HUGE_64KB	HUGETLB_FLAG_ENCODE_64KB
 #define MAP_HUGE_512KB	HUGETLB_FLAG_ENCODE_512KB
 #define MAP_HUGE_1MB	HUGETLB_FLAG_ENCODE_1MB
linux-headers/linux/vfio.h +28 -1
index a906724..b92dcc4 100644
@@ -201,8 +201,11 @@ struct vfio_device_info {
 #define VFIO_DEVICE_FLAGS_AMBA  (1 << 3)	/* vfio-amba device */
 #define VFIO_DEVICE_FLAGS_CCW	(1 << 4)	/* vfio-ccw device */
 #define VFIO_DEVICE_FLAGS_AP	(1 << 5)	/* vfio-ap device */
+#define VFIO_DEVICE_FLAGS_FSL_MC (1 << 6)	/* vfio-fsl-mc device */
+#define VFIO_DEVICE_FLAGS_CAPS	(1 << 7)	/* Info supports caps */
 	__u32	num_regions;	/* Max region index + 1 */
 	__u32	num_irqs;	/* Max IRQ index + 1 */
+	__u32   cap_offset;	/* Offset within info struct of first cap */
 };
 #define VFIO_DEVICE_GET_INFO		_IO(VFIO_TYPE, VFIO_BASE + 7)
 
@@ -218,6 +221,15 @@ struct vfio_device_info {
 #define VFIO_DEVICE_API_CCW_STRING		"vfio-ccw"
 #define VFIO_DEVICE_API_AP_STRING		"vfio-ap"
 
+/*
+ * The following capabilities are unique to s390 zPCI devices.  Their contents
+ * are further-defined in vfio_zdev.h
+ */
+#define VFIO_DEVICE_INFO_CAP_ZPCI_BASE		1
+#define VFIO_DEVICE_INFO_CAP_ZPCI_GROUP		2
+#define VFIO_DEVICE_INFO_CAP_ZPCI_UTIL		3
+#define VFIO_DEVICE_INFO_CAP_ZPCI_PFIP		4
+
 /**
  * VFIO_DEVICE_GET_REGION_INFO - _IOWR(VFIO_TYPE, VFIO_BASE + 8,
  *				       struct vfio_region_info)
@@ -462,7 +474,7 @@ struct vfio_region_gfx_edid {
  * 5. Resumed
  *                  |--------->|
  *
- * 0. Default state of VFIO device is _RUNNNG when the user application starts.
+ * 0. Default state of VFIO device is _RUNNING when the user application starts.
  * 1. During normal shutdown of the user application, the user application may
  *    optionally change the VFIO device state from _RUNNING to _STOP. This
  *    transition is optional. The vendor driver must support this transition but
@@ -1039,6 +1051,21 @@ struct vfio_iommu_type1_info_cap_migration {
 	__u64	max_dirty_bitmap_size;		/* in bytes */
 };
 
+/*
+ * The DMA available capability allows to report the current number of
+ * simultaneously outstanding DMA mappings that are allowed.
+ *
+ * The structure below defines version 1 of this capability.
+ *
+ * avail: specifies the current number of outstanding DMA mappings allowed.
+ */
+#define VFIO_IOMMU_TYPE1_INFO_DMA_AVAIL 3
+
+struct vfio_iommu_type1_info_dma_avail {
+	struct	vfio_info_cap_header header;
+	__u32	avail;
+};
+
 #define VFIO_IOMMU_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12)
 
 /**
linux-headers/linux/vfio_zdev.h new file +78 -0

78 lines not on this page · raw message

Signature · 1 line
1.8.3.1
#3 lore raw

Re: [PATCH 02/13] linux-headers: update against 5.10-rc1

Quoted 72 lines · On Mon, 26 Oct 2020 11:34:30 -0400 Matthew Rosato <[email protected]>…

commit 3650b228f83adda7e5ee532e2b90429c03f7b9ec

---
 .../drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h | 14 ++--
 .../infiniband/hw/vmw_pvrdma/pvrdma_verbs.h        |  2 +-
 include/standard-headers/linux/ethtool.h           |  2 +
 include/standard-headers/linux/fuse.h              | 50 +++++++++++++-
 include/standard-headers/linux/input-event-codes.h |  4 ++
 include/standard-headers/linux/pci_regs.h          |  6 +-
 include/standard-headers/linux/virtio_fs.h         |  3 +
 include/standard-headers/linux/virtio_gpu.h        | 19 ++++++
 include/standard-headers/linux/virtio_mmio.h       | 11 +++
 include/standard-headers/linux/virtio_pci.h        | 11 ++-
 linux-headers/asm-arm64/kvm.h                      | 25 +++++++
 linux-headers/asm-arm64/mman.h                     |  1 +
 linux-headers/asm-generic/hugetlb_encode.h         |  1 +
 linux-headers/asm-generic/unistd.h                 | 18 ++---
 linux-headers/asm-mips/unistd_n32.h                |  1 +
 linux-headers/asm-mips/unistd_n64.h                |  1 +
 linux-headers/asm-mips/unistd_o32.h                |  1 +
 linux-headers/asm-powerpc/unistd_32.h              |  1 +
 linux-headers/asm-powerpc/unistd_64.h              |  1 +
 linux-headers/asm-s390/unistd_32.h                 |  1 +
 linux-headers/asm-s390/unistd_64.h                 |  1 +
 linux-headers/asm-x86/kvm.h                        | 20 ++++++
 linux-headers/asm-x86/unistd_32.h                  |  1 +
 linux-headers/asm-x86/unistd_64.h                  |  1 +
 linux-headers/asm-x86/unistd_x32.h                 |  1 +
 linux-headers/linux/kvm.h                          | 19 ++++++
 linux-headers/linux/mman.h                         |  1 +
 linux-headers/linux/vfio.h                         | 29 +++++++-
 linux-headers/linux/vfio_zdev.h                    | 78 ++++++++++++++++++++++
 29 files changed, 301 insertions(+), 23 deletions(-)
 create mode 100644 linux-headers/linux/vfio_zdev.h
include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h +5 -5
index 7b4062a..acd4c83 100644
@@ -68,7 +68,7 @@ static inline int pvrdma_idx_valid(uint32_t idx, uint32_t max_elems)
 
 static inline int32_t pvrdma_idx(int *var, uint32_t max_elems)
 {
-	const unsigned int idx = qatomic_read(var);
+	const unsigned int idx = atomic_read(var);
 
 	if (pvrdma_idx_valid(idx, max_elems))
 		return idx & (max_elems - 1);
@@ -77,17 +77,17 @@ static inline int32_t pvrdma_idx(int *var, uint32_t max_elems)
 
 static inline void pvrdma_idx_ring_inc(int *var, uint32_t max_elems)
 {
-	uint32_t idx = qatomic_read(var) + 1;	/* Increment. */
+	uint32_t idx = atomic_read(var) + 1;	/* Increment. */
 
 	idx &= (max_elems << 1) - 1;		/* Modulo size, flip gen. */
-	qatomic_set(var, idx);
+	atomic_set(var, idx);
 }
 
 static inline int32_t pvrdma_idx_ring_has_space(const struct pvrdma_ring *r,
 					      uint32_t max_elems, uint32_t *out_tail)
 {
-	const uint32_t tail = qatomic_read(&r->prod_tail);
-	const uint32_t head = qatomic_read(&r->cons_head);
+	const uint32_t tail = atomic_read(&r->prod_tail);
+	const uint32_t head = atomic_read(&r->cons_head);
 
 	if (pvrdma_idx_valid(tail, max_elems) &&
 	    pvrdma_idx_valid(head, max_elems)) {

include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h static inline int32_t pvrdma_idx_ring_has_space(const struct pvrdma_ring *r, · line 107

Quoted 10 lines
include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h +2 -2
@@ -100,8 +100,8 @@ static inline int32_t pvrdma_idx_ring_has_space(const struct pvrdma_ring *r,
 static inline int32_t pvrdma_idx_ring_has_data(const struct pvrdma_ring *r,
 					     uint32_t max_elems, uint32_t *out_head)
 {
-	const uint32_t tail = qatomic_read(&r->prod_tail);
-	const uint32_t head = qatomic_read(&r->cons_head);
+	const uint32_t tail = atomic_read(&r->prod_tail);
+	const uint32_t head = atomic_read(&r->cons_head);
 
 	if (pvrdma_idx_valid(tail, max_elems) &&
 	    pvrdma_idx_valid(head, max_elems)) {

The above is clearly just going to revert Stefan's changes to this file via:

d73415a31547 )"qemu/atomic.h: rename atomic_ to qatomic_")

For now I'm just going to drop these changes (with comment) to avoid that. I'll leave it to others to fix the header update script to either reimplement the s/atomic_/qatomic_/ conversion or remove these code blocks altogether. Sound ok? Thanks,

Alex

#4 lore raw

Re: [PATCH 02/13] linux-headers: update against 5.10-rc1

Quoted 90 lines · Alex Williamson
Quoted 72 lines · On Mon, 26 Oct 2020 11:34:30 -0400 Matthew Rosato <[email protected]>…

commit 3650b228f83adda7e5ee532e2b90429c03f7b9ec

---
  .../drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h | 14 ++--
  .../infiniband/hw/vmw_pvrdma/pvrdma_verbs.h        |  2 +-
  include/standard-headers/linux/ethtool.h           |  2 +
  include/standard-headers/linux/fuse.h              | 50 +++++++++++++-
  include/standard-headers/linux/input-event-codes.h |  4 ++
  include/standard-headers/linux/pci_regs.h          |  6 +-
  include/standard-headers/linux/virtio_fs.h         |  3 +
  include/standard-headers/linux/virtio_gpu.h        | 19 ++++++
  include/standard-headers/linux/virtio_mmio.h       | 11 +++
  include/standard-headers/linux/virtio_pci.h        | 11 ++-
  linux-headers/asm-arm64/kvm.h                      | 25 +++++++
  linux-headers/asm-arm64/mman.h                     |  1 +
  linux-headers/asm-generic/hugetlb_encode.h         |  1 +
  linux-headers/asm-generic/unistd.h                 | 18 ++---
  linux-headers/asm-mips/unistd_n32.h                |  1 +
  linux-headers/asm-mips/unistd_n64.h                |  1 +
  linux-headers/asm-mips/unistd_o32.h                |  1 +
  linux-headers/asm-powerpc/unistd_32.h              |  1 +
  linux-headers/asm-powerpc/unistd_64.h              |  1 +
  linux-headers/asm-s390/unistd_32.h                 |  1 +
  linux-headers/asm-s390/unistd_64.h                 |  1 +
  linux-headers/asm-x86/kvm.h                        | 20 ++++++
  linux-headers/asm-x86/unistd_32.h                  |  1 +
  linux-headers/asm-x86/unistd_64.h                  |  1 +
  linux-headers/asm-x86/unistd_x32.h                 |  1 +
  linux-headers/linux/kvm.h                          | 19 ++++++
  linux-headers/linux/mman.h                         |  1 +
  linux-headers/linux/vfio.h                         | 29 +++++++-
  linux-headers/linux/vfio_zdev.h                    | 78 ++++++++++++++++++++++
  29 files changed, 301 insertions(+), 23 deletions(-)

create mode 100644 linux-headers/linux/vfio_zdev.h

include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h +5 -5
index 7b4062a..acd4c83 100644
@@ -68,7 +68,7 @@ static inline int pvrdma_idx_valid(uint32_t idx, uint32_t max_elems)
 
  static inline int32_t pvrdma_idx(int *var, uint32_t max_elems)
  {
-	const unsigned int idx = qatomic_read(var);
+	const unsigned int idx = atomic_read(var);
 
  	if (pvrdma_idx_valid(idx, max_elems))
  		return idx & (max_elems - 1);
@@ -77,17 +77,17 @@ static inline int32_t pvrdma_idx(int *var, uint32_t max_elems)
 
  static inline void pvrdma_idx_ring_inc(int *var, uint32_t max_elems)
  {
-	uint32_t idx = qatomic_read(var) + 1;	/* Increment. */
+	uint32_t idx = atomic_read(var) + 1;	/* Increment. */
 
  	idx &= (max_elems << 1) - 1;		/* Modulo size, flip gen. */
-	qatomic_set(var, idx);
+	atomic_set(var, idx);
  }
 
  static inline int32_t pvrdma_idx_ring_has_space(const struct pvrdma_ring *r,
  					      uint32_t max_elems, uint32_t *out_tail)
  {
-	const uint32_t tail = qatomic_read(&r->prod_tail);
-	const uint32_t head = qatomic_read(&r->cons_head);
+	const uint32_t tail = atomic_read(&r->prod_tail);
+	const uint32_t head = atomic_read(&r->cons_head);
 
  	if (pvrdma_idx_valid(tail, max_elems) &&
  	    pvrdma_idx_valid(head, max_elems)) {

include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h static inline int32_t pvrdma_idx_ring_has_space(const struct pvrdma_ring *r, · line 107

Quoted 10 lines
include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h +2 -2
@@ -100,8 +100,8 @@ static inline int32_t pvrdma_idx_ring_has_space(const struct pvrdma_ring *r,
  static inline int32_t pvrdma_idx_ring_has_data(const struct pvrdma_ring *r,
  					     uint32_t max_elems, uint32_t *out_head)
  {
-	const uint32_t tail = qatomic_read(&r->prod_tail);
-	const uint32_t head = qatomic_read(&r->cons_head);
+	const uint32_t tail = atomic_read(&r->prod_tail);
+	const uint32_t head = atomic_read(&r->cons_head);
 
  	if (pvrdma_idx_valid(tail, max_elems) &&
  	    pvrdma_idx_valid(head, max_elems)) {

The above is clearly just going to revert Stefan's changes to this file via:

Quoted 8 lines

d73415a31547 )"qemu/atomic.h: rename atomic_ to qatomic_")

For now I'm just going to drop these changes (with comment) to avoid that. I'll leave it to others to fix the header update script to either reimplement the s/atomic_/qatomic_/ conversion or remove these code blocks altogether. Sound ok? Thanks,

Alex

Yes, this makes sense to me.

#5 lore raw

PATCH 3/13 s390x/pci: Move header files to include/hw/s390x

In reply to Matthew Rosato

Seems a more appropriate location for them.

---
 MAINTAINERS                              | 1 +
 hw/s390x/s390-pci-bus.c                  | 4 ++--
 hw/s390x/s390-pci-inst.c                 | 4 ++--
 hw/s390x/s390-virtio-ccw.c               | 2 +-
 {hw => include/hw}/s390x/s390-pci-bus.h  | 0
 {hw => include/hw}/s390x/s390-pci-inst.h | 0
 6 files changed, 6 insertions(+), 5 deletions(-)
 rename {hw => include/hw}/s390x/s390-pci-bus.h (100%)
 rename {hw => include/hw}/s390x/s390-pci-inst.h (100%)
MAINTAINERS +1 -0
index ef6f5c7..e0c6595 100644
@@ -1435,6 +1435,7 @@ S390 PCI
 M: Matthew Rosato <[email protected]>
 S: Supported
 F: hw/s390x/s390-pci*
+F: include/hw/s390x/s390-pci*
 L: [email protected]
 
 UniCore32 Machines
hw/s390x/s390-pci-bus.c +2 -2
index fb4cee8..a929340 100644
@@ -15,8 +15,8 @@
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "cpu.h"
-#include "s390-pci-bus.h"
-#include "s390-pci-inst.h"
+#include "hw/s390x/s390-pci-bus.h"
+#include "hw/s390x/s390-pci-inst.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/qdev-properties.h"
 #include "hw/pci/pci_bridge.h"
hw/s390x/s390-pci-inst.c +2 -2
index 2f7a7d7..639b13c 100644
@@ -13,12 +13,12 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "s390-pci-inst.h"
-#include "s390-pci-bus.h"
 #include "exec/memop.h"
 #include "exec/memory-internal.h"
 #include "qemu/error-report.h"
 #include "sysemu/hw_accel.h"
+#include "hw/s390x/s390-pci-inst.h"
+#include "hw/s390x/s390-pci-bus.h"
 #include "hw/s390x/tod.h"
 
 #ifndef DEBUG_S390PCI_INST
hw/s390x/s390-virtio-ccw.c +1 -1
index e52182f..9bf658d 100644
@@ -28,7 +28,7 @@
 #include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "qemu/qemu-print.h"
-#include "s390-pci-bus.h"
+#include "hw/s390x/s390-pci-bus.h"
 #include "sysemu/reset.h"
 #include "hw/s390x/storage-keys.h"
 #include "hw/s390x/storage-attributes.h"
include/hw/s390x/s390-pci-bus.h renamed from hw/s390x/s390-pci-bus.h +0 -0
similarity index 100%
rename from hw/s390x/s390-pci-bus.h
rename to include/hw/s390x/s390-pci-bus.h
include/hw/s390x/s390-pci-inst.h renamed from hw/s390x/s390-pci-inst.h +0 -0
similarity index 100%
rename from hw/s390x/s390-pci-inst.h
rename to include/hw/s390x/s390-pci-inst.h
Signature · 1 line
1.8.3.1
#6 lore raw

PATCH 4/13 vfio: Create shared routine for scanning info capabilities

In reply to Matthew Rosato

Rather than duplicating the same loop in multiple locations, create a static function to do the work.

---
 hw/vfio/common.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)
hw/vfio/common.c +13 -8
index 13471ae..e47a4d7 100644
@@ -825,17 +825,12 @@ static void vfio_listener_release(VFIOContainer *container)
     }
 }
 
-struct vfio_info_cap_header *
-vfio_get_region_info_cap(struct vfio_region_info *info, uint16_t id)
+static struct vfio_info_cap_header *
+vfio_get_cap(void *ptr, uint32_t cap_offset, uint16_t id)
 {
     struct vfio_info_cap_header *hdr;
-    void *ptr = info;
-
-    if (!(info->flags & VFIO_REGION_INFO_FLAG_CAPS)) {
-        return NULL;
-    }
 
-    for (hdr = ptr + info->cap_offset; hdr != ptr; hdr = ptr + hdr->next) {
+    for (hdr = ptr + cap_offset; hdr != ptr; hdr = ptr + hdr->next) {
         if (hdr->id == id) {
             return hdr;
         }
@@ -844,6 +839,16 @@ vfio_get_region_info_cap(struct vfio_region_info *info, uint16_t id)
     return NULL;
 }
 
+struct vfio_info_cap_header *
+vfio_get_region_info_cap(struct vfio_region_info *info, uint16_t id)
+{
+    if (!(info->flags & VFIO_REGION_INFO_FLAG_CAPS)) {
+        return NULL;
+    }
+
+    return vfio_get_cap((void *)info, info->cap_offset, id);
+}
+
 static int vfio_setup_region_sparse_mmaps(VFIORegion *region,
                                           struct vfio_region_info *info)
 {
Signature · 1 line
1.8.3.1
#7 lore raw

PATCH 5/13 vfio: Find DMA available capability

In reply to Matthew Rosato

The underlying host may be limiting the number of outstanding DMA requests for type 1 IOMMU. Add helper functions to check for the DMA available capability and retrieve the current number of DMA mappings allowed.

---
 hw/vfio/common.c              | 31 +++++++++++++++++++++++++++++++
 include/hw/vfio/vfio-common.h |  2 ++
 2 files changed, 33 insertions(+)
hw/vfio/common.c +31 -0
index e47a4d7..20914bf 100644
@@ -849,6 +849,37 @@ vfio_get_region_info_cap(struct vfio_region_info *info, uint16_t id)
     return vfio_get_cap((void *)info, info->cap_offset, id);
 }
 
+static struct vfio_info_cap_header *
+vfio_get_iommu_type1_info_cap(struct vfio_iommu_type1_info *info, uint16_t id)
+{
+    if (!(info->flags & VFIO_IOMMU_INFO_CAPS)) {
+        return NULL;
+    }
+
+    return vfio_get_cap((void *)info, info->cap_offset, id);
+}
+
+bool vfio_get_info_dma_avail(struct vfio_iommu_type1_info *info,
+                             unsigned int *avail)
+{
+    struct vfio_info_cap_header *hdr;
+    struct vfio_iommu_type1_info_dma_avail *cap;
+
+    /* If the capability cannot be found, assume no DMA limiting */
+    hdr = vfio_get_iommu_type1_info_cap(info,
+                                        VFIO_IOMMU_TYPE1_INFO_DMA_AVAIL);
+    if (hdr == NULL) {
+        return false;
+    }
+
+    if (avail != NULL) {
+        cap = (void *) hdr;
+        *avail = cap->avail;
+    }
+
+    return true;
+}
+
 static int vfio_setup_region_sparse_mmaps(VFIORegion *region,
                                           struct vfio_region_info *info)
 {
include/hw/vfio/vfio-common.h +2 -0
index c78f3ff..661a380 100644
@@ -178,6 +178,8 @@ VFIOGroup *vfio_get_group(int groupid, AddressSpace *as, Error **errp);
 void vfio_put_group(VFIOGroup *group);
 int vfio_get_device(VFIOGroup *group, const char *name,
                     VFIODevice *vbasedev, Error **errp);
+bool vfio_get_info_dma_avail(struct vfio_iommu_type1_info *info,
+                             unsigned int *avail);
 
 extern const MemoryRegionOps vfio_region_ops;
 typedef QLIST_HEAD(VFIOGroupList, VFIOGroup) VFIOGroupList;
Signature · 1 line
1.8.3.1
#8 lore raw

PATCH 6/13 s390x/pci: Add routine to get the vfio dma available count

In reply to Matthew Rosato

Create new files for separating out vfio-specific work for s390 pci. Add the first such routine, which issues VFIO_IOMMU_GET_INFO ioctl to collect the current dma available count.

---
 hw/s390x/meson.build             |  1 +
 hw/s390x/s390-pci-vfio.c         | 54 ++++++++++++++++++++++++++++++++++++++++
 include/hw/s390x/s390-pci-vfio.h | 17 +++++++++++++
 3 files changed, 72 insertions(+)
 create mode 100644 hw/s390x/s390-pci-vfio.c
 create mode 100644 include/hw/s390x/s390-pci-vfio.h
hw/s390x/meson.build +1 -0
index 948ceae..3ee4594 100644
@@ -10,6 +10,7 @@ s390x_ss.add(files(
   's390-ccw.c',
   's390-pci-bus.c',
   's390-pci-inst.c',
+  's390-pci-vfio.c',
   's390-skeys.c',
   's390-stattrib.c',
   's390-virtio-hcall.c',
hw/s390x/s390-pci-vfio.c new file +54 -0

54 lines not on this page · raw message

include/hw/s390x/s390-pci-vfio.h new file +17 -0
new file mode 100644
index 0000000..2a5a261
@@ -0,0 +1,17 @@
+/*
+ * s390 vfio-pci interfaces
+ *
+ * Copyright 2020 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_VFIO_H
+#define HW_S390_PCI_VFIO_H
+
+bool s390_pci_update_dma_avail(int fd, unsigned int *avail);
+
+#endif
Signature · 1 line
1.8.3.1
#9 lore raw

PATCH 7/13 s390x/pci: Honor DMA limits set by vfio

In reply to Matthew Rosato

When an s390 guest is using lazy unmapping, it can result in a very large number of oustanding DMA requests, far beyond the default limit configured for vfio. Let's track DMA usage similar to vfio in the host, and trigger the guest to flush their DMA mappings before vfio runs out.

---
 hw/s390x/s390-pci-bus.c          | 16 +++++++++-----
 hw/s390x/s390-pci-inst.c         | 45 ++++++++++++++++++++++++++++++++++------
 hw/s390x/s390-pci-vfio.c         | 42 +++++++++++++++++++++++++++++++++++++
 include/hw/s390x/s390-pci-bus.h  |  9 ++++++++
 include/hw/s390x/s390-pci-inst.h |  3 +++
 include/hw/s390x/s390-pci-vfio.h |  5 +++++
 6 files changed, 109 insertions(+), 11 deletions(-)
hw/s390x/s390-pci-bus.c +11 -5
index a929340..2187173 100644
@@ -17,6 +17,7 @@
 #include "cpu.h"
 #include "hw/s390x/s390-pci-bus.h"
 #include "hw/s390x/s390-pci-inst.h"
+#include "hw/s390x/s390-pci-vfio.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/qdev-properties.h"
 #include "hw/pci/pci_bridge.h"
@@ -764,6 +765,7 @@ static void s390_pcihost_realize(DeviceState *dev, Error **errp)
     s->bus_no = 0;
     QTAILQ_INIT(&s->pending_sei);
     QTAILQ_INIT(&s->zpci_devs);
+    QTAILQ_INIT(&s->zpci_dma_limit);
 
     css_register_io_adapters(CSS_IO_ADAPTER_PCI, true, false,
                              S390_ADAPTER_SUPPRESSIBLE, errp);
@@ -941,17 +943,18 @@ static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
             }
         }
 
+        pbdev->pdev = pdev;
+        pbdev->iommu = s390_pci_get_iommu(s, pci_get_bus(pdev), pdev->devfn);
+        pbdev->iommu->pbdev = pbdev;
+        pbdev->state = ZPCI_FS_DISABLED;
+
         if (object_dynamic_cast(OBJECT(dev), "vfio-pci")) {
             pbdev->fh |= FH_SHM_VFIO;
+            pbdev->iommu->dma_limit = s390_pci_start_dma_count(s, pbdev);
         } else {
             pbdev->fh |= FH_SHM_EMUL;
         }
 
-        pbdev->pdev = pdev;
-        pbdev->iommu = s390_pci_get_iommu(s, pci_get_bus(pdev), pdev->devfn);
-        pbdev->iommu->pbdev = pbdev;
-        pbdev->state = ZPCI_FS_DISABLED;
-
         if (s390_pci_msix_init(pbdev)) {
             error_setg(errp, "MSI-X support is mandatory "
                        "in the S390 architecture");
@@ -1004,6 +1007,9 @@ static void s390_pcihost_unplug(HotplugHandler *hotplug_dev, DeviceState *dev,
         pbdev->fid = 0;
         QTAILQ_REMOVE(&s->zpci_devs, pbdev, link);
         g_hash_table_remove(s->zpci_table, &pbdev->idx);
+        if (pbdev->iommu->dma_limit) {
+            s390_pci_end_dma_count(s, pbdev->iommu->dma_limit);
+        }
         qdev_unrealize(dev);
     }
 }
hw/s390x/s390-pci-inst.c +39 -6

102 lines not on this page · raw message

hw/s390x/s390-pci-vfio.c +42 -0

52 lines not on this page · raw message

include/hw/s390x/s390-pci-bus.h +9 -0
index 97464d0..6a35f13 100644
@@ -262,6 +262,13 @@ typedef struct S390IOTLBEntry {
     uint64_t perm;
 } S390IOTLBEntry;
 
+typedef struct S390PCIDMACount {
+    int id;
+    int users;
+    uint32_t avail;
+    QTAILQ_ENTRY(S390PCIDMACount) link;
+} S390PCIDMACount;
+
 struct S390PCIIOMMU {
     Object parent_obj;
     S390PCIBusDevice *pbdev;
@@ -273,6 +280,7 @@ struct S390PCIIOMMU {
     uint64_t pba;
     uint64_t pal;
     GHashTable *iotlb;
+    S390PCIDMACount *dma_limit;
 };
 
 typedef struct S390PCIIOMMUTable {
@@ -348,6 +356,7 @@ struct S390pciState {
     GHashTable *zpci_table;
     QTAILQ_HEAD(, SeiContainer) pending_sei;
     QTAILQ_HEAD(, S390PCIBusDevice) zpci_devs;
+    QTAILQ_HEAD(, S390PCIDMACount) zpci_dma_limit;
 };
 
 S390pciState *s390_get_phb(void);
include/hw/s390x/s390-pci-inst.h +3 -0
index fa3bf8b..8ee3a3c 100644
@@ -254,6 +254,9 @@ typedef struct ClpReqRspQueryPciGrp {
 #define ZPCI_STPCIFC_ST_INVAL_DMAAS   28
 #define ZPCI_STPCIFC_ST_ERROR_RECOVER 40
 
+/* Refresh PCI Translations status codes */
+#define ZPCI_RPCIT_ST_INSUFF_RES      16
+
 /* FIB function controls */
 #define ZPCI_FIB_FC_ENABLED     0x80
 #define ZPCI_FIB_FC_ERROR       0x40
include/hw/s390x/s390-pci-vfio.h +5 -0
index 2a5a261..9613783 100644
@@ -12,6 +12,11 @@
 #ifndef HW_S390_PCI_VFIO_H
 #define HW_S390_PCI_VFIO_H
 
+#include "hw/s390x/s390-pci-bus.h"
+
 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);
 
 #endif
Signature · 1 line
1.8.3.1
#10 lore raw

PATCH 8/13 s390x/pci: create a header dedicated to PCI CLP

In reply to Matthew Rosato

From: Pierre Morel <[email protected]>

To have a clean separation between s390-pci-bus.h and s390-pci-inst.h headers we export the PCI CLP instructions in a dedicated header.

---
 include/hw/s390x/s390-pci-bus.h  |   1 +
 include/hw/s390x/s390-pci-clp.h  | 211 +++++++++++++++++++++++++++++++++++++++
 include/hw/s390x/s390-pci-inst.h | 196 ------------------------------------
 3 files changed, 212 insertions(+), 196 deletions(-)
 create mode 100644 include/hw/s390x/s390-pci-clp.h
include/hw/s390x/s390-pci-bus.h +1 -0
index 6a35f13..5f339e5 100644
@@ -19,6 +19,7 @@
 #include "hw/s390x/sclp.h"
 #include "hw/s390x/s390_flic.h"
 #include "hw/s390x/css.h"
+#include "hw/s390x/s390-pci-clp.h"
 #include "qom/object.h"
 
 #define TYPE_S390_PCI_HOST_BRIDGE "s390-pcihost"
include/hw/s390x/s390-pci-clp.h new file +211 -0

211 lines not on this page · raw message

include/hw/s390x/s390-pci-inst.h +0 -196

202 lines not on this page · raw message

Signature · 1 line
1.8.3.1
#11 lore raw

PATCH 9/13 s390x/pci: use a PCI Group structure

In reply to Matthew Rosato

From: Pierre Morel <[email protected]>

We use a S390PCIGroup structure to hold the information related to a zPCI Function group.

This allows us to be ready to support multiple groups and to retrieve the group information from the host.

---
 hw/s390x/s390-pci-bus.c         | 42 +++++++++++++++++++++++++++++++++++++++++
 hw/s390x/s390-pci-inst.c        | 23 +++++++++++++---------
 include/hw/s390x/s390-pci-bus.h | 10 ++++++++++
 3 files changed, 66 insertions(+), 9 deletions(-)
hw/s390x/s390-pci-bus.c +42 -0
index 2187173..4c7f06d 100644
@@ -738,6 +738,46 @@ static void s390_pci_iommu_free(S390pciState *s, PCIBus *bus, int32_t devfn)
     object_unref(OBJECT(iommu));
 }
 
+static S390PCIGroup *s390_group_create(int id)
+{
+    S390PCIGroup *group;
+    S390pciState *s = s390_get_phb();
+
+    group = g_new0(S390PCIGroup, 1);
+    group->id = id;
+    QTAILQ_INSERT_TAIL(&s->zpci_groups, group, link);
+    return group;
+}
+
+S390PCIGroup *s390_group_find(int id)
+{
+    S390PCIGroup *group;
+    S390pciState *s = s390_get_phb();
+
+    QTAILQ_FOREACH(group, &s->zpci_groups, link) {
+        if (group->id == 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);
+    resgrp = &group->zpci_group;
+    resgrp->fr = 1;
+    stq_p(&resgrp->dasm, 0);
+    stq_p(&resgrp->msia, ZPCI_MSI_ADDR);
+    stw_p(&resgrp->mui, DEFAULT_MUI);
+    stw_p(&resgrp->i, 128);
+    stw_p(&resgrp->maxstbl, 128);
+    resgrp->version = 0;
+}
+
 static void s390_pcihost_realize(DeviceState *dev, Error **errp)
 {
     PCIBus *b;
@@ -766,7 +806,9 @@ static void s390_pcihost_realize(DeviceState *dev, Error **errp)
     QTAILQ_INIT(&s->pending_sei);
     QTAILQ_INIT(&s->zpci_devs);
     QTAILQ_INIT(&s->zpci_dma_limit);
+    QTAILQ_INIT(&s->zpci_groups);
 
+    s390_pci_init_default_group();
     css_register_io_adapters(CSS_IO_ADAPTER_PCI, true, false,
                              S390_ADAPTER_SUPPRESSIBLE, errp);
 }
hw/s390x/s390-pci-inst.c +14 -9
index 4eadd9e..c25b2a6 100644
@@ -298,21 +298,25 @@ int clp_service_call(S390CPU *cpu, uint8_t r2, uintptr_t ra)
         stq_p(&resquery->edma, ZPCI_EDMA_ADDR);
         stl_p(&resquery->fid, pbdev->fid);
         stw_p(&resquery->pchid, 0);
-        stw_p(&resquery->ug, 1);
+        stw_p(&resquery->ug, ZPCI_DEFAULT_FN_GRP);
         stl_p(&resquery->uid, pbdev->uid);
         stw_p(&resquery->hdr.rsp, CLP_RC_OK);
         break;
     }
     case CLP_QUERY_PCI_FNGRP: {
         ClpRspQueryPciGrp *resgrp = (ClpRspQueryPciGrp *)resh;
-        resgrp->fr = 1;
-        stq_p(&resgrp->dasm, 0);
-        stq_p(&resgrp->msia, ZPCI_MSI_ADDR);
-        stw_p(&resgrp->mui, DEFAULT_MUI);
-        stw_p(&resgrp->i, 128);
-        stw_p(&resgrp->maxstbl, 128);
-        resgrp->version = 0;
 
+        ClpReqQueryPciGrp *reqgrp = (ClpReqQueryPciGrp *)reqh;
+        S390PCIGroup *group;
+
+        group = s390_group_find(reqgrp->g);
+        if (!group) {
+            /* We do not allow access to unknown groups */
+            /* The group must have been obtained with a vfio device */
+            stw_p(&resgrp->hdr.rsp, CLP_RC_QUERYPCIFG_PFGID);
+            goto out;
+        }
+        memcpy(resgrp, &group->zpci_group, sizeof(ClpRspQueryPciGrp));
         stw_p(&resgrp->hdr.rsp, CLP_RC_OK);
         break;
     }
@@ -787,7 +791,8 @@ int pcistb_service_call(S390CPU *cpu, uint8_t r1, uint8_t r3, uint64_t gaddr,
     }
     /* Length must be greater than 8, a multiple of 8 */
     /* and not greater than maxstbl */
-    if ((len <= 8) || (len % 8) || (len > pbdev->maxstbl)) {
+    if ((len <= 8) || (len % 8) ||
+        (len > pbdev->pci_group->zpci_group.maxstbl)) {
         goto specification_error;
     }
     /* Do not cross a 4K-byte boundary */
include/hw/s390x/s390-pci-bus.h +10 -0
index 5f339e5..869c0f2 100644
@@ -316,6 +316,14 @@ typedef struct ZpciFmb {
 } ZpciFmb;
 QEMU_BUILD_BUG_MSG(offsetof(ZpciFmb, fmt0) != 48, "padding in ZpciFmb");
 
+#define ZPCI_DEFAULT_FN_GRP 0x20
+typedef struct S390PCIGroup {
+    ClpRspQueryPciGrp zpci_group;
+    int id;
+    QTAILQ_ENTRY(S390PCIGroup) link;
+} S390PCIGroup;
+S390PCIGroup *s390_group_find(int id);
+
 struct S390PCIBusDevice {
     DeviceState qdev;
     PCIDevice *pdev;
@@ -333,6 +341,7 @@ struct S390PCIBusDevice {
     uint16_t noi;
     uint16_t maxstbl;
     uint8_t sum;
+    S390PCIGroup *pci_group;
     S390MsixInfo msix;
     AdapterRoutes routes;
     S390PCIIOMMU *iommu;
@@ -358,6 +367,7 @@ struct S390pciState {
     QTAILQ_HEAD(, SeiContainer) pending_sei;
     QTAILQ_HEAD(, S390PCIBusDevice) zpci_devs;
     QTAILQ_HEAD(, S390PCIDMACount) zpci_dma_limit;
+    QTAILQ_HEAD(, S390PCIGroup) zpci_groups;
 };
 
 S390pciState *s390_get_phb(void);
Signature · 1 line
1.8.3.1
#12 lore raw

PATCH 10/13 s390x/pci: clean up s390 PCI groups

In reply to Matthew Rosato

Add a step to remove all stashed PCI groups to avoid stale data between machine resets.

---
 hw/s390x/s390-pci-bus.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
hw/s390x/s390-pci-bus.c +12 -0
index 4c7f06d..036cf46 100644
@@ -813,6 +813,17 @@ static void s390_pcihost_realize(DeviceState *dev, Error **errp)
                              S390_ADAPTER_SUPPRESSIBLE, errp);
 }
 
+static void s390_pcihost_unrealize(DeviceState *dev)
+{
+    S390PCIGroup *group;
+    S390pciState *s = S390_PCI_HOST_BRIDGE(dev);
+
+    while (!QTAILQ_EMPTY(&s->zpci_groups)) {
+        group = QTAILQ_FIRST(&s->zpci_groups);
+        QTAILQ_REMOVE(&s->zpci_groups, group, link);
+    }
+}
+
 static int s390_pci_msix_init(S390PCIBusDevice *pbdev)
 {
     char *name;
@@ -1171,6 +1182,7 @@ static void s390_pcihost_class_init(ObjectClass *klass, void *data)
 
     dc->reset = s390_pcihost_reset;
     dc->realize = s390_pcihost_realize;
+    dc->unrealize = s390_pcihost_unrealize;
     hc->pre_plug = s390_pcihost_pre_plug;
     hc->plug = s390_pcihost_plug;
     hc->unplug_request = s390_pcihost_unplug_request;
Signature · 1 line
1.8.3.1
#13 lore raw

PATCH 11/13 s390x/pci: use a PCI Function structure

In reply to Matthew Rosato

From: Pierre Morel <[email protected]>

We use a ClpRspQueryPci structure to hold the information related to a zPCI Function.

This allows us to be ready to support different zPCI functions and to retrieve the zPCI function information from the host.

---
 hw/s390x/s390-pci-bus.c         | 12 ++++++++++++
 hw/s390x/s390-pci-inst.c        |  8 ++------
 include/hw/s390x/s390-pci-bus.h |  1 +
 3 files changed, 15 insertions(+), 6 deletions(-)
hw/s390x/s390-pci-bus.c +12 -0
index 036cf46..072b56e 100644
@@ -778,6 +778,17 @@ static void s390_pci_init_default_group(void)
     resgrp->version = 0;
 }
 
+static void set_pbdev_info(S390PCIBusDevice *pbdev)
+{
+    pbdev->zpci_fn.sdma = ZPCI_SDMA_ADDR;
+    pbdev->zpci_fn.edma = ZPCI_EDMA_ADDR;
+    pbdev->zpci_fn.pchid = 0;
+    pbdev->zpci_fn.ug = ZPCI_DEFAULT_FN_GRP;
+    pbdev->zpci_fn.fid = pbdev->fid;
+    pbdev->zpci_fn.uid = pbdev->uid;
+    pbdev->pci_group = s390_group_find(ZPCI_DEFAULT_FN_GRP);
+}
+
 static void s390_pcihost_realize(DeviceState *dev, Error **errp)
 {
     PCIBus *b;
@@ -1000,6 +1011,7 @@ static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
         pbdev->iommu = s390_pci_get_iommu(s, pci_get_bus(pdev), pdev->devfn);
         pbdev->iommu->pbdev = pbdev;
         pbdev->state = ZPCI_FS_DISABLED;
+        set_pbdev_info(pbdev);
 
         if (object_dynamic_cast(OBJECT(dev), "vfio-pci")) {
             pbdev->fh |= FH_SHM_VFIO;
hw/s390x/s390-pci-inst.c +2 -6
index c25b2a6..58cd041 100644
@@ -281,6 +281,8 @@ int clp_service_call(S390CPU *cpu, uint8_t r2, uintptr_t ra)
             goto out;
         }
 
+        memcpy(resquery, &pbdev->zpci_fn, sizeof(*resquery));
+
         for (i = 0; i < PCI_BAR_COUNT; i++) {
             uint32_t data = pci_get_long(pbdev->pdev->config +
                 PCI_BASE_ADDRESS_0 + (i * 4));
@@ -294,12 +296,6 @@ int clp_service_call(S390CPU *cpu, uint8_t r2, uintptr_t ra)
                     resquery->bar_size[i]);
         }
 
-        stq_p(&resquery->sdma, ZPCI_SDMA_ADDR);
-        stq_p(&resquery->edma, ZPCI_EDMA_ADDR);
-        stl_p(&resquery->fid, pbdev->fid);
-        stw_p(&resquery->pchid, 0);
-        stw_p(&resquery->ug, ZPCI_DEFAULT_FN_GRP);
-        stl_p(&resquery->uid, pbdev->uid);
         stw_p(&resquery->hdr.rsp, CLP_RC_OK);
         break;
     }
include/hw/s390x/s390-pci-bus.h +1 -0
index 869c0f2..fe36f16 100644
@@ -342,6 +342,7 @@ struct S390PCIBusDevice {
     uint16_t maxstbl;
     uint8_t sum;
     S390PCIGroup *pci_group;
+    ClpRspQueryPci zpci_fn;
     S390MsixInfo msix;
     AdapterRoutes routes;
     S390PCIIOMMU *iommu;
Signature · 1 line
1.8.3.1
#14 lore raw

PATCH 12/13 vfio: Add routine for finding VFIO_DEVICE_GET_INFO capabilities

In reply to Matthew Rosato

Now that VFIO_DEVICE_GET_INFO supports capability chains, add a helper function to find specific capabilities in the chain.

---
 hw/vfio/common.c              | 10 ++++++++++
 include/hw/vfio/vfio-common.h |  2 ++
 2 files changed, 12 insertions(+)
hw/vfio/common.c +10 -0
index 20914bf..dca017d 100644
@@ -859,6 +859,16 @@ vfio_get_iommu_type1_info_cap(struct vfio_iommu_type1_info *info, uint16_t id)
     return vfio_get_cap((void *)info, info->cap_offset, id);
 }
 
+struct vfio_info_cap_header *
+vfio_get_device_info_cap(struct vfio_device_info *info, uint16_t id)
+{
+    if (!(info->flags & VFIO_DEVICE_FLAGS_CAPS)) {
+        return NULL;
+    }
+
+    return vfio_get_cap((void *)info, info->cap_offset, id);
+}
+
 bool vfio_get_info_dma_avail(struct vfio_iommu_type1_info *info,
                              unsigned int *avail)
 {
include/hw/vfio/vfio-common.h +2 -0
index 661a380..d2524f8 100644
@@ -193,6 +193,8 @@ int vfio_get_dev_region_info(VFIODevice *vbasedev, uint32_t type,
 bool vfio_has_region_cap(VFIODevice *vbasedev, int region, uint16_t cap_type);
 struct vfio_info_cap_header *
 vfio_get_region_info_cap(struct vfio_region_info *info, uint16_t id);
+struct vfio_info_cap_header *
+vfio_get_device_info_cap(struct vfio_device_info *info, uint16_t id);
 #endif
 extern const MemoryListener vfio_prereg_listener;
 
Signature · 1 line
1.8.3.1
#15 lore raw

PATCH 13/13 s390x/pci: get zPCI function info from host

In reply to Matthew Rosato

We use the capability chains of the VFIO_DEVICE_GET_INFO ioctl to retrieve the CLP information that the kernel exports.

To be compatible with previous kernel versions we fall back on previous predefined values, same as the emulation values, when the ioctl is found to not support capability chains. If individual CLP capabilities are not found, we fall back on default values for only those capabilities missing from the chain.

This patch is based on work previously done by Pierre Morel.

---
 hw/s390x/s390-pci-bus.c          |   9 +-
 hw/s390x/s390-pci-vfio.c         | 180 +++++++++++++++++++++++++++++++++++++++
 hw/s390x/trace-events            |   6 ++
 include/hw/s390x/s390-pci-bus.h  |   1 +
 include/hw/s390x/s390-pci-clp.h  |  12 ++-
 include/hw/s390x/s390-pci-vfio.h |   1 +
 6 files changed, 202 insertions(+), 7 deletions(-)
hw/s390x/s390-pci-bus.c +6 -3
index 072b56e..48a3be8 100644
@@ -738,7 +738,7 @@ static void s390_pci_iommu_free(S390pciState *s, PCIBus *bus, int32_t devfn)
     object_unref(OBJECT(iommu));
 }
 
-static S390PCIGroup *s390_group_create(int id)
+S390PCIGroup *s390_group_create(int id)
 {
     S390PCIGroup *group;
     S390pciState *s = s390_get_phb();
@@ -783,7 +783,7 @@ static void set_pbdev_info(S390PCIBusDevice *pbdev)
     pbdev->zpci_fn.sdma = ZPCI_SDMA_ADDR;
     pbdev->zpci_fn.edma = ZPCI_EDMA_ADDR;
     pbdev->zpci_fn.pchid = 0;
-    pbdev->zpci_fn.ug = ZPCI_DEFAULT_FN_GRP;
+    pbdev->zpci_fn.pfgid = ZPCI_DEFAULT_FN_GRP;
     pbdev->zpci_fn.fid = pbdev->fid;
     pbdev->zpci_fn.uid = pbdev->uid;
     pbdev->pci_group = s390_group_find(ZPCI_DEFAULT_FN_GRP);
@@ -863,7 +863,8 @@ static int s390_pci_msix_init(S390PCIBusDevice *pbdev)
     name = g_strdup_printf("msix-s390-%04x", pbdev->uid);
     memory_region_init_io(&pbdev->msix_notify_mr, OBJECT(pbdev),
                           &s390_msi_ctrl_ops, pbdev, name, PAGE_SIZE);
-    memory_region_add_subregion(&pbdev->iommu->mr, ZPCI_MSI_ADDR,
+    memory_region_add_subregion(&pbdev->iommu->mr,
+                                pbdev->pci_group->zpci_group.msia,
                                 &pbdev->msix_notify_mr);
     g_free(name);
 
@@ -1016,6 +1017,8 @@ static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
         if (object_dynamic_cast(OBJECT(dev), "vfio-pci")) {
             pbdev->fh |= FH_SHM_VFIO;
             pbdev->iommu->dma_limit = s390_pci_start_dma_count(s, pbdev);
+            /* Fill in CLP information passed via the vfio region */
+            s390_pci_get_clp_info(pbdev);
         } else {
             pbdev->fh |= FH_SHM_EMUL;
         }
hw/s390x/s390-pci-vfio.c +180 -0

192 lines not on this page · raw message

hw/s390x/trace-events +6 -0
index 0dc5b81..0e27b95 100644
@@ -14,3 +14,9 @@ css_do_sic(uint16_t mode, uint8_t isc) "CSS: set interruption mode 0x%x on isc 0
 virtio_ccw_interpret_ccw(int cssid, int ssid, int schid, int cmd_code) "VIRTIO-CCW: %x.%x.%04x: interpret command 0x%x"
 virtio_ccw_new_device(int cssid, int ssid, int schid, int devno, const char *devno_mode) "VIRTIO-CCW: add subchannel %x.%x.%04x, devno 0x%04x (%s)"
 virtio_ccw_set_ind(uint64_t ind_loc, uint8_t ind_old, uint8_t ind_new) "VIRTIO-CCW: indicator at %" PRIu64 ": 0x%x->0x%x"
+
+# s390-pci-vfio.c
+s390_pci_clp_cap(const char *id, uint32_t cap) "PCI: %s: missing expected CLP capability %u"
+s390_pci_clp_cap_size(const char *id, uint32_t size, uint32_t cap) "PCI: %s: bad size (%u) for CLP capability %u"
+s390_pci_clp_dev_info(const char *id) "PCI: %s: cannot read vfio device info"
+
include/hw/s390x/s390-pci-bus.h +1 -0
index fe36f16..49ae9f0 100644
@@ -322,6 +322,7 @@ typedef struct S390PCIGroup {
     int id;
     QTAILQ_ENTRY(S390PCIGroup) link;
 } S390PCIGroup;
+S390PCIGroup *s390_group_create(int id);
 S390PCIGroup *s390_group_find(int id);
 
 struct S390PCIBusDevice {
include/hw/s390x/s390-pci-clp.h +8 -4
index 3708acd..ea2b137 100644
@@ -79,6 +79,7 @@ typedef struct ClpFhListEntry {
 #define CLP_SET_DISABLE_PCI_FN 1 /* Yes, 1 disables it */
 
 #define CLP_UTIL_STR_LEN 64
+#define CLP_PFIP_NR_SEGMENTS 4
 
 #define CLP_MASK_FMT 0xf0000000
 
@@ -120,14 +121,17 @@ typedef struct ClpRspQueryPci {
     uint32_t fmt;
     uint64_t reserved1;
     uint16_t vfn; /* virtual fn number */
-#define CLP_RSP_QPCI_MASK_UTIL  0x100
-#define CLP_RSP_QPCI_MASK_PFGID 0xff
-    uint16_t ug;
+#define CLP_RSP_QPCI_MASK_UTIL  0x01
+    uint8_t flags;
+    uint8_t pfgid;
     uint32_t fid; /* pci function id */
     uint8_t bar_size[PCI_BAR_COUNT];
     uint16_t pchid;
     uint32_t bar[PCI_BAR_COUNT];
-    uint64_t reserved2;
+    uint8_t pfip[CLP_PFIP_NR_SEGMENTS];
+    uint16_t reserved2;
+    uint8_t fmbl;
+    uint8_t pft;
     uint64_t sdma; /* start dma as */
     uint64_t edma; /* end dma as */
     uint32_t reserved3[11];
include/hw/s390x/s390-pci-vfio.h +1 -0
index 9613783..e72fa7e 100644
@@ -18,5 +18,6 @@ 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);
+void s390_pci_get_clp_info(S390PCIBusDevice *pbdev);
 
 #endif
Signature · 1 line
1.8.3.1
Reviewed-by on v1 13/13
#16 lore raw

Re: [PATCH 13/13] s390x/pci: get zPCI function info from host

Quoted 12 lines · On Mon, 26 Oct 2020 11:34:41 -0400 Matthew Rosato <[email protected]>…

We use the capability chains of the VFIO_DEVICE_GET_INFO ioctl to retrieve the CLP information that the kernel exports.

To be compatible with previous kernel versions we fall back on previous predefined values, same as the emulation values, when the ioctl is found to not support capability chains. If individual CLP capabilities are not found, we fall back on default values for only those capabilities missing from the chain.

This patch is based on work previously done by Pierre Morel.

Quoted 8 lines
---
 hw/s390x/s390-pci-bus.c          |   9 +-
 hw/s390x/s390-pci-vfio.c         | 180 +++++++++++++++++++++++++++++++++++++++
 hw/s390x/trace-events            |   6 ++
 include/hw/s390x/s390-pci-bus.h  |   1 +
 include/hw/s390x/s390-pci-clp.h  |  12 ++-
 include/hw/s390x/s390-pci-vfio.h |   1 +
 6 files changed, 202 insertions(+), 7 deletions(-)
#17 lore raw
In reply to Matthew Rosato
Quoted 5 lines · On Mon, 26 Oct 2020 11:34:28 -0400 Matthew Rosato <[email protected]>…

Combined set of patches that exploit vfio/s390-pci features available in kernel 5.10-rc1. This patch set is a combination of

[PATCH v4 0/5] s390x/pci: Accomodate vfio DMA limiting

Quoted 8 lines

and

[PATCH v3 00/10] Retrieve zPCI hardware information from VFIO

with duplicate patches removed and a single header sync. All patches have prior maintainer reviews except for:

- Patch 1 (update-linux-headers change to add new file)

That one has ;)

Quoted 1 line

- Patch 2 (header sync against 5.10-rc1)

I'm still unsure about the rdma/(q)atomic stuff -- had we reached any conclusion there?

Quoted 73 lines

- Patch 13 - contains a functional (debug) change; I switched from using DPRINTFs to using trace events per Connie's request.

Matthew Rosato (10):
update-linux-headers: Add vfio_zdev.h
linux-headers: update against 5.10-rc1
s390x/pci: Move header files to include/hw/s390x
vfio: Create shared routine for scanning info capabilities
vfio: Find DMA available capability
s390x/pci: Add routine to get the vfio dma available count s390x/pci: Honor DMA limits set by vfio
s390x/pci: clean up s390 PCI groups
vfio: Add routine for finding VFIO_DEVICE_GET_INFO capabilities s390x/pci: get zPCI function info from host

Pierre Morel (3):
s390x/pci: create a header dedicated to PCI CLP
s390x/pci: use a PCI Group structure
s390x/pci: use a PCI Function structure

 MAINTAINERS                                        |   1 +
 hw/s390x/meson.build                               |   1 +
 hw/s390x/s390-pci-bus.c                            |  91 ++++++-
 hw/s390x/s390-pci-inst.c                           |  78 ++++--
 hw/s390x/s390-pci-vfio.c                           | 276 +++++++++++++++++++++
 hw/s390x/s390-virtio-ccw.c                         |   2 +-
 hw/s390x/trace-events                              |   6 +
 hw/vfio/common.c                                   |  62 ++++-
 {hw => include/hw}/s390x/s390-pci-bus.h            |  22 ++
 .../hw/s390x/s390-pci-clp.h                        | 123 +--------
 include/hw/s390x/s390-pci-inst.h                   | 119 +++++++++
 include/hw/s390x/s390-pci-vfio.h                   |  23 ++
 include/hw/vfio/vfio-common.h                      |   4 +
 .../drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h |  14 +-
 .../infiniband/hw/vmw_pvrdma/pvrdma_verbs.h        |   2 +-
 include/standard-headers/linux/ethtool.h           |   2 +
 include/standard-headers/linux/fuse.h              |  50 +++-
 include/standard-headers/linux/input-event-codes.h |   4 +
 include/standard-headers/linux/pci_regs.h          |   6 +-
 include/standard-headers/linux/virtio_fs.h         |   3 +
 include/standard-headers/linux/virtio_gpu.h        |  19 ++
 include/standard-headers/linux/virtio_mmio.h       |  11 +
 include/standard-headers/linux/virtio_pci.h        |  11 +-
 linux-headers/asm-arm64/kvm.h                      |  25 ++
 linux-headers/asm-arm64/mman.h                     |   1 +
 linux-headers/asm-generic/hugetlb_encode.h         |   1 +
 linux-headers/asm-generic/unistd.h                 |  18 +-
 linux-headers/asm-mips/unistd_n32.h                |   1 +
 linux-headers/asm-mips/unistd_n64.h                |   1 +
 linux-headers/asm-mips/unistd_o32.h                |   1 +
 linux-headers/asm-powerpc/unistd_32.h              |   1 +
 linux-headers/asm-powerpc/unistd_64.h              |   1 +
 linux-headers/asm-s390/unistd_32.h                 |   1 +
 linux-headers/asm-s390/unistd_64.h                 |   1 +
 linux-headers/asm-x86/kvm.h                        |  20 ++
 linux-headers/asm-x86/unistd_32.h                  |   1 +
 linux-headers/asm-x86/unistd_64.h                  |   1 +
 linux-headers/asm-x86/unistd_x32.h                 |   1 +
 linux-headers/linux/kvm.h                          |  19 ++
 linux-headers/linux/mman.h                         |   1 +
 linux-headers/linux/vfio.h                         |  29 ++-
 linux-headers/linux/vfio_zdev.h                    |  78 ++++++
 scripts/update-linux-headers.sh                    |   2 +-
 43 files changed, 961 insertions(+), 173 deletions(-)
 create mode 100644 hw/s390x/s390-pci-vfio.c
 rename {hw => include/hw}/s390x/s390-pci-bus.h (94%)
 rename hw/s390x/s390-pci-inst.h => include/hw/s390x/s390-pci-clp.h (59%)
 create mode 100644 include/hw/s390x/s390-pci-inst.h
 create mode 100644 include/hw/s390x/s390-pci-vfio.h
 create mode 100644 linux-headers/linux/vfio_zdev.h
#18 lore raw
Quoted 15 lines · Cornelia Huck
Quoted 12 lines · On Mon, 26 Oct 2020 11:34:28 -0400 Matthew Rosato <[email protected]>…

Combined set of patches that exploit vfio/s390-pci features available in kernel 5.10-rc1. This patch set is a combination of

[PATCH v4 0/5] s390x/pci: Accomodate vfio DMA limiting

and

[PATCH v3 00/10] Retrieve zPCI hardware information from VFIO

with duplicate patches removed and a single header sync. All patches have prior maintainer reviews except for:

Quoted 8 lines
Quoted 1 line

- Patch 1 (update-linux-headers change to add new file)

That one has ;)

Quoted 1 line

- Patch 2 (header sync against 5.10-rc1)

I'm still unsure about the rdma/(q)atomic stuff -- had we reached any conclusion there?

Ugh, I forgot about this... I had CC'd the associated maintainers a few times but never heard back from anyone on how to resolve this.

Paolo said previously this stuff should not have been imported by a header sync in the first place (https://lists.gnu.org/archive/html/qemu-devel/2020-10/msg00734.html), so I would guess that the proper fix is to stop importing the rdma stuff and (re)define it somewhere in QEMU.

We could just drop the rmda file hit from this sync, but it's going to keep happening until the code is removed from the kernel header.

Quoted 75 lines
Quoted 74 lines

- Patch 13 - contains a functional (debug) change; I switched from using DPRINTFs to using trace events per Connie's request.

Matthew Rosato (10):
update-linux-headers: Add vfio_zdev.h
linux-headers: update against 5.10-rc1
s390x/pci: Move header files to include/hw/s390x
vfio: Create shared routine for scanning info capabilities
vfio: Find DMA available capability
s390x/pci: Add routine to get the vfio dma available count s390x/pci: Honor DMA limits set by vfio
s390x/pci: clean up s390 PCI groups
vfio: Add routine for finding VFIO_DEVICE_GET_INFO capabilities s390x/pci: get zPCI function info from host

Pierre Morel (3):
s390x/pci: create a header dedicated to PCI CLP s390x/pci: use a PCI Group structure s390x/pci: use a PCI Function structure

  MAINTAINERS                                        |   1 +
  hw/s390x/meson.build                               |   1 +
  hw/s390x/s390-pci-bus.c                            |  91 ++++++-
  hw/s390x/s390-pci-inst.c                           |  78 ++++--
  hw/s390x/s390-pci-vfio.c                           | 276 +++++++++++++++++++++
  hw/s390x/s390-virtio-ccw.c                         |   2 +-
  hw/s390x/trace-events                              |   6 +
  hw/vfio/common.c                                   |  62 ++++-
  {hw => include/hw}/s390x/s390-pci-bus.h            |  22 ++
  .../hw/s390x/s390-pci-clp.h                        | 123 +--------
  include/hw/s390x/s390-pci-inst.h                   | 119 +++++++++
  include/hw/s390x/s390-pci-vfio.h                   |  23 ++
  include/hw/vfio/vfio-common.h                      |   4 +
  .../drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h |  14 +-
  .../infiniband/hw/vmw_pvrdma/pvrdma_verbs.h        |   2 +-
  include/standard-headers/linux/ethtool.h           |   2 +
  include/standard-headers/linux/fuse.h              |  50 +++-
  include/standard-headers/linux/input-event-codes.h |   4 +
  include/standard-headers/linux/pci_regs.h          |   6 +-
  include/standard-headers/linux/virtio_fs.h         |   3 +
  include/standard-headers/linux/virtio_gpu.h        |  19 ++
  include/standard-headers/linux/virtio_mmio.h       |  11 +
  include/standard-headers/linux/virtio_pci.h        |  11 +-
  linux-headers/asm-arm64/kvm.h                      |  25 ++
  linux-headers/asm-arm64/mman.h                     |   1 +
  linux-headers/asm-generic/hugetlb_encode.h         |   1 +
  linux-headers/asm-generic/unistd.h                 |  18 +-
  linux-headers/asm-mips/unistd_n32.h                |   1 +
  linux-headers/asm-mips/unistd_n64.h                |   1 +
  linux-headers/asm-mips/unistd_o32.h                |   1 +
  linux-headers/asm-powerpc/unistd_32.h              |   1 +
  linux-headers/asm-powerpc/unistd_64.h              |   1 +
  linux-headers/asm-s390/unistd_32.h                 |   1 +
  linux-headers/asm-s390/unistd_64.h                 |   1 +
  linux-headers/asm-x86/kvm.h                        |  20 ++
  linux-headers/asm-x86/unistd_32.h                  |   1 +
  linux-headers/asm-x86/unistd_64.h                  |   1 +
  linux-headers/asm-x86/unistd_x32.h                 |   1 +
  linux-headers/linux/kvm.h                          |  19 ++
  linux-headers/linux/mman.h                         |   1 +
  linux-headers/linux/vfio.h                         |  29 ++-
  linux-headers/linux/vfio_zdev.h                    |  78 ++++++
  scripts/update-linux-headers.sh                    |   2 +-
  43 files changed, 961 insertions(+), 173 deletions(-)

create mode 100644 hw/s390x/s390-pci-vfio.c
rename {hw => include/hw}/s390x/s390-pci-bus.h (94%)
rename hw/s390x/s390-pci-inst.h => include/hw/s390x/s390-pci-clp.h (59%) create mode 100644 include/hw/s390x/s390-pci-inst.h
create mode 100644 include/hw/s390x/s390-pci-vfio.h
create mode 100644 linux-headers/linux/vfio_zdev.h

#19 lore raw
Quoted 25 lines · On Mon, 26 Oct 2020 12:38:45 -0400 Matthew Rosato <[email protected]>…
Quoted 15 lines · Cornelia Huck
Quoted 12 lines · On Mon, 26 Oct 2020 11:34:28 -0400 Matthew Rosato <[email protected]>…

Combined set of patches that exploit vfio/s390-pci features available in kernel 5.10-rc1. This patch set is a combination of

[PATCH v4 0/5] s390x/pci: Accomodate vfio DMA limiting

and

[PATCH v3 00/10] Retrieve zPCI hardware information from VFIO

with duplicate patches removed and a single header sync. All patches have prior maintainer reviews except for:

Quoted 8 lines
Quoted 1 line

- Patch 1 (update-linux-headers change to add new file)

That one has ;)

Quoted 1 line

- Patch 2 (header sync against 5.10-rc1)

I'm still unsure about the rdma/(q)atomic stuff -- had we reached any conclusion there?

Quoted 8 lines

Ugh, I forgot about this... I had CC'd the associated maintainers a few times but never heard back from anyone on how to resolve this.

Paolo said previously this stuff should not have been imported by a header sync in the first place
(https://lists.gnu.org/archive/html/qemu-devel/2020-10/msg00734.html),
so I would guess that the proper fix is to stop importing the rdma stuff and (re)define it somewhere in QEMU.

I think so.

Quoted 3 lines

We could just drop the rmda file hit from this sync, but it's going to keep happening until the code is removed from the kernel header.

Yeah.

It's unfortunate that 5.10-rc1 and the soft freeze are so close together :(

Quoted 77 lines
Quoted 76 lines
Quoted 75 lines

- Patch 13 - contains a functional (debug) change; I switched from using DPRINTFs to using trace events per Connie's request.

Matthew Rosato (10):
update-linux-headers: Add vfio_zdev.h
linux-headers: update against 5.10-rc1
s390x/pci: Move header files to include/hw/s390x
vfio: Create shared routine for scanning info capabilities
vfio: Find DMA available capability
s390x/pci: Add routine to get the vfio dma available count s390x/pci: Honor DMA limits set by vfio
s390x/pci: clean up s390 PCI groups
vfio: Add routine for finding VFIO_DEVICE_GET_INFO capabilities s390x/pci: get zPCI function info from host

Pierre Morel (3):
s390x/pci: create a header dedicated to PCI CLP s390x/pci: use a PCI Group structure s390x/pci: use a PCI Function structure

  MAINTAINERS                                        |   1 +
  hw/s390x/meson.build                               |   1 +
  hw/s390x/s390-pci-bus.c                            |  91 ++++++-
  hw/s390x/s390-pci-inst.c                           |  78 ++++--
  hw/s390x/s390-pci-vfio.c                           | 276 +++++++++++++++++++++
  hw/s390x/s390-virtio-ccw.c                         |   2 +-
  hw/s390x/trace-events                              |   6 +
  hw/vfio/common.c                                   |  62 ++++-
  {hw => include/hw}/s390x/s390-pci-bus.h            |  22 ++
  .../hw/s390x/s390-pci-clp.h                        | 123 +--------
  include/hw/s390x/s390-pci-inst.h                   | 119 +++++++++
  include/hw/s390x/s390-pci-vfio.h                   |  23 ++
  include/hw/vfio/vfio-common.h                      |   4 +
  .../drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h |  14 +-
  .../infiniband/hw/vmw_pvrdma/pvrdma_verbs.h        |   2 +-
  include/standard-headers/linux/ethtool.h           |   2 +
  include/standard-headers/linux/fuse.h              |  50 +++-
  include/standard-headers/linux/input-event-codes.h |   4 +
  include/standard-headers/linux/pci_regs.h          |   6 +-
  include/standard-headers/linux/virtio_fs.h         |   3 +
  include/standard-headers/linux/virtio_gpu.h        |  19 ++
  include/standard-headers/linux/virtio_mmio.h       |  11 +
  include/standard-headers/linux/virtio_pci.h        |  11 +-
  linux-headers/asm-arm64/kvm.h                      |  25 ++
  linux-headers/asm-arm64/mman.h                     |   1 +
  linux-headers/asm-generic/hugetlb_encode.h         |   1 +
  linux-headers/asm-generic/unistd.h                 |  18 +-
  linux-headers/asm-mips/unistd_n32.h                |   1 +
  linux-headers/asm-mips/unistd_n64.h                |   1 +
  linux-headers/asm-mips/unistd_o32.h                |   1 +
  linux-headers/asm-powerpc/unistd_32.h              |   1 +
  linux-headers/asm-powerpc/unistd_64.h              |   1 +
  linux-headers/asm-s390/unistd_32.h                 |   1 +
  linux-headers/asm-s390/unistd_64.h                 |   1 +
  linux-headers/asm-x86/kvm.h                        |  20 ++
  linux-headers/asm-x86/unistd_32.h                  |   1 +
  linux-headers/asm-x86/unistd_64.h                  |   1 +
  linux-headers/asm-x86/unistd_x32.h                 |   1 +
  linux-headers/linux/kvm.h                          |  19 ++
  linux-headers/linux/mman.h                         |   1 +
  linux-headers/linux/vfio.h                         |  29 ++-
  linux-headers/linux/vfio_zdev.h                    |  78 ++++++
  scripts/update-linux-headers.sh                    |   2 +-
  43 files changed, 961 insertions(+), 173 deletions(-)

create mode 100644 hw/s390x/s390-pci-vfio.c
rename {hw => include/hw}/s390x/s390-pci-bus.h (94%)
rename hw/s390x/s390-pci-inst.h => include/hw/s390x/s390-pci-clp.h (59%) create mode 100644 include/hw/s390x/s390-pci-inst.h
create mode 100644 include/hw/s390x/s390-pci-vfio.h
create mode 100644 linux-headers/linux/vfio_zdev.h

#20 lore raw
In reply to Cornelia Huck
Quoted 15 lines · On Mon, 26 Oct 2020 17:19:47 +0100 Cornelia Huck <[email protected]> wrote:
Quoted 12 lines · On Mon, 26 Oct 2020 11:34:28 -0400 Matthew Rosato <[email protected]>…

Combined set of patches that exploit vfio/s390-pci features available in kernel 5.10-rc1. This patch set is a combination of

[PATCH v4 0/5] s390x/pci: Accomodate vfio DMA limiting

and

[PATCH v3 00/10] Retrieve zPCI hardware information from VFIO

with duplicate patches removed and a single header sync. All patches have prior maintainer reviews except for:

Quoted 11 lines
Quoted 1 line

- Patch 1 (update-linux-headers change to add new file)

That one has ;)

Quoted 1 line

- Patch 2 (header sync against 5.10-rc1)

I'm still unsure about the rdma/(q)atomic stuff -- had we reached any conclusion there?

Quoted 2 lines

- Patch 13 - contains a functional (debug) change; I switched from using DPRINTFs to using trace events per Connie's request.

Looks good.

I think that should go through the vfio tree, in case there are collisions with the migration stuff?

(The s390x queue is currently empty.)

Quoted 72 lines
Quoted 71 lines

Matthew Rosato (10):
update-linux-headers: Add vfio_zdev.h
linux-headers: update against 5.10-rc1
s390x/pci: Move header files to include/hw/s390x
vfio: Create shared routine for scanning info capabilities
vfio: Find DMA available capability
s390x/pci: Add routine to get the vfio dma available count s390x/pci: Honor DMA limits set by vfio
s390x/pci: clean up s390 PCI groups
vfio: Add routine for finding VFIO_DEVICE_GET_INFO capabilities s390x/pci: get zPCI function info from host

Pierre Morel (3):
s390x/pci: create a header dedicated to PCI CLP
s390x/pci: use a PCI Group structure
s390x/pci: use a PCI Function structure

 MAINTAINERS                                        |   1 +
 hw/s390x/meson.build                               |   1 +
 hw/s390x/s390-pci-bus.c                            |  91 ++++++-
 hw/s390x/s390-pci-inst.c                           |  78 ++++--
 hw/s390x/s390-pci-vfio.c                           | 276 +++++++++++++++++++++
 hw/s390x/s390-virtio-ccw.c                         |   2 +-
 hw/s390x/trace-events                              |   6 +
 hw/vfio/common.c                                   |  62 ++++-
 {hw => include/hw}/s390x/s390-pci-bus.h            |  22 ++
 .../hw/s390x/s390-pci-clp.h                        | 123 +--------
 include/hw/s390x/s390-pci-inst.h                   | 119 +++++++++
 include/hw/s390x/s390-pci-vfio.h                   |  23 ++
 include/hw/vfio/vfio-common.h                      |   4 +
 .../drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h |  14 +-
 .../infiniband/hw/vmw_pvrdma/pvrdma_verbs.h        |   2 +-
 include/standard-headers/linux/ethtool.h           |   2 +
 include/standard-headers/linux/fuse.h              |  50 +++-
 include/standard-headers/linux/input-event-codes.h |   4 +
 include/standard-headers/linux/pci_regs.h          |   6 +-
 include/standard-headers/linux/virtio_fs.h         |   3 +
 include/standard-headers/linux/virtio_gpu.h        |  19 ++
 include/standard-headers/linux/virtio_mmio.h       |  11 +
 include/standard-headers/linux/virtio_pci.h        |  11 +-
 linux-headers/asm-arm64/kvm.h                      |  25 ++
 linux-headers/asm-arm64/mman.h                     |   1 +
 linux-headers/asm-generic/hugetlb_encode.h         |   1 +
 linux-headers/asm-generic/unistd.h                 |  18 +-
 linux-headers/asm-mips/unistd_n32.h                |   1 +
 linux-headers/asm-mips/unistd_n64.h                |   1 +
 linux-headers/asm-mips/unistd_o32.h                |   1 +
 linux-headers/asm-powerpc/unistd_32.h              |   1 +
 linux-headers/asm-powerpc/unistd_64.h              |   1 +
 linux-headers/asm-s390/unistd_32.h                 |   1 +
 linux-headers/asm-s390/unistd_64.h                 |   1 +
 linux-headers/asm-x86/kvm.h                        |  20 ++
 linux-headers/asm-x86/unistd_32.h                  |   1 +
 linux-headers/asm-x86/unistd_64.h                  |   1 +
 linux-headers/asm-x86/unistd_x32.h                 |   1 +
 linux-headers/linux/kvm.h                          |  19 ++
 linux-headers/linux/mman.h                         |   1 +
 linux-headers/linux/vfio.h                         |  29 ++-
 linux-headers/linux/vfio_zdev.h                    |  78 ++++++
 scripts/update-linux-headers.sh                    |   2 +-
 43 files changed, 961 insertions(+), 173 deletions(-)
 create mode 100644 hw/s390x/s390-pci-vfio.c
 rename {hw => include/hw}/s390x/s390-pci-bus.h (94%)
 rename hw/s390x/s390-pci-inst.h => include/hw/s390x/s390-pci-clp.h (59%)
 create mode 100644 include/hw/s390x/s390-pci-inst.h
 create mode 100644 include/hw/s390x/s390-pci-vfio.h
 create mode 100644 linux-headers/linux/vfio_zdev.h
#21 lore raw
Quoted 30 lines · On Mon, 26 Oct 2020 17:41:24 +0100 Cornelia Huck <[email protected]> wrote:
Quoted 15 lines · On Mon, 26 Oct 2020 17:19:47 +0100 Cornelia Huck <[email protected]> wrote:
Quoted 12 lines · On Mon, 26 Oct 2020 11:34:28 -0400 Matthew Rosato <[email protected]>…

Combined set of patches that exploit vfio/s390-pci features available in kernel 5.10-rc1. This patch set is a combination of

[PATCH v4 0/5] s390x/pci: Accomodate vfio DMA limiting

and

[PATCH v3 00/10] Retrieve zPCI hardware information from VFIO

with duplicate patches removed and a single header sync. All patches have prior maintainer reviews except for:

Quoted 11 lines
Quoted 1 line

- Patch 1 (update-linux-headers change to add new file)

That one has ;)

Quoted 1 line

- Patch 2 (header sync against 5.10-rc1)

I'm still unsure about the rdma/(q)atomic stuff -- had we reached any conclusion there?

Quoted 2 lines

- Patch 13 - contains a functional (debug) change; I switched from using DPRINTFs to using trace events per Connie's request.

Quoted 6 lines

Looks good.

I think that should go through the vfio tree, in case there are collisions with the migration stuff?

(The s390x queue is currently empty.)

Patches appear to apply cleanly on top of the migration series, but I can take it if preferred. Thanks,

Alex