Received: by 2002:a05:7208:9594:b0:7e:5202:c8b4 with SMTP id gs20csp1575724rbb; Mon, 26 Feb 2024 14:06:18 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWJtDbcQn5i9ESl7WnmLCaILi3x1zzereqswKLh6lD9vq7uLrYZLFn99Y0qNvbGH94fvt1p3JfusCtlfsITpAu/oG1tneAR3617UNoVKA== X-Google-Smtp-Source: AGHT+IF2cxgPeGZS/PpxqlhwTg3lcRwJGcb8aRbgTRZAL3g3MbB9PjCrHMQacjgBd0hJbKxljG8I X-Received: by 2002:a05:6402:28d:b0:565:b456:4357 with SMTP id l13-20020a056402028d00b00565b4564357mr4082836edv.20.1708985178557; Mon, 26 Feb 2024 14:06:18 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708985178; cv=pass; d=google.com; s=arc-20160816; b=IlmfggSUDZ0vZDyPV1XiZ6FuLHq1zchehpsGIxbLMYGZr5Be4eq2Dw03jgW7ROlICu o9ivzpDAE1tkqSkpCfP+EhBVAiMsN3I5YbNadKOxYHv2HoYAczEsAc18SWN/5cIuHnoQ zT5lHH0j0hnpyHSh9qvuz+4QDVd+mL6noTcSxq6p65QZ9j9k6P9lm60wW+6nGtjIiu+3 Tu0zDW9eAL+1fkqChuuyuy2KiP4J2GwmFH2QMgWGK/njS3FXutw81i0k1B/CcMo6gi/+ Var/RADrNjhdlbbCY8C+x+CwK7e8BA454fa5wjU1/9kfk743JiY9Jjo7W5jxDw9QoHlY boqQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=T5WmPlH+GeSSkC2r3zeNTmXAIzwepnNSeSNojo2GFVo=; fh=vwdQUKS3nNaq1WCA7s3Ch2OClKyb6ikG3TRiHx5kZCQ=; b=bzZ8ytuQK74fiNjZZJqk35wscOykeDUhH3KkkPMuy9d5KA0/iIcw1+cCyRj/Mn7Ok8 DvFfU/3g47xrMk/OvQ6/JVD6ZBddBDa4xSK2JUbpXOisXb2KX9DH00A+OWRoYxHQs1BA +pJql4hwkoeYbhx4EAq7q/eCfOcsbqW8vKyrLONErxk7YtHpF3xMEfLa1L2DUR25R/+V OMsDw19HAmA/8V5gOUFZI5oIjpKioPp61gvl4YJEUxDwJmHeGx2iEUirPgonCOK1+USS Rvo/YafkVza7ETLuVfiUnK/635RypBUlXeBYQvw/zyWBK6iPcOV/AUyT3KffVicoTLwO 6wxA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=T+NziswA; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-82378-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82378-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id df11-20020a05640230ab00b005647bed88b6si120480edb.258.2024.02.26.14.06.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 14:06:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-82378-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=T+NziswA; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-82378-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82378-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 51AE11F23C6A for ; Mon, 26 Feb 2024 22:06:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4C718132480; Mon, 26 Feb 2024 22:05:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="T+NziswA" Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 08647131E3F for ; Mon, 26 Feb 2024 22:05:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708985156; cv=none; b=F2KtIICvEH6rVMjRJX7AVpx68AZMwGj7qBm8nmS1J/Zuv229mew69u7wRxermKJmk/+BZiQLN5JQZvDr8Y15zBpFNLwBKa6Tz3dgeFiBv0RVxyoSDhf1tADVAgltVzhyZ6ZlM0QKkbB9/Bc5ilu7TLcVINx8ZL5qdRLpTpfbAc8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708985156; c=relaxed/simple; bh=yX1kJCbPWTdvnCbAkmvr1WQD29vVYqXsCcrJQQKRZDM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=XHnChu53STIrROnnD3Ix/BfCaia1KMdIZr0DYKJTmSfTNVYxFsa4x45Q9AFIwCPgNE7Bh8xobHpdIWdAPEYv2Q2pOVKUnzzKBgp03RQcprOU+/PYVe6HwBry2UpNhYSZHezBAf8DhCXAnkpiMtlfRkusSKQ42DC58tRNMGBstCw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=T+NziswA; arc=none smtp.client-ip=209.85.222.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-qk1-f179.google.com with SMTP id af79cd13be357-787a2a14d9cso290575985a.2 for ; Mon, 26 Feb 2024 14:05:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708985153; x=1709589953; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=T5WmPlH+GeSSkC2r3zeNTmXAIzwepnNSeSNojo2GFVo=; b=T+NziswAS2Cs0WjxMlEwNiqVHQZU9qVbHUE7cwhUPus316SCqCdStuInHkDdnhMVYu j44pG8Qoh7YfGMGuW9TTsgM6Vnxx3NlsSyD62A4CN9hs/4wBMIG8VGrcwQB15+3pVXvO D9LVkjvus1lCAqii/Wnj6syGBiSLy6Um4dvrI4is0BOxJA+BvdadlPYaz5Cw6SZjPzke 2O4/W+oMwBrPhPnUIPEbmRkCKnc+eoWHx1pyGnEq9nsAT9YW7NId04n4++3ntlUEOMub oFSAmZcruL86SXvr05lUJbd9Cof6FCdYvnKTh2XFimc7o6pRfEDAflioZIj8s2PS9+o5 qAmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708985153; x=1709589953; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=T5WmPlH+GeSSkC2r3zeNTmXAIzwepnNSeSNojo2GFVo=; b=PTOnfjDtZNEKlwQUchfPhWXftd7lyfzSo1kgHRtrZ6uTYzuA32n80Lsaf7R95sVUNJ 8kQ5UZc57uIXK0Kp7i/l+s/v5MywvznZ7TlCpUxBef0qQODzbalI/GkfSXw60SuRcyy+ /4taJxFlQJZTpnUSf9UsAdH3TxgEMw27IBl8nNj0t/KvubbqQx13+623qIy0O1ryFIYW DB0rQpOiSdoVrFIETMkWss5isDifRBnXXXFkLQfpBmstqmwIk9ahgAMpx10Jk/3OyBqm hkKIkjdaABmRJjTj3KMW98nA5+1UHb7RQzvV9XNJS9We9DnYhfP1Gy/DkHT2ncMlsYNF +J9A== X-Gm-Message-State: AOJu0Ywp++lDVRkJzrkhgiEWoqcs070P7NZWspeXbPs/RKQKnsTDw9KK Cd5deEpRn5vZvbkD3+K4zz97sfDXBcdd57BJAZdBvw5xAVCczSeLLhjYcIs= X-Received: by 2002:a05:6214:2429:b0:690:7b4:825 with SMTP id gy9-20020a056214242900b0069007b40825mr526433qvb.26.1708985153624; Mon, 26 Feb 2024 14:05:53 -0800 (PST) Received: from citadel.lan (2600-6c4a-4d3f-6d5c-0000-0000-0000-1019.inf6.spectrum.com. [2600:6c4a:4d3f:6d5c::1019]) by smtp.gmail.com with ESMTPSA id ow1-20020a0562143f8100b0068fdb03a3a3sm3435376qvb.95.2024.02.26.14.05.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 14:05:53 -0800 (PST) From: Brian Gerst To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Ingo Molnar , Thomas Gleixner , Borislav Petkov , "H . Peter Anvin" , Peter Zijlstra , Ard Biesheuvel , Brian Gerst Subject: [PATCH v2] x86/boot/64: Load kernel GDT in early boot Date: Mon, 26 Feb 2024 17:05:44 -0500 Message-ID: <20240226220544.70769-1-brgerst@gmail.com> X-Mailer: git-send-email 2.43.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Instead of loading a duplicate GDT just for early boot, load the kernel GDT from its physical address. Signed-off-by: Brian Gerst --- v2: Updated to latest tip tree arch/x86/include/asm/desc.h | 1 + arch/x86/kernel/head64.c | 13 ++----------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h index ec95fe44fa3a..62dc9f59ea76 100644 --- a/arch/x86/include/asm/desc.h +++ b/arch/x86/include/asm/desc.h @@ -46,6 +46,7 @@ struct gdt_page { } __attribute__((aligned(PAGE_SIZE))); DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page); +DECLARE_INIT_PER_CPU(gdt_page); /* Provide the original GDT */ static inline struct desc_struct *get_cpu_gdt_rw(unsigned int cpu) diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index 72351c3121a6..fd77a266f29d 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -68,15 +68,6 @@ unsigned long vmemmap_base __ro_after_init = __VMEMMAP_BASE_L4; EXPORT_SYMBOL(vmemmap_base); #endif -/* - * GDT used on the boot CPU before switching to virtual addresses. - */ -static struct desc_struct startup_gdt[GDT_ENTRIES] __initdata = { - [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(DESC_CODE32, 0, 0xfffff), - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(DESC_CODE64, 0, 0xfffff), - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(DESC_DATA64, 0, 0xfffff), -}; - #ifdef CONFIG_X86_5LEVEL static void __head *fixup_pointer(void *ptr, unsigned long physaddr) { @@ -589,8 +580,8 @@ void __head startup_64_setup_gdt_idt(void) void *handler = NULL; struct desc_ptr startup_gdt_descr = { - .address = (unsigned long)&RIP_REL_REF(startup_gdt), - .size = sizeof(startup_gdt) - 1, + .address = (unsigned long)&RIP_REL_REF(init_per_cpu_var(gdt_page.gdt)), + .size = GDT_SIZE - 1, }; /* Load GDT */ base-commit: afb9cce6ad6e808cf659f43925941be96f61b9c9 -- 2.43.2