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=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,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 96882C433B4 for ; Thu, 22 Apr 2021 09:51:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6281F60238 for ; Thu, 22 Apr 2021 09:51:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230341AbhDVJvm (ORCPT ); Thu, 22 Apr 2021 05:51:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:54197 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234773AbhDVJvk (ORCPT ); Thu, 22 Apr 2021 05:51:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619085065; 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=DL0LvSptSw1OR4qFWXug2ce4aufBqHnVMVGyRJFHbIA=; b=axty2cdODH4fwdxLxf/bqyUaK5pW6U+LM3/BBDdfnlm0hIb5meup15R35MGTPrNRYwbnMM I+l2DSA9aUKGRF0+gm5WxD11emDkvDH042XsV12/fccgz8CmVEhRaHPWZ5YV6La/wjO3xk KI16jZwB/wnjo6PhptLm2IvWUzhAU5k= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-274-hfg8RlnwP42J5Cymk0vGrg-1; Thu, 22 Apr 2021 05:51:02 -0400 X-MC-Unique: hfg8RlnwP42J5Cymk0vGrg-1 Received: by mail-ed1-f72.google.com with SMTP id m18-20020a0564025112b0290378d2a266ebso16425911edd.15 for ; Thu, 22 Apr 2021 02:51:02 -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=DL0LvSptSw1OR4qFWXug2ce4aufBqHnVMVGyRJFHbIA=; b=hQfW8StRyxRcCDyflVvAmTSNY+Cjk4Csv63/H4zvtksnZID+Tf4PagHaaZrGJrwhew llY8sEAcUfnkCaUr9O+PHWD4tzuBIi4rhDYes40uZ907XvTUvleHu5qRD5Z8Lt8A1yEw sk02iir6rL1cXU4SDd4BkqZZivgN1h0zBMELoLwNfzXUcbk6HT+EIk8VukS5q94vrbtr JWfSz7vK3SYy8CfBu2c2pyc6lt6XtMOUk10ctU5XyihDwOCgzXyHENZmIxN+Pi/NAIaO iapX8t/wr8wgbH6lFsXjivNv+KSfgsfjl2V4yzcOkfJ4PD7+cHvCHp0STm0YkZgLI0ca x/hg== X-Gm-Message-State: AOAM531DCDdToC3kZUpMcFHeUrTvFIvIPvz+p4lpEKuyEx6sTVCrQ25Y syOr4672j5HkB+WEGxEWPkItaB/bj7UxJs5m8utVEunoxotlnn2Af7M3KJFE3KNxHDbPHLGsuLk y2aWf4JQx9FtpobGzsiR+i3f+ X-Received: by 2002:a17:906:b104:: with SMTP id u4mr2464640ejy.211.1619085061441; Thu, 22 Apr 2021 02:51:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw7MByC5DDDsRQtir8pa2yWMLJwpIC7olJd5ApG1r7karH2maV0p/pxOZNSl2zWI2710X64CQ== X-Received: by 2002:a17:906:b104:: with SMTP id u4mr2464626ejy.211.1619085061232; Thu, 22 Apr 2021 02:51:01 -0700 (PDT) Received: from vitty.brq.redhat.com (g-server-2.ign.cz. [91.219.240.2]) by smtp.gmail.com with ESMTPSA id l9sm1464525ejz.96.2021.04.22.02.51.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Apr 2021 02:51:00 -0700 (PDT) From: Vitaly Kuznetsov To: Sean Christopherson Cc: Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Babu Moger , Joao Martins , David Woodhouse , Paolo Bonzini Subject: Re: [PATCH v2 7/9] KVM: x86/xen: Drop RAX[63:32] when processing hypercall In-Reply-To: <20210422022128.3464144-8-seanjc@google.com> References: <20210422022128.3464144-1-seanjc@google.com> <20210422022128.3464144-8-seanjc@google.com> Date: Thu, 22 Apr 2021 11:51:00 +0200 Message-ID: <877dkuhcl7.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sean Christopherson writes: > Truncate RAX to 32 bits, i.e. consume EAX, when retrieving the hypecall > index for a Xen hypercall. Per Xen documentation[*], the index is EAX > when the vCPU is not in 64-bit mode. > > [*] http://xenbits.xenproject.org/docs/sphinx-unstable/guest-guide/x86/hypercall-abi.html > > Fixes: 23200b7a30de ("KVM: x86/xen: intercept xen hypercalls if enabled") > Cc: Joao Martins > Cc: David Woodhouse > Cc: stable@vger.kernel.org > Signed-off-by: Sean Christopherson > --- > arch/x86/kvm/xen.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c > index ae17250e1efe..7f27bb65a572 100644 > --- a/arch/x86/kvm/xen.c > +++ b/arch/x86/kvm/xen.c > @@ -673,7 +673,7 @@ int kvm_xen_hypercall(struct kvm_vcpu *vcpu) > bool longmode; > u64 input, params[6]; > > - input = (u64)kvm_register_read(vcpu, VCPU_REGS_RAX); > + input = (u64)kvm_register_readl(vcpu, VCPU_REGS_RAX); > > /* Hyper-V hypercalls get bit 31 set in EAX */ > if ((input & 0x80000000) && Reviewed-by: Vitaly Kuznetsov Alternatively, as a minor optimization, you could've used '!longmode' check below, something like: diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c index ae17250e1efe..7df1498d3a41 100644 --- a/arch/x86/kvm/xen.c +++ b/arch/x86/kvm/xen.c @@ -682,6 +682,7 @@ int kvm_xen_hypercall(struct kvm_vcpu *vcpu) longmode = is_64_bit_mode(vcpu); if (!longmode) { + input = (u32)input; params[0] = (u32)kvm_rbx_read(vcpu); params[1] = (u32)kvm_rcx_read(vcpu); params[2] = (u32)kvm_rdx_read(vcpu); -- Vitaly