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=-17.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 4B37CC4320A for ; Thu, 19 Aug 2021 06:57:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 31FF061029 for ; Thu, 19 Aug 2021 06:57:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231840AbhHSG5m (ORCPT ); Thu, 19 Aug 2021 02:57:42 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:1452 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230483AbhHSG5l (ORCPT ); Thu, 19 Aug 2021 02:57:41 -0400 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 17J6XEVA153898; Thu, 19 Aug 2021 02:57:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=jFlsDvzF2DKGHQDi0v/i8DbRIu6cozXVXBBFuHVTeiE=; b=mtijCBDIdZrimq6EmGQ+ZcfsYGBHDrVV65syDR95D3F7rfC/uY0BZ3OJltpUM8xHVnXX P8ZxOcu1EEnmRTQnXKTY7I9NnyaAuNWW4n01w7iEOBNMYKxlHPlCK9eO9Xv3GYNlZOQI lb5Ky/uWe/ypkfwQz6t94o2IwJd0ytT8hFjUo/rUKZRpJvKqSm5JH4mUrJNNhbHdoBpd lJHsdFogTiYVDHW4UUashwfyC6WNF+JJDgZES2N2CcZwuQR//U+8NC42g0NCpbx3NcL0 aaEzUjz8NHT8saV5O+Fh1JMjy4+kcDyVldM0MJCZ+MXRwm7A9twoRxinwV6SVx7nhDGM cQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 3aha4vtche-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 19 Aug 2021 02:57:03 -0400 Received: from m0098413.ppops.net (m0098413.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 17J6XLrA154934; Thu, 19 Aug 2021 02:57:02 -0400 Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0b-001b2d01.pphosted.com with ESMTP id 3aha4vtcgx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 19 Aug 2021 02:57:02 -0400 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 17J6rpsA015753; Thu, 19 Aug 2021 06:57:01 GMT Received: from b06avi18878370.portsmouth.uk.ibm.com (b06avi18878370.portsmouth.uk.ibm.com [9.149.26.194]) by ppma06ams.nl.ibm.com with ESMTP id 3ae53hytt1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 19 Aug 2021 06:57:01 +0000 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 17J6rPgS59048254 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Aug 2021 06:53:25 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4D393A4069; Thu, 19 Aug 2021 06:56:57 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DCF4CA4073; Thu, 19 Aug 2021 06:56:56 +0000 (GMT) Received: from oc7455500831.ibm.com (unknown [9.145.161.250]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 19 Aug 2021 06:56:56 +0000 (GMT) Subject: Re: [PATCH 1/2] s390/vfio-ap: r/w lock for PQAP interception handler function pointer To: Halil Pasic Cc: Tony Krowiak , linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, cohuck@redhat.com, pasic@linux.vnet.ibm.com, jjherne@linux.ibm.com, jgg@nvidia.com, alex.williamson@redhat.com, kwankhede@nvidia.com, david@redhat.com References: <20210719193503.793910-1-akrowiak@linux.ibm.com> <20210719193503.793910-2-akrowiak@linux.ibm.com> <1a9f15d7-0f4d-00a0-0a8b-f1c08aa52eeb@de.ibm.com> <20210819012532.0e9c443c.pasic@linux.ibm.com> From: Christian Borntraeger Message-ID: <712484a7-3ccc-5805-67fb-0b0104c27975@de.ibm.com> Date: Thu, 19 Aug 2021 08:56:56 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <20210819012532.0e9c443c.pasic@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-Proofpoint-ORIG-GUID: t-aPFnhXi4J2fCve5gIfgOlnjGOLmwSI X-Proofpoint-GUID: S1mgoGrBFiJg4usA_j6v5foThm3BEw2h X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.790 definitions=2021-08-19_02:2021-08-17,2021-08-19 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 phishscore=0 spamscore=0 suspectscore=0 bulkscore=0 adultscore=0 clxscore=1015 malwarescore=0 lowpriorityscore=0 priorityscore=1501 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2107140000 definitions=main-2108190034 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 19.08.21 01:25, Halil Pasic wrote: > On Wed, 18 Aug 2021 19:03:33 +0200 > Christian Borntraeger wrote: > >> On 19.07.21 21:35, Tony Krowiak wrote: >>> The function pointer to the interception handler for the PQAP instruction >>> can get changed during the interception process. Let's add a >>> semaphore to struct kvm_s390_crypto to control read/write access to the >>> function pointer contained therein. >>> >>> The semaphore must be locked for write access by the vfio_ap device driver >>> when notified that the KVM pointer has been set or cleared. It must be >>> locked for read access by the interception framework when the PQAP >>> instruction is intercepted. >>> >>> Signed-off-by: Tony Krowiak >>> Reviewed-by: Jason Gunthorpe >>> --- >>> arch/s390/include/asm/kvm_host.h | 8 +++----- >>> arch/s390/kvm/kvm-s390.c | 1 + >>> arch/s390/kvm/priv.c | 10 ++++++---- >>> drivers/s390/crypto/vfio_ap_ops.c | 23 +++++++++++++++++------ >>> drivers/s390/crypto/vfio_ap_private.h | 2 +- >>> 5 files changed, 28 insertions(+), 16 deletions(-) >>> >>> diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h >>> index 9b4473f76e56..f18849d259e6 100644 >>> --- a/arch/s390/include/asm/kvm_host.h >>> +++ b/arch/s390/include/asm/kvm_host.h >>> @@ -798,14 +798,12 @@ struct kvm_s390_cpu_model { >>> unsigned short ibc; >>> }; >>> >>> -struct kvm_s390_module_hook { >>> - int (*hook)(struct kvm_vcpu *vcpu); >>> - struct module *owner; >>> -}; >>> +typedef int (*crypto_hook)(struct kvm_vcpu *vcpu); >>> >>> struct kvm_s390_crypto { >>> struct kvm_s390_crypto_cb *crycb; >>> - struct kvm_s390_module_hook *pqap_hook; >>> + struct rw_semaphore pqap_hook_rwsem; >>> + crypto_hook *pqap_hook; >>> __u32 crycbd; >>> __u8 aes_kw; >>> __u8 dea_kw; >>> diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c >>> index b655a7d82bf0..a08f242a9f27 100644 >>> --- a/arch/s390/kvm/kvm-s390.c >>> +++ b/arch/s390/kvm/kvm-s390.c >>> @@ -2630,6 +2630,7 @@ static void kvm_s390_crypto_init(struct kvm *kvm) >>> { >>> kvm->arch.crypto.crycb = &kvm->arch.sie_page2->crycb; >>> kvm_s390_set_crycb_format(kvm); >>> + init_rwsem(&kvm->arch.crypto.pqap_hook_rwsem); >>> >>> if (!test_kvm_facility(kvm, 76)) >>> return; >>> diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c >>> index 9928f785c677..6bed9406c1f3 100644 >>> --- a/arch/s390/kvm/priv.c >>> +++ b/arch/s390/kvm/priv.c >>> @@ -610,6 +610,7 @@ static int handle_io_inst(struct kvm_vcpu *vcpu) >>> static int handle_pqap(struct kvm_vcpu *vcpu) >>> { >>> struct ap_queue_status status = {}; >>> + crypto_hook pqap_hook; >>> unsigned long reg0; >>> int ret; >>> uint8_t fc; >>> @@ -657,15 +658,16 @@ static int handle_pqap(struct kvm_vcpu *vcpu) >>> * Verify that the hook callback is registered, lock the owner >>> * and call the hook. >>> */ >>> + down_read(&vcpu->kvm->arch.crypto.pqap_hook_rwsem); >>> if (vcpu->kvm->arch.crypto.pqap_hook) { <--- HERE >>> - if (!try_module_get(vcpu->kvm->arch.crypto.pqap_hook->owner)) >>> - return -EOPNOTSUPP; >>> - ret = vcpu->kvm->arch.crypto.pqap_hook->hook(vcpu); >>> - module_put(vcpu->kvm->arch.crypto.pqap_hook->owner); >>> + pqap_hook = *vcpu->kvm->arch.crypto.pqap_hook; >> >> Dont we have to check for NULL here? If not can you add a comment why? > > I believe we did the necessary check on the line I just marked with > "<--- HERE". Right, I missed that. Then Reviewed-by: Christian Borntraeger > > I find that "*" operator confusing in this context as it doesn't do > any good for us. I believe this situation is described in 6.5.3.2.4 of > the c11 standard. For convenience I will cite from the corresponding > draft: > "The unary * operator denotes indirection. If the operand points to a > function, the result is a function designator; if it points to an > object, the result is an lvalue designating the object. If the operand > has type ‘‘pointer to type’’, the result has type ‘‘type’’. If an > invalid value has been assigned to the pointer, the behavior of the > unary * operator is undefined." > > Frankly I also fail to see the benefit of introducing the local variable > named "pqap_hook", but back then I decided to not complain about style. Right we can probably do better, but I would rather have the functional fix in now. > > Regards, > Halil > >> >> >>> + ret = pqap_hook(vcpu); >> [...] >