From patchwork Thu Jan 11 03:04:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Jia Shi X-Patchwork-Id: 10156853 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4764760231 for ; Thu, 11 Jan 2018 03:08:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38C3F28571 for ; Thu, 11 Jan 2018 03:08:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D9F7285C6; Thu, 11 Jan 2018 03:08:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8A8BC285BE for ; Thu, 11 Jan 2018 03:08:56 +0000 (UTC) Received: from localhost ([::1]:34165 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZTEd-00082t-MQ for patchwork-qemu-devel@patchwork.kernel.org; Wed, 10 Jan 2018 22:08:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44136) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZTAc-0004LV-Be for qemu-devel@nongnu.org; Wed, 10 Jan 2018 22:04:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZTAX-0002Mi-Ks for qemu-devel@nongnu.org; Wed, 10 Jan 2018 22:04:46 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:34552 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eZTAX-0002M8-Fm for qemu-devel@nongnu.org; Wed, 10 Jan 2018 22:04:41 -0500 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w0B34G9i143683 for ; Wed, 10 Jan 2018 22:04:39 -0500 Received: from e34.co.us.ibm.com (e34.co.us.ibm.com [32.97.110.152]) by mx0b-001b2d01.pphosted.com with ESMTP id 2fdxsca22f-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 10 Jan 2018 22:04:38 -0500 Received: from localhost by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 10 Jan 2018 20:04:38 -0700 Received: from b03cxnp08026.gho.boulder.ibm.com (9.17.130.18) by e34.co.us.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 10 Jan 2018 20:04:34 -0700 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w0B34Sxb12583364; Wed, 10 Jan 2018 20:04:34 -0700 Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DF14B78059; Wed, 10 Jan 2018 20:04:33 -0700 (MST) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP id 4386C78041; Wed, 10 Jan 2018 20:04:32 -0700 (MST) From: Dong Jia Shi To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, kvm@vger.kernel.org, qemu-devel@nongnu.org, qemu-s390x@nongnu.org Date: Thu, 11 Jan 2018 04:04:21 +0100 X-Mailer: git-send-email 2.13.5 In-Reply-To: <20180111030421.31418-1-bjsdjshi@linux.vnet.ibm.com> References: <20180111030421.31418-1-bjsdjshi@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18011103-0016-0000-0000-000008182F2C X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008357; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000245; SDB=6.00973252; UDB=6.00493123; IPR=6.00753202; BA=6.00005772; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00018971; XFM=3.00000015; UTC=2018-01-11 03:04:36 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18011103-0017-0000-0000-00003CFE208D Message-Id: <20180111030421.31418-4-bjsdjshi@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-01-11_02:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1801110036 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [RFC PATCH 3/3] vfio: ccw: handle chp event 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: borntraeger@de.ibm.com, bjsdjshi@linux.vnet.ibm.com, cohuck@redhat.com, pmorel@linux.vnet.ibm.com, pasic@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This adds channel path related event handler for vfio-ccw. This also signals userland when there is a chp event. Signed-off-by: Dong Jia Shi --- drivers/s390/cio/vfio_ccw_drv.c | 51 +++++++++++++++++++++++++++++++++++++ drivers/s390/cio/vfio_ccw_fsm.c | 22 ++++++++++++++++ drivers/s390/cio/vfio_ccw_private.h | 3 +++ 3 files changed, 76 insertions(+) diff --git a/drivers/s390/cio/vfio_ccw_drv.c b/drivers/s390/cio/vfio_ccw_drv.c index ea6a2d0b2894..5f01f3e6742d 100644 --- a/drivers/s390/cio/vfio_ccw_drv.c +++ b/drivers/s390/cio/vfio_ccw_drv.c @@ -17,6 +17,7 @@ #include +#include "chp.h" #include "ioasm.h" #include "css.h" #include "vfio_ccw_private.h" @@ -88,6 +89,15 @@ static void vfio_ccw_sch_io_todo(struct work_struct *work) private->state = VFIO_CCW_STATE_IDLE; } +static void vfio_ccw_sch_chp_todo(struct work_struct *work) +{ + struct vfio_ccw_private *private = + container_of(work, struct vfio_ccw_private, chp_work); + + if (private->chp_trigger) + eventfd_signal(private->chp_trigger, 1); +} + /* * Css driver callbacks */ @@ -130,6 +140,7 @@ static int vfio_ccw_sch_probe(struct subchannel *sch) goto out_disable; INIT_WORK(&private->io_work, vfio_ccw_sch_io_todo); + INIT_WORK(&private->chp_work, vfio_ccw_sch_chp_todo); atomic_set(&private->avail, 1); private->state = VFIO_CCW_STATE_STANDBY; @@ -202,6 +213,45 @@ static int vfio_ccw_sch_event(struct subchannel *sch, int process) return 0; } +static int vfio_ccw_sch_chp_event(struct subchannel *sch, + struct chp_link *link, int event) +{ + struct vfio_ccw_private *private = dev_get_drvdata(&sch->dev); + int mask = chp_ssd_get_mask(&sch->ssd_info, link); + + /* move these checks around? */ + if (!private || !mask) + return 0; + + if (cio_update_schib(sch)) + return -ENODEV; + + switch (event) { + case CHP_VARY_OFF: + sch->opm &= ~mask; + sch->lpm &= ~mask; + /* TODO: terminate current I/O on path. */ + break; + case CHP_VARY_ON: + sch->opm |= mask; + sch->lpm |= mask; + break; + case CHP_OFFLINE: + /* TODO: terminate current I/O on path. */ + break; + case CHP_ONLINE: + sch->lpm |= mask & sch->opm; + break; + default: + /* Not possible? */ + return 0; + } + + vfio_ccw_fsm_event(private, VFIO_CCW_EVENT_UPDATE_CHP); + + return 0; +} + static struct css_device_id vfio_ccw_sch_ids[] = { { .match_flags = 0x1, .type = SUBCHANNEL_TYPE_IO, }, { /* end of list */ }, @@ -219,6 +269,7 @@ static struct css_driver vfio_ccw_sch_driver = { .remove = vfio_ccw_sch_remove, .shutdown = vfio_ccw_sch_shutdown, .sch_event = vfio_ccw_sch_event, + .chp_event = vfio_ccw_sch_chp_event, }; static int __init vfio_ccw_sch_init(void) diff --git a/drivers/s390/cio/vfio_ccw_fsm.c b/drivers/s390/cio/vfio_ccw_fsm.c index be081ccabea3..c400021134cb 100644 --- a/drivers/s390/cio/vfio_ccw_fsm.c +++ b/drivers/s390/cio/vfio_ccw_fsm.c @@ -188,6 +188,23 @@ static void fsm_update_subch(struct vfio_ccw_private *private, sizeof(sch->schib)); } +static void fsm_update_chp(struct vfio_ccw_private *private, + enum vfio_ccw_event event) +{ + queue_work(vfio_ccw_work_q, &private->chp_work); + +} + +static void fsm_update_chp_busy(struct vfio_ccw_private *private, + enum vfio_ccw_event event) +{ + /* + * TODO: + * If we are having I/O on the current path, do + * extra handling? + */ +} + /* * Device statemachine */ @@ -197,29 +214,34 @@ fsm_func_t *vfio_ccw_jumptable[NR_VFIO_CCW_STATES][NR_VFIO_CCW_EVENTS] = { [VFIO_CCW_EVENT_IO_REQ] = fsm_io_error, [VFIO_CCW_EVENT_INTERRUPT] = fsm_disabled_irq, [VFIO_CCW_EVENT_UPDATE_SUBCH] = fsm_update_subch, + [VFIO_CCW_EVENT_UPDATE_CHP] = fsm_nop, }, [VFIO_CCW_STATE_STANDBY] = { [VFIO_CCW_EVENT_NOT_OPER] = fsm_notoper, [VFIO_CCW_EVENT_IO_REQ] = fsm_io_error, [VFIO_CCW_EVENT_INTERRUPT] = fsm_irq, [VFIO_CCW_EVENT_UPDATE_SUBCH] = fsm_update_subch, + [VFIO_CCW_EVENT_UPDATE_CHP] = fsm_update_chp, }, [VFIO_CCW_STATE_IDLE] = { [VFIO_CCW_EVENT_NOT_OPER] = fsm_notoper, [VFIO_CCW_EVENT_IO_REQ] = fsm_io_request, [VFIO_CCW_EVENT_INTERRUPT] = fsm_irq, [VFIO_CCW_EVENT_UPDATE_SUBCH] = fsm_update_subch, + [VFIO_CCW_EVENT_UPDATE_CHP] = fsm_update_chp, }, [VFIO_CCW_STATE_BOXED] = { [VFIO_CCW_EVENT_NOT_OPER] = fsm_notoper, [VFIO_CCW_EVENT_IO_REQ] = fsm_io_busy, [VFIO_CCW_EVENT_INTERRUPT] = fsm_irq, [VFIO_CCW_EVENT_UPDATE_SUBCH] = fsm_update_subch, + [VFIO_CCW_EVENT_UPDATE_CHP] = fsm_update_chp, }, [VFIO_CCW_STATE_BUSY] = { [VFIO_CCW_EVENT_NOT_OPER] = fsm_notoper, [VFIO_CCW_EVENT_IO_REQ] = fsm_io_busy, [VFIO_CCW_EVENT_INTERRUPT] = fsm_irq, [VFIO_CCW_EVENT_UPDATE_SUBCH] = fsm_update_subch, + [VFIO_CCW_EVENT_UPDATE_CHP] = fsm_update_chp_busy, }, }; diff --git a/drivers/s390/cio/vfio_ccw_private.h b/drivers/s390/cio/vfio_ccw_private.h index da86f82dd7b9..e3bdb90555fb 100644 --- a/drivers/s390/cio/vfio_ccw_private.h +++ b/drivers/s390/cio/vfio_ccw_private.h @@ -35,6 +35,7 @@ * @io_trigger: eventfd ctx for signaling userspace I/O results * @chp_trigger: eventfd ctx for signaling userspace chp event * @io_work: work for deferral process of I/O handling + * @chp_work: work for deferral process of chp event */ struct vfio_ccw_private { struct subchannel *sch; @@ -53,6 +54,7 @@ struct vfio_ccw_private { struct eventfd_ctx *io_trigger; struct eventfd_ctx *chp_trigger; struct work_struct io_work; + struct work_struct chp_work; } __aligned(8); extern int vfio_ccw_mdev_reg(struct subchannel *sch); @@ -81,6 +83,7 @@ enum vfio_ccw_event { VFIO_CCW_EVENT_IO_REQ, VFIO_CCW_EVENT_INTERRUPT, VFIO_CCW_EVENT_UPDATE_SUBCH, + VFIO_CCW_EVENT_UPDATE_CHP, /* last element! */ NR_VFIO_CCW_EVENTS };