Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp5103704ybl; Tue, 4 Feb 2020 07:46:55 -0800 (PST) X-Google-Smtp-Source: APXvYqzzYrSfV+2ZRUID4iPj/iy1ujL4+xG8oCrF4obczj/jiMGYZYN1i+kW05Z/LhChXv084OsD X-Received: by 2002:a05:6830:1385:: with SMTP id d5mr23438932otq.61.1580831215129; Tue, 04 Feb 2020 07:46:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580831215; cv=none; d=google.com; s=arc-20160816; b=ht2X+bHLHQs754R02xS0bRgVYEjwuY/NoAm/vE6wtZGu5fUF1V6iLuELSrBHiipp/l ISL9xIdUIt6B82+DTFgI5UKdLTlKIGNPaspy3AsVGKmaAgLxky6NkA1SiqZpiwkHDPVv z12gB+DLduRFzxcFVz95d1qSG1ftDHPi/h4e3FEYGK6zpuyxxBpPza0rnOBpHTK7qRZP n5raZLTwuL+MNIcPHCtNlcEpGLGzpmBevyfK0EXpz5U6yeCpgJXhLUHrLRRS/Obx4zaT 290FSeQqYAcnlXYBWqevDpVcHs5+MyjyQEUKJ9uTRCOmZ/a8dAYQM3eOO8/17WdxER3S gHVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:dkim-signature; bh=0vwXFSaSl40J1FkNNvku6P1ALhyHoP4TEE129R0MITY=; b=csP9FE8CiSdjXCURfps9oOm1nV0sCV4In1at6/qrMDhuf84u+hY7MqXtpqy5a8boe3 H+yj/s5I1l09uXjrZdecdflfkgYpxRPj5/vrBPSJ7AXJ2fID7jIGVzac2wiuNstAt3kB I2n426OUlkz2L1rBwnSYFOy3Hm4ErNP+h/yxKX/4LCVRiNTkg9NIZ8l7zTBIqgfQK5Iz G3xp4wTuSStfG2Ym7ngggC3sGn9GeDBNVAq6HyxJ1YruW4O2lQj2Mfjqi46qG1pIsUJz Y/bShS4HT5qOgPouARJfO+1dyV3KpNhTSt9Gd8ReOBIKKEwNYuJkj5uMFpX6Qrvqmo9X +x5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="dbL7/Auz"; 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=pass (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 25si10363817oiz.230.2020.02.04.07.46.42; Tue, 04 Feb 2020 07:46:55 -0800 (PST) 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; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="dbL7/Auz"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727385AbgBDPo3 (ORCPT + 99 others); Tue, 4 Feb 2020 10:44:29 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:54060 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727290AbgBDPo3 (ORCPT ); Tue, 4 Feb 2020 10:44:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580831068; 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=0vwXFSaSl40J1FkNNvku6P1ALhyHoP4TEE129R0MITY=; b=dbL7/AuzHq9bCrQ/9I4Mt0hrHh9gecgLi3gRzXmnBdGvxOY3fHwFI9CPU3IB4HYxiFNIET DZnWEhyVxlSyRubSkQzrqxH6WkZBtGcjH9uD6odNeMIHpt+6BI/P4Bh+rd/FWLzTiB6z+Z ooBNf8hHHKjWuvKhmzPOJpdiIuwY2CQ= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-281-hLpSkTMJMded1P6Xlb99fw-1; Tue, 04 Feb 2020 10:44:26 -0500 X-MC-Unique: hLpSkTMJMded1P6Xlb99fw-1 Received: by mail-wr1-f70.google.com with SMTP id 90so10466949wrq.6 for ; Tue, 04 Feb 2020 07:44:26 -0800 (PST) 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=0vwXFSaSl40J1FkNNvku6P1ALhyHoP4TEE129R0MITY=; b=GHx+xc7upegbnM6W+rb1df3FIIdOi9crFPN+3mu9Hf+NUaaMMXRK8z8xLyP6noSGi4 5S9s7Z/r4CUxWct6RQXFz5vLoG/HzH7wKgHuxCx7nURiQ9c83hcnHERnuqQ4ieH5Y5AN I07GaFuKrLGhLO/s62K3YxgAod907mUSEvk/h1omx8m0oS5knuTLUAMOIec9Rek8nmci mHIX6z9zzjdp9ZqT3XLUgDtG497ib218afqtf9HKikq60yiFz6O9E6Dg/JHvVnKyfO7L W+81VmncjU5HwtKvik/HmR4Nj9z3kbyM4x+FhosnVcJYE5g7umZZoni+NwKI/fzX75iN +M9A== X-Gm-Message-State: APjAAAXwyl0SjLxaOdoF4t8AWHT3oHckx05QPjUzBzSbzL1UORVO4QZ1 YhBb1TuhrMMtP5KKXSkxmeL1d8aRGCnq3+RnCjoIby9KH3Q5P2VuEzsydBuiDNxOe04Fxq+SvhW xsArgkNl6gUPjna58DO4/4IUD X-Received: by 2002:adf:f58a:: with SMTP id f10mr24341724wro.105.1580831065883; Tue, 04 Feb 2020 07:44:25 -0800 (PST) X-Received: by 2002:adf:f58a:: with SMTP id f10mr24341714wro.105.1580831065692; Tue, 04 Feb 2020 07:44:25 -0800 (PST) Received: from vitty.brq.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id i204sm4499498wma.44.2020.02.04.07.44.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2020 07:44:24 -0800 (PST) From: Vitaly Kuznetsov To: Eric Auger Cc: thuth@redhat.com, drjones@redhat.com, wei.huang2@amd.com, eric.auger.pro@gmail.com, eric.auger@redhat.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, pbonzini@redhat.com Subject: Re: [PATCH v3 1/3] selftests: KVM: Replace get_gdt/idt_base() by get_gdt/idt() In-Reply-To: <20200204150040.2465-2-eric.auger@redhat.com> References: <20200204150040.2465-1-eric.auger@redhat.com> <20200204150040.2465-2-eric.auger@redhat.com> Date: Tue, 04 Feb 2020 16:44:23 +0100 Message-ID: <87r1zamk6g.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 Eric Auger writes: > get_gdt_base() and get_idt_base() only return the base address > of the descriptor tables. Soon we will need to get the size as well. > Change the prototype of those functions so that they return > the whole desc_ptr struct instead of the address field. > > Signed-off-by: Eric Auger > --- > tools/testing/selftests/kvm/include/x86_64/processor.h | 8 ++++---- > tools/testing/selftests/kvm/lib/x86_64/vmx.c | 6 +++--- > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/tools/testing/selftests/kvm/include/x86_64/processor.h b/tools/testing/selftests/kvm/include/x86_64/processor.h > index aa6451b3f740..6f7fffaea2e8 100644 > --- a/tools/testing/selftests/kvm/include/x86_64/processor.h > +++ b/tools/testing/selftests/kvm/include/x86_64/processor.h > @@ -220,20 +220,20 @@ static inline void set_cr4(uint64_t val) > __asm__ __volatile__("mov %0, %%cr4" : : "r" (val) : "memory"); > } > > -static inline uint64_t get_gdt_base(void) > +static inline struct desc_ptr get_gdt(void) > { > struct desc_ptr gdt; > __asm__ __volatile__("sgdt %[gdt]" > : /* output */ [gdt]"=m"(gdt)); > - return gdt.address; > + return gdt; > } > > -static inline uint64_t get_idt_base(void) > +static inline struct desc_ptr get_idt(void) > { > struct desc_ptr idt; > __asm__ __volatile__("sidt %[idt]" > : /* output */ [idt]"=m"(idt)); > - return idt.address; > + return idt; > } > > #define SET_XMM(__var, __xmm) \ > diff --git a/tools/testing/selftests/kvm/lib/x86_64/vmx.c b/tools/testing/selftests/kvm/lib/x86_64/vmx.c > index 85064baf5e97..7aaa99ca4dbc 100644 > --- a/tools/testing/selftests/kvm/lib/x86_64/vmx.c > +++ b/tools/testing/selftests/kvm/lib/x86_64/vmx.c > @@ -288,9 +288,9 @@ static inline void init_vmcs_host_state(void) > vmwrite(HOST_FS_BASE, rdmsr(MSR_FS_BASE)); > vmwrite(HOST_GS_BASE, rdmsr(MSR_GS_BASE)); > vmwrite(HOST_TR_BASE, > - get_desc64_base((struct desc64 *)(get_gdt_base() + get_tr()))); > - vmwrite(HOST_GDTR_BASE, get_gdt_base()); > - vmwrite(HOST_IDTR_BASE, get_idt_base()); > + get_desc64_base((struct desc64 *)(get_gdt().address + get_tr()))); > + vmwrite(HOST_GDTR_BASE, get_gdt().address); > + vmwrite(HOST_IDTR_BASE, get_idt().address); > vmwrite(HOST_IA32_SYSENTER_ESP, rdmsr(MSR_IA32_SYSENTER_ESP)); > vmwrite(HOST_IA32_SYSENTER_EIP, rdmsr(MSR_IA32_SYSENTER_EIP)); > } Reviewed-by: Vitaly Kuznetsov -- Vitaly