Skip to contentSkip to conversation

vfio-ccw: Enable transparent CCW IPL from DASD [QEMU]

PATCH Applied Jared Rossi 3 participants 7 messages May 12, 2020 – May 18, 2020

v2 of 4 Applied Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v2 cover vfio-ccw: Enable transparent CCW IPL from DASD [QEMU]

Remove the explicit prefetch check when using vfio-ccw devices. This check does not trigger in practice as all Linux channel programs are intended to use prefetch.

QEMU part to make use of the corresponding kernel patch posted here:

https://lore.kernel.org/kvm/[email protected]/

It is no longer required to force the PFCH flag, but the option is still supported.

Jared Rossi (1):
vfio-ccw: allow non-prefetch ORBs

 hw/vfio/ccw.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
Signature · 1 line
2.17.0
#1 lore raw

PATCH v2 1/1 vfio-ccw: allow non-prefetch ORBs

Remove the explicit prefetch check when using vfio-ccw devices. This check does not trigger in practice as all Linux channel programs are intended to use prefetch.

It is no longer required to force the PFCH flag when using vfio-ccw devices.

---
 hw/vfio/ccw.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
hw/vfio/ccw.c +3 -10
index 50cc2ec75c..e649377b68 100644
@@ -74,16 +74,9 @@ static IOInstEnding vfio_ccw_handle_request(SubchDev *sch)
     struct ccw_io_region *region = vcdev->io_region;
     int ret;
 
