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 X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA297C433E1 for ; Mon, 29 Jun 2020 21:13:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9A999206A1 for ; Mon, 29 Jun 2020 21:13:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387457AbgF2VNy (ORCPT ); Mon, 29 Jun 2020 17:13:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730114AbgF2S5m (ORCPT ); Mon, 29 Jun 2020 14:57:42 -0400 Received: from mail-qk1-x742.google.com (mail-qk1-x742.google.com [IPv6:2607:f8b0:4864:20::742]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A5CFC02E2DE for ; Mon, 29 Jun 2020 07:09:31 -0700 (PDT) Received: by mail-qk1-x742.google.com with SMTP id c139so15284106qkg.12 for ; Mon, 29 Jun 2020 07:09:31 -0700 (PDT) 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:date:message-id:mime-version :content-transfer-encoding; bh=M44I2v4UaO9OPEP+jg2wmc2GcKMVwLBT5iRhIL1Tao0=; b=gkVYx7pFDEcAbkRfTYC2pg6NwcWLXbxj2hL6P244iWxQMgI3hbmg6xjKbzAXhU/rsM zl1nx4fDlOsC8hHLQC4J5+J6bb2ueB8skk2tExB02VxZJ2ignd7rg+qSKvtaL/s1ROkW 3Nw3OfHyKoJkGhXr7PzVtfK22MpvrX6yeW+ooaEfCjRby+Yso7r17zrtuY5rU14zpLtW NQa3khVbaNQ/dt0hex9d1QN4jk6beINdt7Qgh6DqicwurIYzUt0ISBk40fj5UIbId37R 3nndbr6cwGLVnOVHA06vSgOqGeHHPPFbEquy0SPwULqrJMZcfulQiXOfpad/ibQ+sjtl UBMw== X-Gm-Message-State: AOAM531PZvp2Wuh3jumWBa/A6MC5UGUYCXNzJ9bxifFqdvuypxjhfOwl nLPVXK1PGhp28g0plrztO7k= X-Google-Smtp-Source: ABdhPJwwE/vx5To5SsVvdlgxz339Jn/jyUnXKYT8iXjlNSw6rXFzj1NqeKKv6bAnr1dvVOjAgL3yzg== X-Received: by 2002:a37:a00a:: with SMTP id j10mr14602308qke.87.1593439770329; Mon, 29 Jun 2020 07:09:30 -0700 (PDT) Received: from rani.riverdale.lan ([2001:470:1f07:5f3::b55f]) by smtp.gmail.com with ESMTPSA id i26sm10741461qkh.14.2020.06.29.07.09.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2020 07:09:29 -0700 (PDT) From: Arvind Sankar To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , x86@kernel.org Cc: Nick Desaulniers , Fangrui Song , Dmitry Golovin , clang-built-linux@googlegroups.com, Ard Biesheuvel , Masahiro Yamada , Daniel Kiper , Sedat Dilek , Kees Cook , Nathan Chancellor , Arnd Bergmann , "H . J . Lu" , linux-kernel@vger.kernel.org Subject: [PATCH v3 0/7] x86/boot: Remove runtime relocations from compressed kernel Date: Mon, 29 Jun 2020 10:09:21 -0400 Message-Id: <20200629140928.858507-1-nivedita@alum.mit.edu> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The compressed kernel currently contains bogus runtime relocations in the startup code in head_{32,64}.S, which are generated by the linker, but must not actually be processed at runtime. This generates warnings when linking with the BFD linker, and errors with LLD, which defaults to erroring on runtime relocations in read-only sections. It also requires the -z noreloc-overflow hack for the 64-bit kernel, which prevents us from linking it as -pie on an older BFD linker (<= 2.26) or on LLD, because the locations that are to be apparently relocated are only 32-bits in size and so cannot really have R_X86_64_RELATIVE relocations. This series aims to get rid of these relocations. I've build- and boot-tested with combinations of clang/gcc-10 with lld/bfd-2.34, and gcc-4.8.5 with bfd-2.23, skipping clang on 32-bit because it currently has other issues [0]. The first three patches by Ard remove indirection via the GOT from the compressed kernel code. The next patch is an independent fix for LLD, to avoid an orphan section in arch/x86/boot/setup.elf. The fifth patch gets rid of almost all the relocations. It uses standard PIC addressing technique for 32-bit, i.e. loading a register with the address of _GLOBAL_OFFSET_TABLE_ and then using GOTOFF references to access variables. For 64-bit, there is 32-bit code that cannot use RIP-relative addressing, and also cannot use the 32-bit method, since GOTOFF references are 64-bit only. This is instead handled using a macro to replace a reference like gdt with (gdt-startup_32) instead. The assembler will generate a PC32 relocation entry, with addend set to (.-startup_32), and these will be replaced with constants at link time. This works as long as all the code using such references lives in the same section as startup_32, i.e. in .head.text. The sixth patch addresses a remaining issue with the BFD linker, which generates runtime relocations for absolute symbols. We use z_input_len and z_output_len, defined in the generated piggy.S file, as symbols whose absolute "addresses" are actually the size of the compressed payload and the size of the decompressed kernel image respectively. LLD does not generate relocations for these two symbols, but the BFD linker does, prior to the upcoming 2.35. To get around this, piggy.S is extended to also define two u32 variables (in .rodata) with the lengths, and the head code is modified to use those instead of the symbol addresses. An alternative way to handle z_input_len/z_output_len would be to just include piggy.S in head_{32,64}.S instead of as a separate object file, since the GNU assembler doesn't generate relocations for symbols set to constants. The last patch adds a check in the linker script to ensure that no runtime relocations get reintroduced. [0] https://lore.kernel.org/lkml/20200504230309.237398-1-ndesaulniers@google.com/ Changes from v2: - Incorporate Ard's patches for eliminating GOT references into this series - Rebase on v5.8-rc3 v2: https://lore.kernel.org/lkml/20200525225918.1624470-1-nivedita@alum.mit.edu/ Changes from v1: - Add .text.* to setup.ld instead of just .text.startup - Rename the la() macro introduced in the second patch for 64-bit to rva(), and rework the explanatory comment. - In the last patch, check both .rel.dyn and .rela.dyn, instead of just one per arch. Ard Biesheuvel (3): x86/boot/compressed: Move .got.plt entries out of the .got section x86/boot/compressed: Force hidden visibility for all symbol references x86/boot/compressed: Get rid of GOT fixup code Arvind Sankar (4): x86/boot: Add .text.* to setup.ld x86/boot: Remove run-time relocations from .head.text code x86/boot: Remove runtime relocations from head_{32,64}.S x86/boot: Check that there are no runtime relocations arch/x86/boot/compressed/Makefile | 37 +----- arch/x86/boot/compressed/head_32.S | 99 +++++---------- arch/x86/boot/compressed/head_64.S | 165 ++++++++++--------------- arch/x86/boot/compressed/hidden.h | 19 +++ arch/x86/boot/compressed/mkpiggy.c | 6 + arch/x86/boot/compressed/vmlinux.lds.S | 24 +++- arch/x86/boot/setup.ld | 2 +- 7 files changed, 151 insertions(+), 201 deletions(-) create mode 100644 arch/x86/boot/compressed/hidden.h base-commit: 9ebcfadb0610322ac537dd7aa5d9cbc2b2894c68 -- 2.26.2