From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZptX9TgBWkN2cshj+eIwi2grCfXEAnvey0oaWvK0aqaFEj7EiMTlLyv1oFsEeKbMZMLX4Yn ARC-Seal: i=1; a=rsa-sha256; t=1525116509; cv=none; d=google.com; s=arc-20160816; b=ryft/DMh2x9dTYb5QNDYeh0ZUYpBBMCN0hUiRtZEh8Z54HrZ4AvbFMIjW2SOAhXRNZ eeUoyoO37TruPhjGWjmJB8gO+etMgRwdew2Ik8FHL5EYW6hpOKKw52p/H+O3yJLfsQXi urHlIaY/Pyp7bEYnqodbF5/OdV+5D7zIRcfuLpYVlxzEuzdQlGHFRChj8bi9T8CQLx5E OvEoU6hG9aLW8CVYBXXVGotH56a+vGX13s5y7ubyBViX1j+za1h2tU0P0/EEw9kudu5A Au5UIZuU+h5MbhYRt3EpY2a13IzBoHGEXHTiktg6cGSldyfciXc/mJ+mZjoS0hMjOEPD xUhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:dmarc-filter:arc-authentication-results; bh=wWi48bdUwbbtcqYPFZ+RmltX76lz51PDDzXUZ/JA0bI=; b=YY/EeiehiqCFZcBi9Yi9g7tIE32k4XaVaqY2/BEeijWjEnQF8wZUWX4uzEjXs03N/X 2eSIscLaizVo/x2oicJuEOcdMiuKKEhJQ6GGU0nf8wDTqKHXFQZhMN1d55Yh8r+mRckp /3K8onhpshIcQWxLeYQQ4IODJzUYRwa1JZNyk6P/YG7GXiy5IhCsWPU7RDzi9UbijrBZ 243rDJsWHUC6PDO7+1CRabliT8bNdyPYlqHGl7avWsZwGGSbASn4dUJbHx7H2iWx+7oq N6BENRcmkFTF/83gC/TW3sRTxMdL02Z7kFGt/9pLN+m6muJNVYT4BK0x4xkVluS2/cS9 Lx3g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of srs0=k66p=ht=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=K66P=HT=linuxfoundation.org=gregkh@kernel.org Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of srs0=k66p=ht=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=K66P=HT=linuxfoundation.org=gregkh@kernel.org DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C2AEE22DBF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=fail smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dong Jia Shi , Halil Pasic , Pierre Morel , Cornelia Huck , Martin Schwidefsky Subject: [PATCH 4.16 066/113] vfio: ccw: process ssch with interrupts disabled Date: Mon, 30 Apr 2018 12:24:37 -0700 Message-Id: <20180430184018.006950047@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180430184015.043892819@linuxfoundation.org> References: <20180430184015.043892819@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1599200503442942312?= X-GMAIL-MSGID: =?utf-8?q?1599200568932696542?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Cornelia Huck commit 3368e547c52b96586f0edf9657ca12b94d8e61a7 upstream. When we call ssch, an interrupt might already be pending once we return from the START SUBCHANNEL instruction. Therefore we need to make sure interrupts are disabled while holding the subchannel lock until after we're done with our processing. Cc: stable@vger.kernel.org #v4.12+ Reviewed-by: Dong Jia Shi Acked-by: Halil Pasic Acked-by: Pierre Morel Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky Signed-off-by: Greg Kroah-Hartman --- drivers/s390/cio/vfio_ccw_fsm.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) --- a/drivers/s390/cio/vfio_ccw_fsm.c +++ b/drivers/s390/cio/vfio_ccw_fsm.c @@ -20,12 +20,12 @@ static int fsm_io_helper(struct vfio_ccw int ccode; __u8 lpm; unsigned long flags; + int ret; sch = private->sch; spin_lock_irqsave(sch->lock, flags); private->state = VFIO_CCW_STATE_BUSY; - spin_unlock_irqrestore(sch->lock, flags); orb = cp_get_orb(&private->cp, (u32)(addr_t)sch, sch->lpm); @@ -38,10 +38,12 @@ static int fsm_io_helper(struct vfio_ccw * Initialize device status information */ sch->schib.scsw.cmd.actl |= SCSW_ACTL_START_PEND; - return 0; + ret = 0; + break; case 1: /* Status pending */ case 2: /* Busy */ - return -EBUSY; + ret = -EBUSY; + break; case 3: /* Device/path not operational */ { lpm = orb->cmd.lpm; @@ -51,13 +53,16 @@ static int fsm_io_helper(struct vfio_ccw sch->lpm = 0; if (cio_update_schib(sch)) - return -ENODEV; - - return sch->lpm ? -EACCES : -ENODEV; + ret = -ENODEV; + else + ret = sch->lpm ? -EACCES : -ENODEV; + break; } default: - return ccode; + ret = ccode; } + spin_unlock_irqrestore(sch->lock, flags); + return ret; } static void fsm_notoper(struct vfio_ccw_private *private,