Received: by 10.192.165.148 with SMTP id m20csp197496imm; Fri, 20 Apr 2018 05:28:16 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/jRm5NCTjFm7YZEjLnSs694nm5dVRlfxNesSg2F+f6PWiWZusKtEHzKzNy+5N++pu/5m3J X-Received: by 2002:a17:902:6ecd:: with SMTP id l13-v6mr10292527pln.113.1524227296441; Fri, 20 Apr 2018 05:28:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524227296; cv=none; d=google.com; s=arc-20160816; b=Pkh2qHh0tQW9caf8YexZ5vKjdZm6w7/waSD/nCghJ7/oICu+cXmNEHjsyHD9c1LAUO SvWgXdb9YZSkmUI3N3+vAPGb36kqDzuNbMcgua745YvtQ2Lyvk3xhDGmkkG7bVmYoBUK cAeddPxDAMY6jAGLgpwAFeWI3gdGjHK/+HG8wR3VX9gDEkyj22Kc9h9hYsxMSgEzH94V R6Wi9ziT/3SlAupDLiqReA21wsKbH+FiOYqybcLvidNwKGl1uUf8IaN9TEfdvp2FdQkR JD7QNhEfbBvhZ3FPPTthLFiAK6B+gTcIx3QojMK68RTTRjDhR4plkcL933YJTwr4Ozyv b6gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:organization:from:references:cc:to:subject :arc-authentication-results; bh=o4qyHwUOnHk/JZQVWcsfgS36dSR+LZnFZRKxac6N5ZI=; b=t1JOTe74miZnQnRhWag+2G9xc21WPLLtCvJaIWisoqoMwBgGQwvanKuKQ36dJtwC4M QmDTIX7JrUPsUftK72O5nu1zA0OdYFk5ATR015xWG9jCDOU62aAaHFLkciE7rSAYCMEN qQds7Q2jvShC4x2mNqO8WsPIipDWIbbCPPd8+PJHcah5vl5sRXpHcZj1yC021mPj1Xdr R0qT0GRoq1j32EbMJ2ANyPXL6FYhPuojSpiB5+wxAG8LOJ73Ko0Xydr1cC7/oqZQk3/x yUPEXW8I/QRs6w8uk+w2uzNLDRXT6RtDElxlkgCZVvCfEg1ERGmUwr0WbN/t7HYluQhK Bp+g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ay8-v6si5904522plb.244.2018.04.20.05.28.01; Fri, 20 Apr 2018 05:28:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754792AbeDTM07 (ORCPT + 99 others); Fri, 20 Apr 2018 08:26:59 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:42886 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754591AbeDTM05 (ORCPT ); Fri, 20 Apr 2018 08:26:57 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 447E3406F97B; Fri, 20 Apr 2018 12:26:57 +0000 (UTC) Received: from [10.36.116.142] (ovpn-116-142.ams2.redhat.com [10.36.116.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id C18ED8444C; Fri, 20 Apr 2018 12:26:55 +0000 (UTC) Subject: Re: [PATCH] KVM: s390: reset crypto attributes for all vcpus To: Tony Krowiak , linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: borntraeger@de.ibm.com, cohuck@redhat.com, pmorel@linux.vnet.ibm.com, pasic@linux.vnet.ibm.com, pbonzini@redhat.com, rkrcmar@redhat.com References: <1524172432-26211-1-git-send-email-akrowiak@linux.vnet.ibm.com> From: David Hildenbrand Organization: Red Hat GmbH Message-ID: Date: Fri, 20 Apr 2018 14:26:55 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <1524172432-26211-1-git-send-email-akrowiak@linux.vnet.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 20 Apr 2018 12:26:57 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 20 Apr 2018 12:26:57 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'david@redhat.com' RCPT:'' Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 19.04.2018 23:13, Tony Krowiak wrote: > Introduces a new function to reset the crypto attributes for all > vcpus whether they are running or not. Each vcpu in KVM will > be removed from SIE prior to resetting the crypto attributes in its > SIE state description. After all vcpus have had their crypto attributes > reset the vcpus will be restored to SIE. > > This function is incorporated into the kvm_s390_vm_set_crypto(kvm) > function to fix a reported issue whereby the crypto key wrapping > attributes could potentially get out of synch for running vcpus. > > Reported-by: Halil Pasic A reported-by for a code refactoring is strange. > Signed-off-by: Tony Krowiak > --- > arch/s390/kvm/kvm-s390.c | 18 ++++++++++++++---- > arch/s390/kvm/kvm-s390.h | 13 +++++++++++++ > 2 files changed, 27 insertions(+), 4 deletions(-) > > diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c > index fa355a6..4fa3037 100644 > --- a/arch/s390/kvm/kvm-s390.c > +++ b/arch/s390/kvm/kvm-s390.c > @@ -789,6 +789,19 @@ static int kvm_s390_set_mem_control(struct kvm *kvm, struct kvm_device_attr *att > return ret; > } > > +void kvm_s390_vcpu_crypto_reset_all(struct kvm *kvm) > + { > + int i; > + struct kvm_vcpu *vcpu; > + > + kvm_s390_vcpu_block_all(kvm); > + > + kvm_for_each_vcpu(i, vcpu, kvm) > + kvm_s390_vcpu_crypto_setup(vcpu); > + > + kvm_s390_vcpu_unblock_all(kvm); This code has to be protected by kvm->lock. Can that be guaranteed by the caller? > +} > + > static void kvm_s390_vcpu_crypto_setup(struct kvm_vcpu *vcpu); > > static int kvm_s390_vm_set_crypto(struct kvm *kvm, struct kvm_device_attr *attr) > @@ -832,10 +845,7 @@ static int kvm_s390_vm_set_crypto(struct kvm *kvm, struct kvm_device_attr *attr) > return -ENXIO; > } > > - kvm_for_each_vcpu(i, vcpu, kvm) { > - kvm_s390_vcpu_crypto_setup(vcpu); > - exit_sie(vcpu); > - } > + kvm_s390_vcpu_crypto_reset_all(kvm); > mutex_unlock(&kvm->lock); > return 0; > } > diff --git a/arch/s390/kvm/kvm-s390.h b/arch/s390/kvm/kvm-s390.h > index 1b5621f..981e3ba 100644 > --- a/arch/s390/kvm/kvm-s390.h > +++ b/arch/s390/kvm/kvm-s390.h > @@ -410,4 +410,17 @@ static inline int kvm_s390_use_sca_entries(void) > } > void kvm_s390_reinject_machine_check(struct kvm_vcpu *vcpu, > struct mcck_volatile_info *mcck_info); > + > +/** > + * kvm_s390_vcpu_crypto_reset_all > + * > + * Reset the crypto attributes for each vcpu. This can be done while the vcpus > + * are running as each vcpu will be removed from SIE before resetting the crypt > + * attributes and restored to SIE afterward. > + * > + * Note: The kvm->lock must be held while calling this function > + * > + * @kvm: the KVM guest > + */ > +void kvm_s390_vcpu_crypto_reset_all(struct kvm *kvm); > #endif > -- Thanks, David / dhildenb