Report vfio-ap configuration changes
v11 cover Report vfio-ap configuration changes
Changelog:
v11:
- reverted return type to int for 'ap_chsc_sei_nt0_get_event'
- files reflected are 'ap.c', 'ap-bridge'h, and 'ap-stub.c'
- using defined variables to represent return 0 and 1 to reflect logical sense
- update documentation for 'ap_chsc_sei_nt0_get_event' to reflect return types
v10:
- Added reviewed by for patch 4 by Tony and Cedric
- review needed for patch 2 and 3
- changed 'cfg_chg_events' to a static variable
- locked 'cfg_chg_events' using QemuMutex
- removed ';' at the end of the definition for NT0
- returning bools for 'ap_chsc_sei_nt0_get_event' and 'ap_chsc_sei_nt0_have_event'
- updated the header file that contains 'ap_chsc_sei_nt0_get_event' and 'ap_chsc_sei_nt0_have_event' to a bool function
- added documentation explaining the returning bool functions
- whitespace clean up
v9:
- added SPDX licensing to newly created file 'hw/s390x/ap-stub.c'
v8:
- fixed windows cross-compile build
- moved /hw/vfio/ap-stub.c to /hw/s390x/ap-stub.c
- updated the use of stub file to MAINTAINERS to reflect new location
- removed if_false for 'CONFIG_VFIO_AP' statement from /hw/vfio/meson.build
- added if_false for 'CONFIG_VFIO_AP' to use ap-stub.c in /hw/s390x/meson.build
- all those changes still address '--without-default-devices' issue from v5
v7:
- Dropped initial commit for linux-header file vfio.h since I created two new commits to address the changes made in v6
- Moved patches 6 and 7 to the beginning of the series after dropping the first patch
- Because I dropped the initial commit for linux-header file vfio.h, I had to addVFIO_AP_CFG_CHG_IRQ_INDEX
- Resyncing latest to v6.15-rc3
- Still need Thomas Huth's review of v5 changes for patch 6/6
v6:
- Updating the update-linux-headers script to address kernel commit change 8a14
- Update headers to retrieve uapi information for vfio-ap for update to Linux v6.15-rc1
- Still need Thomas Huth's review of v5 changes for patch 7/7 (see below)
v5:
- configuring using the '--without-default-devices' fails when building the code
- created a stub file for functions ap_chsc_sei_nt0_get_event and ap_chsc_sei_nt0_have_event
- add if_false for 'CONFIG_VFIO_AP' use ap-stub.c in meson.build
- add the use of the stub file to MAINTAINERS since it's a new file
v4:
- allocating cfg_chg_event before inserting into the queue
- calling nt0_have_event in if loop to check if there are any elemenets in the queue, then calling QTAILQ_FIRST when the check passes
- moving memset() after the check
v3:
- changes that were made to patch 3/5 should have been made in patch 2/5
v2:
- removed warnings that weren't needed
- added unregister function
- removed whitelines
- changed variable names for consistency
- removed rc variable and returning 1 or 0 outright
- reversed logics for if statements
- using g_free() instead of free()
- replaced hardcoded numeric values by defining them with #define in the header
--------------------------------------------------------------------------
This patch series creates and registers a handler that is called when userspace is notified by the kernel that a guest's AP configuration has changed. The handler in turn notifies the guest that its AP configuration has changed. This allows the guest to immediately respond to AP configuration changes rather than relying on polling or some other inefficient mechanism for detecting config changes.
Rorie Reyes (4):
hw/vfio/ap: notification handler for AP config changed event hw/vfio/ap: store object indicating AP config changed in a queue hw/vfio/ap: Storing event information for an AP configuration change
event
s390: implementing CHSC SEI for AP config change
MAINTAINERS | 1 + hw/s390x/ap-stub.c | 21 ++++++++ hw/s390x/meson.build | 1 + hw/vfio/ap.c | 96 ++++++++++++++++++++++++++++++++++++ include/hw/s390x/ap-bridge.h | 39 +++++++++++++++ target/s390x/ioinst.c | 11 ++++- 6 files changed, 167 insertions(+), 2 deletions(-) create mode 100644 hw/s390x/ap-stub.c
Signature · 1 line
2.48.1
RFC PATCH v11 1/4 hw/vfio/ap: notification handler for AP config changed event
Register an event notifier handler to process AP configuration change events by queuing the event and generating a CRW to let the guest know its AP configuration has changed
--- hw/vfio/ap.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
hw/vfio/ap.c +31 -0
@@ -18,6 +18,7 @@#include "hw/vfio/vfio-device.h" #include "system/iommufd.h" #include "hw/s390x/ap-device.h" +#include "hw/s390x/css.h" #include "qemu/error-report.h" #include "qemu/event_notifier.h" #include "qemu/main-loop.h"
@@ -37,6 +38,7 @@ struct VFIOAPDevice {APDevice apdev;VFIODevice vdev;EventNotifier req_notifier; +EventNotifier cfg_notifier; };OBJECT_DECLARE_SIMPLE_TYPE (VFIOAPDevice,VFIO_AP_DEVICE )
@@ -70,6 +72,18 @@ static void vfio_ap_req_notifier_handler(void *opaque) } } +static void vfio_ap_cfg_chg_notifier_handler (void *opaque) +{ +VFIOAPDevice *vapdev = opaque; + +if (!event_notifier_test_and_clear (&vapdev->cfg_notifier)) { +return ; + } + +css_generate_css_crws (0 ); + +} +static bool vfio_ap_register_irq_notifier (VFIOAPDevice *vapdev,unsigned int irq,Error **errp) {
@@ -85,6 +99,10 @@ static bool vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev, notifier = &vapdev->req_notifier; fd_read = vfio_ap_req_notifier_handler;break ; +case VFIO_AP_CFG_CHG_IRQ_INDEX : + notifier = &vapdev->cfg_notifier; + fd_read = vfio_ap_cfg_chg_notifier_handler; +break ;default :error_setg (errp,"vfio: Unsupported device irq(%d)" , irq);return false;
@@ -137,6 +155,9 @@ static void vfio_ap_unregister_irq_notifier(VFIOAPDevice *vapdev,case VFIO_AP_REQ_IRQ_INDEX : notifier = &vapdev->req_notifier;break ; +case VFIO_AP_CFG_CHG_IRQ_INDEX : + notifier = &vapdev->cfg_notifier; +break ;default :error_report ("vfio: Unsupported device irq(%d)" , irq);return ;
@@ -176,6 +197,15 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp)warn_report_err (err); } +if (!vfio_ap_register_irq_notifier (vapdev,VFIO_AP_CFG_CHG_IRQ_INDEX , &err)) + { +/* +* Report this error, but do not make it a failing condition. +* Lack of this IRQ in the host does not prevent normal operation. +*/ +warn_report_err (err); + } +return ; error:
@@ -188,6 +218,7 @@ static void vfio_ap_unrealize(DeviceState *dev)VFIOAPDevice *vapdev =VFIO_AP_DEVICE (dev);vfio_ap_unregister_irq_notifier (vapdev,VFIO_AP_REQ_IRQ_INDEX ); +vfio_ap_unregister_irq_notifier (vapdev,VFIO_AP_CFG_CHG_IRQ_INDEX );vfio_device_detach (&vapdev->vdev);g_free (vapdev->vdev.name); }
Signature · 1 line
2.48.1
RFC PATCH v11 2/4 hw/vfio/ap: store object indicating AP config changed in a queue
In reply to Rorie ReyesCreates an object indicating that an AP configuration change event has been received and stores it in a queue. These objects will later be used to store event information for an AP configuration change when the CHSC instruction is intercepted.
--- hw/vfio/ap.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
hw/vfio/ap.c +12 -0
@@ -41,6 +41,13 @@ struct VFIOAPDevice {EventNotifier cfg_notifier; }; +typedef struct APConfigChgEvent { +QTAILQ_ENTRY (APConfigChgEvent) next; +}APConfigChgEvent ; + +static QTAILQ_HEAD(, APConfigChgEvent) cfg_chg_events = +QTAILQ_HEAD_INITIALIZER (cfg_chg_events); + OBJECT_DECLARE_SIMPLE_TYPE(VFIOAPDevice, VFIO_AP_DEVICE)static void vfio_ap_compute_needs_reset (VFIODevice *vdev)
@@ -74,12 +81,17 @@ static void vfio_ap_req_notifier_handler(void *opaque)static void vfio_ap_cfg_chg_notifier_handler (void *opaque) { +APConfigChgEvent *cfg_chg_event;VFIOAPDevice *vapdev = opaque;if (!event_notifier_test_and_clear (&vapdev->cfg_notifier)) {return ; } + cfg_chg_event =g_new0 (APConfigChgEvent,1 ); + +QTAILQ_INSERT_TAIL (&cfg_chg_events, cfg_chg_event, next); +css_generate_css_crws (0 ); }
Signature · 1 line
2.48.1
RFC PATCH v11 3/4 hw/vfio/ap: Storing event information for an AP configuration change event
In reply to Rorie ReyesThese functions can be invoked by the function that handles interception of the CHSC SEI instruction for requests indicating the accessibility of one or more adjunct processors has changed.
--- hw/vfio/ap.c | 53 ++++++++++++++++++++++++++++++++++++ include/hw/s390x/ap-bridge.h | 39 ++++++++++++++++++++++++++ 2 files changed, 92 insertions(+)
hw/vfio/ap.c +53 -0
@@ -10,6 +10,7 @@* directory. */ +#include <stdbool.h> #include "qemu/osdep.h" #include CONFIG_DEVICES /* CONFIG_IOMMUFD */ #include <linux/vfio.h>
@@ -48,6 +49,8 @@ typedef struct APConfigChgEvent { static QTAILQ_HEAD(, APConfigChgEvent) cfg_chg_events =QTAILQ_HEAD_INITIALIZER (cfg_chg_events); +static QemuMutex cfg_chg_events_lock; + OBJECT_DECLARE_SIMPLE_TYPE(VFIOAPDevice, VFIO_AP_DEVICE)static void vfio_ap_compute_needs_reset (VFIODevice *vdev)
@@ -96,6 +99,49 @@ static void vfio_ap_cfg_chg_notifier_handler(void *opaque) } +int ap_chsc_sei_nt0_get_event (void *res) +{ +ChscSeiNt0Res *nt0_res = (ChscSeiNt0Res *)res; +APConfigChgEvent *cfg_chg_event; + +qemu_mutex_lock (&cfg_chg_events_lock); + +if (!ap_chsc_sei_nt0_have_event ()) { +qemu_mutex_unlock (&cfg_chg_events_lock); +return EVENT_INFORMATION_NOT_STORED ; + } + + cfg_chg_event =QTAILQ_FIRST (&cfg_chg_events); +QTAILQ_REMOVE (&cfg_chg_events, cfg_chg_event, next); + +qemu_mutex_unlock (&cfg_chg_events_lock); + +memset (nt0_res,0 ,sizeof (*nt0_res)); +g_free (cfg_chg_event); + +/* +* If there are any AP configuration change events in the queue, +* indicate to the caller that there is pending event info in +* the response block +*/ +if (ap_chsc_sei_nt0_have_event ()) { + nt0_res->flags |=PENDING_EVENT_INFO_BITMASK ; + } + + nt0_res->length =sizeof (ChscSeiNt0Res); + nt0_res->code =NT0_RES_RESPONSE_CODE ; + nt0_res->nt =NT0_RES_NT_DEFAULT ; + nt0_res->rs =NT0_RES_RS_AP_CHANGE ; + nt0_res->cc =NT0_RES_CC_AP_CHANGE ; + +return EVENT_INFORMATION_STORED ; +} + +bool ap_chsc_sei_nt0_have_event (void ) +{ +return !QTAILQ_EMPTY (&cfg_chg_events); +} +static bool vfio_ap_register_irq_notifier (VFIOAPDevice *vapdev,unsigned int irq,Error **errp) {
@@ -192,6 +238,13 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp)VFIOAPDevice *vapdev =VFIO_AP_DEVICE (dev);VFIODevice *vbasedev = &vapdev->vdev; +static bool lock_initialized; + +if (!lock_initialized) { +qemu_mutex_init (&cfg_chg_events_lock); + lock_initialized = true; + } +if (!vfio_device_get_name (vbasedev, errp)) {return ; }
include/hw/s390x/ap-bridge.h +39 -0
@@ -16,4 +16,43 @@void s390_init_ap (void ); +typedef struct ChscSeiNt0Res { +uint16_t length; +uint16_t code; +uint8_t reserved1; +uint16_t reserved2; +uint8_t nt; +#define PENDING_EVENT_INFO_BITMASK 0x80; +uint8_t flags; +uint8_t reserved3; +uint8_t rs; +uint8_t cc; +} QEMU_PACKED ChscSeiNt0Res; + +#define NT0_RES_RESPONSE_CODE 1 +#define NT0_RES_NT_DEFAULT 0 +#define NT0_RES_RS_AP_CHANGE 5 +#define NT0_RES_CC_AP_CHANGE 3 + +#define EVENT_INFORMATION_NOT_STORED 1 +#define EVENT_INFORMATION_STORED 0 + +/** +* ap_chsc_sei_nt0_get_event - Retrieve the next pending AP config +* change event +* @res: Pointer to a ChscSeiNt0Res struct to be filled with event +* data +* +* This function checks for any pending AP config change events and, +* if present, populates the provided response structure with the +* appropriate SEI NT0 fields. +* +* Return: +* EVENT_INFORMATION_STORED - An event was available and written to @res +* EVENT_INFORMATION_NOT_STORED - No event was available +*/ +int ap_chsc_sei_nt0_get_event (void *res); + +bool ap_chsc_sei_nt0_have_event (void ); +#endif
Signature · 1 line
2.48.1
Re: [RFC PATCH v11 3/4] hw/vfio/ap: Storing event information for an AP configuration change event
Quoted 32 lines · Rorie Reyes
These functions can be invoked by the function that handles interception of the CHSC SEI instruction for requests indicating the accessibility of one or more adjunct processors has changed.
Signed-off-by Rorie Reyes <[email protected]>--- hw/vfio/ap.c | 53 ++++++++++++++++++++++++++++++++++++ include/hw/s390x/ap-bridge.h | 39 ++++++++++++++++++++++++++ 2 files changed, 92 insertions(+)hw/vfio/ap.c +3
-0@@ -10,6 +10,7 @@* directory. */ +#include <stdbool.h> #include "qemu/osdep.h" #include CONFIG_DEVICES /* CONFIG_IOMMUFD */ #include <linux/vfio.h> @@ -48,6 +49,8 @@ typedef struct APConfigChgEvent { static QTAILQ_HEAD(, APConfigChgEvent) cfg_chg_events =QTAILQ_HEAD_INITIALIZER (cfg_chg_events); +static QemuMutex cfg_chg_events_lock; + OBJECT_DECLARE_SIMPLE_TYPE(VFIOAPDevice, VFIO_AP_DEVICE)static void vfio_ap_compute_needs_reset (VFIODevice *vdev)
hw/vfio/ap.c static void vfio_ap_cfg_chg_notifier_handler(void *opaque) · line 107
Quoted 9 lines
hw/vfio/ap.c +6
-0@@ -96,6 +99,49 @@ static void vfio_ap_cfg_chg_notifier_handler(void *opaque) } +int ap_chsc_sei_nt0_get_event (void *res) +{ +ChscSeiNt0Res *nt0_res = (ChscSeiNt0Res *)res; +APConfigChgEvent *cfg_chg_event; + +qemu_mutex_lock (&cfg_chg_events_lock);
please consider using WITH_QEMU_LOCK_GUARD()
Quoted 22 lines
hw/vfio/ap.c +22
-0+if (!ap_chsc_sei_nt0_have_event ()) { +qemu_mutex_unlock (&cfg_chg_events_lock); +return EVENT_INFORMATION_NOT_STORED ; + } + + cfg_chg_event =QTAILQ_FIRST (&cfg_chg_events); +QTAILQ_REMOVE (&cfg_chg_events, cfg_chg_event, next); + +qemu_mutex_unlock (&cfg_chg_events_lock); + +memset (nt0_res,0 ,sizeof (*nt0_res)); +g_free (cfg_chg_event); + +/* +* If there are any AP configuration change events in the queue, +* indicate to the caller that there is pending event info in +* the response block +*/ +if (ap_chsc_sei_nt0_have_event ()) { + nt0_res->flags |=PENDING_EVENT_INFO_BITMASK ; + } +
hw/vfio/ap.c static void vfio_ap_cfg_chg_notifier_handler(void *opaque) · line 140
Quoted 10 lines
hw/vfio/ap.c +10
-0+ nt0_res->length =sizeof (ChscSeiNt0Res); + nt0_res->code =NT0_RES_RESPONSE_CODE ; + nt0_res->nt =NT0_RES_NT_DEFAULT ; + nt0_res->rs =NT0_RES_RS_AP_CHANGE ; + nt0_res->cc =NT0_RES_CC_AP_CHANGE ; + +return EVENT_INFORMATION_STORED ; +} + +bool ap_chsc_sei_nt0_have_event (void )
hmm, no locking ?
Quoted 8 lines
hw/vfio/ap.c +4
-0+{ +return !QTAILQ_EMPTY (&cfg_chg_events); +} +static bool vfio_ap_register_irq_notifier (VFIOAPDevice *vapdev,unsigned int irq,Error **errp) {
hw/vfio/ap.c static void vfio_ap_realize(DeviceState *dev, Error **errp) · line 246
Quoted 9 lines
hw/vfio/ap.c +6
-0@@ -192,6 +238,13 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp)VFIOAPDevice *vapdev =VFIO_AP_DEVICE (dev);VFIODevice *vbasedev = &vapdev->vdev; +static bool lock_initialized; + +if (!lock_initialized) { +qemu_mutex_init (&cfg_chg_events_lock); + lock_initialized = true; + }
this could be replaced with a constructor routine. See hyperv.
Thanks,
C.
Quoted 50 lines
hw/vfio/ap.c +0
-0if (!vfio_device_get_name (vbasedev, errp)) {return ; }include/hw/s390x/ap-bridge.h +39
-0@@ -16,4 +16,43 @@void s390_init_ap (void ); +typedef struct ChscSeiNt0Res { +uint16_t length; +uint16_t code; +uint8_t reserved1; +uint16_t reserved2; +uint8_t nt; +#define PENDING_EVENT_INFO_BITMASK 0x80; +uint8_t flags; +uint8_t reserved3; +uint8_t rs; +uint8_t cc; +} QEMU_PACKED ChscSeiNt0Res; + +#define NT0_RES_RESPONSE_CODE 1 +#define NT0_RES_NT_DEFAULT 0 +#define NT0_RES_RS_AP_CHANGE 5 +#define NT0_RES_CC_AP_CHANGE 3 + +#define EVENT_INFORMATION_NOT_STORED 1 +#define EVENT_INFORMATION_STORED 0 + +/** +* ap_chsc_sei_nt0_get_event - Retrieve the next pending AP config +* change event +* @res: Pointer to a ChscSeiNt0Res struct to be filled with event +* data +* +* This function checks for any pending AP config change events and, +* if present, populates the provided response structure with the +* appropriate SEI NT0 fields. +* +* Return: +* EVENT_INFORMATION_STORED - An event was available and written to @res +* EVENT_INFORMATION_NOT_STORED - No event was available +*/ +int ap_chsc_sei_nt0_get_event (void *res); + +bool ap_chsc_sei_nt0_have_event (void ); +> #endif
Re: [RFC PATCH v11 3/4] hw/vfio/ap: Storing event information for an AP configuration change event
Hey Cedric,
You mentioned the following in my v9 patches
"In that case, let's keep it simple (no mutex) and add a assert(bql_locked()) statement where we think the bql should be protecting access to shared resources. "
Does this still apply down bellow?
Quoted 32 lines · Cédric Le Goater
Quoted 31 lines · Rorie Reyes
These functions can be invoked by the function that handles interception of the CHSC SEI instruction for requests indicating the accessibility of one or more adjunct processors has changed.
Signed-off-by Rorie Reyes <[email protected]>---
hw/vfio/ap.c | 53 ++++++++++++++++++++++++++++++++++++include/hw/s390x/ap-bridge.h| 39 ++++++++++++++++++++++++++2 files changed, 92 insertions(+)hw/vfio/ap.c +0
-0@@ -10,6 +10,7 @@* directory. */ +#include <
stdbool.h>
#include "qemu/osdep.h"
#includeCONFIG_DEVICES/*CONFIG_IOMMUFD*/
#include <linux/vfio.h>hw/vfio/ap.c +0
-0@@ -48,6 +49,8 @@ typedef struct APConfigChgEvent {static
QTAILQ_HEAD(, APConfigChgEvent)cfg_chg_events=QTAILQ_HEAD_INITIALIZER(cfg_chg_events); +static QemuMutexcfg_chg_events_lock;
+
OBJECT_DECLARE_SIMPLE_TYPE(VFIOAPDevice, VFIO_AP_DEVICE)static voidvfio_ap_compute_needs_reset(VFIODevice *vdev)hw/vfio/ap.c +0
-0@@ -96,6 +99,49 @@ static void vfio_ap_cfg_chg_notifier_handler(void *opaque) }
Quoted 9 lines
hw/vfio/ap.c static void vfio_ap_cfg_chg_notifier_handler(void *opaque) · line 107
Quoted 6 lines
hw/vfio/ap.c +5
-0+int ap_chsc_sei_nt0_get_event(void *res) +{ + ChscSeiNt0Res *nt0_res = (ChscSeiNt0Res *)res; + APConfigChgEvent *cfg_chg_event; + + qemu_mutex_lock(&cfg_chg_events_lock);please consider using
WITH_QEMU_LOCK_GUARD()
See note above about bql_locked
Quoted 26 lines
Quoted 26 lines
hw/vfio/ap.c +26
-0+ if (!ap_chsc_sei_nt0_have_event()) { + qemu_mutex_unlock(&cfg_chg_events_lock); + return EVENT_INFORMATION_NOT_STORED; + } + + cfg_chg_event = QTAILQ_FIRST(&cfg_chg_events); + QTAILQ_REMOVE(&cfg_chg_events, cfg_chg_event, next); + + qemu_mutex_unlock(&cfg_chg_events_lock); + + memset(nt0_res, 0, sizeof(*nt0_res)); + g_free(cfg_chg_event); + + /* + * If there are any AP configuration change events in the queue, + * indicate to the caller that there is pending event info in + * the response block + */ + if (ap_chsc_sei_nt0_have_event()) { + nt0_res->flags |= PENDING_EVENT_INFO_BITMASK; + } + + nt0_res->length = sizeof(ChscSeiNt0Res); + nt0_res->code = NT0_RES_RESPONSE_CODE; + nt0_res->nt = NT0_RES_NT_DEFAULT; + nt0_res->rs = NT0_RES_RS_AP_CHANGE;
Quoted 9 lines
hw/vfio/ap.c static void vfio_ap_cfg_chg_notifier_handler(void *opaque) · line 140
Quoted 6 lines
hw/vfio/ap.c +6
-0+ nt0_res->cc = NT0_RES_CC_AP_CHANGE; + + return EVENT_INFORMATION_STORED; +} + +bool ap_chsc_sei_nt0_have_event (void )hmm, no locking ?
See not above for bql_locked
Quoted 21 lines
Quoted 8 lines
hw/vfio/ap.c +4
-0+{ + return !QTAILQ_EMPTY(&cfg_chg_events); +} + static bool vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev, unsigned int irq, Error **errp) {hw/vfio/ap.c static void vfio_ap_realize(DeviceState *dev, · line 246
Quoted 9 lines
hw/vfio/ap.c +5
-0@@ -192,6 +238,13 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp) VFIOAPDevice *vapdev = VFIO_AP_DEVICE(dev); VFIODevice *vbasedev = &vapdev->vdev; + static bool lock_initialized; + + if (!lock_initialized) { + qemu_mutex_init(&cfg_chg_events_lock); + lock_initialized = true; + }this could be replaced with a constructor routine. See hyperv.
Quoted 4 lines
Thanks,
C.
Noted
Quoted 52 lines
Quoted 51 lines
hw/vfio/ap.c +0
-0if (!vfio_device_get_name(vbasedev, errp)) { return;}
include/hw/s390x/ap-bridge.h +32
-0@@ -16,4 +16,43 @@ void s390_init_ap(void); +typedef struct ChscSeiNt0Res { + uint16_t length; + uint16_t code; + uint8_t reserved1; + uint16_t reserved2; + uint8_t nt; +#define PENDING_EVENT_INFO_BITMASK 0x80; + uint8_t flags; + uint8_t reserved3; + uint8_t rs; + uint8_t cc; +} QEMU_PACKED ChscSeiNt0Res; + +#define NT0_RES_RESPONSE_CODE 1 +#define NT0_RES_NT_DEFAULT 0 +#define NT0_RES_RS_AP_CHANGE 5 +#define NT0_RES_CC_AP_CHANGE 3 + +#define EVENT_INFORMATION_NOT_STORED 1 +#define EVENT_INFORMATION_STORED 0 + +/** +* ap_chsc_sei_nt0_get_event - Retrieve the next pending AP config +* change event +* @res: Pointer to a ChscSeiNt0Res struct to be filled with event +* data +* +* This function checks for any pending AP config change events and, +* if present, populates the provided response structure with the +* appropriate SEI NT0 fields. +* +* Return: +* EVENT_INFORMATION_STORED - An event was available and written to @res
+ *EVENT_INFORMATION_NOT_STORED- No event was available
+ */include/hw/s390x/ap-bridge.h +4
-0+int ap_chsc_sei_nt0_get_event (void *res); + +bool ap_chsc_sei_nt0_have_event (void ); +> #endif
Re: [RFC PATCH v11 3/4] hw/vfio/ap: Storing event information for an AP configuration change event
Quoted 9 lines · Rorie Reyes
Hey Cedric,
You mentioned the following in my v9 patches
"In that case, let's keep it simple (no mutex) and add a assert(bql_locked()) statement where we think the bql should be protecting access to shared resources. "
Does this still apply down bellow?
Anthony replied :
https://lore.kernel.org/qemu-devel/[email protected]/
Thanks,
C.
Quoted 156 lines · Cédric Le Goater
Quoted 31 lines · Rorie Reyes
Quoted 30 lines
These functions can be invoked by the function that handles interception of the CHSC SEI instruction for requests indicating the accessibility of one or more adjunct processors has changed.
Signed-off-by Rorie Reyes <[email protected]>---
hw/vfio/ap.c | 53 ++++++++++++++++++++++++++++++++++++include/hw/s390x/ap-bridge.h| 39 ++++++++++++++++++++++++++2 files changed, 92 insertions(+)hw/vfio/ap.c +0
-0@@ -10,6 +10,7 @@* directory. */ +#include <
stdbool.h>
#include "qemu/osdep.h"
#includeCONFIG_DEVICES/*CONFIG_IOMMUFD*/
#include <linux/vfio.h>hw/vfio/ap.c +0
-0@@ -48,6 +49,8 @@ typedef struct APConfigChgEvent {static
QTAILQ_HEAD(, APConfigChgEvent)cfg_chg_events=QTAILQ_HEAD_INITIALIZER(cfg_chg_events); +static QemuMutexcfg_chg_events_lock;
+
OBJECT_DECLARE_SIMPLE_TYPE(VFIOAPDevice, VFIO_AP_DEVICE)static voidvfio_ap_compute_needs_reset(VFIODevice *vdev)hw/vfio/ap.c +0
-0@@ -96,6 +99,49 @@ static void vfio_ap_cfg_chg_notifier_handler(void *opaque) }Quoted 9 lines
hw/vfio/ap.c static void vfio_ap_cfg_chg_notifier_handler(void *opaque) · line 107
Quoted 6 lines
hw/vfio/ap.c +5
-0+int ap_chsc_sei_nt0_get_event(void *res) +{ + ChscSeiNt0Res *nt0_res = (ChscSeiNt0Res *)res; + APConfigChgEvent *cfg_chg_event; + + qemu_mutex_lock(&cfg_chg_events_lock);please consider using
WITH_QEMU_LOCK_GUARD()See note above about
bql_lockedQuoted 26 lines
Quoted 26 lines
hw/vfio/ap.c +26
-0+ if (!ap_chsc_sei_nt0_have_event()) { + qemu_mutex_unlock(&cfg_chg_events_lock); + return EVENT_INFORMATION_NOT_STORED; + } + + cfg_chg_event = QTAILQ_FIRST(&cfg_chg_events); + QTAILQ_REMOVE(&cfg_chg_events, cfg_chg_event, next); + + qemu_mutex_unlock(&cfg_chg_events_lock); + + memset(nt0_res, 0, sizeof(*nt0_res)); + g_free(cfg_chg_event); + + /* + * If there are any AP configuration change events in the queue, + * indicate to the caller that there is pending event info in + * the response block + */ + if (ap_chsc_sei_nt0_have_event()) { + nt0_res->flags |= PENDING_EVENT_INFO_BITMASK; + } + + nt0_res->length = sizeof(ChscSeiNt0Res); + nt0_res->code = NT0_RES_RESPONSE_CODE; + nt0_res->nt = NT0_RES_NT_DEFAULT; + nt0_res->rs = NT0_RES_RS_AP_CHANGE;Quoted 9 lines
hw/vfio/ap.c static void vfio_ap_cfg_chg_notifier_handler(void *opaque) · line 140
Quoted 6 lines
hw/vfio/ap.c +6
-0+ nt0_res->cc = NT0_RES_CC_AP_CHANGE; + + return EVENT_INFORMATION_STORED; +} + +bool ap_chsc_sei_nt0_have_event (void )hmm, no locking ?
See not above for
bql_lockedQuoted 20 lines
Quoted 8 lines
hw/vfio/ap.c +4
-0+{ + return !QTAILQ_EMPTY(&cfg_chg_events); +} + static bool vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev, unsigned int irq, Error **errp) {hw/vfio/ap.c static void vfio_ap_realize(DeviceState *dev, Error **errp) · line 245
Quoted 8 lines
hw/vfio/ap.c +5
-0@@ -192,6 +238,13 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp) VFIOAPDevice *vapdev = VFIO_AP_DEVICE(dev); VFIODevice *vbasedev = &vapdev->vdev; + static bool lock_initialized; + + if (!lock_initialized) { + qemu_mutex_init(&cfg_chg_events_lock); + lock_initialized = true; + }this could be replaced with a constructor routine. See hyperv.
Quoted 4 lines
Thanks,
C.
Noted
Quoted 51 lines
Quoted 50 lines
hw/vfio/ap.c +0
-0if (!vfio_device_get_name(vbasedev, errp)) { return; }include/hw/s390x/ap-bridge.h +38
-0@@ -16,4 +16,43 @@ void s390_init_ap(void); +typedef struct ChscSeiNt0Res { + uint16_t length; + uint16_t code; + uint8_t reserved1; + uint16_t reserved2; + uint8_t nt; +#define PENDING_EVENT_INFO_BITMASK 0x80; + uint8_t flags; + uint8_t reserved3; + uint8_t rs; + uint8_t cc; +} QEMU_PACKED ChscSeiNt0Res; + +#define NT0_RES_RESPONSE_CODE 1 +#define NT0_RES_NT_DEFAULT 0 +#define NT0_RES_RS_AP_CHANGE 5 +#define NT0_RES_CC_AP_CHANGE 3 + +#define EVENT_INFORMATION_NOT_STORED 1 +#define EVENT_INFORMATION_STORED 0 + +/** +* ap_chsc_sei_nt0_get_event - Retrieve the next pending AP config +* change event +* @res: Pointer to a ChscSeiNt0Res struct to be filled with event +* data +* +* This function checks for any pending AP config change events and, +* if present, populates the provided response structure with the +* appropriate SEI NT0 fields. +* +* Return: +* EVENT_INFORMATION_STORED - An event was available and written to @res +* EVENT_INFORMATION_NOT_STORED - No event was available +*/ +int ap_chsc_sei_nt0_get_event (void *res); + +bool ap_chsc_sei_nt0_have_event (void ); +> #endif
Re: [RFC PATCH v11 3/4] hw/vfio/ap: Storing event information for an AP configuration change event
Quoted 11 lines · Cédric Le Goater
Quoted 9 lines · Rorie Reyes
Hey Cedric,
You mentioned the following in my v9 patches
"In that case, let's keep it simple (no mutex) and add a assert(bql_locked()) statement where we think the bql should be protecting access to shared resources. "
Does this still apply down bellow?
Quoted 8 lines
Anthony replied :
https://lore.kernel.org/qemu-devel/[email protected]/
Thanks,
C.
So we'll still use WITH_QEMU_LOCK_GUARD?
Quoted 161 lines
Quoted 160 lines · Cédric Le Goater
Quoted 33 lines · Rorie Reyes
Quoted 32 lines
These functions can be invoked by the function that handles interception of the CHSC SEI instruction for requests indicating the accessibility of one or more adjunct processors has changed.
Signed-off-by Rorie Reyes <[email protected]>---
hw/vfio/ap.c | 53
++++++++++++++++++++++++++++++++++++
include/hw/s390x/ap-bridge.h| 39 ++++++++++++++++++++++++++2 files changed, 92 insertions(+)hw/vfio/ap.c +0
-0@@ -10,6 +10,7 @@* directory. */ +#include <
stdbool.h>
#include "qemu/osdep.h"
#includeCONFIG_DEVICES/*CONFIG_IOMMUFD*/
#include <linux/vfio.h>hw/vfio/ap.c +0
-0@@ -48,6 +49,8 @@ typedef struct APConfigChgEvent {static
QTAILQ_HEAD(, APConfigChgEvent)cfg_chg_events=QTAILQ_HEAD_INITIALIZER(cfg_chg_events); +static QemuMutexcfg_chg_events_lock;
+
OBJECT_DECLARE_SIMPLE_TYPE(VFIOAPDevice, VFIO_AP_DEVICE)static voidvfio_ap_compute_needs_reset(VFIODevice *vdev)hw/vfio/ap.c +0
-0@@ -96,6 +99,49 @@ static voidvfio_ap_cfg_chg_notifier_handler (void *opaque) }Quoted 9 lines
hw/vfio/ap.c static void vfio_ap_cfg_chg_notifier_handler(void *opaque) · line 107
Quoted 6 lines
hw/vfio/ap.c +5
-0+int ap_chsc_sei_nt0_get_event(void *res) +{ + ChscSeiNt0Res *nt0_res = (ChscSeiNt0Res *)res; + APConfigChgEvent *cfg_chg_event; + + qemu_mutex_lock(&cfg_chg_events_lock);please consider using
WITH_QEMU_LOCK_GUARD()See note above about
bql_lockedQuoted 26 lines
Quoted 26 lines
hw/vfio/ap.c +26
-0+ if (!ap_chsc_sei_nt0_have_event()) { + qemu_mutex_unlock(&cfg_chg_events_lock); + return EVENT_INFORMATION_NOT_STORED; + } + + cfg_chg_event = QTAILQ_FIRST(&cfg_chg_events); + QTAILQ_REMOVE(&cfg_chg_events, cfg_chg_event, next); + + qemu_mutex_unlock(&cfg_chg_events_lock); + + memset(nt0_res, 0, sizeof(*nt0_res)); + g_free(cfg_chg_event); + + /* + * If there are any AP configuration change events in the queue, + * indicate to the caller that there is pending event info in + * the response block + */ + if (ap_chsc_sei_nt0_have_event()) { + nt0_res->flags |= PENDING_EVENT_INFO_BITMASK; + } + + nt0_res->length = sizeof(ChscSeiNt0Res); + nt0_res->code = NT0_RES_RESPONSE_CODE; + nt0_res->nt = NT0_RES_NT_DEFAULT; + nt0_res->rs = NT0_RES_RS_AP_CHANGE;Quoted 9 lines
hw/vfio/ap.c static void vfio_ap_cfg_chg_notifier_handler(void *opaque) · line 140
Quoted 6 lines
hw/vfio/ap.c +6
-0+ nt0_res->cc = NT0_RES_CC_AP_CHANGE; + + return EVENT_INFORMATION_STORED; +} + +bool ap_chsc_sei_nt0_have_event (void )hmm, no locking ?
See not above for
bql_lockedQuoted 21 lines
Quoted 8 lines
hw/vfio/ap.c +4
-0+{ + return !QTAILQ_EMPTY(&cfg_chg_events); +} + static bool vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev, unsigned int irq, Error **errp) {hw/vfio/ap.c static void vfio_ap_realize(DeviceState *dev, · line 246
Quoted 9 lines
hw/vfio/ap.c +5
-0@@ -192,6 +238,13 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp) VFIOAPDevice *vapdev = VFIO_AP_DEVICE(dev); VFIODevice *vbasedev = &vapdev->vdev; + static bool lock_initialized; + + if (!lock_initialized) { + qemu_mutex_init(&cfg_chg_events_lock); + lock_initialized = true; + }this could be replaced with a constructor routine. See hyperv.
Quoted 4 lines
Thanks,
C.
Noted
Quoted 52 lines
Quoted 51 lines
hw/vfio/ap.c +0
-0if (!vfio_device_get_name(vbasedev, errp)) { return;}
include/hw/s390x/ap-bridge.h +32
-0@@ -16,4 +16,43 @@ void s390_init_ap(void); +typedef struct ChscSeiNt0Res { + uint16_t length; + uint16_t code; + uint8_t reserved1; + uint16_t reserved2; + uint8_t nt; +#define PENDING_EVENT_INFO_BITMASK 0x80; + uint8_t flags; + uint8_t reserved3; + uint8_t rs; + uint8_t cc; +} QEMU_PACKED ChscSeiNt0Res; + +#define NT0_RES_RESPONSE_CODE 1 +#define NT0_RES_NT_DEFAULT 0 +#define NT0_RES_RS_AP_CHANGE 5 +#define NT0_RES_CC_AP_CHANGE 3 + +#define EVENT_INFORMATION_NOT_STORED 1 +#define EVENT_INFORMATION_STORED 0 + +/** +* ap_chsc_sei_nt0_get_event - Retrieve the next pending AP config +* change event +* @res: Pointer to a ChscSeiNt0Res struct to be filled with event +* data +* +* This function checks for any pending AP config change events and, +* if present, populates the provided response structure with the +* appropriate SEI NT0 fields. +* +* Return: +* EVENT_INFORMATION_STORED - An event was available and written to @res
+ *EVENT_INFORMATION_NOT_STORED- No event was available
+ */include/hw/s390x/ap-bridge.h +4
-0+int ap_chsc_sei_nt0_get_event (void *res); + +bool ap_chsc_sei_nt0_have_event (void ); +> #endif
Re: [RFC PATCH v11 3/4] hw/vfio/ap: Storing event information for an AP configuration change event
Quoted 15 lines · Rorie Reyes
Quoted 13 lines · Cédric Le Goater
Quoted 9 lines · Rorie Reyes
Hey Cedric,
You mentioned the following in my v9 patches
"In that case, let's keep it simple (no mutex) and add a assert(bql_locked()) statement where we think the bql should be protecting access to shared resources. "
Does this still apply down bellow?
Anthony replied :
Quoted 7 lines
Quoted 6 lines
https://lore.kernel.org/qemu-devel/[email protected]/
Thanks,
C.
So we'll still use
WITH_QEMU_LOCK_GUARD?
If a lock is needed to protect the list, then ap_chsc_sei_nt0_have_event() should lock/unlock too. WITH_QEMU_LOCK_GUARD() is just a pratical way to do so.
Thanks,
C.
Quoted 158 lines
Quoted 157 lines
Quoted 156 lines · Cédric Le Goater
Quoted 31 lines · Rorie Reyes
Quoted 30 lines
These functions can be invoked by the function that handles interception of the CHSC SEI instruction for requests indicating the accessibility of one or more adjunct processors has changed.
Signed-off-by Rorie Reyes <[email protected]>---
hw/vfio/ap.c | 53 ++++++++++++++++++++++++++++++++++++include/hw/s390x/ap-bridge.h| 39 ++++++++++++++++++++++++++2 files changed, 92 insertions(+)hw/vfio/ap.c +0
-0@@ -10,6 +10,7 @@* directory. */ +#include <
stdbool.h>
#include "qemu/osdep.h"
#includeCONFIG_DEVICES/*CONFIG_IOMMUFD*/
#include <linux/vfio.h>hw/vfio/ap.c +0
-0@@ -48,6 +49,8 @@ typedef struct APConfigChgEvent {static
QTAILQ_HEAD(, APConfigChgEvent)cfg_chg_events=QTAILQ_HEAD_INITIALIZER(cfg_chg_events); +static QemuMutexcfg_chg_events_lock;
+
OBJECT_DECLARE_SIMPLE_TYPE(VFIOAPDevice, VFIO_AP_DEVICE)static voidvfio_ap_compute_needs_reset(VFIODevice *vdev)hw/vfio/ap.c +0
-0@@ -96,6 +99,49 @@ static void vfio_ap_cfg_chg_notifier_handler(void *opaque) }Quoted 9 lines
hw/vfio/ap.c static void vfio_ap_cfg_chg_notifier_handler(void *opaque) · line 107
Quoted 6 lines
hw/vfio/ap.c +5
-0+int ap_chsc_sei_nt0_get_event(void *res) +{ + ChscSeiNt0Res *nt0_res = (ChscSeiNt0Res *)res; + APConfigChgEvent *cfg_chg_event; + + qemu_mutex_lock(&cfg_chg_events_lock);please consider using
WITH_QEMU_LOCK_GUARD()See note above about
bql_lockedQuoted 26 lines
Quoted 26 lines
hw/vfio/ap.c +26
-0+ if (!ap_chsc_sei_nt0_have_event()) { + qemu_mutex_unlock(&cfg_chg_events_lock); + return EVENT_INFORMATION_NOT_STORED; + } + + cfg_chg_event = QTAILQ_FIRST(&cfg_chg_events); + QTAILQ_REMOVE(&cfg_chg_events, cfg_chg_event, next); + + qemu_mutex_unlock(&cfg_chg_events_lock); + + memset(nt0_res, 0, sizeof(*nt0_res)); + g_free(cfg_chg_event); + + /* + * If there are any AP configuration change events in the queue, + * indicate to the caller that there is pending event info in + * the response block + */ + if (ap_chsc_sei_nt0_have_event()) { + nt0_res->flags |= PENDING_EVENT_INFO_BITMASK; + } + + nt0_res->length = sizeof(ChscSeiNt0Res); + nt0_res->code = NT0_RES_RESPONSE_CODE; + nt0_res->nt = NT0_RES_NT_DEFAULT; + nt0_res->rs = NT0_RES_RS_AP_CHANGE;Quoted 9 lines
hw/vfio/ap.c static void vfio_ap_cfg_chg_notifier_handler(void *opaque) · line 140
Quoted 6 lines
hw/vfio/ap.c +6
-0+ nt0_res->cc = NT0_RES_CC_AP_CHANGE; + + return EVENT_INFORMATION_STORED; +} + +bool ap_chsc_sei_nt0_have_event (void )hmm, no locking ?
See not above for
bql_lockedQuoted 20 lines
Quoted 8 lines
hw/vfio/ap.c +4
-0+{ + return !QTAILQ_EMPTY(&cfg_chg_events); +} + static bool vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev, unsigned int irq, Error **errp) {hw/vfio/ap.c static void vfio_ap_realize(DeviceState *dev, Error **errp) · line 245
Quoted 8 lines
hw/vfio/ap.c +5
-0@@ -192,6 +238,13 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp) VFIOAPDevice *vapdev = VFIO_AP_DEVICE(dev); VFIODevice *vbasedev = &vapdev->vdev; + static bool lock_initialized; + + if (!lock_initialized) { + qemu_mutex_init(&cfg_chg_events_lock); + lock_initialized = true; + }this could be replaced with a constructor routine. See hyperv.
Quoted 4 lines
Thanks,
C.
Noted
Quoted 51 lines
Quoted 50 lines
hw/vfio/ap.c +0
-0if (!vfio_device_get_name(vbasedev, errp)) { return; }include/hw/s390x/ap-bridge.h +38
-0@@ -16,4 +16,43 @@ void s390_init_ap(void); +typedef struct ChscSeiNt0Res { + uint16_t length; + uint16_t code; + uint8_t reserved1; + uint16_t reserved2; + uint8_t nt; +#define PENDING_EVENT_INFO_BITMASK 0x80; + uint8_t flags; + uint8_t reserved3; + uint8_t rs; + uint8_t cc; +} QEMU_PACKED ChscSeiNt0Res; + +#define NT0_RES_RESPONSE_CODE 1 +#define NT0_RES_NT_DEFAULT 0 +#define NT0_RES_RS_AP_CHANGE 5 +#define NT0_RES_CC_AP_CHANGE 3 + +#define EVENT_INFORMATION_NOT_STORED 1 +#define EVENT_INFORMATION_STORED 0 + +/** +* ap_chsc_sei_nt0_get_event - Retrieve the next pending AP config +* change event +* @res: Pointer to a ChscSeiNt0Res struct to be filled with event +* data +* +* This function checks for any pending AP config change events and, +* if present, populates the provided response structure with the +* appropriate SEI NT0 fields. +* +* Return: +* EVENT_INFORMATION_STORED - An event was available and written to @res +* EVENT_INFORMATION_NOT_STORED - No event was available +*/ +int ap_chsc_sei_nt0_get_event (void *res); + +bool ap_chsc_sei_nt0_have_event (void ); +> #endif
Re: [RFC PATCH v11 3/4] hw/vfio/ap: Storing event information for an AP configuration change event
Quoted 21 lines · Cédric Le Goater
Quoted 20 lines · Rorie Reyes
Quoted 18 lines · Cédric Le Goater
Quoted 9 lines · Rorie Reyes
Hey Cedric,
You mentioned the following in my v9 patches
"In that case, let's keep it simple (no mutex) and add a assert(bql_locked()) statement where we think the bql should be protecting access to shared resources. "
Does this still apply down bellow?
Anthony replied :
https://lore.kernel.org/qemu-devel/[email protected]/
Thanks,
Quoted 7 lines
Quoted 3 lines
Quoted 2 lines
C.
So we'll still use
WITH_QEMU_LOCK_GUARD?If a lock is needed to protect the list, then
ap_chsc_sei_nt0_have_event()should lock/unlock too.WITH_QEMU_LOCK_GUARD()is just a pratical way to do so.
Since ap_chsc_sei_nt0_have_event() is a single line that returns !QTAILQ_EMPTY(&cfg_chg_events), wouldn't it be better to just use the QEMU_LOCK_GUARD macro which, if I'm not mistaken, will unlock on the return statement?
Quoted 173 lines
Thanks,
C.
Quoted 164 lines
Quoted 163 lines
Quoted 162 lines · Cédric Le Goater
Quoted 33 lines · Rorie Reyes
Quoted 32 lines
These functions can be invoked by the function that handles interception of the CHSC SEI instruction for requests indicating the accessibility of one or more adjunct processors has changed.
Signed-off-by Rorie Reyes <[email protected]>---
hw/vfio/ap.c | 53
++++++++++++++++++++++++++++++++++++
include/hw/s390x/ap-bridge.h| 39 ++++++++++++++++++++++++++2 files changed, 92 insertions(+)hw/vfio/ap.c +0
-0@@ -10,6 +10,7 @@* directory. */ +#include <
stdbool.h>
#include "qemu/osdep.h"
#includeCONFIG_DEVICES/*CONFIG_IOMMUFD*/
#include <linux/vfio.h>hw/vfio/ap.c +0
-0@@ -48,6 +49,8 @@ typedef struct APConfigChgEvent {static
QTAILQ_HEAD(, APConfigChgEvent)cfg_chg_events=QTAILQ_HEAD_INITIALIZER(cfg_chg_events); +static QemuMutexcfg_chg_events_lock;
+
OBJECT_DECLARE_SIMPLE_TYPE(VFIOAPDevice, VFIO_AP_DEVICE)static voidvfio_ap_compute_needs_reset(VFIODevice *vdev)hw/vfio/ap.c +0
-0@@ -96,6 +99,49 @@ static voidvfio_ap_cfg_chg_notifier_handler (void *opaque) }Quoted 9 lines
hw/vfio/ap.c static void vfio_ap_cfg_chg_notifier_handler(void *opaque) · line 107
Quoted 6 lines
hw/vfio/ap.c +5
-0+int ap_chsc_sei_nt0_get_event(void *res) +{ + ChscSeiNt0Res *nt0_res = (ChscSeiNt0Res *)res; + APConfigChgEvent *cfg_chg_event; + + qemu_mutex_lock(&cfg_chg_events_lock);please consider using
WITH_QEMU_LOCK_GUARD()See note above about
bql_lockedQuoted 27 lines
Quoted 27 lines
hw/vfio/ap.c +26
-0+ if (!ap_chsc_sei_nt0_have_event()) { + qemu_mutex_unlock(&cfg_chg_events_lock); + return EVENT_INFORMATION_NOT_STORED; + } + + cfg_chg_event = QTAILQ_FIRST(&cfg_chg_events); + QTAILQ_REMOVE(&cfg_chg_events, cfg_chg_event, next); + + qemu_mutex_unlock(&cfg_chg_events_lock); + + memset(nt0_res, 0, sizeof(*nt0_res)); + g_free(cfg_chg_event); + + /* + * If there are any AP configuration change events in the queue, + * indicate to the caller that there is pending event info in + * the response block + */ + if (ap_chsc_sei_nt0_have_event()) { + nt0_res->flags |= PENDING_EVENT_INFO_BITMASK; + } + + nt0_res->length = sizeof(ChscSeiNt0Res); + nt0_res->code = NT0_RES_RESPONSE_CODE; + nt0_res->nt = NT0_RES_NT_DEFAULT; + nt0_res->rs = NT0_RES_RS_AP_CHANGE;Quoted 9 lines
hw/vfio/ap.c static void vfio_ap_cfg_chg_notifier_handler(void *opaque) · line 140
Quoted 6 lines
hw/vfio/ap.c +6
-0+ nt0_res->cc = NT0_RES_CC_AP_CHANGE; + + return EVENT_INFORMATION_STORED; +} + +bool ap_chsc_sei_nt0_have_event (void )hmm, no locking ?
See not above for
bql_lockedQuoted 21 lines
Quoted 8 lines
hw/vfio/ap.c +4
-0+{ + return !QTAILQ_EMPTY(&cfg_chg_events); +} + static bool vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev, unsigned int irq, Error **errp){
hw/vfio/ap.c static void vfio_ap_realize(DeviceState · line 246
Quoted 9 lines
hw/vfio/ap.c +5
-0@@ -192,6 +238,13 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp) VFIOAPDevice *vapdev = VFIO_AP_DEVICE(dev); VFIODevice *vbasedev = &vapdev->vdev; + static bool lock_initialized; + + if (!lock_initialized) { + qemu_mutex_init(&cfg_chg_events_lock); + lock_initialized = true; + }this could be replaced with a constructor routine. See hyperv.
Quoted 4 lines
Thanks,
C.
Noted
Quoted 53 lines
Quoted 52 lines
hw/vfio/ap.c +0
-0if (!vfio_device_get_name(vbasedev, errp)) { return;}
include/hw/s390x/ap-bridge.h +32
-0@@ -16,4 +16,43 @@ void s390_init_ap(void); +typedef struct ChscSeiNt0Res { + uint16_t length; + uint16_t code; + uint8_t reserved1; + uint16_t reserved2; + uint8_t nt; +#define PENDING_EVENT_INFO_BITMASK 0x80; + uint8_t flags; + uint8_t reserved3; + uint8_t rs; + uint8_t cc; +} QEMU_PACKED ChscSeiNt0Res; + +#define NT0_RES_RESPONSE_CODE 1 +#define NT0_RES_NT_DEFAULT 0 +#define NT0_RES_RS_AP_CHANGE 5 +#define NT0_RES_CC_AP_CHANGE 3 + +#define EVENT_INFORMATION_NOT_STORED 1 +#define EVENT_INFORMATION_STORED 0 + +/** +* ap_chsc_sei_nt0_get_event - Retrieve the next pending AP config +* change event +* @res: Pointer to a ChscSeiNt0Res struct to be filled with event +* data +* +* This function checks for any pending AP config change events and, +* if present, populates the provided response structure with the +* appropriate SEI NT0 fields. +* +* Return: +* EVENT_INFORMATION_STORED - An event was available and written to @res
+ *EVENT_INFORMATION_NOT_STORED- No event was available
+ */include/hw/s390x/ap-bridge.h +4
-0+int ap_chsc_sei_nt0_get_event (void *res); + +bool ap_chsc_sei_nt0_have_event (void ); +> #endif
Re: [RFC PATCH v11 3/4] hw/vfio/ap: Storing event information for an AP configuration change event
Quoted 29 lines · Anthony Krowiak
Quoted 25 lines · Cédric Le Goater
Quoted 23 lines · Rorie Reyes
Quoted 11 lines · Cédric Le Goater
Quoted 9 lines · Rorie Reyes
Hey Cedric,
You mentioned the following in my v9 patches
"In that case, let's keep it simple (no mutex) and add a assert(bql_locked()) statement where we think the bql should be protecting access to shared resources. "
Does this still apply down bellow?
Quoted 9 lines
Anthony replied :
https://lore.kernel.org/qemu-devel/[email protected]/
Thanks,
C.
So we'll still use
WITH_QEMU_LOCK_GUARD?
Quoted 97 lines
Quoted 3 lines
If a lock is needed to protect the list, then
ap_chsc_sei_nt0_have_event()should lock/unlock too.WITH_QEMU_LOCK_GUARD()is just a pratical way to do so.Since
ap_chsc_sei_nt0_have_event()is a single line that returns !QTAILQ_EMPTY(&cfg_chg_events), wouldn't it be better to just use theQEMU_LOCK_GUARDmacro which, if I'm not mistaken, will unlock on the return statement?Quoted 89 lines
Thanks,
C.
Quoted 81 lines
Quoted 81 lines
Quoted 81 lines · Cédric Le Goater
Quoted 33 lines · Rorie Reyes
Quoted 32 lines
These functions can be invoked by the function that handles interception of the CHSC SEI instruction for requests indicating the accessibility of one or more adjunct processors has changed.
Signed-off-by Rorie Reyes <[email protected]>---
hw/vfio/ap.c | 53
++++++++++++++++++++++++++++++++++++
include/hw/s390x/ap-bridge.h| 39 ++++++++++++++++++++++++++2 files changed, 92 insertions(+)hw/vfio/ap.c +0
-0@@ -10,6 +10,7 @@* directory. */ +#include <
stdbool.h>
#include "qemu/osdep.h"
#includeCONFIG_DEVICES/*CONFIG_IOMMUFD*/
#include <linux/vfio.h>hw/vfio/ap.c +0
-0@@ -48,6 +49,8 @@ typedef struct APConfigChgEvent {static
QTAILQ_HEAD(, APConfigChgEvent)cfg_chg_events=QTAILQ_HEAD_INITIALIZER(cfg_chg_events); +static QemuMutexcfg_chg_events_lock;
+
OBJECT_DECLARE_SIMPLE_TYPE(VFIOAPDevice, VFIO_AP_DEVICE)static voidvfio_ap_compute_needs_reset(VFIODevice *vdev)hw/vfio/ap.c +0
-0@@ -96,6 +99,49 @@ static voidvfio_ap_cfg_chg_notifier_handler (void *opaque) }Quoted 9 lines
hw/vfio/ap.c static void · line 106
Quoted 6 lines
hw/vfio/ap.c +5
-0+int ap_chsc_sei_nt0_get_event(void *res) +{ + ChscSeiNt0Res *nt0_res = (ChscSeiNt0Res *)res; + APConfigChgEvent *cfg_chg_event; + + qemu_mutex_lock(&cfg_chg_events_lock);please consider using
WITH_QEMU_LOCK_GUARD()See note above about
bql_lockedQuoted 36 lines
Quoted 23 lines
hw/vfio/ap.c +22
-0+ if (!ap_chsc_sei_nt0_have_event()) { + qemu_mutex_unlock(&cfg_chg_events_lock); + return EVENT_INFORMATION_NOT_STORED; + } + + cfg_chg_event = QTAILQ_FIRST(&cfg_chg_events); + QTAILQ_REMOVE(&cfg_chg_events, cfg_chg_event, next); + + qemu_mutex_unlock(&cfg_chg_events_lock); + + memset(nt0_res, 0, sizeof(*nt0_res)); + g_free(cfg_chg_event); + + /* + * If there are any AP configuration change events in the queue, + * indicate to the caller that there is pending event info in + * the response block + */ + if (ap_chsc_sei_nt0_have_event()) { + nt0_res->flags |= PENDING_EVENT_INFO_BITMASK; + } +hw/vfio/ap.c static void · line 139
Quoted 10 lines
hw/vfio/ap.c +10
-0+ nt0_res->length = sizeof(ChscSeiNt0Res); + nt0_res->code = NT0_RES_RESPONSE_CODE; + nt0_res->nt = NT0_RES_NT_DEFAULT; + nt0_res->rs = NT0_RES_RS_AP_CHANGE; + nt0_res->cc = NT0_RES_CC_AP_CHANGE; + + return EVENT_INFORMATION_STORED; +} + +bool ap_chsc_sei_nt0_have_event (void )hmm, no locking ?
How important do we need to lock this? When I lock this method my guest freezes every time. But when I only lock the get event, my code continues to work as designed
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
See not above for
bql_lockedQuoted 6 lines
Quoted 6 lines
hw/vfio/ap.c +4
-0+{ + return !QTAILQ_EMPTY(&cfg_chg_events); +} + static bool vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev, unsigned int irq, Error **errp)
Re: [RFC PATCH v11 3/4] hw/vfio/ap: Storing event information for an AP configuration change event
Quoted 128 lines · Rorie Reyes
Quoted 29 lines · Anthony Krowiak
Quoted 25 lines · Cédric Le Goater
Quoted 23 lines · Rorie Reyes
Quoted 11 lines · Cédric Le Goater
Quoted 9 lines · Rorie Reyes
Hey Cedric,
You mentioned the following in my v9 patches
"In that case, let's keep it simple (no mutex) and add a assert(bql_locked()) statement where we think the bql should be protecting access to shared resources. "
Does this still apply down bellow?
Quoted 9 lines
Anthony replied :
https://lore.kernel.org/qemu-devel/[email protected]/
Thanks,
C.
So we'll still use
WITH_QEMU_LOCK_GUARD?Quoted 97 lines
Quoted 3 lines
If a lock is needed to protect the list, then
ap_chsc_sei_nt0_have_event()should lock/unlock too.WITH_QEMU_LOCK_GUARD()is just a pratical way to do so.Since
ap_chsc_sei_nt0_have_event()is a single line that returns !QTAILQ_EMPTY(&cfg_chg_events), wouldn't it be better to just use theQEMU_LOCK_GUARDmacro which, if I'm not mistaken, will unlock on the return statement?Quoted 89 lines
Thanks,
C.
Quoted 81 lines
Quoted 81 lines
Quoted 81 lines · Cédric Le Goater
Quoted 33 lines · Rorie Reyes
Quoted 32 lines
These functions can be invoked by the function that handles interception of the CHSC SEI instruction for requests indicating the accessibility of one or more adjunct processors has changed.
Signed-off-by Rorie Reyes <[email protected]>---
hw/vfio/ap.c | 53
++++++++++++++++++++++++++++++++++++
include/hw/s390x/ap-bridge.h| 39 ++++++++++++++++++++++++++2 files changed, 92 insertions(+)hw/vfio/ap.c +0
-0@@ -10,6 +10,7 @@* directory. */ +#include <
stdbool.h>
#include "qemu/osdep.h"
#includeCONFIG_DEVICES/*CONFIG_IOMMUFD*/
#include <linux/vfio.h>hw/vfio/ap.c +0
-0@@ -48,6 +49,8 @@ typedef struct APConfigChgEvent {static
QTAILQ_HEAD(, APConfigChgEvent)cfg_chg_events=QTAILQ_HEAD_INITIALIZER(cfg_chg_events); +static QemuMutexcfg_chg_events_lock;
+
OBJECT_DECLARE_SIMPLE_TYPE(VFIOAPDevice, VFIO_AP_DEVICE)static voidvfio_ap_compute_needs_reset(VFIODevice *vdev)hw/vfio/ap.c +0
-0@@ -96,6 +99,49 @@ static voidvfio_ap_cfg_chg_notifier_handler (void *opaque) }Quoted 9 lines
hw/vfio/ap.c static void · line 106
Quoted 6 lines
hw/vfio/ap.c +5
-0+int ap_chsc_sei_nt0_get_event(void *res) +{ + ChscSeiNt0Res *nt0_res = (ChscSeiNt0Res *)res; + APConfigChgEvent *cfg_chg_event; + + qemu_mutex_lock(&cfg_chg_events_lock);please consider using
WITH_QEMU_LOCK_GUARD()See note above about
bql_lockedQuoted 36 lines
Quoted 23 lines
hw/vfio/ap.c +22
-0+ if (!ap_chsc_sei_nt0_have_event()) { +qemu_mutex_unlock (&cfg_chg_events_lock); + return EVENT_INFORMATION_NOT_STORED; + } + + cfg_chg_event = QTAILQ_FIRST(&cfg_chg_events); + QTAILQ_REMOVE(&cfg_chg_events, cfg_chg_event, next); + + qemu_mutex_unlock(&cfg_chg_events_lock); + + memset(nt0_res, 0, sizeof(*nt0_res)); + g_free(cfg_chg_event); + + /* + * If there are any AP configuration change events in the queue, + * indicate to the caller that there is pending event info in + * the response block + */ + if (ap_chsc_sei_nt0_have_event()) { + nt0_res->flags |= PENDING_EVENT_INFO_BITMASK; + } +hw/vfio/ap.c static void · line 139
Quoted 10 lines
hw/vfio/ap.c +10
-0+ nt0_res->length = sizeof(ChscSeiNt0Res); + nt0_res->code = NT0_RES_RESPONSE_CODE; + nt0_res->nt = NT0_RES_NT_DEFAULT; + nt0_res->rs = NT0_RES_RS_AP_CHANGE; + nt0_res->cc = NT0_RES_CC_AP_CHANGE; + + return EVENT_INFORMATION_STORED; +} + +bool ap_chsc_sei_nt0_have_event (void )hmm, no locking ?
Quoted 1 line
How important do we need to lock this? When I lock this method my guest freezes every time. But when I only lock the get event, my code continues to work as designed
Try locking in both functions, but instead of calling the have event function from the get event function, use
!QTAILQ_EMPTY(&cfg_chg_events) in the get event function. If you are holding the lock when you call the have event function, you will be locking the same lock twice and it will hang when you lock the second time because the lock is already held.
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
See not above for
bql_lockedQuoted 6 lines
Quoted 6 lines
hw/vfio/ap.c +4
-0+{ + return !QTAILQ_EMPTY(&cfg_chg_events); +} + static bool vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev, unsigned int irq, Error **errp)
Re: [RFC PATCH v11 3/4] hw/vfio/ap: Storing event information for an AP configuration change event
Quoted 133 lines · Anthony Krowiak
Quoted 129 lines · Rorie Reyes
Quoted 127 lines · Anthony Krowiak
Quoted 21 lines · Cédric Le Goater
Quoted 20 lines · Rorie Reyes
Quoted 18 lines · Cédric Le Goater
Quoted 9 lines · Rorie Reyes
Hey Cedric,
You mentioned the following in my v9 patches
"In that case, let's keep it simple (no mutex) and add a assert(bql_locked()) statement where we think the bql should be protecting access to shared resources. "
Does this still apply down bellow?
Anthony replied :
https://lore.kernel.org/qemu-devel/[email protected]/
Thanks,
Quoted 7 lines
Quoted 3 lines
Quoted 2 lines
C.
So we'll still use
WITH_QEMU_LOCK_GUARD?If a lock is needed to protect the list, then
ap_chsc_sei_nt0_have_event()should lock/unlock too.WITH_QEMU_LOCK_GUARD()is just a pratical way to do so.Since
ap_chsc_sei_nt0_have_event()is a single line that returns !QTAILQ_EMPTY(&cfg_chg_events), wouldn't it be better to just use theQEMU_LOCK_GUARDmacro which, if I'm not mistaken, will unlock on the return statement?Quoted 90 lines
Thanks,
C.
Quoted 82 lines
Quoted 82 lines
Quoted 82 lines · Cédric Le Goater
Quoted 33 lines · Rorie Reyes
Quoted 32 lines
These functions can be invoked by the function that handles interception of the CHSC SEI instruction for requests indicating the accessibility of one or more adjunct processors has changed.
Signed-off-by Rorie Reyes <[email protected]>---
hw/vfio/ap.c | 53
++++++++++++++++++++++++++++++++++++
include/hw/s390x/ap-bridge.h| 39 ++++++++++++++++++++++++++2 files changed, 92 insertions(+)hw/vfio/ap.c +0
-0@@ -10,6 +10,7 @@* directory. */ +#include <
stdbool.h>
#include "qemu/osdep.h"
#includeCONFIG_DEVICES/*CONFIG_IOMMUFD*/
#include <linux/vfio.h>hw/vfio/ap.c +0
-0@@ -48,6 +49,8 @@ typedef struct APConfigChgEvent {static
QTAILQ_HEAD(, APConfigChgEvent)cfg_chg_events=QTAILQ_HEAD_INITIALIZER(cfg_chg_events); +static QemuMutexcfg_chg_events_lock;
+
OBJECT_DECLARE_SIMPLE_TYPE(VFIOAPDevice, VFIO_AP_DEVICE)static voidvfio_ap_compute_needs_reset(VFIODevice *vdev)hw/vfio/ap.c +0
-0@@ -96,6 +99,49 @@ static voidvfio_ap_cfg_chg_notifier_handler (void *opaque) }Quoted 9 lines
hw/vfio/ap.c static void · line 106
Quoted 6 lines
hw/vfio/ap.c +5
-0+int ap_chsc_sei_nt0_get_event(void *res) +{ + ChscSeiNt0Res *nt0_res = (ChscSeiNt0Res *)res; + APConfigChgEvent *cfg_chg_event; + + qemu_mutex_lock(&cfg_chg_events_lock);please consider using
WITH_QEMU_LOCK_GUARD()See note above about
bql_lockedQuoted 37 lines
Quoted 24 lines
hw/vfio/ap.c +16
-0+ if (!ap_chsc_sei_nt0_have_event()) { +qemu_mutex_unlock (&cfg_chg_events_lock); + return EVENT_INFORMATION_NOT_STORED; + } + + cfg_chg_event = QTAILQ_FIRST(&cfg_chg_events); + QTAILQ_REMOVE(&cfg_chg_events, cfg_chg_event, next); + + qemu_mutex_unlock(&cfg_chg_events_lock); + + memset(nt0_res, 0, sizeof(*nt0_res)); + g_free(cfg_chg_event); + + /* +* If there are any AP configuration change events in the queue, +* indicate to the caller that there is pending event info in
+ * the response block
+ */
+ if (ap_chsc_sei_nt0_have_event()) {
+nt0_res->flags|=PENDING_EVENT_INFO_BITMASK; + }hw/vfio/ap.c +1
-0+hw/vfio/ap.c
Quoted 10 lines
hw/vfio/ap.c +10
-0+ nt0_res->length = sizeof(ChscSeiNt0Res); + nt0_res->code = NT0_RES_RESPONSE_CODE; + nt0_res->nt = NT0_RES_NT_DEFAULT; + nt0_res->rs = NT0_RES_RS_AP_CHANGE; + nt0_res->cc = NT0_RES_CC_AP_CHANGE; + + return EVENT_INFORMATION_STORED; +} + +bool ap_chsc_sei_nt0_have_event (void )hmm, no locking ?
Quoted 5 lines
Quoted 1 line
How important do we need to lock this? When I lock this method my guest freezes every time. But when I only lock the get event, my code continues to work as designed
Try locking in both functions, but instead of calling the have event function from the get event function, use
!QTAILQ_EMPTY(&cfg_chg_events) in the get event function. If you are holding the lock when you call the have event function, you will be locking the same lock twice and it will hang when you lock the second time because the lock is already held.
Let me give that a shot. Thanks Tony
Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
See not above for
bql_lockedQuoted 6 lines
Quoted 6 lines
hw/vfio/ap.c +4
-0+{ + return !QTAILQ_EMPTY(&cfg_chg_events); +} +static bool
vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev, unsigned int irq, Error **errp)
RFC PATCH v11 4/4 s390: implementing CHSC SEI for AP config change
In reply to Rorie ReyesHandle interception of the CHSC SEI instruction for requests indicating the guest's AP configuration has changed.
If configuring --without-default-devices, hw/s390x/ap-stub.c was created to handle such circumstance. Also added the following to hw/s390x/meson.build if CONFIG_VFIO_AP is false, it will use the stub file.
--- MAINTAINERS | 1 + hw/s390x/ap-stub.c | 21 +++++++++++++++++++++ hw/s390x/meson.build | 1 + target/s390x/ioinst.c | 11 +++++++++-- 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 hw/s390x/ap-stub.c
MAINTAINERS +1 -0
@@ -112,6 +112,7 @@ F: hw/intc/s390_flic.c F: hw/intc/s390_flic_kvm.c F: hw/s390x/ F: hw/vfio/ap.c +F: hw/s390x/ap-stub.c F: hw/vfio/ccw.c F: hw/watchdog/wdt_diag288.c F: include/hw/s390x/
hw/s390x/ap-stub.c new file +21 -0
@@ -0,0 +1,21 @@ +/* +* VFIO based AP matrix device assignment +* +* Copyright 2025 IBM Corp. +* Author(s): Rorie Reyes <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "qemu/osdep.h" +#include "hw/s390x/ap-bridge.h" + +int ap_chsc_sei_nt0_get_event (void *res) +{ +return EVENT_INFORMATION_NOT_STORED ; +} + +bool ap_chsc_sei_nt0_have_event (void ) +{ +return false; +}
hw/s390x/meson.build +1 -0
@@ -33,6 +33,7 @@ s390x_ss.add(when: 'CONFIG_S390_CCW_VIRTIO', if_true: files( )) s390x_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('3270-ccw.c')) s390x_ss.add(when: 'CONFIG_VFIO', if_true: files('s390-pci-vfio.c')) +s390x_ss.add(when: 'CONFIG_VFIO_AP', if_false: files('ap-stub.c')) virtio_ss = ss.source_set() virtio_ss.add(files('virtio-ccw.c'))
target/s390x/ioinst.c +9 -2
@@ -18,6 +18,7 @@#include "trace.h" #include "hw/s390x/s390-pci-bus.h" #include "target/s390x/kvm/pv.h" +#include "hw/s390x/ap-bridge.h" /* All I/O instructions but chsc use the s format */ static uint64_t get_address_from_regs(CPUS390XState *env, uint32_t ipb,
@@ -574,13 +575,19 @@ out:static int chsc_sei_nt0_get_event (void *res) { -/* no events yet */ +if (s390_has_feat (S390_FEAT_AP )) { +return ap_chsc_sei_nt0_get_event (res); + } +return 1 ; }static int chsc_sei_nt0_have_event (void ) { -/* no events yet */ +if (s390_has_feat (S390_FEAT_AP )) { +return ap_chsc_sei_nt0_have_event (); + } +return 0 ; }
Signature · 1 line
2.48.1