Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Ross Philipson <ross.philipson@oracle.com>
To:     linux-kernel@vger.kernel.org, x86@kernel.org,
        iommu@lists.linux-foundation.org, linux-integrity@vger.kernel.org,
        linux-doc@vger.kernel.org
Cc:     ross.philipson@oracle.com, dpsmith@apertussolutions.com,
        tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com,
        luto@amacapital.net, kanth.ghatraju@oracle.com,
        trenchboot-devel@googlegroups.com
Subject: [PATCH v4 03/14] x86/boot: Place kernel_info at a fixed offset
Date:   Fri, 27 Aug 2021 09:28:26 -0400
Message-Id: <1630070917-9896-4-git-send-email-ross.philipson@oracle.com>
In-Reply-To: <1630070917-9896-1-git-send-email-ross.philipson@oracle.com>
References: <1630070917-9896-1-git-send-email-ross.philipson@oracle.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from lateralus.us.oracle.com (209.17.40.45) by SN6PR05CA0011.namprd05.prod.outlook.com (2603:10b6:805:de::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.8 via Frontend Transport; Fri, 27 Aug 2021 13:20:40 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 6d96d3c4-2992-43b3-c00b-08d9695d7813
X-MS-TrafficTypeDiagnostic: BYAPR10MB3432:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BYAPR10MB34329C9E3E2C34EFE2840081E6C89@BYAPR10MB3432.namprd10.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:5516;
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: vYNC3Jo0/wTN4djWpd68bj+vLAT+OO1EdJfLACs/jKmHNirJaJePgf85+5nqio4gFe2useocSE8xUuDq1C/FZY8olTRSkABhmq/KlCtV6ABiHllMgwN4/SKtksixapOqh9iiFB5Q/xl0FLPvB4867BA7qlMU5AQjHWvlECezAD5X4ALCCBtDP+FbVa4x5fmc2ToVkIjE6t1T+Hjn6RqWynAWrYeq8qbQ7q1b4e8sE4GKl2JIGxeCUzJI0t94vAJPhLuJSHe7IUddSQgijA/uz9oLkeF/CGsAuqkOIfZZ47uwEkObmDmYvDL5udzhAKJyg+y9LNhb20X7MoBeezccC9PovyacZrLVOQsBDpDPJFMKxK1xgC7aFmx5/LNi1upo83pOzG+DkQ7JO4MDSzeNh9BRr3Ic9OIUj4NaVqL6Po8bUCK5zAPMjlwplOnv+nLCNIq4uhUxh+ceJ08DVkTeDcF8e5ld+L0JnU3WlrdlUiHQZGe/xx2ppAh8Shake0qikNOk3O5vDRqvjWAJOSkXFHhVOBL3gL4rv94BOFA1OEyLJgkt1KOQX5/GFyHLRdbBTfnYLCh6Z9dKHBbrqt16lI5tojt4aej7q4hj/PvbdTWWePgvU2nilab2c4HrHvJz3JFRjuYHNMEFJcvweTursVnjlSsf1BtBZomUVYP3pZC6jbescKSbfWduG1J27tplncEDBzh2kS1emlvBLtrlyg==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB3793.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(396003)(346002)(136003)(366004)(39860400002)(376002)(8936002)(2906002)(86362001)(478600001)(186003)(6666004)(5660300002)(36756003)(7696005)(4326008)(316002)(38350700002)(83380400001)(66946007)(6486002)(38100700002)(956004)(26005)(7416002)(8676002)(52116002)(44832011)(66556008)(66476007)(2616005);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?MQz+RMz64S8ape6Pfht1lNgw0o6mnBhx4FEDpH3KfIMnCTj6DJHYt5NXWezR?=
 =?us-ascii?Q?tupuc4tB+Ait77x2nSeaEwWYDUTq6NIyYzgcPwmcSj7goE1zYNEZ160sp2Ei?=
 =?us-ascii?Q?uxbBfUqqJz7146wQPtVZXHtPgM0VTx17AeJEzK7yz47l5W0o44St22KQG1sA?=
 =?us-ascii?Q?DrPuy9B70VisQ9ECsKTNGF0uueV4f22bR2NEfnnd6s5+kPKW9Jc9/iJTMr6M?=
 =?us-ascii?Q?sbyHMp8yaThjlpX2ek61CC6ybOHAeLLk7Yd8Mhzfd+cMoqbOxQeqUBMqRa6y?=
 =?us-ascii?Q?eVM+LBJdfWAGMgaG/6ZGDdLD5kfSnAjdsPdzuJQPLsqAHmYgltxqt+NrSpbr?=
 =?us-ascii?Q?suyUGay7qWOxw9FL3UlfokbghefodBkS8H+8ny4KXe4aWN/uF673D38z0gKf?=
 =?us-ascii?Q?xLaeO7PY6XXNOgnP6iHBjtr/ZH7MbAt1uiPapIUUSP9NJ88mFhyrZEKmteOh?=
 =?us-ascii?Q?lNfhb0hmmbB7fZ7OPeewNjOaHbYusL6XAW5r1HbZ7FlA//jRlWvYWmh5YLnI?=
 =?us-ascii?Q?RenLlyZPcjeFZsQpp8VhRAAj5YKSzMcIYmCSgtF9qAIBxHwPHRJDrEaUDkbi?=
 =?us-ascii?Q?u5Qy8TDJggscnzd2c6IFu2NTMXpjuC7FcnwNH8hL2eYa6mmqy0xAYZU9jUQY?=
 =?us-ascii?Q?i20i+Vx0IMebkvAgrFVG9MK7IUHW0MDe5QKjwqIv81pNiW3zjulF6A6X+V6+?=
 =?us-ascii?Q?RakDDlABWK2v0WBHl8rnEftiaOmxXI361RyC0esOsDRhcmkfbVI+nmOPeS/D?=
 =?us-ascii?Q?a46HKDGnjqszhSucVx7MGsgWLFpJg0LMyeBcfBywRLY27etctu1dkP9USrDO?=
 =?us-ascii?Q?JBaTUQv6p/Z4Byl7wolYKWJ2wvNrDUjCeQxUiowXAZAjwBM3zkTQ7s1pYSVZ?=
 =?us-ascii?Q?upMGLrSXbFPCWB+1Ykg7x9xJdBQq8TX+WqE2JaQDL0AJia/KqJyWsTm7b/UR?=
 =?us-ascii?Q?qVKZJ+RTzerFUZX7SnKexRHk7cwRDNijv6FPURYnBjTdI6/k00CzE8Tkb3uJ?=
 =?us-ascii?Q?EJohG6P5Vq5APldGbGMfvW/mWSp6P8ULFO1ZUueeWqC2nFEvpksMDrV4ByBj?=
 =?us-ascii?Q?ZOS8u4319Piu8P/0JKhaVGYOx119a/O/kqKgFtEhcqZQCl//midyyNA20O+u?=
 =?us-ascii?Q?h8qz0BP3gLRGvjK4UmJdluOJCkje8XDBECB3LPH49w+81q2KhY2JMx0UGPGv?=
 =?us-ascii?Q?vVNFLVV8PIQ1Qhd3TH2oMT1buQeL3EfwsRp6Q3mNZYyWMkxCxrU9SxdUOb8S?=
 =?us-ascii?Q?QObnt2MPDU4P1oCQwwjUJKw0fZS6vn7Cj38BKwDcBvPURXo6YR/2bf5qVhiX?=
 =?us-ascii?Q?8u4udHgDXV06ngBWeRCp2AJB?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6d96d3c4-2992-43b3-c00b-08d9695d7813
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3793.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2021 13:20:41.8760
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: GFGH4JskyprSrSvj9Iav2CnpPY/CVaEj3FMnHAHaiUd+pK0JkTKgm+h5u2n3vTbmDyPbdPktBLfhCeY7h1p7F5VQR/RHPCjzZTx8wsNKoqg=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3432
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10088 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 malwarescore=0
 mlxscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2107140000
 definitions=main-2108270086
X-Proofpoint-ORIG-GUID: BFcFcHv4Wvqx--95J7R8OniCamwtENwR
X-Proofpoint-GUID: BFcFcHv4Wvqx--95J7R8OniCamwtENwR
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Arvind Sankar <nivedita@alum.mit.edu>

There are use cases for storing the offset of a symbol in kernel_info.
For example, the trenchboot series [0] needs to store the offset of the
Measured Launch Environment header in kernel_info.

Since commit (note: commit ID from tip/master)

  527afc212231 ("x86/boot: Check that there are no run-time relocations")

run-time relocations are not allowed in the compressed kernel, so simply
using the symbol in kernel_info, as

	.long	symbol

will cause a linker error because this is not position-independent.

With kernel_info being a separate object file and in a different section
from startup_32, there is no way to calculate the offset of a symbol
from the start of the image in a position-independent way.

To enable such use cases, put kernel_info into its own section which is
placed at a predetermined offset (KERNEL_INFO_OFFSET) via the linker
script. This will allow calculating the symbol offset in a
position-independent way, by adding the offset from the start of
kernel_info to KERNEL_INFO_OFFSET.

Ensure that kernel_info is aligned, and use the SYM_DATA.* macros
instead of bare labels. This stores the size of the kernel_info
structure in the ELF symbol table.

Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Cc: Ross Philipson <ross.philipson@oracle.com>
Signed-off-by: Ross Philipson <ross.philipson@oracle.com>
---
 arch/x86/boot/compressed/kernel_info.S | 19 +++++++++++++++----
 arch/x86/boot/compressed/kernel_info.h | 12 ++++++++++++
 arch/x86/boot/compressed/vmlinux.lds.S |  6 ++++++
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 arch/x86/boot/compressed/kernel_info.h

diff --git a/arch/x86/boot/compressed/kernel_info.S b/arch/x86/boot/compressed/kernel_info.S
index f818ee8..c18f071 100644
--- a/arch/x86/boot/compressed/kernel_info.S
+++ b/arch/x86/boot/compressed/kernel_info.S
@@ -1,12 +1,23 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 
+#include <linux/linkage.h>
 #include <asm/bootparam.h>
+#include "kernel_info.h"
 
-	.section ".rodata.kernel_info", "a"
+/*
+ * If a field needs to hold the offset of a symbol from the start
+ * of the image, use the macro below, eg
+ *	.long	rva(symbol)
+ * This will avoid creating run-time relocations, which are not
+ * allowed in the compressed kernel.
+ */
+
+#define rva(X) (((X) - kernel_info) + KERNEL_INFO_OFFSET)
 
-	.global kernel_info
+	.section ".rodata.kernel_info", "a"
 
-kernel_info:
+	.balign	16
+SYM_DATA_START(kernel_info)
 	/* Header, Linux top (structure). */
 	.ascii	"LToP"
 	/* Size. */
@@ -19,4 +30,4 @@ kernel_info:
 
 kernel_info_var_len_data:
 	/* Empty for time being... */
-kernel_info_end:
+SYM_DATA_END_LABEL(kernel_info, SYM_L_LOCAL, kernel_info_end)
diff --git a/arch/x86/boot/compressed/kernel_info.h b/arch/x86/boot/compressed/kernel_info.h
new file mode 100644
index 0000000..c127f84
--- /dev/null
+++ b/arch/x86/boot/compressed/kernel_info.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#ifndef BOOT_COMPRESSED_KERNEL_INFO_H
+#define BOOT_COMPRESSED_KERNEL_INFO_H
+
+#ifdef CONFIG_X86_64
+#define KERNEL_INFO_OFFSET 0x500
+#else /* 32-bit */
+#define KERNEL_INFO_OFFSET 0x100
+#endif
+
+#endif /* BOOT_COMPRESSED_KERNEL_INFO_H */
diff --git a/arch/x86/boot/compressed/vmlinux.lds.S b/arch/x86/boot/compressed/vmlinux.lds.S
index 112b237..84c7b4d 100644
--- a/arch/x86/boot/compressed/vmlinux.lds.S
+++ b/arch/x86/boot/compressed/vmlinux.lds.S
@@ -7,6 +7,7 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT)
 
 #include <asm/cache.h>
 #include <asm/page_types.h>
+#include "kernel_info.h"
 
 #ifdef CONFIG_X86_64
 OUTPUT_ARCH(i386:x86-64)
@@ -27,6 +28,11 @@ SECTIONS
 		HEAD_TEXT
 		_ehead = . ;
 	}
+	.rodata.kernel_info KERNEL_INFO_OFFSET : {
+		*(.rodata.kernel_info)
+	}
+	ASSERT(ABSOLUTE(kernel_info) == KERNEL_INFO_OFFSET, "kernel_info at bad address!")
+
 	.rodata..compressed : {
 		*(.rodata..compressed)
 	}
-- 
1.8.3.1