From patchwork Wed May 9 15:49:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 910960 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40h18j1M5Wz9s37 for ; Thu, 10 May 2018 01:52:53 +1000 (AEST) Received: from localhost ([::1]:57210 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGROc-0004bX-PO for incoming@patchwork.ozlabs.org; Wed, 09 May 2018 11:52:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGRLA-0001MH-Dr for qemu-devel@nongnu.org; Wed, 09 May 2018 11:49:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fGRL8-0007YY-S4 for qemu-devel@nongnu.org; Wed, 09 May 2018 11:49:16 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:40260 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fGRL8-0007Wc-M1; Wed, 09 May 2018 11:49:14 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2254777067; Wed, 9 May 2018 15:49:14 +0000 (UTC) Received: from localhost (dhcp-192-222.str.redhat.com [10.33.192.222]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D1F7E2166BAD; Wed, 9 May 2018 15:49:13 +0000 (UTC) From: Cornelia Huck To: Dong Jia Shi , Halil Pasic , Pierre Morel Date: Wed, 9 May 2018 17:49:09 +0200 Message-Id: <20180509154910.23578-2-cohuck@redhat.com> In-Reply-To: <20180509154910.23578-1-cohuck@redhat.com> References: <20180509154910.23578-1-cohuck@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 09 May 2018 15:49:14 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 09 May 2018 15:49:14 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'cohuck@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH RFC 1/2] vfio-ccw: forward halt/clear to device if supported X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-s390@vger.kernel.org, kvm@vger.kernel.org, Cornelia Huck , linux-kernel@vger.kernel.org, qemu-devel@nongnu.org, qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The initial version of vfio-ccw did not support forwarding of the halt or clear functions to the device, and we had to emulate them instead. For versions of the vfio-ccw kernel implementation that indeed do support halt/clear (by indicating them in the fctl of the scsw in the io_region), we can simply start making use of it. If the kernel does not support handling halt/clear, fall back to emulation. Signed-off-by: Cornelia Huck --- hw/s390x/css.c | 32 ++++++++++++++++++++++++++++---- hw/vfio/ccw.c | 11 +++++++++-- include/hw/s390x/css.h | 10 +++++++--- 3 files changed, 44 insertions(+), 9 deletions(-) diff --git a/hw/s390x/css.c b/hw/s390x/css.c index 301bf1772f..b6727d0607 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -1180,6 +1180,16 @@ static void sch_handle_start_func_virtual(SubchDev *sch) } +static IOInstEnding sch_handle_clear_func_passthrough(SubchDev *sch) +{ + return s390_ccw_cmd_request(sch); +} + +static IOInstEnding sch_handle_halt_func_passthrough(SubchDev *sch) +{ + return s390_ccw_cmd_request(sch); +} + static IOInstEnding sch_handle_start_func_passthrough(SubchDev *sch) { @@ -1233,13 +1243,27 @@ IOInstEnding do_subchannel_work_virtual(SubchDev *sch) IOInstEnding do_subchannel_work_passthrough(SubchDev *sch) { SCSW *s = &sch->curr_status.scsw; + static bool no_halt_clear; + /* if the kernel does not support halt/clear, fall back to emulation */ if (s->ctrl & SCSW_FCTL_CLEAR_FUNC) { - /* TODO: Clear handling */ - sch_handle_clear_func(sch); + if (no_halt_clear) { + sch_handle_clear_func(sch); + } else { + if (sch_handle_clear_func_passthrough(sch) == IOINST_OPNOTSUPP) { + no_halt_clear = true; + sch_handle_halt_func(sch); + } + } } else if (s->ctrl & SCSW_FCTL_HALT_FUNC) { - /* TODO: Halt handling */ - sch_handle_halt_func(sch); + if (no_halt_clear) { + sch_handle_halt_func(sch); + } else { + if (sch_handle_halt_func_passthrough(sch) == IOINST_OPNOTSUPP) { + no_halt_clear = true; + sch_handle_halt_func(sch); + } + } } else if (s->ctrl & SCSW_FCTL_START_FUNC) { return sch_handle_start_func_passthrough(sch); } diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index e67392c5f9..247901ae41 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -60,6 +60,7 @@ static IOInstEnding vfio_ccw_handle_request(SubchDev *sch) memset(region, 0, sizeof(*region)); + /* orb is only valid for ssch, but does not hurt for other functions */ memcpy(region->orb_area, &sch->orb, sizeof(ORB)); memcpy(region->scsw_area, &sch->curr_status.scsw, sizeof(SCSW)); @@ -70,8 +71,12 @@ again: if (errno == EAGAIN) { goto again; } - error_report("vfio-ccw: wirte I/O region failed with errno=%d", errno); - ret = -errno; + /* handle not supported operations like halt/clear on older kernels */ + if (ret != -EOPNOTSUPP) { + error_report("vfio-ccw: write I/O region failed with errno=%d", + errno); + ret = -errno; + } } else { ret = region->ret_code; } @@ -83,6 +88,8 @@ again: case -ENODEV: case -EACCES: return IOINST_CC_NOT_OPERATIONAL; + case -EOPNOTSUPP: + return IOINST_OPNOTSUPP; case -EFAULT: default: sch_gen_unit_exception(sch); diff --git a/include/hw/s390x/css.h b/include/hw/s390x/css.h index 35facb47d2..e33f26882b 100644 --- a/include/hw/s390x/css.h +++ b/include/hw/s390x/css.h @@ -100,9 +100,11 @@ typedef struct CcwDataStream { } CcwDataStream; /* - * IO instructions conclude according to this. Currently we have only - * cc codes. Valid values are 0, 1, 2, 3 and the generic semantic for + * IO instructions conclude according to this. One class of values are + * cc codes: Valid values are 0, 1, 2, 3 and the generic semantic for * IO instructions is described briefly. For more details consult the PoP. + * Additionally, other endings may occur due to internal processing errors + * like lack of support for an operation. */ typedef enum IOInstEnding { /* produced expected result */ @@ -112,7 +114,9 @@ typedef enum IOInstEnding { /* inst. ineffective because busy with previously initiated function */ IOINST_CC_BUSY = 2, /* inst. ineffective because not operational */ - IOINST_CC_NOT_OPERATIONAL = 3 + IOINST_CC_NOT_OPERATIONAL = 3, + /* internal: operation not supported */ + IOINST_OPNOTSUPP = 4 } IOInstEnding; typedef struct SubchDev SubchDev; From patchwork Wed May 9 15:49:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 910962 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40h1CZ0qNSz9s37 for ; Thu, 10 May 2018 01:55:22 +1000 (AEST) Received: from localhost ([::1]:57224 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGRR1-0006nz-Lr for incoming@patchwork.ozlabs.org; Wed, 09 May 2018 11:55:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41645) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGRLB-0001Pt-EB for qemu-devel@nongnu.org; Wed, 09 May 2018 11:49:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fGRLA-0007ag-Bw for qemu-devel@nongnu.org; Wed, 09 May 2018 11:49:17 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:39998 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fGRLA-0007Zq-5p; Wed, 09 May 2018 11:49:16 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9CD9281A8B72; Wed, 9 May 2018 15:49:15 +0000 (UTC) Received: from localhost (dhcp-192-222.str.redhat.com [10.33.192.222]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 590D92023456; Wed, 9 May 2018 15:49:15 +0000 (UTC) From: Cornelia Huck To: Dong Jia Shi , Halil Pasic , Pierre Morel Date: Wed, 9 May 2018 17:49:10 +0200 Message-Id: <20180509154910.23578-3-cohuck@redhat.com> In-Reply-To: <20180509154910.23578-1-cohuck@redhat.com> References: <20180509154910.23578-1-cohuck@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 09 May 2018 15:49:15 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 09 May 2018 15:49:15 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'cohuck@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH RFC 2/2] s390/css: add some tracing for pass-through handling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-s390@vger.kernel.org, kvm@vger.kernel.org, Cornelia Huck , linux-kernel@vger.kernel.org, qemu-devel@nongnu.org, qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" ...so we can get more easily an idea whether halt/clear is sent to the device or emulated. Signed-off-by: Cornelia Huck --- hw/s390x/css.c | 6 ++++++ hw/s390x/trace-events | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/hw/s390x/css.c b/hw/s390x/css.c index b6727d0607..b6f3421380 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -1182,11 +1182,13 @@ static void sch_handle_start_func_virtual(SubchDev *sch) static IOInstEnding sch_handle_clear_func_passthrough(SubchDev *sch) { + trace_css_handle_clear_pt(sch->cssid, sch->ssid, sch->schid); return s390_ccw_cmd_request(sch); } static IOInstEnding sch_handle_halt_func_passthrough(SubchDev *sch) { + trace_css_handle_halt_pt(sch->cssid, sch->ssid, sch->schid); return s390_ccw_cmd_request(sch); } @@ -1197,6 +1199,8 @@ static IOInstEnding sch_handle_start_func_passthrough(SubchDev *sch) SCSW *s = &sch->curr_status.scsw; ORB *orb = &sch->orb; + + trace_css_handle_start_pt(sch->cssid, sch->ssid, sch->schid); if (!(s->ctrl & SCSW_ACTL_SUSP)) { assert(orb != NULL); p->intparm = orb->intparm; @@ -1252,6 +1256,7 @@ IOInstEnding do_subchannel_work_passthrough(SubchDev *sch) } else { if (sch_handle_clear_func_passthrough(sch) == IOINST_OPNOTSUPP) { no_halt_clear = true; + trace_css_no_haltclear_pt(); sch_handle_halt_func(sch); } } @@ -1260,6 +1265,7 @@ IOInstEnding do_subchannel_work_passthrough(SubchDev *sch) sch_handle_halt_func(sch); } else { if (sch_handle_halt_func_passthrough(sch) == IOINST_OPNOTSUPP) { + trace_css_no_haltclear_pt(); no_halt_clear = true; sch_handle_halt_func(sch); } diff --git a/hw/s390x/trace-events b/hw/s390x/trace-events index 0d3622ec6f..d4fd1b9da6 100644 --- a/hw/s390x/trace-events +++ b/hw/s390x/trace-events @@ -9,6 +9,10 @@ css_assign_subch(const char *do_assign, uint8_t cssid, uint8_t ssid, uint16_t sc css_io_interrupt(int cssid, int ssid, int schid, uint32_t intparm, uint8_t isc, const char *conditional) "CSS: I/O interrupt on sch %x.%x.%04x (intparm 0x%08x, isc 0x%x) %s" css_adapter_interrupt(uint8_t isc) "CSS: adapter I/O interrupt (isc 0x%x)" css_do_sic(uint16_t mode, uint8_t isc) "CSS: set interruption mode 0x%x on isc 0x%x" +css_handle_clear_pt(int cssid, int ssid, int schid) "CSS: handling clear function for pass-through subchannel %x.%x.%04x" +css_handle_halt_pt(int cssid, int ssid, int schid) "CSS: handling halt function for pass-through subchannel %x.%x.%04x" +css_handle_start_pt(int cssid, int ssid, int schid) "CSS: handling start function for pass-through subchannel %x.%x.%04x" +css_no_haltclear_pt(void) "CSS: no kernel support for halt/clear function passthrough handling, falling back to emulation" # hw/s390x/virtio-ccw.c virtio_ccw_interpret_ccw(int cssid, int ssid, int schid, int cmd_code) "VIRTIO-CCW: %x.%x.%04x: interpret command 0x%x"