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=-18.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL 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 3FCBEC43460 for ; Tue, 6 Apr 2021 15:11:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1AFE561246 for ; Tue, 6 Apr 2021 15:11:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345511AbhDFPLu (ORCPT ); Tue, 6 Apr 2021 11:11:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242532AbhDFPLr (ORCPT ); Tue, 6 Apr 2021 11:11:47 -0400 Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C39FC061756 for ; Tue, 6 Apr 2021 08:11:39 -0700 (PDT) Received: by mail-pg1-x52a.google.com with SMTP id b17so6927585pgh.7 for ; Tue, 06 Apr 2021 08:11:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=wMg1tXo5GvHCGxwhu8OpzGcHgBM3RWJCydSk6NMOEDA=; b=lQ+a9APS5AQlbbgHxBC5O48i5WwOH3t4pPGoOaG0U4ShcakCjIsOZlN8WwqQ42U9Nl JUh5cWmm4FlbKBS7ZMHp5rmwIK+HvVD8gYudjaVLQDc6eahkVwjA3l2g4AtBJnt/GvGI 6Ott5YFVpUR2P2xiFDk1LRipYxhtktoNn7J9HX3HyvZgY2BKDVMNzkmbVx6Q02NZZ1dt MXVMbRyVx2swtq4jwmACZwppxBsIFzX4AUgqabdamawz9trDfXz4CCHeO769Tv5WnCwj v/hYDDK/lEfreugbDKEH8PgKnhOVsWAXY5VspwlbPN8EGmPIjTzinjgQfB4Tt9TqtZ+l 8EVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=wMg1tXo5GvHCGxwhu8OpzGcHgBM3RWJCydSk6NMOEDA=; b=tP+iZnjFyq9PsxBaEJP7sSFry1gtMmVg/1ajD2+FEuPmLgfLoU9iTkWqB67iT6yRNm 3I5hGjYT3IRy28ipdZ0S2/qdiP4kg1eXl06aKYFM9xlYZXw3CeqNbIZI5aItp/tA/hsD Tzn/1DgogGinH0CPnlvt/Cq3fnWQ783/XAOJCBjTF7Qry9RShtYorcQ+9XhXxxd8fL0B oEhJi8ap5/OfaP8A0jWiRF9EwY+27AIoLDv2fRa4ulEJ+O+q6KZ1gPN6HVyoIAT7iqgB vr+xZTct7PvZqWItYseACc1gIOKSD+cNu/XxZRkPdKG9x+dJdAsqkBRo1VrJIfPmXIst zzew== X-Gm-Message-State: AOAM532+VmNHBq2153SiuUexhQRTByRXuaAriuD+Q5uxFja91mbeITxy HAxlaonFxBfD3jHSkKt4LHrhrA== X-Google-Smtp-Source: ABdhPJxZN10dqOxUDE5yq5Wyrimzq5bW7D/DDvbtu3+EqSK2qvD+9Tv2uh+u84Yon5Nj4QEJCUOvaQ== X-Received: by 2002:a05:6a00:1ad4:b029:216:aa9d:dcea with SMTP id f20-20020a056a001ad4b0290216aa9ddceamr27645348pfv.47.1617721898770; Tue, 06 Apr 2021 08:11:38 -0700 (PDT) Received: from google.com (240.111.247.35.bc.googleusercontent.com. [35.247.111.240]) by smtp.gmail.com with ESMTPSA id t1sm2839175pjo.45.2021.04.06.08.11.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Apr 2021 08:11:37 -0700 (PDT) Date: Tue, 6 Apr 2021 15:11:34 +0000 From: Sean Christopherson To: Ashish Kalra Cc: Steve Rutherford , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Joerg Roedel , Borislav Petkov , Tom Lendacky , X86 ML , KVM list , LKML , Venu Busireddy , Brijesh Singh , Will Deacon , maz@kernel.org, Quentin Perret Subject: Re: [PATCH v11 08/13] KVM: X86: Introduce KVM_HC_PAGE_ENC_STATUS hypercall Message-ID: References: <4da0d40c309a21ba3952d06f346b6411930729c9.1617302792.git.ashish.kalra@amd.com> <20210406062248.GA22937@ashkalra_ubuntu_server> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210406062248.GA22937@ashkalra_ubuntu_server> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Apr 06, 2021, Ashish Kalra wrote: > On Mon, Apr 05, 2021 at 01:42:42PM -0700, Steve Rutherford wrote: > > On Mon, Apr 5, 2021 at 7:28 AM Ashish Kalra wrote: > > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > > > index f7d12fca397b..ef5c77d59651 100644 > > > --- a/arch/x86/kvm/x86.c > > > +++ b/arch/x86/kvm/x86.c > > > @@ -8273,6 +8273,18 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu) > > > kvm_sched_yield(vcpu->kvm, a0); > > > ret = 0; > > > break; > > > + case KVM_HC_PAGE_ENC_STATUS: { > > > + int r; > > > + > > > + ret = -KVM_ENOSYS; > > > + if (kvm_x86_ops.page_enc_status_hc) { > > > + r = kvm_x86_ops.page_enc_status_hc(vcpu, a0, a1, a2); > > > + if (r >= 0) > > > + return r; > > > + ret = r; > > Style nit: Why not just set ret, and return ret if ret >=0? > > > > But ret is "unsigned long", if i set ret and return, then i will return to guest > even in case of error above ? As proposed, svm_page_enc_status_hc() already hooks complete_userspace_io(), so this could be hoisted out of the switch statement. diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 16fb39503296..794dde3adfab 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -8261,6 +8261,10 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu) goto out; } + /* comment goes here */ + if (nr == KVM_HC_PAGE_ENC_STATUS && kvm_x86_ops.page_enc_status_hc) + return static_call(kvm_x86_page_enc_status_hc(vcpu, a0, a1, a2)); + ret = -KVM_ENOSYS; switch (nr) {