From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FBDBC10F14 for ; Tue, 23 Apr 2019 12:50:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ED579206A3 for ; Tue, 23 Apr 2019 12:50:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727735AbfDWMug (ORCPT ); Tue, 23 Apr 2019 08:50:36 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:54202 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726033AbfDWMug (ORCPT ); Tue, 23 Apr 2019 08:50:36 -0400 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x3NCnZFi020886 for ; Tue, 23 Apr 2019 08:50:35 -0400 Received: from e06smtp02.uk.ibm.com (e06smtp02.uk.ibm.com [195.75.94.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 2s21eucjma-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 23 Apr 2019 08:50:34 -0400 Received: from localhost by e06smtp02.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 23 Apr 2019 13:50:32 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp02.uk.ibm.com (192.168.101.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 23 Apr 2019 13:50:29 +0100 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x3NCoRZt17563738 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 23 Apr 2019 12:50:27 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 84C21A405B; Tue, 23 Apr 2019 12:50:27 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CA575A4054; Tue, 23 Apr 2019 12:50:26 +0000 (GMT) Received: from [9.145.50.246] (unknown [9.145.50.246]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 23 Apr 2019 12:50:26 +0000 (GMT) Reply-To: pmorel@linux.ibm.com Subject: Re: [PATCH v2 5/8] s390: vfio-ap: wait for queue empty on queue reset To: Tony Krowiak , linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: freude@linux.ibm.com, borntraeger@de.ibm.com, cohuck@redhat.com, frankja@linux.ibm.com, david@redhat.com, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, pasic@linux.ibm.com, alex.williamson@redhat.com, kwankhede@nvidia.com References: <1555796980-27920-1-git-send-email-akrowiak@linux.ibm.com> <1555796980-27920-6-git-send-email-akrowiak@linux.ibm.com> From: Pierre Morel Date: Tue, 23 Apr 2019 14:50:26 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <1555796980-27920-6-git-send-email-akrowiak@linux.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 x-cbid: 19042312-0008-0000-0000-000002DCB908 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19042312-0009-0000-0000-0000224909E7 Message-Id: <9a23da6d-89a8-227d-b756-6e002b0199e3@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-04-23_03:,, 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 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904230089 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 20/04/2019 23:49, Tony Krowiak wrote: > Refactors the AP queue reset function to wait until the queue is empty > after the PQAP(ZAPQ) instruction is executed to zero out the queue as > required by the AP architecture. > > Signed-off-by: Tony Krowiak > --- > drivers/s390/crypto/vfio_ap_ops.c | 35 ++++++++++++++++++++++++++++++++--- > 1 file changed, 32 insertions(+), 3 deletions(-) > > diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c > index 091804317c5e..31ce30ee784d 100644 > --- a/drivers/s390/crypto/vfio_ap_ops.c > +++ b/drivers/s390/crypto/vfio_ap_ops.c > @@ -744,15 +744,44 @@ static int vfio_ap_mdev_group_notifier(struct notifier_block *nb, > return NOTIFY_OK; > } > > -static int vfio_ap_mdev_reset_queue(unsigned int apid, unsigned int apqi, > - unsigned int retry) > +static void vfio_ap_mdev_wait_for_qempty(unsigned long apid, unsigned long apqi) > { > struct ap_queue_status status; > + ap_qid_t qid = AP_MKQID(apid, apqi); > + int retry = 5; > + > + do { > + status = ap_tapq(qid, NULL); > + switch (status.response_code) { > + case AP_RESPONSE_NORMAL: > + if (status.queue_empty) > + return; > + msleep(20); > + break; > + case AP_RESPONSE_RESET_IN_PROGRESS: > + case AP_RESPONSE_BUSY: > + msleep(20); > + break; > + default: > + pr_warn("%s: tapq err %02x: 0x%04x may not be empty\n", > + __func__, status.response_code, q->apqn); q is not defined. use qid ? > + return; > + } > + } while (--retry); > +} > + > +int vfio_ap_mdev_reset_queue(unsigned int apid, unsigned int apqi) > +{ > + struct ap_queue_status status; > + int retry = 5; > > do { > status = ap_zapq(AP_MKQID(apid, apqi)); > switch (status.response_code) { > case AP_RESPONSE_NORMAL: > + vfio_ap_mdev_wait_for_qempty(apid, apqi); > + return 0; > + case AP_RESPONSE_DECONFIGURED: > return 0; > case AP_RESPONSE_RESET_IN_PROGRESS: > case AP_RESPONSE_BUSY: > @@ -778,7 +807,7 @@ static int vfio_ap_mdev_reset_queues(struct mdev_device *mdev) > matrix_mdev->matrix.apm_max + 1) { > for_each_set_bit_inv(apqi, matrix_mdev->matrix.aqm, > matrix_mdev->matrix.aqm_max + 1) { > - ret = vfio_ap_mdev_reset_queue(apid, apqi, 1); > + ret = vfio_ap_mdev_reset_queue(apid, apqi); > /* > * Regardless whether a queue turns out to be busy, or > * is not operational, we need to continue resetting > -- Pierre Morel Linux/KVM/QEMU in Böblingen - Germany