From patchwork Fri Dec 27 13:03:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 11311159 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2325D138C for ; Fri, 27 Dec 2019 13:04:49 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E913E206CB for ; Fri, 27 Dec 2019 13:04:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="MwlK+bpV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E913E206CB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ikpHA-00087A-Im; Fri, 27 Dec 2019 13:03:32 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ikpH8-000875-V7 for xen-devel@lists.xenproject.org; Fri, 27 Dec 2019 13:03:30 +0000 X-Inumbo-ID: 3dc71c58-28a9-11ea-b6f1-bc764e2007e4 Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 3dc71c58-28a9-11ea-b6f1-bc764e2007e4; Fri, 27 Dec 2019 13:03:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1577451794; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Nz0iRwCBhvbOCNjhmIG2ueCEfbkuzaWxmNn4LiId/wM=; b=MwlK+bpVUp6y+YW0NfQensbNySMiKfAAdJvq7wiliq5Imfbsms+t0j59 I7/B6jAI3wgCx6hTaU7OiJBTXvVm9dwW7minA+WN0WFTVuE+Qj+ITe6Vx qEldS7RAQyVb//srHOhr/E/T7abSNWswdU8F3k4Hs1vPHAb3immpqJVnh Y=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa6.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: qfaZ0RqxZmeQcxt1yJBjRsUdMts8smtbgppL/N9i1wUd65UfZFwBkM1SkUqdBW/9ESOGIhtP8i HSYjn+Zwb+pXOdiQUYcHDH8M5w+sHtdn+M/k6JvY+wOLBEBBpMsS/zbHGpdmjSUkr6d6oaYAQo aH2wSrcTOt3URtPbK9EV9iNE5772KI709HgmxEgVkieUECzuM7yANPu9BjoN7Knu0QYT/4mh0k tDX6XXcyuBmRjV3xrveW5nD8KqP6LXdlS8I7/RpPsVEa7TFla8HAz8h4UVXI7l4rIMuqG4bBgK cHM= X-SBRS: 2.7 X-MesageID: 10617811 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.69,363,1571716800"; d="scan'208";a="10617811" From: Andrew Cooper To: Xen-devel Date: Fri, 27 Dec 2019 13:03:10 +0000 Message-ID: <20191227130310.27887-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH] x86/boot: Fold gdt_48 into the bottom of trampoline_gdt X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Wei Liu , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Saves 8 bytes in the trampoline. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Wei Liu CC: Roger Pau Monné --- xen/arch/x86/boot/trampoline.S | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/boot/trampoline.S b/xen/arch/x86/boot/trampoline.S index ef5baa31e0..4b9a9697e9 100644 --- a/xen/arch/x86/boot/trampoline.S +++ b/xen/arch/x86/boot/trampoline.S @@ -139,12 +139,13 @@ start64: .balign 8 .word 0 idt_48: .word 0, 0, 0 # base = limit = 0 - .word 0 -gdt_48: .word .Ltrampoline_gdt_end - trampoline_gdt - 1 - .long bootsym_rel(trampoline_gdt,4) trampoline_gdt: - .quad 0x0000000000000000 /* 0x0000: unused */ + .word 0 /* 0x0000: unused (reused for GDTR) */ +gdt_48: + .word .Ltrampoline_gdt_end - trampoline_gdt - 1 + .long bootsym_rel(trampoline_gdt, 4) + .quad 0x00cf9b000000ffff /* 0x0008: ring 0 code, 32-bit mode */ .quad 0x00af9b000000ffff /* 0x0010: ring 0 code, 64-bit mode */ .quad 0x00cf93000000ffff /* 0x0018: ring 0 data */