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 9F353C433FE for ; Wed, 20 Oct 2021 19:27:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 887536128E for ; Wed, 20 Oct 2021 19:27:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231627AbhJTT3y (ORCPT ); Wed, 20 Oct 2021 15:29:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:45949 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231584AbhJTT3x (ORCPT ); Wed, 20 Oct 2021 15:29:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634758058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b/4ClaGPce98clySe9ZIAKLRy0wYjW109FvVZi3a8UE=; b=cRJlgWTxaxw+3rBiWsZj1oIfFHi8nGhaL71kNWvRapfp2x+QJy8WAueHObL07Y1nOBPRgP Nfszmj5IgvzmZQN/POpy3wzaPJuVs0HduXHNMav4/SLRe6RcP2RY0dbX1/ddHbZ7d3AQmn Q1svEg3BWLXSzG9S2oZBeadv5gMbY+o= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-538-PvrvxCLePNuJeqxtIghQ3w-1; Wed, 20 Oct 2021 15:27:35 -0400 X-MC-Unique: PvrvxCLePNuJeqxtIghQ3w-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 168481006AAA; Wed, 20 Oct 2021 19:27:34 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7FE3D69FBB; Wed, 20 Oct 2021 19:27:33 +0000 (UTC) From: Paolo Bonzini To: kvm@vger.kernel.org Cc: jmattson@google.com, zxwang42@gmail.com, marcorr@google.com, seanjc@google.com, jroedel@suse.de, varad.gautam@suse.com Subject: [PATCH v2 kvm-unit-tests 1/2] unify field names and definitions for GDT descriptors Date: Wed, 20 Oct 2021 15:27:31 -0400 Message-Id: <20211020192732.960782-2-pbonzini@redhat.com> In-Reply-To: <20211020192732.960782-1-pbonzini@redhat.com> References: <20211020192732.960782-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Use the same names and definitions (apart from the high base field) for GDT descriptors in both 32-bit and 64-bit code. The next patch will also reuse gdt_entry_t in the 16-byte struct definition, for now some duplication remains. Signed-off-by: Paolo Bonzini --- lib/x86/desc.c | 16 ++++++---------- lib/x86/desc.h | 28 +++++++++++++++++++++------- x86/taskswitch.c | 2 +- 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/lib/x86/desc.c b/lib/x86/desc.c index e7378c1..3d38565 100644 --- a/lib/x86/desc.c +++ b/lib/x86/desc.c @@ -285,17 +285,13 @@ void set_gdt_entry(int sel, u32 base, u32 limit, u8 access, u8 gran) int num = sel >> 3; /* Setup the descriptor base address */ - gdt32[num].base_low = (base & 0xFFFF); - gdt32[num].base_middle = (base >> 16) & 0xFF; - gdt32[num].base_high = (base >> 24) & 0xFF; + gdt32[num].base1 = (base & 0xFFFF); + gdt32[num].base2 = (base >> 16) & 0xFF; + gdt32[num].base3 = (base >> 24) & 0xFF; - /* Setup the descriptor limits */ - gdt32[num].limit_low = (limit & 0xFFFF); - gdt32[num].granularity = ((limit >> 16) & 0x0F); - - /* Finally, set up the granularity and access flags */ - gdt32[num].granularity |= (gran & 0xF0); - gdt32[num].access = access; + /* Setup the descriptor limits, granularity and flags */ + gdt32[num].limit1 = (limit & 0xFFFF); + gdt32[num].type_limit_flags = ((limit & 0xF0000) >> 8) | ((gran & 0xF0) << 8) | access; } void set_gdt_task_gate(u16 sel, u16 tss_sel) diff --git a/lib/x86/desc.h b/lib/x86/desc.h index a6ffb38..0af37e3 100644 --- a/lib/x86/desc.h +++ b/lib/x86/desc.h @@ -164,14 +164,27 @@ typedef struct { } idt_entry_t; typedef struct { - u16 limit_low; - u16 base_low; - u8 base_middle; - u8 access; - u8 granularity; - u8 base_high; -} gdt_entry_t; + uint16_t limit1; + uint16_t base1; + uint8_t base2; + union { + uint16_t type_limit_flags; /* Type and limit flags */ + struct { + uint16_t type:4; + uint16_t s:1; + uint16_t dpl:2; + uint16_t p:1; + uint16_t limit:4; + uint16_t avl:1; + uint16_t l:1; + uint16_t db:1; + uint16_t g:1; + } __attribute__((__packed__)); + } __attribute__((__packed__)); + uint8_t base3; +} __attribute__((__packed__)) gdt_entry_t; +#ifdef __x86_64__ struct segment_desc64 { uint16_t limit1; uint16_t base1; @@ -194,6 +207,7 @@ struct segment_desc64 { uint32_t base4; uint32_t zero; } __attribute__((__packed__)); +#endif #define DESC_BUSY ((uint64_t) 1 << 41) diff --git a/x86/taskswitch.c b/x86/taskswitch.c index 889831e..b6b3451 100644 --- a/x86/taskswitch.c +++ b/x86/taskswitch.c @@ -21,7 +21,7 @@ fault_handler(unsigned long error_code) tss.eip += 2; - gdt32[TSS_MAIN / 8].access &= ~2; + gdt32[TSS_MAIN / 8].type &= ~2; set_gdt_task_gate(TSS_RETURN, tss_intr.prev); } -- 2.27.0