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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 AEF56C83007 for ; Wed, 29 Apr 2020 12:23:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 88100208FE for ; Wed, 29 Apr 2020 12:23:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VXHnq+tF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727115AbgD2MXx (ORCPT ); Wed, 29 Apr 2020 08:23:53 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:48771 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726701AbgD2MXw (ORCPT ); Wed, 29 Apr 2020 08:23:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588163030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=P8pgV6uMHzNDOfpWIiJdoKMsBBSJGFZq++Qsl0KZjhI=; b=VXHnq+tFqe+w/qesSKeLfV/regHTBCMF9k8lcthWPDi4TkZm59CV/Q9zzyYN4a/gKI4i9e G3tmdbRyXgfP3ePtACRykRgezZNYQdQOUczYEb5UQQm8F63xJ9LPOTr9/IJ9IYXXeQggvp PhoWGhIgOahXuMhPQCKtBpnCyl1G01c= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-70-L9CLOikzP3SLcvn9LhUxOw-1; Wed, 29 Apr 2020 08:23:47 -0400 X-MC-Unique: L9CLOikzP3SLcvn9LhUxOw-1 Received: by mail-wm1-f71.google.com with SMTP id l21so1127127wmh.2 for ; Wed, 29 Apr 2020 05:23:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=P8pgV6uMHzNDOfpWIiJdoKMsBBSJGFZq++Qsl0KZjhI=; b=r9KxYy6L6BHNZcs18P7TdPrMUkWqV9Du+PkOLowE5hEmEqZtbXZjJDRcEftsd+hIh0 YUkNZVCvu3qNUhaJcg2Bt6F/35hFlGCnY2Cu7eIP/GuoZI9GjpNQCnsWGw0hQpAxALTa 9VdasYJ2nBlxSZm/IliwHAJ/jkcGw4x14z4dPKgsj4Cc37WrfYssE3iyh0YxLQHDl2ba 5M2FI+KghoDZzs6QEEZJig12lxsEk6kCtDCv7hCI8Ato1NMmhAVJzVogH7OELBsnV04k IBFLCQlVXjP2h7yRsqQiTsABvKoK7k9FlE81uNX5H2Y51CwLrCV8ByubNnYTCOy6rNwL YTrw== X-Gm-Message-State: AGi0PuYTlJUXHaeAQVqUZwKw4XUgQ8fIuKsUJO6lp+96tK2/aBWdaOMZ N12fdCg3s5gQHKbsOpezdE7LOwU4iVe52xx3JX9zh2yS8sn8bgFoZY0sPkeRdNLZjyKYqOMw5cm RTc3k2d3em7WOFP70UrjD0ZJ6 X-Received: by 2002:a1c:8106:: with SMTP id c6mr2999761wmd.88.1588163026201; Wed, 29 Apr 2020 05:23:46 -0700 (PDT) X-Google-Smtp-Source: APiQypLEQN/fKbOj2PpKvd2yk8qFu2uTYg65caL+qOuUZqYZNmiqKNZUNV+CX/Wun7VWjygdbXHKLA== X-Received: by 2002:a1c:8106:: with SMTP id c6mr2999734wmd.88.1588163025929; Wed, 29 Apr 2020 05:23:45 -0700 (PDT) Received: from vitty.brq.redhat.com (g-server-2.ign.cz. [91.219.240.2]) by smtp.gmail.com with ESMTPSA id n6sm32160645wrs.81.2020.04.29.05.23.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2020 05:23:45 -0700 (PDT) From: Vitaly Kuznetsov To: Tianjia Zhang Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-mips@vger.kernel.org, kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, tianjia.zhang@linux.alibaba.com, pbonzini@redhat.com, tsbogend@alpha.franken.de, paulus@ozlabs.org, mpe@ellerman.id.au, benh@kernel.crashing.org, borntraeger@de.ibm.com, frankja@linux.ibm.com, david@redhat.com, cohuck@redhat.com, heiko.carstens@de.ibm.com, gor@linux.ibm.com, sean.j.christopherson@intel.com, wanpengli@tencent.com, jmattson@google.com, joro@8bytes.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, hpa@zytor.com, maz@kernel.org, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, christoffer.dall@arm.com, peterx@redhat.com, thuth@redhat.com, chenhuacai@gmail.com Subject: Re: [PATCH v4 3/7] KVM: PPC: Remove redundant kvm_run from vcpu_arch In-Reply-To: <20200427043514.16144-4-tianjia.zhang@linux.alibaba.com> References: <20200427043514.16144-1-tianjia.zhang@linux.alibaba.com> <20200427043514.16144-4-tianjia.zhang@linux.alibaba.com> Date: Wed, 29 Apr 2020 14:23:42 +0200 Message-ID: <87lfmeh44x.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Tianjia Zhang writes: > The 'kvm_run' field already exists in the 'vcpu' structure, which > is the same structure as the 'kvm_run' in the 'vcpu_arch' and > should be deleted. > > Signed-off-by: Tianjia Zhang > --- > arch/powerpc/include/asm/kvm_host.h | 1 - > arch/powerpc/kvm/book3s_hv.c | 6 ++---- > arch/powerpc/kvm/book3s_hv_nested.c | 3 +-- > 3 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h > index 1dc63101ffe1..2745ff8faa01 100644 > --- a/arch/powerpc/include/asm/kvm_host.h > +++ b/arch/powerpc/include/asm/kvm_host.h > @@ -795,7 +795,6 @@ struct kvm_vcpu_arch { > struct mmio_hpte_cache_entry *pgfault_cache; > > struct task_struct *run_task; > - struct kvm_run *kvm_run; > > spinlock_t vpa_update_lock; > struct kvmppc_vpa vpa; > diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c > index 93493f0cbfe8..413ea2dcb10c 100644 > --- a/arch/powerpc/kvm/book3s_hv.c > +++ b/arch/powerpc/kvm/book3s_hv.c > @@ -2934,7 +2934,7 @@ static void post_guest_process(struct kvmppc_vcore *vc, bool is_master) > > ret = RESUME_GUEST; > if (vcpu->arch.trap) > - ret = kvmppc_handle_exit_hv(vcpu->arch.kvm_run, vcpu, > + ret = kvmppc_handle_exit_hv(vcpu->run, vcpu, > vcpu->arch.run_task); > > vcpu->arch.ret = ret; > @@ -3920,7 +3920,6 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) > spin_lock(&vc->lock); > vcpu->arch.ceded = 0; > vcpu->arch.run_task = current; > - vcpu->arch.kvm_run = kvm_run; > vcpu->arch.stolen_logged = vcore_stolen_time(vc, mftb()); > vcpu->arch.state = KVMPPC_VCPU_RUNNABLE; > vcpu->arch.busy_preempt = TB_NIL; > @@ -3973,7 +3972,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) > if (signal_pending(v->arch.run_task)) { > kvmppc_remove_runnable(vc, v); > v->stat.signal_exits++; > - v->arch.kvm_run->exit_reason = KVM_EXIT_INTR; > + v->run->exit_reason = KVM_EXIT_INTR; > v->arch.ret = -EINTR; > wake_up(&v->arch.cpu_run); > } > @@ -4049,7 +4048,6 @@ int kvmhv_run_single_vcpu(struct kvm_run *kvm_run, > vc = vcpu->arch.vcore; > vcpu->arch.ceded = 0; > vcpu->arch.run_task = current; > - vcpu->arch.kvm_run = kvm_run; > vcpu->arch.stolen_logged = vcore_stolen_time(vc, mftb()); > vcpu->arch.state = KVMPPC_VCPU_RUNNABLE; > vcpu->arch.busy_preempt = TB_NIL; > diff --git a/arch/powerpc/kvm/book3s_hv_nested.c b/arch/powerpc/kvm/book3s_hv_nested.c > index dc97e5be76f6..5a3987f3ebf3 100644 > --- a/arch/powerpc/kvm/book3s_hv_nested.c > +++ b/arch/powerpc/kvm/book3s_hv_nested.c > @@ -290,8 +290,7 @@ long kvmhv_enter_nested_guest(struct kvm_vcpu *vcpu) > r = RESUME_HOST; > break; > } > - r = kvmhv_run_single_vcpu(vcpu->arch.kvm_run, vcpu, hdec_exp, > - lpcr); > + r = kvmhv_run_single_vcpu(vcpu->run, vcpu, hdec_exp, lpcr); > } while (is_kvmppc_resume_guest(r)); > > /* save L2 state for return */ FWIW, Reviewed-by: Vitaly Kuznetsov -- Vitaly From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-1.mimecast.com ([207.211.31.81]:38571 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727106AbgD2MXw (ORCPT ); Wed, 29 Apr 2020 08:23:52 -0400 Received: by mail-wr1-f70.google.com with SMTP id d17so1617423wrr.17 for ; Wed, 29 Apr 2020 05:23:47 -0700 (PDT) From: Vitaly Kuznetsov Subject: Re: [PATCH v4 3/7] KVM: PPC: Remove redundant kvm_run from vcpu_arch In-Reply-To: <20200427043514.16144-4-tianjia.zhang@linux.alibaba.com> References: <20200427043514.16144-1-tianjia.zhang@linux.alibaba.com> <20200427043514.16144-4-tianjia.zhang@linux.alibaba.com> Date: Wed, 29 Apr 2020 14:23:42 +0200 Message-ID: <87lfmeh44x.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-s390-owner@vger.kernel.org List-ID: To: Tianjia Zhang Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-mips@vger.kernel.org, kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, pbonzini@redhat.com, tsbogend@alpha.franken.de, paulus@ozlabs.org, mpe@ellerman.id.au, benh@kernel.crashing.org, borntraeger@de.ibm.com, frankja@linux.ibm.com, david@redhat.com, cohuck@redhat.com, heiko.carstens@de.ibm.com, gor@linux.ibm.com, sean.j.christopherson@intel.com, wanpengli@tencent.com, jmattson@google.com, joro@8bytes.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, hpa@zytor.com, maz@kernel.org, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, christoffer.dall@arm.com, peterx@redhat.com, thuth@redhat.com, chenhuacai@gmail.com Tianjia Zhang writes: > The 'kvm_run' field already exists in the 'vcpu' structure, which > is the same structure as the 'kvm_run' in the 'vcpu_arch' and > should be deleted. > > Signed-off-by: Tianjia Zhang > --- > arch/powerpc/include/asm/kvm_host.h | 1 - > arch/powerpc/kvm/book3s_hv.c | 6 ++---- > arch/powerpc/kvm/book3s_hv_nested.c | 3 +-- > 3 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h > index 1dc63101ffe1..2745ff8faa01 100644 > --- a/arch/powerpc/include/asm/kvm_host.h > +++ b/arch/powerpc/include/asm/kvm_host.h > @@ -795,7 +795,6 @@ struct kvm_vcpu_arch { > struct mmio_hpte_cache_entry *pgfault_cache; > > struct task_struct *run_task; > - struct kvm_run *kvm_run; > > spinlock_t vpa_update_lock; > struct kvmppc_vpa vpa; > diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c > index 93493f0cbfe8..413ea2dcb10c 100644 > --- a/arch/powerpc/kvm/book3s_hv.c > +++ b/arch/powerpc/kvm/book3s_hv.c > @@ -2934,7 +2934,7 @@ static void post_guest_process(struct kvmppc_vcore *vc, bool is_master) > > ret = RESUME_GUEST; > if (vcpu->arch.trap) > - ret = kvmppc_handle_exit_hv(vcpu->arch.kvm_run, vcpu, > + ret = kvmppc_handle_exit_hv(vcpu->run, vcpu, > vcpu->arch.run_task); > > vcpu->arch.ret = ret; > @@ -3920,7 +3920,6 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) > spin_lock(&vc->lock); > vcpu->arch.ceded = 0; > vcpu->arch.run_task = current; > - vcpu->arch.kvm_run = kvm_run; > vcpu->arch.stolen_logged = vcore_stolen_time(vc, mftb()); > vcpu->arch.state = KVMPPC_VCPU_RUNNABLE; > vcpu->arch.busy_preempt = TB_NIL; > @@ -3973,7 +3972,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) > if (signal_pending(v->arch.run_task)) { > kvmppc_remove_runnable(vc, v); > v->stat.signal_exits++; > - v->arch.kvm_run->exit_reason = KVM_EXIT_INTR; > + v->run->exit_reason = KVM_EXIT_INTR; > v->arch.ret = -EINTR; > wake_up(&v->arch.cpu_run); > } > @@ -4049,7 +4048,6 @@ int kvmhv_run_single_vcpu(struct kvm_run *kvm_run, > vc = vcpu->arch.vcore; > vcpu->arch.ceded = 0; > vcpu->arch.run_task = current; > - vcpu->arch.kvm_run = kvm_run; > vcpu->arch.stolen_logged = vcore_stolen_time(vc, mftb()); > vcpu->arch.state = KVMPPC_VCPU_RUNNABLE; > vcpu->arch.busy_preempt = TB_NIL; > diff --git a/arch/powerpc/kvm/book3s_hv_nested.c b/arch/powerpc/kvm/book3s_hv_nested.c > index dc97e5be76f6..5a3987f3ebf3 100644 > --- a/arch/powerpc/kvm/book3s_hv_nested.c > +++ b/arch/powerpc/kvm/book3s_hv_nested.c > @@ -290,8 +290,7 @@ long kvmhv_enter_nested_guest(struct kvm_vcpu *vcpu) > r = RESUME_HOST; > break; > } > - r = kvmhv_run_single_vcpu(vcpu->arch.kvm_run, vcpu, hdec_exp, > - lpcr); > + r = kvmhv_run_single_vcpu(vcpu->run, vcpu, hdec_exp, lpcr); > } while (is_kvmppc_resume_guest(r)); > > /* save L2 state for return */ FWIW, Reviewed-by: Vitaly Kuznetsov -- Vitaly 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=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 52C3AC83003 for ; Wed, 29 Apr 2020 13:18:34 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F0A142074A for ; Wed, 29 Apr 2020 13:18:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bPXMF5BI"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bPXMF5BI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F0A142074A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49Bzbq5WNrzDq9p for ; Wed, 29 Apr 2020 23:18:31 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=redhat.com (client-ip=205.139.110.61; helo=us-smtp-delivery-1.mimecast.com; envelope-from=vkuznets@redhat.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=bPXMF5BI; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=bPXMF5BI; dkim-atps=neutral Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49ByNr2mSQzDqVP for ; Wed, 29 Apr 2020 22:23:56 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588163031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f73XFclQGMI95HoTU649yPccrfl6BgMf60JAuz7AmbU=; b=bPXMF5BIRwCmB50fr+kc4JOvXEa/5HG2HmoHvKOTPTQzECAfZzKOtqFFYUnYRPigmPCUYm 3wkFS9DrbAu691q7hc9BwO+umBtTMVRqJdFLBvQLTC9kWxUcfUPgVyW490KZr9mufAPY+l 7wUVqLxFxGA73HYZ2oX0Q1WNVEYDmOo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588163031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f73XFclQGMI95HoTU649yPccrfl6BgMf60JAuz7AmbU=; b=bPXMF5BIRwCmB50fr+kc4JOvXEa/5HG2HmoHvKOTPTQzECAfZzKOtqFFYUnYRPigmPCUYm 3wkFS9DrbAu691q7hc9BwO+umBtTMVRqJdFLBvQLTC9kWxUcfUPgVyW490KZr9mufAPY+l 7wUVqLxFxGA73HYZ2oX0Q1WNVEYDmOo= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-172-0S59-kZkMyWKYwkgigQjww-1; Wed, 29 Apr 2020 08:23:47 -0400 X-MC-Unique: 0S59-kZkMyWKYwkgigQjww-1 Received: by mail-wm1-f70.google.com with SMTP id h22so1131211wml.1 for ; Wed, 29 Apr 2020 05:23:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=P8pgV6uMHzNDOfpWIiJdoKMsBBSJGFZq++Qsl0KZjhI=; b=diM+p/p4I2dl1k1JG3JaIHvjLdBphbd25JFCxtRKc1yvAzzSUbp+YS0EycPn0Mj9zh 5WPlFrjEsf8Xfm9EivyIX2vC+UFTQLdwW8kLobFIKT45NDMl9sR1PpRQK7X7LeN6Btq1 pFLIIhG2k5CY8r6aLjFqYgKpJJI4tFkLQZHmjHhVcOmWd4EQTEfg0zaCOurJZiO7zyk1 WMaSheF0so7BqqsRekd7LA7r80nu5GZCSFgBiClQ9jdoknkU2Fi9N5vPsiN58Q+bowY4 74iC4qN4d/cOclOmbNX5v5me9+BPJzoLJJQqOWNlBiKImnlkEjJAc5X3NoaVJxwwRdrE vWaw== X-Gm-Message-State: AGi0PuatCWmG2fxcr+nmDlT/gq8oXgyyKOgtVxnXy3VH41d/F3+CWt2L +EdGbb0Jwbsj7ixef4l573qw+kULy7Pt5LUAmbYIvg61/rJTx1ZZbB1u/RU4NkpklVzB3z5qCYB L0fRRtwnXqAYoCYjok+6t/ABVfw== X-Received: by 2002:a1c:8106:: with SMTP id c6mr2999782wmd.88.1588163026211; Wed, 29 Apr 2020 05:23:46 -0700 (PDT) X-Google-Smtp-Source: APiQypLEQN/fKbOj2PpKvd2yk8qFu2uTYg65caL+qOuUZqYZNmiqKNZUNV+CX/Wun7VWjygdbXHKLA== X-Received: by 2002:a1c:8106:: with SMTP id c6mr2999734wmd.88.1588163025929; Wed, 29 Apr 2020 05:23:45 -0700 (PDT) Received: from vitty.brq.redhat.com (g-server-2.ign.cz. [91.219.240.2]) by smtp.gmail.com with ESMTPSA id n6sm32160645wrs.81.2020.04.29.05.23.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2020 05:23:45 -0700 (PDT) From: Vitaly Kuznetsov To: Tianjia Zhang Subject: Re: [PATCH v4 3/7] KVM: PPC: Remove redundant kvm_run from vcpu_arch In-Reply-To: <20200427043514.16144-4-tianjia.zhang@linux.alibaba.com> References: <20200427043514.16144-1-tianjia.zhang@linux.alibaba.com> <20200427043514.16144-4-tianjia.zhang@linux.alibaba.com> Date: Wed, 29 Apr 2020 14:23:42 +0200 Message-ID: <87lfmeh44x.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: christoffer.dall@arm.com, wanpengli@tencent.com, kvm@vger.kernel.org, david@redhat.com, heiko.carstens@de.ibm.com, peterx@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, kvmarm@lists.cs.columbia.edu, linux-s390@vger.kernel.org, frankja@linux.ibm.com, chenhuacai@gmail.com, joro@8bytes.org, x86@kernel.org, borntraeger@de.ibm.com, mingo@redhat.com, julien.thierry.kdev@gmail.com, thuth@redhat.com, gor@linux.ibm.com, suzuki.poulose@arm.com, kvm-ppc@vger.kernel.org, bp@alien8.de, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org, jmattson@google.com, tsbogend@alpha.franken.de, tianjia.zhang@linux.alibaba.com, cohuck@redhat.com, linux-mips@vger.kernel.org, sean.j.christopherson@intel.com, james.morse@arm.com, maz@kernel.org, pbonzini@redhat.com, linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Tianjia Zhang writes: > The 'kvm_run' field already exists in the 'vcpu' structure, which > is the same structure as the 'kvm_run' in the 'vcpu_arch' and > should be deleted. > > Signed-off-by: Tianjia Zhang > --- > arch/powerpc/include/asm/kvm_host.h | 1 - > arch/powerpc/kvm/book3s_hv.c | 6 ++---- > arch/powerpc/kvm/book3s_hv_nested.c | 3 +-- > 3 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/a= sm/kvm_host.h > index 1dc63101ffe1..2745ff8faa01 100644 > --- a/arch/powerpc/include/asm/kvm_host.h > +++ b/arch/powerpc/include/asm/kvm_host.h > @@ -795,7 +795,6 @@ struct kvm_vcpu_arch { > =09struct mmio_hpte_cache_entry *pgfault_cache; > =20 > =09struct task_struct *run_task; > -=09struct kvm_run *kvm_run; > =20 > =09spinlock_t vpa_update_lock; > =09struct kvmppc_vpa vpa; > diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c > index 93493f0cbfe8..413ea2dcb10c 100644 > --- a/arch/powerpc/kvm/book3s_hv.c > +++ b/arch/powerpc/kvm/book3s_hv.c > @@ -2934,7 +2934,7 @@ static void post_guest_process(struct kvmppc_vcore = *vc, bool is_master) > =20 > =09=09ret =3D RESUME_GUEST; > =09=09if (vcpu->arch.trap) > -=09=09=09ret =3D kvmppc_handle_exit_hv(vcpu->arch.kvm_run, vcpu, > +=09=09=09ret =3D kvmppc_handle_exit_hv(vcpu->run, vcpu, > =09=09=09=09=09=09 vcpu->arch.run_task); > =20 > =09=09vcpu->arch.ret =3D ret; > @@ -3920,7 +3920,6 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run,= struct kvm_vcpu *vcpu) > =09spin_lock(&vc->lock); > =09vcpu->arch.ceded =3D 0; > =09vcpu->arch.run_task =3D current; > -=09vcpu->arch.kvm_run =3D kvm_run; > =09vcpu->arch.stolen_logged =3D vcore_stolen_time(vc, mftb()); > =09vcpu->arch.state =3D KVMPPC_VCPU_RUNNABLE; > =09vcpu->arch.busy_preempt =3D TB_NIL; > @@ -3973,7 +3972,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run,= struct kvm_vcpu *vcpu) > =09=09=09if (signal_pending(v->arch.run_task)) { > =09=09=09=09kvmppc_remove_runnable(vc, v); > =09=09=09=09v->stat.signal_exits++; > -=09=09=09=09v->arch.kvm_run->exit_reason =3D KVM_EXIT_INTR; > +=09=09=09=09v->run->exit_reason =3D KVM_EXIT_INTR; > =09=09=09=09v->arch.ret =3D -EINTR; > =09=09=09=09wake_up(&v->arch.cpu_run); > =09=09=09} > @@ -4049,7 +4048,6 @@ int kvmhv_run_single_vcpu(struct kvm_run *kvm_run, > =09vc =3D vcpu->arch.vcore; > =09vcpu->arch.ceded =3D 0; > =09vcpu->arch.run_task =3D current; > -=09vcpu->arch.kvm_run =3D kvm_run; > =09vcpu->arch.stolen_logged =3D vcore_stolen_time(vc, mftb()); > =09vcpu->arch.state =3D KVMPPC_VCPU_RUNNABLE; > =09vcpu->arch.busy_preempt =3D TB_NIL; > diff --git a/arch/powerpc/kvm/book3s_hv_nested.c b/arch/powerpc/kvm/book3= s_hv_nested.c > index dc97e5be76f6..5a3987f3ebf3 100644 > --- a/arch/powerpc/kvm/book3s_hv_nested.c > +++ b/arch/powerpc/kvm/book3s_hv_nested.c > @@ -290,8 +290,7 @@ long kvmhv_enter_nested_guest(struct kvm_vcpu *vcpu) > =09=09=09r =3D RESUME_HOST; > =09=09=09break; > =09=09} > -=09=09r =3D kvmhv_run_single_vcpu(vcpu->arch.kvm_run, vcpu, hdec_exp, > -=09=09=09=09=09 lpcr); > +=09=09r =3D kvmhv_run_single_vcpu(vcpu->run, vcpu, hdec_exp, lpcr); > =09} while (is_kvmppc_resume_guest(r)); > =20 > =09/* save L2 state for return */ FWIW, Reviewed-by: Vitaly Kuznetsov --=20 Vitaly 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=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 D53CAC83006 for ; Wed, 29 Apr 2020 16:58:38 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 8E07A208FE for ; Wed, 29 Apr 2020 16:58:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="fuujgmR5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8E07A208FE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 384EF4B1E2; Wed, 29 Apr 2020 12:58:38 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@redhat.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DzgNbJhq2mvU; Wed, 29 Apr 2020 12:58:37 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id B7A7D4B3DB; Wed, 29 Apr 2020 12:58:35 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id E89644B360 for ; Wed, 29 Apr 2020 08:23:51 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DBk+NP2Hcq4V for ; Wed, 29 Apr 2020 08:23:50 -0400 (EDT) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 925624B34E for ; Wed, 29 Apr 2020 08:23:50 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588163030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f73XFclQGMI95HoTU649yPccrfl6BgMf60JAuz7AmbU=; b=fuujgmR5ob2u7VwkF5yr0BeWbm3SaQ0BmMHX5j/5WckyPOlC9NNPqbN4aBnX+mrtycYc2U U1IKI3cU/nrTDSMfmuj2L9dNLpk7qMeOgptZTTGAMDu4qw83r83zI8Wdk1kwIXfed2xnH2 b0EP/J/O8yEBVgs67VMD590UYzJEmYs= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-309-SbhVv0A7NfO1l_pC9qOfvA-1; Wed, 29 Apr 2020 08:23:47 -0400 X-MC-Unique: SbhVv0A7NfO1l_pC9qOfvA-1 Received: by mail-wr1-f71.google.com with SMTP id g7so1615955wrw.18 for ; Wed, 29 Apr 2020 05:23:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=P8pgV6uMHzNDOfpWIiJdoKMsBBSJGFZq++Qsl0KZjhI=; b=r1tzfnwZoT+vSXxgTUrl5c/FRYGICvLbi3g0gn+tSyZFbLBgbOfjdS7RIQrHhW3d3f O7cdqH7mzvCg1H4s1zY183MwHNSXOCltBiZbr2hA2rpBiK5PyGXooK7hpPBY3jYBCyNH Mva+Iqawi3Orum2vB+JuAnhk6HAr+/S9eiprKYOMZIPSms4M3ai1XHYStRC7mWoAr/rL Ilb1g7J9iO4bF8d3hZe4RGj4GYl7HEcYtSO4yWvtdA4ORd8mtERdf2JrIeHc2xcjL05H 9tCiFN8DJ9P07JQDRJn3WTPp26EAjQ2eS4X7D2ghL4IiTBPjaXPlz2NifHoSKt/Go8Z8 gjUw== X-Gm-Message-State: AGi0PuYDWrAGGYBQFBY0WBpBGqrxq/kL04GuOXSUcjZ1h/SX7efSuQJ+ 6unurZ9AszbbHrJgS9OJFNI0MCb+uFi7il0zibozRGKJy+gbjgu4Rr6fgXjUquqtv47w3SJLgMu 5PnUjXL4B7HEyM7T5igmw0UI/ X-Received: by 2002:a1c:8106:: with SMTP id c6mr2999796wmd.88.1588163026245; Wed, 29 Apr 2020 05:23:46 -0700 (PDT) X-Google-Smtp-Source: APiQypLEQN/fKbOj2PpKvd2yk8qFu2uTYg65caL+qOuUZqYZNmiqKNZUNV+CX/Wun7VWjygdbXHKLA== X-Received: by 2002:a1c:8106:: with SMTP id c6mr2999734wmd.88.1588163025929; Wed, 29 Apr 2020 05:23:45 -0700 (PDT) Received: from vitty.brq.redhat.com (g-server-2.ign.cz. [91.219.240.2]) by smtp.gmail.com with ESMTPSA id n6sm32160645wrs.81.2020.04.29.05.23.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2020 05:23:45 -0700 (PDT) From: Vitaly Kuznetsov To: Tianjia Zhang Subject: Re: [PATCH v4 3/7] KVM: PPC: Remove redundant kvm_run from vcpu_arch In-Reply-To: <20200427043514.16144-4-tianjia.zhang@linux.alibaba.com> References: <20200427043514.16144-1-tianjia.zhang@linux.alibaba.com> <20200427043514.16144-4-tianjia.zhang@linux.alibaba.com> Date: Wed, 29 Apr 2020 14:23:42 +0200 Message-ID: <87lfmeh44x.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Mailman-Approved-At: Wed, 29 Apr 2020 12:58:34 -0400 Cc: wanpengli@tencent.com, kvm@vger.kernel.org, david@redhat.com, benh@kernel.crashing.org, heiko.carstens@de.ibm.com, linux-kernel@vger.kernel.org, paulus@ozlabs.org, hpa@zytor.com, kvmarm@lists.cs.columbia.edu, linux-s390@vger.kernel.org, frankja@linux.ibm.com, chenhuacai@gmail.com, mpe@ellerman.id.au, joro@8bytes.org, x86@kernel.org, borntraeger@de.ibm.com, mingo@redhat.com, thuth@redhat.com, gor@linux.ibm.com, kvm-ppc@vger.kernel.org, bp@alien8.de, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org, jmattson@google.com, tsbogend@alpha.franken.de, tianjia.zhang@linux.alibaba.com, cohuck@redhat.com, linux-mips@vger.kernel.org, sean.j.christopherson@intel.com, maz@kernel.org, pbonzini@redhat.com, linuxppc-dev@lists.ozlabs.org X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu Tianjia Zhang writes: > The 'kvm_run' field already exists in the 'vcpu' structure, which > is the same structure as the 'kvm_run' in the 'vcpu_arch' and > should be deleted. > > Signed-off-by: Tianjia Zhang > --- > arch/powerpc/include/asm/kvm_host.h | 1 - > arch/powerpc/kvm/book3s_hv.c | 6 ++---- > arch/powerpc/kvm/book3s_hv_nested.c | 3 +-- > 3 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h > index 1dc63101ffe1..2745ff8faa01 100644 > --- a/arch/powerpc/include/asm/kvm_host.h > +++ b/arch/powerpc/include/asm/kvm_host.h > @@ -795,7 +795,6 @@ struct kvm_vcpu_arch { > struct mmio_hpte_cache_entry *pgfault_cache; > > struct task_struct *run_task; > - struct kvm_run *kvm_run; > > spinlock_t vpa_update_lock; > struct kvmppc_vpa vpa; > diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c > index 93493f0cbfe8..413ea2dcb10c 100644 > --- a/arch/powerpc/kvm/book3s_hv.c > +++ b/arch/powerpc/kvm/book3s_hv.c > @@ -2934,7 +2934,7 @@ static void post_guest_process(struct kvmppc_vcore *vc, bool is_master) > > ret = RESUME_GUEST; > if (vcpu->arch.trap) > - ret = kvmppc_handle_exit_hv(vcpu->arch.kvm_run, vcpu, > + ret = kvmppc_handle_exit_hv(vcpu->run, vcpu, > vcpu->arch.run_task); > > vcpu->arch.ret = ret; > @@ -3920,7 +3920,6 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) > spin_lock(&vc->lock); > vcpu->arch.ceded = 0; > vcpu->arch.run_task = current; > - vcpu->arch.kvm_run = kvm_run; > vcpu->arch.stolen_logged = vcore_stolen_time(vc, mftb()); > vcpu->arch.state = KVMPPC_VCPU_RUNNABLE; > vcpu->arch.busy_preempt = TB_NIL; > @@ -3973,7 +3972,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) > if (signal_pending(v->arch.run_task)) { > kvmppc_remove_runnable(vc, v); > v->stat.signal_exits++; > - v->arch.kvm_run->exit_reason = KVM_EXIT_INTR; > + v->run->exit_reason = KVM_EXIT_INTR; > v->arch.ret = -EINTR; > wake_up(&v->arch.cpu_run); > } > @@ -4049,7 +4048,6 @@ int kvmhv_run_single_vcpu(struct kvm_run *kvm_run, > vc = vcpu->arch.vcore; > vcpu->arch.ceded = 0; > vcpu->arch.run_task = current; > - vcpu->arch.kvm_run = kvm_run; > vcpu->arch.stolen_logged = vcore_stolen_time(vc, mftb()); > vcpu->arch.state = KVMPPC_VCPU_RUNNABLE; > vcpu->arch.busy_preempt = TB_NIL; > diff --git a/arch/powerpc/kvm/book3s_hv_nested.c b/arch/powerpc/kvm/book3s_hv_nested.c > index dc97e5be76f6..5a3987f3ebf3 100644 > --- a/arch/powerpc/kvm/book3s_hv_nested.c > +++ b/arch/powerpc/kvm/book3s_hv_nested.c > @@ -290,8 +290,7 @@ long kvmhv_enter_nested_guest(struct kvm_vcpu *vcpu) > r = RESUME_HOST; > break; > } > - r = kvmhv_run_single_vcpu(vcpu->arch.kvm_run, vcpu, hdec_exp, > - lpcr); > + r = kvmhv_run_single_vcpu(vcpu->run, vcpu, hdec_exp, lpcr); > } while (is_kvmppc_resume_guest(r)); > > /* save L2 state for return */ FWIW, Reviewed-by: Vitaly Kuznetsov -- Vitaly _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 2D878C83004 for ; Wed, 29 Apr 2020 12:23:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 01FB421775 for ; Wed, 29 Apr 2020 12:23:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mmGI254s"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="fuujgmR5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 01FB421775 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:References :In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=gbhcPTvyv7kNdn8C5NgrJLvqX/y664pKiKtsmvn631U=; b=mmGI254srR+Hm1 pEzuJs38LbyjRBTL2gT5RnUj1JN56f6hoeMtke3vv1hVUF5/+EMASyKj4gAz9mLNPV9AB9FOOMBS6 8B7jEByFynF/VOy3rPkWIXYx08AXxJb4RM1UwQTnBVKX+1Kvjhw7EWfde9gJqPZgXU9NOehBfDIXs uaYtVYJeVowDGIXMXZ8FUojDmHpPQwdzKyDSW3o8MDWWqwdtvn/wp1bJXZcqgsH3MNN+4PrcIQ9x8 w75eDKXISmG6e2/90BN/iy4N9wUwKdNKHuGizOnXLSCipXHPfg/H75bCkjbJaGg4wlVqo4uu2+ogR biR1FIBaEpog0CV4CD7w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jTlkp-0000Gc-10; Wed, 29 Apr 2020 12:23:55 +0000 Received: from us-smtp-2.mimecast.com ([205.139.110.61] helo=us-smtp-delivery-1.mimecast.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jTlkm-0000Ff-Eg for linux-arm-kernel@lists.infradead.org; Wed, 29 Apr 2020 12:23:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588163030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f73XFclQGMI95HoTU649yPccrfl6BgMf60JAuz7AmbU=; b=fuujgmR5ob2u7VwkF5yr0BeWbm3SaQ0BmMHX5j/5WckyPOlC9NNPqbN4aBnX+mrtycYc2U U1IKI3cU/nrTDSMfmuj2L9dNLpk7qMeOgptZTTGAMDu4qw83r83zI8Wdk1kwIXfed2xnH2 b0EP/J/O8yEBVgs67VMD590UYzJEmYs= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-96-vhHPHKIDMFiU5Gnluu976w-1; Wed, 29 Apr 2020 08:23:47 -0400 X-MC-Unique: vhHPHKIDMFiU5Gnluu976w-1 Received: by mail-wm1-f70.google.com with SMTP id f128so1116381wmf.8 for ; Wed, 29 Apr 2020 05:23:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=P8pgV6uMHzNDOfpWIiJdoKMsBBSJGFZq++Qsl0KZjhI=; b=Plq0CK14PfCqGjnn4F8JBVzhws8M0V1XdOGEpUkraG6MGWE5DY7d6qINc4ZhHxjQEX 44ZGO4rOHE1CdzoqBd8MfGlktd93lYmfcSrSmn1pPekji9eFdDUO6kwhuyxthx27i6Fb Hnyn+tDS07HrEOUsuaZKd1E/tHzdw2wDUx6knqswjsLWKjbmWc03uo0xJr9KkOnMcNtK PrxPHC51sEqsI6ND+h4g5oDUeBjaGk1D53kZZIsdtfyMQ6PXDRtzHhLj6sBMMUwzj520 eA87B33OKhPvQ5sVMQQY6wqTmb7WrhsvM4LoS+YnqK7OU4j6AO7CNbopqjo5VL9VIIF9 8xXw== X-Gm-Message-State: AGi0PuaQGQcFwH5WqVfH/YA1pu0Xiic+w1ZW2aVeNe4H+M9QPBEZ+qLM GyvejLCAklV3lBHTk1PcfpHEn2BHIE3C4C5glPCTNu9H9F+pmZ00ZMAQGMc3ToFSR7brc+b5FZW 8mS42Gh1aqKfw80H9RuCIsGPd34mlObwdHuw= X-Received: by 2002:a1c:8106:: with SMTP id c6mr2999783wmd.88.1588163026213; Wed, 29 Apr 2020 05:23:46 -0700 (PDT) X-Google-Smtp-Source: APiQypLEQN/fKbOj2PpKvd2yk8qFu2uTYg65caL+qOuUZqYZNmiqKNZUNV+CX/Wun7VWjygdbXHKLA== X-Received: by 2002:a1c:8106:: with SMTP id c6mr2999734wmd.88.1588163025929; Wed, 29 Apr 2020 05:23:45 -0700 (PDT) Received: from vitty.brq.redhat.com (g-server-2.ign.cz. [91.219.240.2]) by smtp.gmail.com with ESMTPSA id n6sm32160645wrs.81.2020.04.29.05.23.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2020 05:23:45 -0700 (PDT) From: Vitaly Kuznetsov To: Tianjia Zhang Subject: Re: [PATCH v4 3/7] KVM: PPC: Remove redundant kvm_run from vcpu_arch In-Reply-To: <20200427043514.16144-4-tianjia.zhang@linux.alibaba.com> References: <20200427043514.16144-1-tianjia.zhang@linux.alibaba.com> <20200427043514.16144-4-tianjia.zhang@linux.alibaba.com> Date: Wed, 29 Apr 2020 14:23:42 +0200 Message-ID: <87lfmeh44x.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200429_052352_566551_3F8B3E48 X-CRM114-Status: GOOD ( 13.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: christoffer.dall@arm.com, wanpengli@tencent.com, kvm@vger.kernel.org, david@redhat.com, benh@kernel.crashing.org, heiko.carstens@de.ibm.com, peterx@redhat.com, linux-kernel@vger.kernel.org, paulus@ozlabs.org, hpa@zytor.com, kvmarm@lists.cs.columbia.edu, linux-s390@vger.kernel.org, frankja@linux.ibm.com, chenhuacai@gmail.com, mpe@ellerman.id.au, joro@8bytes.org, x86@kernel.org, borntraeger@de.ibm.com, mingo@redhat.com, julien.thierry.kdev@gmail.com, thuth@redhat.com, gor@linux.ibm.com, suzuki.poulose@arm.com, kvm-ppc@vger.kernel.org, bp@alien8.de, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org, jmattson@google.com, tsbogend@alpha.franken.de, tianjia.zhang@linux.alibaba.com, cohuck@redhat.com, linux-mips@vger.kernel.org, sean.j.christopherson@intel.com, james.morse@arm.com, maz@kernel.org, pbonzini@redhat.com, linuxppc-dev@lists.ozlabs.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Tianjia Zhang writes: > The 'kvm_run' field already exists in the 'vcpu' structure, which > is the same structure as the 'kvm_run' in the 'vcpu_arch' and > should be deleted. > > Signed-off-by: Tianjia Zhang > --- > arch/powerpc/include/asm/kvm_host.h | 1 - > arch/powerpc/kvm/book3s_hv.c | 6 ++---- > arch/powerpc/kvm/book3s_hv_nested.c | 3 +-- > 3 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h > index 1dc63101ffe1..2745ff8faa01 100644 > --- a/arch/powerpc/include/asm/kvm_host.h > +++ b/arch/powerpc/include/asm/kvm_host.h > @@ -795,7 +795,6 @@ struct kvm_vcpu_arch { > struct mmio_hpte_cache_entry *pgfault_cache; > > struct task_struct *run_task; > - struct kvm_run *kvm_run; > > spinlock_t vpa_update_lock; > struct kvmppc_vpa vpa; > diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c > index 93493f0cbfe8..413ea2dcb10c 100644 > --- a/arch/powerpc/kvm/book3s_hv.c > +++ b/arch/powerpc/kvm/book3s_hv.c > @@ -2934,7 +2934,7 @@ static void post_guest_process(struct kvmppc_vcore *vc, bool is_master) > > ret = RESUME_GUEST; > if (vcpu->arch.trap) > - ret = kvmppc_handle_exit_hv(vcpu->arch.kvm_run, vcpu, > + ret = kvmppc_handle_exit_hv(vcpu->run, vcpu, > vcpu->arch.run_task); > > vcpu->arch.ret = ret; > @@ -3920,7 +3920,6 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) > spin_lock(&vc->lock); > vcpu->arch.ceded = 0; > vcpu->arch.run_task = current; > - vcpu->arch.kvm_run = kvm_run; > vcpu->arch.stolen_logged = vcore_stolen_time(vc, mftb()); > vcpu->arch.state = KVMPPC_VCPU_RUNNABLE; > vcpu->arch.busy_preempt = TB_NIL; > @@ -3973,7 +3972,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) > if (signal_pending(v->arch.run_task)) { > kvmppc_remove_runnable(vc, v); > v->stat.signal_exits++; > - v->arch.kvm_run->exit_reason = KVM_EXIT_INTR; > + v->run->exit_reason = KVM_EXIT_INTR; > v->arch.ret = -EINTR; > wake_up(&v->arch.cpu_run); > } > @@ -4049,7 +4048,6 @@ int kvmhv_run_single_vcpu(struct kvm_run *kvm_run, > vc = vcpu->arch.vcore; > vcpu->arch.ceded = 0; > vcpu->arch.run_task = current; > - vcpu->arch.kvm_run = kvm_run; > vcpu->arch.stolen_logged = vcore_stolen_time(vc, mftb()); > vcpu->arch.state = KVMPPC_VCPU_RUNNABLE; > vcpu->arch.busy_preempt = TB_NIL; > diff --git a/arch/powerpc/kvm/book3s_hv_nested.c b/arch/powerpc/kvm/book3s_hv_nested.c > index dc97e5be76f6..5a3987f3ebf3 100644 > --- a/arch/powerpc/kvm/book3s_hv_nested.c > +++ b/arch/powerpc/kvm/book3s_hv_nested.c > @@ -290,8 +290,7 @@ long kvmhv_enter_nested_guest(struct kvm_vcpu *vcpu) > r = RESUME_HOST; > break; > } > - r = kvmhv_run_single_vcpu(vcpu->arch.kvm_run, vcpu, hdec_exp, > - lpcr); > + r = kvmhv_run_single_vcpu(vcpu->run, vcpu, hdec_exp, lpcr); > } while (is_kvmppc_resume_guest(r)); > > /* save L2 state for return */ FWIW, Reviewed-by: Vitaly Kuznetsov -- Vitaly _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vitaly Kuznetsov Date: Wed, 29 Apr 2020 12:23:42 +0000 Subject: Re: [PATCH v4 3/7] KVM: PPC: Remove redundant kvm_run from vcpu_arch Message-Id: <87lfmeh44x.fsf@vitty.brq.redhat.com> List-Id: References: <20200427043514.16144-1-tianjia.zhang@linux.alibaba.com> <20200427043514.16144-4-tianjia.zhang@linux.alibaba.com> In-Reply-To: <20200427043514.16144-4-tianjia.zhang@linux.alibaba.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Tianjia Zhang Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-mips@vger.kernel.org, kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, tianjia.zhang@linux.alibaba.com, pbonzini@redhat.com, tsbogend@alpha.franken.de, paulus@ozlabs.org, mpe@ellerman.id.au, benh@kernel.crashing.org, borntraeger@de.ibm.com, frankja@linux.ibm.com, david@redhat.com, cohuck@redhat.com, heiko.carstens@de.ibm.com, gor@linux.ibm.com, sean.j.christopherson@intel.com, wanpengli@tencent.com, jmattson@google.com, joro@8bytes.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, hpa@zytor.com, maz@kernel.org, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, christoffer.dall@arm.com, peterx@redhat.com, thuth@redhat.com, chenhuacai@gmail.com Tianjia Zhang writes: > The 'kvm_run' field already exists in the 'vcpu' structure, which > is the same structure as the 'kvm_run' in the 'vcpu_arch' and > should be deleted. > > Signed-off-by: Tianjia Zhang > --- > arch/powerpc/include/asm/kvm_host.h | 1 - > arch/powerpc/kvm/book3s_hv.c | 6 ++---- > arch/powerpc/kvm/book3s_hv_nested.c | 3 +-- > 3 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h > index 1dc63101ffe1..2745ff8faa01 100644 > --- a/arch/powerpc/include/asm/kvm_host.h > +++ b/arch/powerpc/include/asm/kvm_host.h > @@ -795,7 +795,6 @@ struct kvm_vcpu_arch { > struct mmio_hpte_cache_entry *pgfault_cache; > > struct task_struct *run_task; > - struct kvm_run *kvm_run; > > spinlock_t vpa_update_lock; > struct kvmppc_vpa vpa; > diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c > index 93493f0cbfe8..413ea2dcb10c 100644 > --- a/arch/powerpc/kvm/book3s_hv.c > +++ b/arch/powerpc/kvm/book3s_hv.c > @@ -2934,7 +2934,7 @@ static void post_guest_process(struct kvmppc_vcore *vc, bool is_master) > > ret = RESUME_GUEST; > if (vcpu->arch.trap) > - ret = kvmppc_handle_exit_hv(vcpu->arch.kvm_run, vcpu, > + ret = kvmppc_handle_exit_hv(vcpu->run, vcpu, > vcpu->arch.run_task); > > vcpu->arch.ret = ret; > @@ -3920,7 +3920,6 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) > spin_lock(&vc->lock); > vcpu->arch.ceded = 0; > vcpu->arch.run_task = current; > - vcpu->arch.kvm_run = kvm_run; > vcpu->arch.stolen_logged = vcore_stolen_time(vc, mftb()); > vcpu->arch.state = KVMPPC_VCPU_RUNNABLE; > vcpu->arch.busy_preempt = TB_NIL; > @@ -3973,7 +3972,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) > if (signal_pending(v->arch.run_task)) { > kvmppc_remove_runnable(vc, v); > v->stat.signal_exits++; > - v->arch.kvm_run->exit_reason = KVM_EXIT_INTR; > + v->run->exit_reason = KVM_EXIT_INTR; > v->arch.ret = -EINTR; > wake_up(&v->arch.cpu_run); > } > @@ -4049,7 +4048,6 @@ int kvmhv_run_single_vcpu(struct kvm_run *kvm_run, > vc = vcpu->arch.vcore; > vcpu->arch.ceded = 0; > vcpu->arch.run_task = current; > - vcpu->arch.kvm_run = kvm_run; > vcpu->arch.stolen_logged = vcore_stolen_time(vc, mftb()); > vcpu->arch.state = KVMPPC_VCPU_RUNNABLE; > vcpu->arch.busy_preempt = TB_NIL; > diff --git a/arch/powerpc/kvm/book3s_hv_nested.c b/arch/powerpc/kvm/book3s_hv_nested.c > index dc97e5be76f6..5a3987f3ebf3 100644 > --- a/arch/powerpc/kvm/book3s_hv_nested.c > +++ b/arch/powerpc/kvm/book3s_hv_nested.c > @@ -290,8 +290,7 @@ long kvmhv_enter_nested_guest(struct kvm_vcpu *vcpu) > r = RESUME_HOST; > break; > } > - r = kvmhv_run_single_vcpu(vcpu->arch.kvm_run, vcpu, hdec_exp, > - lpcr); > + r = kvmhv_run_single_vcpu(vcpu->run, vcpu, hdec_exp, lpcr); > } while (is_kvmppc_resume_guest(r)); > > /* save L2 state for return */ FWIW, Reviewed-by: Vitaly Kuznetsov -- Vitaly