From patchwork Fri Sep 8 03:16:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 111997 Delivered-To: patch@linaro.org Received: by 10.140.94.239 with SMTP id g102csp939395qge; Thu, 7 Sep 2017 20:14:59 -0700 (PDT) X-Received: by 10.99.126.84 with SMTP id o20mr1620486pgn.137.1504840499459; Thu, 07 Sep 2017 20:14:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504840499; cv=none; d=google.com; s=arc-20160816; b=EnJCBhpjbJbeNQuwlrirwpptcMdRe3cuIX4GUnvJCgNocEtZR8su+MulHWhOB4GzFH jTU0l6xK6Qjt4i6oBxoXBBbQZonCnFh8aH8kwRZhDJMB0id6Wc/0qWmHehnY35z3n0Ei 4g6KBLq9d8Cvod6BfDKyKvdilVnYn6KKqGJBsvQKca7ur6RlF6b60dnuko9xDiESJKT1 oreYI/0hkjZRoj0iYd+o2XBGjOynZwWvDjROnUeplb+AxdaIirBi5Y3b3xC1YaLK1YAD kElP26Jm+ef1LYKlLoEFa0W7kRWfLCXlETumQWmBLGBOB3+V6r69L+ouAKJoEJsQFmqN tFUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=WqX73MiCOhvE/80J1q+Q8HqQBxgeOOQyRfgRjL0KTbA=; b=un76M8i4guwkbPtF/GyNdiHKJ/8dftrNTxQZn1mzgcBc/7uPq15rbvg4V04KAk423L l/uN3biJ/4Ycg5RS5idXj/ALa681S5gHOiIux7BxfkW5Y5+eptu1/F7U/fNsOFtFLz2f E3Tm+9cuhhvpDK/IZ3HPBLtj4K5MiacY83PZfQ3ZjV7t+R69dDtIIANzHzBzb7pFG5uf 2SgM1io0+gitPBy6oEgLz/5avRdHNZUWL8F1eTdR/X8t4vv8RoRDEorBgA80YKuxr0l3 WGheytB5KHz3KfDFwmLRYUaEkS5/RCJG8tiHyGjvuJLHmtrnsqxnZvyef2KDKd3T7Npa jY/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TIbWpOrV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k8si800627pga.495.2017.09.07.20.14.59; Thu, 07 Sep 2017 20:14:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TIbWpOrV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754115AbdIHDOu (ORCPT + 26 others); Thu, 7 Sep 2017 23:14:50 -0400 Received: from mail-pg0-f48.google.com ([74.125.83.48]:36870 "EHLO mail-pg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751985AbdIHDOs (ORCPT ); Thu, 7 Sep 2017 23:14:48 -0400 Received: by mail-pg0-f48.google.com with SMTP id d8so2758473pgt.4 for ; Thu, 07 Sep 2017 20:14:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=WqX73MiCOhvE/80J1q+Q8HqQBxgeOOQyRfgRjL0KTbA=; b=TIbWpOrVcqSzVnZAK/4s2LZNwsAduo91N6goKYlMbBvwHC2+1QVfCu2hnW6Xj8RUTB sniVyK2td59r003sl5Zzq5quKfzi/kPlyG6fH4QeR9wqbgcXVc+1gfTuC9h4UOVYB2lS lJI9+NMLX8Ap94BvhgrbjWRHho30DuCtbqzFA= 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; bh=WqX73MiCOhvE/80J1q+Q8HqQBxgeOOQyRfgRjL0KTbA=; b=gpYhL0YYV+K5FbbzXFJcKxc0BM3tIUWBzQYCPgRgjhuO6p8XL9FInSeaL8/qxOrAEr ItSS7OL7pdSyR9Kflk80Kn/Yx9Pz849gMLEtEUZ/SGEYBevupzvOsCV6qszqPuGVebG6 pxRFyOjk/0LovWKGzdxJf7kzQD02/aefOa8tLKnOQn+OcCMea0e6VOkf1XW/6/RJX/2o /IFflNf7vU3UGNHQc+OeT6/vZqMUDfHWnkWqew/tf/MlyfbI7MolSYZbLsnyb3YVOvCV gW8ic3Sn2BS+qDJoAA+XhUh2crUUWSDVvqksq25CJsY2nl0POYFmnRzU5WbU1gWpxLdG cQTw== X-Gm-Message-State: AHPjjUjLc87pztPToVKObHRoiqjsPKKUdSP9SJjrS+VKfgv8wqX1kMu4 EcA+s1AP8Dt/VONT X-Google-Smtp-Source: ADKCNb6+BnaDuto+BzGVWekDCUndNPMcnz5wf8wsfllGDw1dSz94pA7sjsniP0W0LKDyP9SmmGPDlA== X-Received: by 10.84.132.34 with SMTP id 31mr1706223ple.225.1504840487990; Thu, 07 Sep 2017 20:14:47 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id r138sm1029343pgr.12.2017.09.07.20.14.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Sep 2017 20:14:47 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, bauerman@linux.vnet.ibm.com, dhowells@redhat.com, vgoyal@redhat.com, herbert@gondor.apana.org.au, davem@davemloft.net, akpm@linux-foundation.org, mpe@ellerman.id.au, dyoung@redhat.com, bhe@redhat.com, arnd@arndb.de, ard.biesheuvel@linaro.org Cc: kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [PATCH 0/9] kexec: add kexec_file_load() support Date: Fri, 8 Sep 2017 12:16:07 +0900 Message-Id: <20170908031616.17916-1-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.14.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is the second round of implementing kexec_file_load() support on arm64.[1] Most of the code is based on kexec-tools (along with some kernel code from x86, which also came from kexec-tools). This patch series enables us to * load the kernel, Image, with kexec_file_load system call, and * optionally verify its signature at load time for trusted boot. To load the kernel via kexec_file_load system call, a small change is also needed to kexec-tools. See [2]. This enables '-s' option. As we discussed a long time ago, users may not be allowed to specify device-tree file of the 2nd kernel explicitly with kexec-tools, therefore re-using the blob of the first kernel. Regarding a signing method, we conform with x86 (or rather Microsoft?) style of signing since the binary can also be seen as in PE format (assuming that CONFIG_EFI is enabled). Powerpc is also going to support extended-file-attribute-based verification[3] with vmlinux, but arm64 doesn't for now partly because we don't have TPM-based IMA at this moment. Accordingly, we can use the existing command, sbsign, to sign the kernel. $ sbsign --key ${KEY} --cert ${CERT} Image Please note that it is totally up to the system what key/certificate is used for signing, but one of easy ways to *try* this feature is to turn on CONFIG_MODULE_SIG so that we can reuse certs/signing_key.pem as a signing key, KEY and CERT above, for kernel. (This also enables CONFIG_CRYPTO_SHA1 by default.) Some concerns(or future works): * Even if the kernel is configured with CONFIG_RANDOMIZE_BASE, the 2nd kernel won't be placed at a randomized address. We will have to add some boot code similar to efi-stub to implement the feature. * While big-endian kernel can support kernel signing, I'm not sure that Image can be recognized as in PE format because x86 standard only defines little-endian-based format. * IMA(and file extended attribute)-based kexec * vmlinux support [1] http://git.linaro.org/people/takahiro.akashi/linux-aarch64.git branch:arm64/kexec_file [2] http://git.linaro.org/people/takahiro.akashi/kexec-tools.git branch:arm64/kexec_file [3] http://lkml.iu.edu//hypermail/linux/kernel/1707.0/03669.html Changes in v2 (Sep 8, 2017) * move core-header-related functions from crash_core.c to kexec_file.c * drop hash-check code from purgatory * modify purgatory asm to remove arch_kexec_apply_relocations_add() * drop older kernel support * drop vmlinux support (at least, for this series) Patch #1 to #4 are all preparatory patches on generic side. Patch #5 is purgatory code. Patch #6 to #8 are common for enabling kexec_file_load. Patch #9 is for 'Image' support. AKASHI Takahiro (9): include: pe.h: remove message[] from mz header definition resource: add walk_system_ram_res_rev() kexec_file: factor out crashdump elf header function from x86 asm-generic: add kexec_file_load system call to unistd.h arm64: kexec_file: create purgatory arm64: kexec_file: load initrd, device-tree and purgatory segments arm64: kexec_file: set up for crash dump adding elf core header arm64: enable KEXEC_FILE config arm64: kexec_file: add Image format support arch/arm64/Kconfig | 29 +++ arch/arm64/Makefile | 1 + arch/arm64/include/asm/kexec.h | 24 ++ arch/arm64/include/asm/kexec_file.h | 69 ++++++ arch/arm64/kernel/Makefile | 4 +- arch/arm64/kernel/kexec_image.c | 106 +++++++++ arch/arm64/kernel/machine_kexec_file.c | 413 +++++++++++++++++++++++++++++++++ arch/arm64/purgatory/Makefile | 24 ++ arch/arm64/purgatory/entry.S | 55 +++++ arch/x86/kernel/crash.c | 324 -------------------------- include/linux/ioport.h | 3 + include/linux/kexec.h | 19 ++ include/linux/pe.h | 2 +- include/uapi/asm-generic/unistd.h | 4 +- kernel/kexec_file.c | 329 ++++++++++++++++++++++++++ kernel/resource.c | 59 +++++ 16 files changed, 1138 insertions(+), 327 deletions(-) create mode 100644 arch/arm64/include/asm/kexec_file.h create mode 100644 arch/arm64/kernel/kexec_image.c create mode 100644 arch/arm64/kernel/machine_kexec_file.c create mode 100644 arch/arm64/purgatory/Makefile create mode 100644 arch/arm64/purgatory/entry.S -- 2.14.1