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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8CC6CC433EF for ; Mon, 4 Oct 2021 08:19:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 77A1F6124C for ; Mon, 4 Oct 2021 08:19:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231233AbhJDIV2 (ORCPT ); Mon, 4 Oct 2021 04:21:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41338 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231229AbhJDIVW (ORCPT ); Mon, 4 Oct 2021 04:21:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633335568; 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=bN5QvHIJyGEQLQUq3qeSzwte5zqrib25h9U6MkoN11c=; b=dFZCfJB1/vNKO6bnvZheP9Gnj3ql2C/3WkZJW4TVMUFoNLjjtN3MwE/8ERLdaTu5VYg2HV yTvythpIUa/PPAkzX0YrW3mGoMPLnWgXJ3801GH6pxvCClnILRHCFgfXaQvcV9KJbsacZl WZj1pPRElDVVLwc4GfcWJid62G0+dDk= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-215-OLkLFwv7PtCtIlpmoF_goQ-1; Mon, 04 Oct 2021 04:19:25 -0400 X-MC-Unique: OLkLFwv7PtCtIlpmoF_goQ-1 Received: by mail-ed1-f71.google.com with SMTP id m20-20020aa7c2d4000000b003d1add00b8aso16465813edp.0 for ; Mon, 04 Oct 2021 01:19:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=bN5QvHIJyGEQLQUq3qeSzwte5zqrib25h9U6MkoN11c=; b=Co6c8lprDw6P944RahWAWEa6FTKrdAQRDjN7/fCDi54FUtP1NSJyZbMCK+wGaGmScf KA1XdA9OQob5RQkem3vYyFeEC5HQ6gtOI2EtbUXAPNFV+07g8YF03x8Q8LgNny6TedPe H9e/jKU4Q1MEaPILT5MkHa9xt6pMPq18fWPWf+S9qL+JfaJXqKzuMELnvnhyDpjB/E0b aVDeISzBz1b6U+vV4oaoQPWmjiHaQtFqYD7WXPl6PxNfC+f96M40iqeL64ZQdesmSwtq 0FY7/6maDwQtVcfj5B2mZkjhpjLBCBnQnNCKzAmb+eJYKppo67tb697UBrrM2uM0uxFJ 5Z1g== X-Gm-Message-State: AOAM533Wml6bzVmm4VUlY51v+/nMsJPWuEO0ulODG6rvOe33+NaEMdho hlz/Ass5HJhpvg8QmXb44vX4lLiJmBoFLCmvCCxp6CSiFe0fVFCovT1VatSHfJUT1xlcn9bh3Aq f7JdvdS9MlcRY X-Received: by 2002:a05:6402:3133:: with SMTP id dd19mr16994647edb.172.1633335564509; Mon, 04 Oct 2021 01:19:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBhF4FwsUP4iOjbFWBnvAEoKJKpZZrsb6YyGy3NvjZ0mIJUpS1ews6+9+BjKYDpFDl1JzbGQ== X-Received: by 2002:a05:6402:3133:: with SMTP id dd19mr16994619edb.172.1633335564242; Mon, 04 Oct 2021 01:19:24 -0700 (PDT) Received: from ?IPV6:2001:b07:6468:f312:c8dd:75d4:99ab:290a? ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id d22sm6204775ejk.5.2021.10.04.01.19.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 04 Oct 2021 01:19:23 -0700 (PDT) Message-ID: <84e1213b-c6c0-85a4-0d3e-854cd3dc0fa0@redhat.com> Date: Mon, 4 Oct 2021 10:19:12 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.1.0 Subject: Re: [PATCH v3 13/22] target/i386/sev: Remove stubs by using code elision Content-Language: en-US To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org Cc: Brijesh Singh , kvm@vger.kernel.org, Sergio Lopez , James Bottomley , "Dr . David Alan Gilbert" , Dov Murik , "Daniel P . Berrange" , Eduardo Habkost References: <20211002125317.3418648-1-philmd@redhat.com> <20211002125317.3418648-14-philmd@redhat.com> From: Paolo Bonzini In-Reply-To: <20211002125317.3418648-14-philmd@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On 02/10/21 14:53, Philippe Mathieu-Daudé wrote: > Only declare sev_enabled() and sev_es_enabled() when CONFIG_SEV is > set, to allow the compiler to elide unused code. Remove unnecessary > stubs. > > Signed-off-by: Philippe Mathieu-Daudé > --- > include/sysemu/sev.h | 14 +++++++++++++- > target/i386/sev_i386.h | 3 --- > target/i386/cpu.c | 16 +++++++++------- > target/i386/sev-stub.c | 36 ------------------------------------ > target/i386/meson.build | 2 +- > 5 files changed, 23 insertions(+), 48 deletions(-) > delete mode 100644 target/i386/sev-stub.c > > diff --git a/include/sysemu/sev.h b/include/sysemu/sev.h > index a329ed75c1c..f5c625bb3b3 100644 > --- a/include/sysemu/sev.h > +++ b/include/sysemu/sev.h > @@ -14,9 +14,21 @@ > #ifndef QEMU_SEV_H > #define QEMU_SEV_H > > -#include "sysemu/kvm.h" > +#ifndef CONFIG_USER_ONLY > +#include CONFIG_DEVICES /* CONFIG_SEV */ > +#endif > > +#ifdef CONFIG_SEV > bool sev_enabled(void); > +bool sev_es_enabled(void); > +#else > +#define sev_enabled() 0 > +#define sev_es_enabled() 0 > +#endif This means that sev.h can only be included from target-specific files. An alternative could be: #ifdef NEED_CPU_H # include CONFIG_DEVICES #endif #if defined NEED_CPU_H && !defined CONFIG_SEV # define sev_enabled() 0 # define sev_es_enabled() 0 #else bool sev_enabled(void); bool sev_es_enabled(void); #endif ... but in fact sysemu/sev.h _is_ only used from x86-specific files. So should it be moved to include/hw/i386, and even merged with target/i386/sev_i386.h? Do we need two files? Thanks, Paolo > +uint32_t sev_get_cbit_position(void); > +uint32_t sev_get_reduced_phys_bits(void); > + > int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp); > > #endif > diff --git a/target/i386/sev_i386.h b/target/i386/sev_i386.h > index 0798ab3519a..2d9a1a0112e 100644 > --- a/target/i386/sev_i386.h > +++ b/target/i386/sev_i386.h > @@ -24,10 +24,7 @@ > #define SEV_POLICY_DOMAIN 0x10 > #define SEV_POLICY_SEV 0x20 > > -extern bool sev_es_enabled(void); > extern SevInfo *sev_get_info(void); > -extern uint32_t sev_get_cbit_position(void); > -extern uint32_t sev_get_reduced_phys_bits(void); > extern char *sev_get_launch_measurement(void); > extern SevCapability *sev_get_capabilities(Error **errp); > extern SevAttestationReport * > diff --git a/target/i386/cpu.c b/target/i386/cpu.c > index e169a01713d..27992bdc9f8 100644 > --- a/target/i386/cpu.c > +++ b/target/i386/cpu.c > @@ -25,8 +25,8 @@ > #include "tcg/helper-tcg.h" > #include "sysemu/reset.h" > #include "sysemu/hvf.h" > +#include "sysemu/sev.h" > #include "kvm/kvm_i386.h" > -#include "sev_i386.h" > #include "qapi/error.h" > #include "qapi/qapi-visit-machine.h" > #include "qapi/qmp/qerror.h" > @@ -38,6 +38,7 @@ > #include "exec/address-spaces.h" > #include "hw/boards.h" > #include "hw/i386/sgx-epc.h" > +#include "sev_i386.h" > #endif > > #include "disas/capstone.h" > @@ -5764,12 +5765,13 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, > *edx = 0; > break; > case 0x8000001F: > - *eax = sev_enabled() ? 0x2 : 0; > - *eax |= sev_es_enabled() ? 0x8 : 0; > - *ebx = sev_get_cbit_position(); > - *ebx |= sev_get_reduced_phys_bits() << 6; > - *ecx = 0; > - *edx = 0; > + *eax = *ebx = *ecx = *edx = 0; > + if (sev_enabled()) { > + *eax = 0x2; > + *eax |= sev_es_enabled() ? 0x8 : 0; > + *ebx = sev_get_cbit_position(); > + *ebx |= sev_get_reduced_phys_bits() << 6; > + } > break; > default: > /* reserved values: zero */ > diff --git a/target/i386/sev-stub.c b/target/i386/sev-stub.c > deleted file mode 100644 > index 8eae5d2fa8d..00000000000 > --- a/target/i386/sev-stub.c > +++ /dev/null > @@ -1,36 +0,0 @@ > -/* > - * QEMU SEV stub > - * > - * Copyright Advanced Micro Devices 2018 > - * > - * Authors: > - * Brijesh Singh > - * > - * This work is licensed under the terms of the GNU GPL, version 2 or later. > - * See the COPYING file in the top-level directory. > - * > - */ > - > -#include "qemu/osdep.h" > -#include "qapi/error.h" > -#include "sev_i386.h" > - > -bool sev_enabled(void) > -{ > - return false; > -} > - > -uint32_t sev_get_cbit_position(void) > -{ > - return 0; > -} > - > -uint32_t sev_get_reduced_phys_bits(void) > -{ > - return 0; > -} > - > -bool sev_es_enabled(void) > -{ > - return false; > -} > diff --git a/target/i386/meson.build b/target/i386/meson.build > index a4f45c3ec1d..ae38dc95635 100644 > --- a/target/i386/meson.build > +++ b/target/i386/meson.build > @@ -6,7 +6,7 @@ > 'xsave_helper.c', > 'cpu-dump.c', > )) > -i386_ss.add(when: 'CONFIG_SEV', if_true: files('host-cpu.c'), if_false: files('sev-stub.c')) > +i386_ss.add(when: 'CONFIG_SEV', if_true: files('host-cpu.c')) > > # x86 cpu type > i386_ss.add(when: 'CONFIG_KVM', if_true: files('host-cpu.c')) >