Report vfio-ap configuration changes
v10 cover Report vfio-ap configuration changes
Changelog:
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 | 25 ++++++++++ hw/s390x/meson.build | 1 + hw/vfio/ap.c | 96 ++++++++++++++++++++++++++++++++++++ include/hw/s390x/ap-bridge.h | 36 ++++++++++++++ target/s390x/ioinst.c | 11 ++++- 6 files changed, 168 insertions(+), 2 deletions(-) create mode 100644 hw/s390x/ap-stub.c
Signature · 1 line
2.48.1
RFC PATCH v10 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 v10 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 v10 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 | 36 ++++++++++++++++++++++++ 2 files changed, 89 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) } +bool 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 true; + } + + 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 false; +} + +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 +36 -0
@@ -16,4 +16,40 @@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 + +/** +* 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: +* false - An event was available and written to @res +* true - No event was available +*/ +bool 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 v10 3/4] hw/vfio/ap: Storing event information for an AP configuration change event
Quoted 62 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 | 36 ++++++++++++++++++++++++ 2 files changed, 89 insertions(+)hw/vfio/ap.c +30
-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) } +bool 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 true; + } + + 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 138
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 false; +}
The boolean return values in the function above do not make logical sense. What they are effectively saying is that event information has been stored in the response when there is no event information to store (i.e., the event queue is empty), and that event information has not been stored if the response has been filled with event information.
After looking at the calling code in target/s390x/ionst.c, apparently the meaning of the int value originally returned from the above function was not in fact intended to be a boolean value. It looks like the caller uses this value to indicate whether the response code should be set to 0x0001 (this function returns 0) or 0x0005 (this function returns 1); so, the boolean values returned match what is expected by the caller. I think this is why your original pass at returning a boolean caused your patch to fail; because you did what made logical sense in this function.
I think the calling code is very convoluted to say the least, so maybe what makes sense here is to continue to return an int and use #define to document the return value; for example:
#define EVENT_INFORMATION_STORED 0
#define EVENT_INFORMATION_NOT_STORED 1
It would probably make a great deal of sense to refactor the calling code, but that could potentially open up a large can of worms, so at least this makes sense from the perspective of reading this code.
hw/vfio/ap.c static void vfio_ap_cfg_chg_notifier_handler(void *opaque) · line 143
Quoted 5 lines
hw/vfio/ap.c +5
-0+ +bool ap_chsc_sei_nt0_have_event (void ) +{ +return !QTAILQ_EMPTY (&cfg_chg_events); +}
It's probably fine to return boolean from the above function because it makes sense even from the caller's perspective.
Quoted 63 lines
hw/vfio/ap.c +8
-0+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 +36
-0@@ -16,4 +16,40 @@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 + +/** +* 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: +* false - An event was available and written to @res +* true - No event was available +*/ +bool ap_chsc_sei_nt0_get_event (void *res); + +bool ap_chsc_sei_nt0_have_event (void ); +#endif
Re: [RFC PATCH v10 3/4] hw/vfio/ap: Storing event information for an AP configuration change event
Quoted 59 lines
Quoted 30 lines
hw/vfio/ap.c +26
-0@@ -96,6 +99,49 @@ static void vfio_ap_cfg_chg_notifier_handler(void *opaque) } +bool 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 true; + } + + 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 · line 137
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 false; +}The boolean return values in the function above do not make logical sense. What they are effectively saying is that event information has been stored in the response when there is no event information to store (i.e., the event queue is empty), and that event information has not been stored if the response has been filled with event information.
After looking at the calling code in
target/s390x/ionst.c, apparently the meaning of the int value originally returned from the above function was not in fact intended to be a boolean value. It looks like the caller uses this value to indicate whether the response code should be set to0x0001(this function returns 0) or0x0005(this function returns 1); so, the boolean values returned match what is expected by the caller. I think this is why your original pass at returning a boolean caused your patch to fail; because you did what made logical sense in this function.I think the calling code is very convoluted to say the least, so maybe what makes sense here is to continue to return an int and use #define to document the return value; for example:
Quoted 7 lines
#define EVENT_INFORMATION_STORED 0
#defineEVENT_INFORMATION_NOT_STORED1It would probably make a great deal of sense to refactor the calling code, but that could potentially open up a large can of worms, so at least this makes sense from the perspective of reading this code.
I agree with you on that, Tony. It makes sense to return an int due to the calling code. I will make these updates and set up the appropriate definitions in the header file, 'ap-bridge.h'. I'll also reflect the same type changes in the stub file to match
Quoted 9 lines
hw/vfio/ap.c static void vfio_ap_cfg_chg_notifier_handler(void *opaque) · line 143
Quoted 5 lines
hw/vfio/ap.c +5
-0+ +bool ap_chsc_sei_nt0_have_event (void ) +{ + return !QTAILQ_EMPTY(&cfg_chg_events); +}It's probably fine to return boolean from the above function because it makes sense even from the caller's perspective.
I'll keep this as is as, but I'll update the stub file to match
RFC PATCH v10 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 | 25 +++++++++++++++++++++++++ hw/s390x/meson.build | 1 + target/s390x/ioinst.c | 11 +++++++++-- 4 files changed, 36 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 +25 -0
@@ -0,0 +1,25 @@ +/* +* VFIO based AP matrix device assignment +* +* Copyright 2025 IBM Corp. +* Author(s): Rorie Reyes <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0-or-later +* +* This work is licensed under the terms of the GNU GPL, version 2 or (at +* your option) any later version. See the COPYING file in the top-level +* directory. +*/ + +#include "qemu/osdep.h" +#include "hw/s390x/ap-bridge.h" + +int ap_chsc_sei_nt0_get_event (void *res) +{ +return 0 ; +} + +int ap_chsc_sei_nt0_have_event (void ) +{ +return 0 ; +}
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
Re: [RFC PATCH v10 4/4] s390: implementing CHSC SEI for AP config change
Quoted 52 lines · Rorie Reyes
Handle 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.cwas created to handle such circumstance. Also added the following to hw/s390x/meson.build ifCONFIG_VFIO_APis false, it will use the stub file.Signed-off-by Rorie Reyes <[email protected]>Reviewed-by Anthony Krowiak <[email protected]>Reviewed-by Cédric Le Goater <[email protected]>--- MAINTAINERS | 1 + hw/s390x/ap-stub.c | 25 +++++++++++++++++++++++++ hw/s390x/meson.build | 1 + target/s390x/ioinst.c | 11 +++++++++-- 4 files changed, 36 insertions(+), 2 deletions(-)create mode 100644
hw/s390x/ap-stub.cMAINTAINERS +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 +15
-0@@ -0,0 +1,25 @@ +/* +* VFIO based AP matrix device assignment +* +* Copyright 2025 IBM Corp. +* Author(s): Rorie Reyes <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0-or-later +* +* This work is licensed under the terms of the GNU GPL, version 2 or (at +* your option) any later version. See the COPYING file in the top-level +* directory. +*/ + +#include "qemu/osdep.h" +#include "hw/s390x/ap-bridge.h"
hw/s390x/ap-stub.c line 25
Quoted 10 lines
hw/s390x/ap-stub.c new file +10
-0+ +int ap_chsc_sei_nt0_get_event (void *res) +{ +return 0 ; +} + +int ap_chsc_sei_nt0_have_event (void ) +{ +return 0 ; +}
Shouldn't these stub function signatures match those in ap-bridge.h?
Quoted 46 lines
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 ; }
Re: [RFC PATCH v10 4/4] s390: implementing CHSC SEI for AP config change
Quoted 28 lines
Quoted 28 lines
hw/s390x/ap-stub.c new file +9
-0@@ -0,0 +1,25 @@ +/* +* VFIO based AP matrix device assignment +* +* Copyright 2025 IBM Corp. +* Author(s): Rorie Reyes <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0-or-later +* +* 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.
+ */hw/s390x/ap-stub.c new file +8
-0+ +#include "qemu/osdep.h" +#include "hw/s390x/ap-bridge.h" + +int ap_chsc_sei_nt0_get_event (void *res) +{ + return 0; +}
Quoted 9 lines
hw/s390x/ap-stub.c line 25
Quoted 5 lines
hw/s390x/ap-stub.c new file +5
-0+ +int ap_chsc_sei_nt0_have_event (void ) +{ + return 0; +}Shouldn't these stub function signatures match those in
ap-bridge.h?
I'll update 'ap_chsc_sei_nt0_have_event' to be a boolean function, but keep the get_event as an int. The definition that I'll use from the header file will keep the integrity of function type