-    if (!(sch->orb.ctrl0 & ORB_CTRL0_MASK_PFCH)) {
-        if (!(vcdev->force_orb_pfch)) {
-            warn_once_pfch(vcdev, sch, "requires PFCH flag set");
-            sch_gen_unit_exception(sch);
-            css_inject_io_interrupt(sch);
-            return IOINST_CC_EXPECTED;
-        } else {
-            sch->orb.ctrl0 |= ORB_CTRL0_MASK_PFCH;
-            warn_once_pfch(vcdev, sch, "PFCH flag forced");
-        }
+    if (!(sch->orb.ctrl0 & ORB_CTRL0_MASK_PFCH) && vcdev->force_orb_pfch) {
+        sch->orb.ctrl0 |= ORB_CTRL0_MASK_PFCH;
+        warn_once_pfch(vcdev, sch, "PFCH flag forced");
     }
 
     QEMU_BUILD_BUG_ON(sizeof(region->orb_area) != sizeof(ORB));
Signature · 1 line
2.17.0
#2 lore raw

Re: [PATCH v2 1/1] vfio-ccw: allow non-prefetch ORBs

Quoted 6 lines · On Tue, 12 May 2020 14:15:35 -0400 Jared Rossi <[email protected]> wrote:

Remove the explicit prefetch check when using vfio-ccw devices. This check does not trigger in practice as all Linux channel programs are intended to use prefetch.

It is no longer required to force the PFCH flag when using vfio-ccw devices.

That's not quite true: Only kernels that include the currently-queued patch do not require it. Maybe

"Newer Linux kernel versions do not require to force the PFCH flag with vfio-ccw devices anymore."

?

Quoted 20 lines
---
 hw/vfio/ccw.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
hw/vfio/ccw.c +0 -6
index 50cc2ec75c..e649377b68 100644
@@ -74,16 +74,9 @@ static IOInstEnding vfio_ccw_handle_request(SubchDev *sch)
     struct ccw_io_region *region = vcdev->io_region;
     int ret;
 
-    if (!(sch->orb.ctrl0 & ORB_CTRL0_MASK_PFCH)) {
-        if (!(vcdev->force_orb_pfch)) {
-            warn_once_pfch(vcdev, sch, "requires PFCH flag set");
-            sch_gen_unit_exception(sch);
-            css_inject_io_interrupt(sch);
-            return IOINST_CC_EXPECTED;

hw/vfio/ccw.c static IOInstEnding vfio_ccw_handle_request(SubchDev *sch) · line 82

Quoted 10 lines
hw/vfio/ccw.c +3 -4
-        } else {
-            sch->orb.ctrl0 |= ORB_CTRL0_MASK_PFCH;
-            warn_once_pfch(vcdev, sch, "PFCH flag forced");
-        }
+    if (!(sch->orb.ctrl0 & ORB_CTRL0_MASK_PFCH) && vcdev->force_orb_pfch) {
+        sch->orb.ctrl0 |= ORB_CTRL0_MASK_PFCH;
+        warn_once_pfch(vcdev, sch, "PFCH flag forced");
     }
 
     QEMU_BUILD_BUG_ON(sizeof(region->orb_area) != sizeof(ORB));

Let me spell out what happens:
- PFCH bit set -> no change
- PFCH bit not set, but force_orb_pfch set -> no change
- neither PFCH bit nor force_orb_pfch set:
- older kernels: QEMU makes the request, the kernel rejects it, guest gets a unit exception (same result for the guest as before, only a different code flow)
- newer kernels: QEMU makes the request, the kernel forwards the request (logging a rate-limited warning); the result depends on whether the guest actually tries to rewrite the channel program or not

I think that is what we want, and I think I'll queue this patch with the tweaked commit message, but I'd like a second opinion.

(We should also deprecate force_orb_pfch in the future.)

#3 lore raw

Re: [PATCH v2 1/1] vfio-ccw: allow non-prefetch ORBs

Quoted 10 lines · Cornelia Huck
Quoted 6 lines · On Tue, 12 May 2020 14:15:35 -0400 Jared Rossi <[email protected]> wrote:

Remove the explicit prefetch check when using vfio-ccw devices. This check does not trigger in practice as all Linux channel programs are intended to use prefetch.

It is no longer required to force the PFCH flag when using vfio-ccw devices.

Quoted 8 lines

That's not quite true: Only kernels that include the currently-queued patch do not require it. Maybe

"Newer Linux kernel versions do not require to force the PFCH flag with vfio-ccw devices anymore."

?

This is a good point and your proposed message is reasonable.

Quoted 31 lines
Quoted 31 lines
---
 hw/vfio/ccw.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
hw/vfio/ccw.c +3 -10
index 50cc2ec75c..e649377b68 100644
@@ -74,16 +74,9 @@ static IOInstEnding 
 vfio_ccw_handle_request(SubchDev *sch)
     struct ccw_io_region *region = vcdev->io_region;
     int ret;
 
-    if (!(sch->orb.ctrl0 & ORB_CTRL0_MASK_PFCH)) {
-        if (!(vcdev->force_orb_pfch)) {
-            warn_once_pfch(vcdev, sch, "requires PFCH flag set");
-            sch_gen_unit_exception(sch);
-            css_inject_io_interrupt(sch);
-            return IOINST_CC_EXPECTED;
-        } else {
-            sch->orb.ctrl0 |= ORB_CTRL0_MASK_PFCH;
-            warn_once_pfch(vcdev, sch, "PFCH flag forced");
-        }
+    if (!(sch->orb.ctrl0 & ORB_CTRL0_MASK_PFCH) && 
 vcdev->force_orb_pfch) {
+        sch->orb.ctrl0 |= ORB_CTRL0_MASK_PFCH;
+        warn_once_pfch(vcdev, sch, "PFCH flag forced");
     }
Quoted 14 lines
Quoted 1 line
     QEMU_BUILD_BUG_ON(sizeof(region->orb_area) != sizeof(ORB));

Let me spell out what happens:
- PFCH bit set -> no change
- PFCH bit not set, but force_orb_pfch set -> no change
- neither PFCH bit nor force_orb_pfch set:
- older kernels: QEMU makes the request, the kernel rejects it, guest gets a unit exception (same result for the guest as before, only a different code flow)
- newer kernels: QEMU makes the request, the kernel forwards the request (logging a rate-limited warning); the result depends on whether the guest actually tries to rewrite the channel program or not

This is correct, but I think it is worth noting that while the exception is the same in the case of new QEMU + old kernel, the logging is different. The old kernel code did not issue any warning if a non-prefetch ORB was rejected, it simply raised the exception. In reality, the old kernel code path was not accessible because QEMU would always reject ORBs before then with the "requires PFCH flag set" message. The new QEMU code does not issue a warning in this case.

I considered keeping a warning for the non-prefetch path, but it seemed excessive to me, since it causes a redundant warning when used with the new kernel code (which I expect to be the case normally). Do you think some sort of warning should still be issued by QEMU in this case, even if it is redundant with the kernel warning?

Quoted 4 lines

I think that is what we want, and I think I'll queue this patch with the tweaked commit message, but I'd like a second opinion.

(We should also deprecate force_orb_pfch in the future.)

Reviewed-by
#4 lore raw

Re: [PATCH v2 1/1] vfio-ccw: allow non-prefetch ORBs

Quoted 8 lines · Jared Rossi
Quoted 7 lines · Cornelia Huck
Quoted 4 lines · On Tue, 12 May 2020 14:15:35 -0400 Jared Rossi <[email protected]> wrote:

Remove the explicit prefetch check when using vfio-ccw devices. This check does not trigger in practice as all Linux channel programs are intended to use prefetch.

Quoted 8 lines
Quoted 8 lines
Quoted 2 lines

It is no longer required to force the PFCH flag when using vfio-ccw devices.

That's not quite true: Only kernels that include the currently-queued patch do not require it. Maybe

"Newer Linux kernel versions do not require to force the PFCH flag with vfio-ccw devices anymore."

I like it.

Quoted 60 lines
Quoted 3 lines

?

This is a good point and your proposed message is reasonable.

Quoted 31 lines
Quoted 31 lines

---
 hw/vfio/ccw.c | 13 +++----------

 1 file changed, 3 insertions(+), 10 deletions(-)
hw/vfio/ccw.c +3 -10
index 50cc2ec75c..e649377b68 100644
@@ -74,16 +74,9 @@ static IOInstEnding
 vfio_ccw_handle_request(SubchDev *sch)
      struct ccw_io_region *region = vcdev->io_region;
      int ret;
 
-    if (!(sch->orb.ctrl0 & ORB_CTRL0_MASK_PFCH)) {
-        if (!(vcdev->force_orb_pfch)) {
-            warn_once_pfch(vcdev, sch, "requires PFCH flag set");
-            sch_gen_unit_exception(sch);
-            css_inject_io_interrupt(sch);
-            return IOINST_CC_EXPECTED;
-        } else {
-            sch->orb.ctrl0 |= ORB_CTRL0_MASK_PFCH;
-            warn_once_pfch(vcdev, sch, "PFCH flag forced");
-        }
+    if (!(sch->orb.ctrl0 & ORB_CTRL0_MASK_PFCH) &&
 vcdev->force_orb_pfch) {
+        sch->orb.ctrl0 |= ORB_CTRL0_MASK_PFCH;
+        warn_once_pfch(vcdev, sch, "PFCH flag forced");
      }
Quoted 14 lines
Quoted 1 line

     QEMU_BUILD_BUG_ON(sizeof(region->orb_area) != sizeof(ORB));

Let me spell out what happens:
- PFCH bit set -> no change
- PFCH bit not set, but force_orb_pfch set -> no change
- neither PFCH bit nor force_orb_pfch set:
  - older kernels: QEMU makes the request, the kernel rejects it, guest gets a unit exception (same result for the guest as before, only a different code flow)
  - newer kernels: QEMU makes the request, the kernel forwards the request (logging a rate-limited warning); the result depends on whether the guest actually tries to rewrite the channel program or not

This is correct, but I think it is worth noting that while the exception is the same in the case of new QEMU + old kernel, the logging is different. The old kernel code did not issue any warning if a non-prefetch ORB was rejected, it simply raised the exception. In reality, the old kernel code path was not accessible because QEMU would always reject ORBs before then with the "requires PFCH flag set" message.  The new QEMU code does not issue a warning in this case.

Quoted 5 lines

I considered keeping a warning for the non-prefetch path, but it seemed excessive to me, since it causes a redundant warning when used with the new kernel code (which I expect to be the case normally). Do you think some sort of warning should still be issued by QEMU in this case, even if it is redundant with the kernel warning?

Hrm... Keeping the warning out of QEMU might be beneficial. Sure, when running with new kernels the message will be redundant, but if running with an old kernel the result will just be a silent error.

Quoted 3 lines
Quoted 3 lines

I think that is what we want, and I think I'll queue this patch with the tweaked commit message, but I'd like a second opinion.

I don't have a strong opinion of the messaging, but think everything else looks fine. If you'd like to queue this patch with the tweaked commit message:

Quoted 2 lines
Quoted 2 lines

(We should also deprecate force_orb_pfch in the future.)

+1

#5 lore raw

Re: [PATCH v2 1/1] vfio-ccw: allow non-prefetch ORBs

Quoted 12 lines · On Fri, 15 May 2020 07:06:29 -0400 Eric Farman <[email protected]> wrote:
Quoted 11 lines · Jared Rossi
Quoted 10 lines · Cornelia Huck
Quoted 6 lines · On Tue, 12 May 2020 14:15:35 -0400 Jared Rossi <[email protected]> wrote:

Remove the explicit prefetch check when using vfio-ccw devices. This check does not trigger in practice as all Linux channel programs are intended to use prefetch.

It is no longer required to force the PFCH flag when using vfio-ccw devices.

Quoted 13 lines
Quoted 5 lines
Quoted 5 lines

That's not quite true: Only kernels that include the currently-queued patch do not require it. Maybe

"Newer Linux kernel versions do not require to force the PFCH flag with vfio-ccw devices anymore."

I like it.

Quoted 5 lines
Quoted 3 lines

?

This is a good point and your proposed message is reasonable.

I'll use it, then :)

Quoted 61 lines
Quoted 55 lines
Quoted 32 lines
Quoted 32 lines

---
 hw/vfio/ccw.c | 13 +++----------

 1 file changed, 3 insertions(+), 10 deletions(-)
hw/vfio/ccw.c +3 -10
index 50cc2ec75c..e649377b68 100644
@@ -74,16 +74,9 @@ static IOInstEnding
 vfio_ccw_handle_request(SubchDev *sch)
      struct ccw_io_region *region = vcdev->io_region;
      int ret;
 
-    if (!(sch->orb.ctrl0 & ORB_CTRL0_MASK_PFCH)) {
-        if (!(vcdev->force_orb_pfch)) {
-            warn_once_pfch(vcdev, sch, "requires PFCH flag set");
-            sch_gen_unit_exception(sch);
-            css_inject_io_interrupt(sch);
-            return IOINST_CC_EXPECTED;
-        } else {
-            sch->orb.ctrl0 |= ORB_CTRL0_MASK_PFCH;
-            warn_once_pfch(vcdev, sch, "PFCH flag forced");
-        }
+    if (!(sch->orb.ctrl0 & ORB_CTRL0_MASK_PFCH) &&
 vcdev->force_orb_pfch) {
+        sch->orb.ctrl0 |= ORB_CTRL0_MASK_PFCH;
+        warn_once_pfch(vcdev, sch, "PFCH flag forced");
      }
Quoted 14 lines
Quoted 1 line

     QEMU_BUILD_BUG_ON(sizeof(region->orb_area) != sizeof(ORB));

Let me spell out what happens:
- PFCH bit set -> no change
- PFCH bit not set, but force_orb_pfch set -> no change
- neither PFCH bit nor force_orb_pfch set:
  - older kernels: QEMU makes the request, the kernel rejects it, guest gets a unit exception (same result for the guest as before, only a different code flow)
  - newer kernels: QEMU makes the request, the kernel forwards the request (logging a rate-limited warning); the result depends on whether the guest actually tries to rewrite the channel program or not

This is correct, but I think it is worth noting that while the exception is the same in the case of new QEMU + old kernel, the logging is different. The old kernel code did not issue any warning if a non-prefetch ORB was rejected, it simply raised the exception. In reality, the old kernel code path was not accessible because QEMU would always reject ORBs before then with the "requires PFCH flag set" message.  The new QEMU code does not issue a warning in this case.

Quoted 5 lines

I considered keeping a warning for the non-prefetch path, but it seemed excessive to me, since it causes a redundant warning when used with the new kernel code (which I expect to be the case normally). Do you think some sort of warning should still be issued by QEMU in this case, even if it is redundant with the kernel warning?

Quoted 3 lines

Hrm... Keeping the warning out of QEMU might be beneficial. Sure, when running with new kernels the message will be redundant, but if running with an old kernel the result will just be a silent error.

I don't think we need to care about that situation that much; I'd hope that any distribution will pick both patches (or at least not the QEMU patch without the kernel patch).

Quoted 8 lines
Quoted 4 lines
Quoted 4 lines

I think that is what we want, and I think I'll queue this patch with the tweaked commit message, but I'd like a second opinion.

I don't have a strong opinion of the messaging, but think everything else looks fine. If you'd like to queue this patch with the tweaked commit message:

Ok, then I'll just go ahead and queue it.

Quoted 8 lines
Quoted 2 lines
Quoted 2 lines

(We should also deprecate force_orb_pfch in the future.)

+1

#6 lore raw

Re: [PATCH v2 1/1] vfio-ccw: allow non-prefetch ORBs

In reply to Jared Rossi
Quoted 11 lines · On Tue, 12 May 2020 14:15:35 -0400 Jared Rossi <[email protected]> wrote:

Remove the explicit prefetch check when using vfio-ccw devices. This check does not trigger in practice as all Linux channel programs are intended to use prefetch.

It is no longer required to force the PFCH flag when using vfio-ccw devices.

---
 hw/vfio/ccw.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

Thanks, applied (with updated commit message.)