From patchwork Mon Oct 2 06:14:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 114547 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp325458qgn; Sun, 1 Oct 2017 23:12:42 -0700 (PDT) X-Received: by 10.99.121.141 with SMTP id u135mr11382458pgc.86.1506924762259; Sun, 01 Oct 2017 23:12:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506924762; cv=none; d=google.com; s=arc-20160816; b=fF7oRlKq2+vRYSm+58gQeP6kzDr29iOt+Go9BbyQHouCBgZgKAJeMzfWJSHflni7nQ C2MfWvy5yBifYicSIgv18UF8Zrg6zhXfjLAezjjpWBcWk6jWXYtMV6A41bJrrfkY170V KI7chqMXAhkNsT29ixSjAOfMSe06jyjCU62eQP2i8/tHjCE5kaM0Lo1YogO8x0Uf3J4X ROiww8omjO7+geyyozjoGxJLqoX4/2vlfPTBtfwolAb2JryYL6OQyo3+3U1fCI89XcVO Bz7Y8pvWgM8Savj628X1ILiGqzsxHkTVNWqTjYN+Oh1epBtNO60thlGhxf9B4rIJxz5U Pt9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=fVNkswW2F9Q2QI2ZTaY0vlW/IrEbCVf8dY1cNKokZF4=; b=Si48br/njLRrOHvtLsFBAUUGghr1ik95Z4op9Bk5jtVtjK8DBbtO70tqOHx28bUO0F wzaWEqj20gzSRsMCC/4eMjm/a7GBQNi21Uj6Jcsh1ycGtBXW1AKrdyeVVeUOxQh5KaiB EoYwCEgblUoozpJC0lOFKTYPl0yHIntvNh14tSF0XK4FQeoqIsbt+QfE7i1sLBeEHB1Q VQezTYqlZgac9fa2AcZyMag6COa8vgYLntEMLcPXuJgKfRVxtMP+zN8LRwyq6hXCT/7Y F6ObRePXO3qFreVAn4vFWawrUo8oXggjrFa7462Ixk45inHibSsZ/fzYejYdmtmKstC+ 21tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i0j+Q0fD; 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 11si7189782pfl.365.2017.10.01.23.12.42; Sun, 01 Oct 2017 23:12:42 -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=i0j+Q0fD; 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 S1751075AbdJBGMk (ORCPT + 26 others); Mon, 2 Oct 2017 02:12:40 -0400 Received: from mail-pg0-f51.google.com ([74.125.83.51]:57059 "EHLO mail-pg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750949AbdJBGMi (ORCPT ); Mon, 2 Oct 2017 02:12:38 -0400 Received: by mail-pg0-f51.google.com with SMTP id n1so1790690pgt.13 for ; Sun, 01 Oct 2017 23:12:37 -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:in-reply-to:references; bh=fVNkswW2F9Q2QI2ZTaY0vlW/IrEbCVf8dY1cNKokZF4=; b=i0j+Q0fDGlInInThkS3PwWG3rUMl6d8rCYq8rbiC9z3NznGuVYqV1wVkcdut6O5OkQ wh/AKuHNr/+dVE6bjkcE1hXYzwN50lvhQ7fp5AMDmy8pEIimy8WJ4OiaVcFPNnMpNH2C GHYKl5Jujf9yZjpfxGr6vFV1GbYF7RxcGE8Gk= 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:in-reply-to :references; bh=fVNkswW2F9Q2QI2ZTaY0vlW/IrEbCVf8dY1cNKokZF4=; b=C43IN+TLUvH82lWWHMkiOPa1JuNJWt8m9NhgcrJ4HfsywcZHyZg9pXc6vB3y0/t/xx STTfK8PgsFBXZCZJZQQqXOGRRDVxBkDCFlFI+imJjjjVxO38Lu0rEgxE7WN6/oELJZOl 8igJvBg2kqAoXcGjPae0Tj6oNmHPS+9N4pUv07UrD53QW5dpbDkRIXaxEQk0azFJQMp0 gr9gFyvxzTu9FREPL9p9bExUt7V33Qffk7A86zokJdGc30fbv2b5FhMC6ugxiq3OhGVR B6d/Lqi6sYxo+KGELJAFrWI0w333W2tSMREIqCzivF4j1YtWFB9aK0Qj+owhJj0g9qNj Z4mg== X-Gm-Message-State: AMCzsaXQK80Ib5N0D37b6yXrvA/IkpkYjngNo9wU87DQpiBIyKfzzyk3 gTX3raJiG5dJrl//iCzTnLzG3A== X-Google-Smtp-Source: AOwi7QDP3cX6zeOQfNh34Rp6Cx1W+DI8b3sO9v6APKKyOkVMFQdVKDNf3Flgua6lurD3wehxktoCwg== X-Received: by 10.99.155.26 with SMTP id r26mr6653570pgd.139.1506924757565; Sun, 01 Oct 2017 23:12:37 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id n18sm14684514pgd.69.2017.10.01.23.12.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 23:12:36 -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 v4 01/10] include: pe.h: remove message[] from mz header definition Date: Mon, 2 Oct 2017 15:14:22 +0900 Message-Id: <20171002061431.11117-2-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171002061431.11117-1-takahiro.akashi@linaro.org> References: <20171002061431.11117-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org message[] field won't be part of the definition of mz header. This change is crucial for enabling kexec_file_load on arm64 because arm64's "Image" binary, as in PE format, doesn't have any data for it and accordingly the following check in pefile_parse_binary() will fail: chkaddr(cursor, mz->peaddr, sizeof(*pe)); Signed-off-by: AKASHI Takahiro Reviewed-by: Ard Biesheuvel Cc: David Howells Cc: Vivek Goyal Cc: Herbert Xu Cc: David S. Miller --- include/linux/pe.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.14.1 diff --git a/include/linux/pe.h b/include/linux/pe.h index 143ce75be5f0..3482b18a48b5 100644 --- a/include/linux/pe.h +++ b/include/linux/pe.h @@ -166,7 +166,7 @@ struct mz_hdr { uint16_t oem_info; /* oem specific */ uint16_t reserved1[10]; /* reserved */ uint32_t peaddr; /* address of pe header */ - char message[64]; /* message to print */ + char message[]; /* message to print */ }; struct mz_reloc { From patchwork Mon Oct 2 06:14:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 114548 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp325537qgn; Sun, 1 Oct 2017 23:12:48 -0700 (PDT) X-Received: by 10.98.236.17 with SMTP id k17mr13875042pfh.191.1506924768228; Sun, 01 Oct 2017 23:12:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506924768; cv=none; d=google.com; s=arc-20160816; b=IN/Zsc30m3xMiBerPaKAERLz9cYVKkxZKqiLww97sj1FLWajDo/JIRZAvQancx+f5x d6tyASkUVWx9pchbRwUndK1wjOZJDlw/bvK0504u+0z6EjyOOAd0PLvfaLeniA6nCVdm BOCBUXEJk6+XpA2WXqnBf0kDXsuaWm6uSCtNHG0Kj3HI+Nz9GLLdnGjcQg4MtVAVTqWA T+YI4S0X56agJE6MPPTpdSdvQpbhHu5brv/UDI0IYg18bn2y2cKsazJuq0TScX3vRuxK GOfzBjv1gRKmiqikTacJd2CxJEoyYqyIWc+gLnKZUI/KWKbJBUFHjEqTfw6fr4YpEJcu mR/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=3PJjeEMGMmVmmUqd0U+eX8BRVZwhX6vxgKfYogZL91Y=; b=uKNxjr1Sy4I1YO2T48f0Tfng4+faKrm0PynTIUfAgeVMXhsRoJwTY2g/L0ITGzeNLK TMEhX8hMRU7QTCy/cXqLIO8zBUCGseShn//DR1YK4LVnPeAURwI007yQ9GFRKyR6URy/ KMwpKGe3JVswld5DTcCPXoRdEftCYeJoQikKk3UHItk3NOYmlTxZCKckK0hgwZoZwjxk 1pP+2/dHdkqTT28Srs5/ccq+UIhcr+HdgCWrbbjy3OEL8jNGmzPS2+mvrLDIWyoy8x1i F+HKdwUiPih4laRRphMvy21WJcZMWHqrm7u0xieOhg8/VQPN9ukOq2I245+IpSVkdwpY vbBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ibbrIWIL; 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 11si7189782pfl.365.2017.10.01.23.12.47; Sun, 01 Oct 2017 23:12:48 -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=ibbrIWIL; 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 S1751162AbdJBGMr (ORCPT + 26 others); Mon, 2 Oct 2017 02:12:47 -0400 Received: from mail-pf0-f175.google.com ([209.85.192.175]:43445 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751082AbdJBGMo (ORCPT ); Mon, 2 Oct 2017 02:12:44 -0400 Received: by mail-pf0-f175.google.com with SMTP id y29so2444487pff.0 for ; Sun, 01 Oct 2017 23:12:44 -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:in-reply-to:references; bh=3PJjeEMGMmVmmUqd0U+eX8BRVZwhX6vxgKfYogZL91Y=; b=ibbrIWIL2Qkr7+y6UJIsHNtXoo+EO5LGrJHsLTuhnMztEMsnQfBB503IUTYf9Mtbee BlV9EBLhlXirTiCZT19arv8D2Wpn9aSkmxzpxRimYTKYRmz/V8Op+cjVO8Qvld3iuU4T /6hk0Yo/1hSK7FGdF00ppYYrGgT1VJju2ypuc= 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:in-reply-to :references; bh=3PJjeEMGMmVmmUqd0U+eX8BRVZwhX6vxgKfYogZL91Y=; b=mOWVxGC4yl2R29wJAkHz55sT6UPCU1wn3mCAPGli6B1+ayDVmMm+SoCZCYxMudpqR6 awKT0fnj9Fu1l9Wo0ak24hD7sIAyg1tBijvTYYEhtg/fy2+Mhn7YsZp56ilFxNEBMABW bqhAY7iSx7yGbviZNN0fxGleW48O6kaLeFt0Tg/EwO6mDj2QFHIEOWwk0b4Csdp3IE+2 EO1p3Sjx1xmcBvv9R2wcFqJ0tQOoDUSwBP3yiS6y+nEHopC/auMwgsvDmQsiT6Phtav/ i6dtLSg/2Kisxphn+xUx02oQ0wkYhZg1Ycf2/w4q4IW8vqL82Yu5LJsuzxHAmxm0cbGc /1xw== X-Gm-Message-State: AMCzsaWhka1SFANIFtVNmMnVyHVQcr8AfLKSBgr8MULVL4Hv5oKBJ8bq qjN0nlVVKt/Q0cxhkUre1jae7w== X-Google-Smtp-Source: AOwi7QATPhYf/0tvntMQ+TY/y08cZNH/VHQ3j2+wyUVQg7BF5A2OwNJ39zpsZhXjlmLm0LUqlUhFYg== X-Received: by 10.98.218.86 with SMTP id w22mr1188888pfl.84.1506924763725; Sun, 01 Oct 2017 23:12:43 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id q7sm16171312pgn.56.2017.10.01.23.12.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 23:12:43 -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 , Linus Torvalds Subject: [PATCH v4 02/10] resource: add walk_system_ram_res_rev() Date: Mon, 2 Oct 2017 15:14:23 +0900 Message-Id: <20171002061431.11117-3-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171002061431.11117-1-takahiro.akashi@linaro.org> References: <20171002061431.11117-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This function, being a variant of walk_system_ram_res() introduced in commit 8c86e70acead ("resource: provide new functions to walk through resources"), walks through a list of all the resources of System RAM in reversed order, i.e., from higher to lower. It will be used in kexec_file implementation on arm64. Signed-off-by: AKASHI Takahiro Cc: Vivek Goyal Cc: Andrew Morton Cc: Linus Torvalds --- include/linux/ioport.h | 3 +++ kernel/resource.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) -- 2.14.1 diff --git a/include/linux/ioport.h b/include/linux/ioport.h index f5cf32e80041..62eb62b98118 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -273,6 +273,9 @@ extern int walk_system_ram_res(u64 start, u64 end, void *arg, int (*func)(u64, u64, void *)); extern int +walk_system_ram_res_rev(u64 start, u64 end, void *arg, + int (*func)(u64, u64, void *)); +extern int walk_iomem_res_desc(unsigned long desc, unsigned long flags, u64 start, u64 end, void *arg, int (*func)(u64, u64, void *)); diff --git a/kernel/resource.c b/kernel/resource.c index 9b5f04404152..572f2f91ce9c 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -23,6 +23,8 @@ #include #include #include +#include +#include #include @@ -469,6 +471,63 @@ int walk_system_ram_res(u64 start, u64 end, void *arg, return ret; } +int walk_system_ram_res_rev(u64 start, u64 end, void *arg, + int (*func)(u64, u64, void *)) +{ + struct resource res, *rams; + u64 orig_end; + int count, i; + int ret = -1; + + count = 16; /* initial */ + + /* create a list */ + rams = vmalloc(sizeof(struct resource) * count); + if (!rams) + return ret; + + res.start = start; + res.end = end; + res.flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY; + orig_end = res.end; + i = 0; + while ((res.start < res.end) && + (!find_next_iomem_res(&res, IORES_DESC_NONE, true))) { + if (i >= count) { + /* re-alloc */ + struct resource *rams_new; + int count_new; + + count_new = count + 16; + rams_new = vmalloc(sizeof(struct resource) * count_new); + if (!rams_new) + goto out; + + memcpy(rams_new, rams, count); + vfree(rams); + rams = rams_new; + count = count_new; + } + + rams[i].start = res.start; + rams[i++].end = res.end; + + res.start = res.end + 1; + res.end = orig_end; + } + + /* go reverse */ + for (i--; i >= 0; i--) { + ret = (*func)(rams[i].start, rams[i].end, arg); + if (ret) + break; + } + +out: + vfree(rams); + return ret; +} + #if !defined(CONFIG_ARCH_HAS_WALK_MEMORY) /* From patchwork Mon Oct 2 06:14:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 114549 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp325613qgn; Sun, 1 Oct 2017 23:12:56 -0700 (PDT) X-Received: by 10.101.85.70 with SMTP id t6mr11427459pgr.255.1506924776566; Sun, 01 Oct 2017 23:12:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506924776; cv=none; d=google.com; s=arc-20160816; b=F4+ctVbt/O9RpcHInOz1YFY7rQwPtzvp3hm2Jjvfdp2/h+g82LNOgAXlrtphVgM/Or 03SybCGzUVAoLHOgX0Z3/mfrDN4DvY/j9IYYdO6Ts83K8ktFzASsybxdw1WFLuran/Y7 BG/6A+fEtySkO9Scoh5NFPaOkO9b1Hg0r9uiqXq1LL665aw13PJp5QypKr1qjbsLh0FX sjJb1Zhi6aYBdAfdnne+G+KroJq/w2ZvlvgI3y8ayjmRVObJW9J5992+796g0LEf/oFK EibGg+rB3yRLovUKG8zmKwY5e7AzyYLOQaozW2NNbA6WKSTFn06fnI/4amHc9nZmn3Oz yKIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=IOwctMQa0flgfwvnXIuj6aTR3KLFAvsQeOkqmZrNvoY=; b=Hrzm55tVCqPlBnNYmGHUO+SEweIHWHsDO+Ltvf88AmC/QmE1zgAkZHlF7B/XzNex2J YHxG8GnQR+nSnjMrvYTSFL4sZk34NnLOI4mTTRDO5/DxKXTO0Tqb5VCIxGlgo72ItYSA i+RQixMq+ZKI7okK+2Lv5+Ng3JNlSqdLvQSePE4mDxgxE8Q1eXHiXdZmvnsbThF3/HHA Gz7W+FXJlEc2kXh3cchuqEmsQWX8IY8Y3FGG90zKcQuFuGVwB8gumPfcWe5Jd8OsDifJ s4Q+K/DLayexkWKh+WqGJ8DIhEsVv9yPuKL3gH8Mbm7X+WnADCHYq6o1+IBZyTxOYiLw ZupA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Uhp/ib3g; 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 u9si3772977pge.605.2017.10.01.23.12.56; Sun, 01 Oct 2017 23:12:56 -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=Uhp/ib3g; 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 S1751251AbdJBGMz (ORCPT + 26 others); Mon, 2 Oct 2017 02:12:55 -0400 Received: from mail-pg0-f53.google.com ([74.125.83.53]:48810 "EHLO mail-pg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751167AbdJBGMt (ORCPT ); Mon, 2 Oct 2017 02:12:49 -0400 Received: by mail-pg0-f53.google.com with SMTP id v78so703447pgb.5 for ; Sun, 01 Oct 2017 23:12:49 -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:in-reply-to:references; bh=IOwctMQa0flgfwvnXIuj6aTR3KLFAvsQeOkqmZrNvoY=; b=Uhp/ib3gydRit/VbKFOs2wEEpqaQx/fUpczq7ecUtC3jIrhQb4f49XzdXc5mbSnyj/ nc1lSmSplo57UO3+Xnr9Uca3CdYhlWWd8gD07PsuFhiu8Q9r171To3+/5qmypN9Pvm+U BZV5ZUSokXcZfOdHtxgyJ3Uj/WfJmASBEP8qY= 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:in-reply-to :references; bh=IOwctMQa0flgfwvnXIuj6aTR3KLFAvsQeOkqmZrNvoY=; b=DqvfE1KjbFkQ2ywl+K5hLcIe0KWqduYDshYgcL6TJYB5SaAk+ekWchXHjEnNKusK4z j+VitEGaf+RlmhlF3t+tGAdItwa6gvTPJFqw8WFJqq9XQuBZdXZshs2YYP6H+MbKXyrY Om4FYkiAgT1uK2OEwJ+Yu9kOlih7gr2qjT4iuubtlJsp8t8deIulWwCB6Xx8Nb5eebrI B3x0iOb01ZYJGCViJvGf3PIrTB+tUN6yL761qsSX782j6r1j8VSnH7hWFA+JMEE6K4s9 95d++zG5a5Ys7Fvqp0kHqVeBqV6uO1CSZTe8jmcTjyrWdlIZg2svIMHiXgzlp3CxmVBC NsSw== X-Gm-Message-State: AHPjjUgfLDtiVIMThFGtbQRkj2/fjceTOOXiv8NyT17cIQomYvttGJ0W 0HjbpJmLRaRAK0a9EWDMP3s+GQ== X-Google-Smtp-Source: AOwi7QB96erPSOzvMpjhz3tkdCgD+BV2KdOV3/PEUaCPNzcq4oVYrjOu6xXTkGJ1MnG3FdmGXYDfHg== X-Received: by 10.99.117.13 with SMTP id q13mr11566560pgc.366.1506924769149; Sun, 01 Oct 2017 23:12:49 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id c185sm16325483pfb.57.2017.10.01.23.12.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 23:12:48 -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 v4 03/10] kexec_file: factor out arch_kexec_kernel_*() from x86, powerpc Date: Mon, 2 Oct 2017 15:14:24 +0900 Message-Id: <20171002061431.11117-4-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171002061431.11117-1-takahiro.akashi@linaro.org> References: <20171002061431.11117-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org arch_kexec_kernel_*() and arch_kimage_file_post_load_cleanup can now be duplicated among some architectures, so let's factor them out. Signed-off-by: AKASHI Takahiro Cc: Dave Young Cc: Vivek Goyal Cc: Baoquan He Cc: Michael Ellerman Cc: Thiago Jung Bauermann --- arch/powerpc/kernel/kexec_elf_64.c | 2 +- arch/powerpc/kernel/machine_kexec_file_64.c | 36 ++--------------- arch/x86/kernel/kexec-bzimage64.c | 2 +- arch/x86/kernel/machine_kexec_64.c | 45 +-------------------- include/linux/kexec.h | 15 +++---- kernel/kexec_file.c | 63 ++++++++++++++++++++++++++--- 6 files changed, 73 insertions(+), 90 deletions(-) -- 2.14.1 diff --git a/arch/powerpc/kernel/kexec_elf_64.c b/arch/powerpc/kernel/kexec_elf_64.c index 9a42309b091a..6c78c11c7faf 100644 --- a/arch/powerpc/kernel/kexec_elf_64.c +++ b/arch/powerpc/kernel/kexec_elf_64.c @@ -657,7 +657,7 @@ static void *elf64_load(struct kimage *image, char *kernel_buf, return ret ? ERR_PTR(ret) : fdt; } -struct kexec_file_ops kexec_elf64_ops = { +const struct kexec_file_ops kexec_elf64_ops = { .probe = elf64_probe, .load = elf64_load, }; diff --git a/arch/powerpc/kernel/machine_kexec_file_64.c b/arch/powerpc/kernel/machine_kexec_file_64.c index 992c0d258e5d..e7ce78857f0b 100644 --- a/arch/powerpc/kernel/machine_kexec_file_64.c +++ b/arch/powerpc/kernel/machine_kexec_file_64.c @@ -31,8 +31,9 @@ #define SLAVE_CODE_SIZE 256 -static struct kexec_file_ops *kexec_file_loaders[] = { +const struct kexec_file_ops * const kexec_file_loaders[] = { &kexec_elf64_ops, + NULL }; int arch_kexec_kernel_image_probe(struct kimage *image, void *buf, @@ -45,38 +46,7 @@ int arch_kexec_kernel_image_probe(struct kimage *image, void *buf, if (image->type == KEXEC_TYPE_CRASH) return -ENOTSUPP; - for (i = 0; i < ARRAY_SIZE(kexec_file_loaders); i++) { - fops = kexec_file_loaders[i]; - if (!fops || !fops->probe) - continue; - - ret = fops->probe(buf, buf_len); - if (!ret) { - image->fops = fops; - return ret; - } - } - - return ret; -} - -void *arch_kexec_kernel_image_load(struct kimage *image) -{ - if (!image->fops || !image->fops->load) - return ERR_PTR(-ENOEXEC); - - return image->fops->load(image, image->kernel_buf, - image->kernel_buf_len, image->initrd_buf, - image->initrd_buf_len, image->cmdline_buf, - image->cmdline_buf_len); -} - -int arch_kimage_file_post_load_cleanup(struct kimage *image) -{ - if (!image->fops || !image->fops->cleanup) - return 0; - - return image->fops->cleanup(image->image_loader_data); + return _kexec_kernel_image_probe(image, buf, buf_len); } /** diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c index fb095ba0c02f..705654776c0c 100644 --- a/arch/x86/kernel/kexec-bzimage64.c +++ b/arch/x86/kernel/kexec-bzimage64.c @@ -538,7 +538,7 @@ static int bzImage64_verify_sig(const char *kernel, unsigned long kernel_len) } #endif -struct kexec_file_ops kexec_bzImage64_ops = { +const struct kexec_file_ops kexec_bzImage64_ops = { .probe = bzImage64_probe, .load = bzImage64_load, .cleanup = bzImage64_cleanup, diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c index 1f790cf9d38f..2cdd29d64181 100644 --- a/arch/x86/kernel/machine_kexec_64.c +++ b/arch/x86/kernel/machine_kexec_64.c @@ -30,8 +30,9 @@ #include #ifdef CONFIG_KEXEC_FILE -static struct kexec_file_ops *kexec_file_loaders[] = { +const struct kexec_file_ops * const kexec_file_loaders[] = { &kexec_bzImage64_ops, + NULL }; #endif @@ -363,27 +364,6 @@ void arch_crash_save_vmcoreinfo(void) /* arch-dependent functionality related to kexec file-based syscall */ #ifdef CONFIG_KEXEC_FILE -int arch_kexec_kernel_image_probe(struct kimage *image, void *buf, - unsigned long buf_len) -{ - int i, ret = -ENOEXEC; - struct kexec_file_ops *fops; - - for (i = 0; i < ARRAY_SIZE(kexec_file_loaders); i++) { - fops = kexec_file_loaders[i]; - if (!fops || !fops->probe) - continue; - - ret = fops->probe(buf, buf_len); - if (!ret) { - image->fops = fops; - return ret; - } - } - - return ret; -} - void *arch_kexec_kernel_image_load(struct kimage *image) { vfree(image->arch.elf_headers); @@ -398,27 +378,6 @@ void *arch_kexec_kernel_image_load(struct kimage *image) image->cmdline_buf_len); } -int arch_kimage_file_post_load_cleanup(struct kimage *image) -{ - if (!image->fops || !image->fops->cleanup) - return 0; - - return image->fops->cleanup(image->image_loader_data); -} - -#ifdef CONFIG_KEXEC_VERIFY_SIG -int arch_kexec_kernel_verify_sig(struct kimage *image, void *kernel, - unsigned long kernel_len) -{ - if (!image->fops || !image->fops->verify_sig) { - pr_debug("kernel loader does not support signature verification."); - return -EKEYREJECTED; - } - - return image->fops->verify_sig(kernel, kernel_len); -} -#endif - /* * Apply purgatory relocations. * diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 2b7590f5483a..c64c29c1fb0e 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -208,7 +208,7 @@ struct kimage { unsigned long cmdline_buf_len; /* File operations provided by image loader */ - struct kexec_file_ops *fops; + const struct kexec_file_ops *fops; /* Image loader handling the kernel can store a pointer here */ void *image_loader_data; @@ -276,12 +276,13 @@ int crash_shrink_memory(unsigned long new_size); size_t crash_get_memory_size(void); void crash_free_reserved_phys_range(unsigned long begin, unsigned long end); -int __weak arch_kexec_kernel_image_probe(struct kimage *image, void *buf, - unsigned long buf_len); -void * __weak arch_kexec_kernel_image_load(struct kimage *image); -int __weak arch_kimage_file_post_load_cleanup(struct kimage *image); -int __weak arch_kexec_kernel_verify_sig(struct kimage *image, void *buf, - unsigned long buf_len); +int _kexec_kernel_image_probe(struct kimage *image, void *buf, + unsigned long buf_len); +void *_kexec_kernel_image_load(struct kimage *image); +int _kexec_kernel_post_load_cleanup(struct kimage *image); +int _kexec_kernel_verify_sig(struct kimage *image, void *buf, + unsigned long buf_len); + int __weak arch_kexec_apply_relocations_add(const Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, unsigned int relsec); int __weak arch_kexec_apply_relocations(const Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 9f48f4412297..130965b28392 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -26,30 +26,83 @@ #include #include "kexec_internal.h" +const __weak struct kexec_file_ops * const kexec_file_loaders[] = {NULL}; + static int kexec_calculate_store_digests(struct kimage *image); +int _kexec_kernel_image_probe(struct kimage *image, void *buf, + unsigned long buf_len) +{ + int i, ret = -ENOEXEC; + const struct kexec_file_ops *fops; + + for (i = 0; ; i++) { + fops = kexec_file_loaders[i]; + if (!fops || !fops->probe) + break; + + ret = fops->probe(buf, buf_len); + if (!ret) { + image->fops = fops; + return ret; + } + } + + return ret; +} + /* Architectures can provide this probe function */ int __weak arch_kexec_kernel_image_probe(struct kimage *image, void *buf, unsigned long buf_len) { - return -ENOEXEC; + return _kexec_kernel_image_probe(image, buf, buf_len); +} + +void *_kexec_kernel_image_load(struct kimage *image) +{ + if (!image->fops || !image->fops->load) + return ERR_PTR(-ENOEXEC); + + return image->fops->load(image, image->kernel_buf, + image->kernel_buf_len, image->initrd_buf, + image->initrd_buf_len, image->cmdline_buf, + image->cmdline_buf_len); } void * __weak arch_kexec_kernel_image_load(struct kimage *image) { - return ERR_PTR(-ENOEXEC); + return _kexec_kernel_image_load(image); } -int __weak arch_kimage_file_post_load_cleanup(struct kimage *image) +int _kexec_kernel_post_load_cleanup(struct kimage *image) { - return -EINVAL; + if (!image->fops || !image->fops->cleanup) + return 0; + + return image->fops->cleanup(image->image_loader_data); +} + +int __weak arch_kexec_kernel_post_load_cleanup(struct kimage *image) +{ + return _kexec_kernel_post_load_cleanup(image); } #ifdef CONFIG_KEXEC_VERIFY_SIG +int _kexec_kernel_verify_sig(struct kimage *image, void *buf, + unsigned long buf_len) +{ + if (!image->fops || !image->fops->verify_sig) { + pr_debug("kernel loader does not support signature verification.\n"); + return -EKEYREJECTED; + } + + return image->fops->verify_sig(buf, buf_len); +} + int __weak arch_kexec_kernel_verify_sig(struct kimage *image, void *buf, unsigned long buf_len) { - return -EKEYREJECTED; + return _kexec_kernel_verify_sig(image, buf, buf_len); } #endif From patchwork Mon Oct 2 06:14:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 114550 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp325648qgn; Sun, 1 Oct 2017 23:12:59 -0700 (PDT) X-Received: by 10.99.124.67 with SMTP id l3mr11435912pgn.296.1506924779399; Sun, 01 Oct 2017 23:12:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506924779; cv=none; d=google.com; s=arc-20160816; b=keYcXdwUUk7x5wM0FUs4weO3lGPo+2NLMpvJUM8Rm13kGTLuo/k/MIMfwQE9o7DV81 2O2g0wfvPcxEIMx/i3jWXnW6US6mfpphuL8vXwTxZlbh7o4ZPxUdbuyiBvAzcdXHgcoI FUeR/dAVEY7zTkJyvXSwzgfT1DdKB8vc4PGD+DzCqU2SuTmsEbCBKFQqLpTKtI+EDbH0 ntg299DvI22/akeRzsw8sX5EdKltouuqQn5YYmF4/Rf0jACuWV4fUN2ILEHFj2S2R9CO V7tCg9pLgcnjke/nXet594DSprQxSm/AbXjW4zPWCkqmW16AWNTh9pB08rx6etOolCqJ 5IoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=2Iy/90yMSaAPxjHBe7PBYZmTGyRW3XapRldBAkcxjw4=; b=WKsOfgs/TfOBWifdlOkVTcWfVDJ79O/0HYK8oqFl3T7NtLBQ2kKpd6VxPUWqxs9tko x5YFs9276XdDZuzJS3SkI+cAww+WvgA1G5yBh2DWll9TO9MPoTv4wJFsVkac6rWTHtI3 ikPciJmfG/nZ9ioCmmpFqPR4KEZaT7ew4cnsjP+CODr5W44+vrQP7iTxfYJCrVUuDZhP 9YFnVHMTadpLHRrazTPuB21eZt/IwNAqrdu/QVouOmQu50lsL+//T/etuiTkYLhbS58h n+AmreguoMpoa/CMdrwZLTVglO900Z+iRqPqe3VDEBi9UfS9OkwSKcXd5rDF3Ci95swL dxVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RCKid3h8; 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 u9si3772977pge.605.2017.10.01.23.12.59; Sun, 01 Oct 2017 23:12: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=RCKid3h8; 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 S1751305AbdJBGM5 (ORCPT + 26 others); Mon, 2 Oct 2017 02:12:57 -0400 Received: from mail-pf0-f178.google.com ([209.85.192.178]:46811 "EHLO mail-pf0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751082AbdJBGMy (ORCPT ); Mon, 2 Oct 2017 02:12:54 -0400 Received: by mail-pf0-f178.google.com with SMTP id r68so2441404pfj.3 for ; Sun, 01 Oct 2017 23:12:54 -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:in-reply-to:references; bh=2Iy/90yMSaAPxjHBe7PBYZmTGyRW3XapRldBAkcxjw4=; b=RCKid3h898nv2JAMYJ6LN2thAEAu3/W6uoXl7I6Fz2I9UvC6pIKCh9Ef1SRqnPMJrv /fEXRSMid8sTCa2e7pLHJLKH+Ly+5DOj57gYTCT6MeBbpNAYHalyEdp2D/p+iqa7aB9a 6Pbl/lLbABpM/mdhRJXOp7vZNtHow8XqlP7Wc= 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:in-reply-to :references; bh=2Iy/90yMSaAPxjHBe7PBYZmTGyRW3XapRldBAkcxjw4=; b=OBtDhhu/OqJ4nf64gcHUkeRwRTqb3qZAgrayfddjiAK7FMx9qlaZ0jBHBaSy3iyxW4 9pBbalcSAF0MD6vl6clgldWbWL6QRTiuiTUbHdCFaUZTjjjyGusqIYmFjrFLmf/9tAW4 OZeU5reQ71pPEfPU7FzhraUmg6RWwwtdysEwLrfR+BoP4IJ3ZMPYgCET/pp6CrLxPJDn GYLCFWiL7yswwnnViXJ4+6RbFmThk3xL7KS1PKueV7xNHzXWQGhKOFMDgw+ITUg/I8Gh JyDNBkYJim1+oo2gPTRXdJ5/rb1j/6dWRDl8FA3KGUnrPa0aIoGuNG7j3/GZlM1K/raX 1UFw== X-Gm-Message-State: AHPjjUgm4TwHkvgKPyK5bsXugbhbJcLKEqG7JgMg7Mx5pmkjPwWnNwMg KRim0AiJDUQ/pi5yLaSuZl3spA== X-Google-Smtp-Source: AOwi7QBCi4D0DwdAQaM8+B3ajhLFCLjutOEdOdQmWwK5+CfloWksIEEHOV9MQPoaZmSvhezOLqHPdQ== X-Received: by 10.159.218.69 with SMTP id x5mr12974303plv.4.1506924773586; Sun, 01 Oct 2017 23:12:53 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id h9sm16151633pfh.98.2017.10.01.23.12.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 23:12:52 -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 v4 04/10] kexec_file: factor out crashdump elf header function from x86 Date: Mon, 2 Oct 2017 15:14:25 +0900 Message-Id: <20171002061431.11117-5-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171002061431.11117-1-takahiro.akashi@linaro.org> References: <20171002061431.11117-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org prepare_elf_headers() can also be useful for other architectures, including arm64. So let it factored out. Signed-off-by: AKASHI Takahiro Cc: Dave Young Cc: Vivek Goyal Cc: Baoquan He --- arch/x86/kernel/crash.c | 324 ------------------------------------------------ include/linux/kexec.h | 17 +++ kernel/kexec_file.c | 308 +++++++++++++++++++++++++++++++++++++++++++++ kernel/kexec_internal.h | 20 +++ 4 files changed, 345 insertions(+), 324 deletions(-) -- 2.14.1 diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 44404e2307bb..3c6b880f6dbf 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include @@ -41,34 +40,6 @@ /* Alignment required for elf header segment */ #define ELF_CORE_HEADER_ALIGN 4096 -/* This primarily represents number of split ranges due to exclusion */ -#define CRASH_MAX_RANGES 16 - -struct crash_mem_range { - u64 start, end; -}; - -struct crash_mem { - unsigned int nr_ranges; - struct crash_mem_range ranges[CRASH_MAX_RANGES]; -}; - -/* Misc data about ram ranges needed to prepare elf headers */ -struct crash_elf_data { - struct kimage *image; - /* - * Total number of ram ranges we have after various adjustments for - * crash reserved region, etc. - */ - unsigned int max_nr_ranges; - - /* Pointer to elf header */ - void *ehdr; - /* Pointer to next phdr */ - void *bufp; - struct crash_mem mem; -}; - /* Used while preparing memory map entries for second kernel */ struct crash_memmap_data { struct boot_params *params; @@ -209,301 +180,6 @@ void native_machine_crash_shutdown(struct pt_regs *regs) } #ifdef CONFIG_KEXEC_FILE -static int get_nr_ram_ranges_callback(u64 start, u64 end, void *arg) -{ - unsigned int *nr_ranges = arg; - - (*nr_ranges)++; - return 0; -} - - -/* Gather all the required information to prepare elf headers for ram regions */ -static void fill_up_crash_elf_data(struct crash_elf_data *ced, - struct kimage *image) -{ - unsigned int nr_ranges = 0; - - ced->image = image; - - walk_system_ram_res(0, -1, &nr_ranges, - get_nr_ram_ranges_callback); - - ced->max_nr_ranges = nr_ranges; - - /* Exclusion of crash region could split memory ranges */ - ced->max_nr_ranges++; - - /* If crashk_low_res is not 0, another range split possible */ - if (crashk_low_res.end) - ced->max_nr_ranges++; -} - -static int exclude_mem_range(struct crash_mem *mem, - unsigned long long mstart, unsigned long long mend) -{ - int i, j; - unsigned long long start, end; - struct crash_mem_range temp_range = {0, 0}; - - for (i = 0; i < mem->nr_ranges; i++) { - start = mem->ranges[i].start; - end = mem->ranges[i].end; - - if (mstart > end || mend < start) - continue; - - /* Truncate any area outside of range */ - if (mstart < start) - mstart = start; - if (mend > end) - mend = end; - - /* Found completely overlapping range */ - if (mstart == start && mend == end) { - mem->ranges[i].start = 0; - mem->ranges[i].end = 0; - if (i < mem->nr_ranges - 1) { - /* Shift rest of the ranges to left */ - for (j = i; j < mem->nr_ranges - 1; j++) { - mem->ranges[j].start = - mem->ranges[j+1].start; - mem->ranges[j].end = - mem->ranges[j+1].end; - } - } - mem->nr_ranges--; - return 0; - } - - if (mstart > start && mend < end) { - /* Split original range */ - mem->ranges[i].end = mstart - 1; - temp_range.start = mend + 1; - temp_range.end = end; - } else if (mstart != start) - mem->ranges[i].end = mstart - 1; - else - mem->ranges[i].start = mend + 1; - break; - } - - /* If a split happend, add the split to array */ - if (!temp_range.end) - return 0; - - /* Split happened */ - if (i == CRASH_MAX_RANGES - 1) { - pr_err("Too many crash ranges after split\n"); - return -ENOMEM; - } - - /* Location where new range should go */ - j = i + 1; - if (j < mem->nr_ranges) { - /* Move over all ranges one slot towards the end */ - for (i = mem->nr_ranges - 1; i >= j; i--) - mem->ranges[i + 1] = mem->ranges[i]; - } - - mem->ranges[j].start = temp_range.start; - mem->ranges[j].end = temp_range.end; - mem->nr_ranges++; - return 0; -} - -/* - * Look for any unwanted ranges between mstart, mend and remove them. This - * might lead to split and split ranges are put in ced->mem.ranges[] array - */ -static int elf_header_exclude_ranges(struct crash_elf_data *ced, - unsigned long long mstart, unsigned long long mend) -{ - struct crash_mem *cmem = &ced->mem; - int ret = 0; - - memset(cmem->ranges, 0, sizeof(cmem->ranges)); - - cmem->ranges[0].start = mstart; - cmem->ranges[0].end = mend; - cmem->nr_ranges = 1; - - /* Exclude crashkernel region */ - ret = exclude_mem_range(cmem, crashk_res.start, crashk_res.end); - if (ret) - return ret; - - if (crashk_low_res.end) { - ret = exclude_mem_range(cmem, crashk_low_res.start, crashk_low_res.end); - if (ret) - return ret; - } - - return ret; -} - -static int prepare_elf64_ram_headers_callback(u64 start, u64 end, void *arg) -{ - struct crash_elf_data *ced = arg; - Elf64_Ehdr *ehdr; - Elf64_Phdr *phdr; - unsigned long mstart, mend; - struct kimage *image = ced->image; - struct crash_mem *cmem; - int ret, i; - - ehdr = ced->ehdr; - - /* Exclude unwanted mem ranges */ - ret = elf_header_exclude_ranges(ced, start, end); - if (ret) - return ret; - - /* Go through all the ranges in ced->mem.ranges[] and prepare phdr */ - cmem = &ced->mem; - - for (i = 0; i < cmem->nr_ranges; i++) { - mstart = cmem->ranges[i].start; - mend = cmem->ranges[i].end; - - phdr = ced->bufp; - ced->bufp += sizeof(Elf64_Phdr); - - phdr->p_type = PT_LOAD; - phdr->p_flags = PF_R|PF_W|PF_X; - phdr->p_offset = mstart; - - /* - * If a range matches backup region, adjust offset to backup - * segment. - */ - if (mstart == image->arch.backup_src_start && - (mend - mstart + 1) == image->arch.backup_src_sz) - phdr->p_offset = image->arch.backup_load_addr; - - phdr->p_paddr = mstart; - phdr->p_vaddr = (unsigned long long) __va(mstart); - phdr->p_filesz = phdr->p_memsz = mend - mstart + 1; - phdr->p_align = 0; - ehdr->e_phnum++; - pr_debug("Crash PT_LOAD elf header. phdr=%p vaddr=0x%llx, paddr=0x%llx, sz=0x%llx e_phnum=%d p_offset=0x%llx\n", - phdr, phdr->p_vaddr, phdr->p_paddr, phdr->p_filesz, - ehdr->e_phnum, phdr->p_offset); - } - - return ret; -} - -static int prepare_elf64_headers(struct crash_elf_data *ced, - void **addr, unsigned long *sz) -{ - Elf64_Ehdr *ehdr; - Elf64_Phdr *phdr; - unsigned long nr_cpus = num_possible_cpus(), nr_phdr, elf_sz; - unsigned char *buf, *bufp; - unsigned int cpu; - unsigned long long notes_addr; - int ret; - - /* extra phdr for vmcoreinfo elf note */ - nr_phdr = nr_cpus + 1; - nr_phdr += ced->max_nr_ranges; - - /* - * kexec-tools creates an extra PT_LOAD phdr for kernel text mapping - * area on x86_64 (ffffffff80000000 - ffffffffa0000000). - * I think this is required by tools like gdb. So same physical - * memory will be mapped in two elf headers. One will contain kernel - * text virtual addresses and other will have __va(physical) addresses. - */ - - nr_phdr++; - elf_sz = sizeof(Elf64_Ehdr) + nr_phdr * sizeof(Elf64_Phdr); - elf_sz = ALIGN(elf_sz, ELF_CORE_HEADER_ALIGN); - - buf = vzalloc(elf_sz); - if (!buf) - return -ENOMEM; - - bufp = buf; - ehdr = (Elf64_Ehdr *)bufp; - bufp += sizeof(Elf64_Ehdr); - memcpy(ehdr->e_ident, ELFMAG, SELFMAG); - ehdr->e_ident[EI_CLASS] = ELFCLASS64; - ehdr->e_ident[EI_DATA] = ELFDATA2LSB; - ehdr->e_ident[EI_VERSION] = EV_CURRENT; - ehdr->e_ident[EI_OSABI] = ELF_OSABI; - memset(ehdr->e_ident + EI_PAD, 0, EI_NIDENT - EI_PAD); - ehdr->e_type = ET_CORE; - ehdr->e_machine = ELF_ARCH; - ehdr->e_version = EV_CURRENT; - ehdr->e_phoff = sizeof(Elf64_Ehdr); - ehdr->e_ehsize = sizeof(Elf64_Ehdr); - ehdr->e_phentsize = sizeof(Elf64_Phdr); - - /* Prepare one phdr of type PT_NOTE for each present cpu */ - for_each_present_cpu(cpu) { - phdr = (Elf64_Phdr *)bufp; - bufp += sizeof(Elf64_Phdr); - phdr->p_type = PT_NOTE; - notes_addr = per_cpu_ptr_to_phys(per_cpu_ptr(crash_notes, cpu)); - phdr->p_offset = phdr->p_paddr = notes_addr; - phdr->p_filesz = phdr->p_memsz = sizeof(note_buf_t); - (ehdr->e_phnum)++; - } - - /* Prepare one PT_NOTE header for vmcoreinfo */ - phdr = (Elf64_Phdr *)bufp; - bufp += sizeof(Elf64_Phdr); - phdr->p_type = PT_NOTE; - phdr->p_offset = phdr->p_paddr = paddr_vmcoreinfo_note(); - phdr->p_filesz = phdr->p_memsz = VMCOREINFO_NOTE_SIZE; - (ehdr->e_phnum)++; - -#ifdef CONFIG_X86_64 - /* Prepare PT_LOAD type program header for kernel text region */ - phdr = (Elf64_Phdr *)bufp; - bufp += sizeof(Elf64_Phdr); - phdr->p_type = PT_LOAD; - phdr->p_flags = PF_R|PF_W|PF_X; - phdr->p_vaddr = (Elf64_Addr)_text; - phdr->p_filesz = phdr->p_memsz = _end - _text; - phdr->p_offset = phdr->p_paddr = __pa_symbol(_text); - (ehdr->e_phnum)++; -#endif - - /* Prepare PT_LOAD headers for system ram chunks. */ - ced->ehdr = ehdr; - ced->bufp = bufp; - ret = walk_system_ram_res(0, -1, ced, - prepare_elf64_ram_headers_callback); - if (ret < 0) - return ret; - - *addr = buf; - *sz = elf_sz; - return 0; -} - -/* Prepare elf headers. Return addr and size */ -static int prepare_elf_headers(struct kimage *image, void **addr, - unsigned long *sz) -{ - struct crash_elf_data *ced; - int ret; - - ced = kzalloc(sizeof(*ced), GFP_KERNEL); - if (!ced) - return -ENOMEM; - - fill_up_crash_elf_data(ced, image); - - /* By default prepare 64bit headers */ - ret = prepare_elf64_headers(ced, addr, sz); - kfree(ced); - return ret; -} - static int add_e820_entry(struct boot_params *params, struct e820_entry *entry) { unsigned int nr_e820_entries; diff --git a/include/linux/kexec.h b/include/linux/kexec.h index c64c29c1fb0e..36d90fa41419 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -162,6 +162,23 @@ int __weak arch_kexec_walk_mem(struct kexec_buf *kbuf, int (*func)(u64, u64, void *)); extern int kexec_add_buffer(struct kexec_buf *kbuf); int kexec_locate_mem_hole(struct kexec_buf *kbuf); +extern int prepare_elf_headers(struct kimage *image, void **addr, + unsigned long *sz); + +/* This primarily represents number of split ranges due to exclusion */ +#define CRASH_MAX_RANGES 16 + +struct crash_mem_range { + u64 start, end; +}; + +struct crash_mem { + unsigned int nr_ranges; + struct crash_mem_range ranges[CRASH_MAX_RANGES]; +}; + +extern int exclude_mem_range(struct crash_mem *mem, + unsigned long long mstart, unsigned long long mend); #endif /* CONFIG_KEXEC_FILE */ struct kimage { diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 130965b28392..8a7f029c5995 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -22,6 +22,11 @@ #include #include #include +#include +#include +#include +#include +#include #include #include #include "kexec_internal.h" @@ -1074,3 +1079,306 @@ int kexec_purgatory_get_set_symbol(struct kimage *image, const char *name, return 0; } + +static int get_nr_ram_ranges_callback(u64 start, u64 end, void *arg) +{ + unsigned int *nr_ranges = arg; + + (*nr_ranges)++; + return 0; +} + + +/* Gather all the required information to prepare elf headers for ram regions */ +static void fill_up_crash_elf_data(struct crash_elf_data *ced, + struct kimage *image) +{ + unsigned int nr_ranges = 0; + + ced->image = image; + + walk_system_ram_res(0, -1, &nr_ranges, + get_nr_ram_ranges_callback); + + ced->max_nr_ranges = nr_ranges; + + /* Exclusion of crash region could split memory ranges */ + ced->max_nr_ranges++; + +#ifdef CONFIG_X86_64 + /* If crashk_low_res is not 0, another range split possible */ + if (crashk_low_res.end) + ced->max_nr_ranges++; +#endif +} + +int exclude_mem_range(struct crash_mem *mem, + unsigned long long mstart, unsigned long long mend) +{ + int i, j; + unsigned long long start, end; + struct crash_mem_range temp_range = {0, 0}; + + for (i = 0; i < mem->nr_ranges; i++) { + start = mem->ranges[i].start; + end = mem->ranges[i].end; + + if (mstart > end || mend < start) + continue; + + /* Truncate any area outside of range */ + if (mstart < start) + mstart = start; + if (mend > end) + mend = end; + + /* Found completely overlapping range */ + if (mstart == start && mend == end) { + mem->ranges[i].start = 0; + mem->ranges[i].end = 0; + if (i < mem->nr_ranges - 1) { + /* Shift rest of the ranges to left */ + for (j = i; j < mem->nr_ranges - 1; j++) { + mem->ranges[j].start = + mem->ranges[j+1].start; + mem->ranges[j].end = + mem->ranges[j+1].end; + } + } + mem->nr_ranges--; + return 0; + } + + if (mstart > start && mend < end) { + /* Split original range */ + mem->ranges[i].end = mstart - 1; + temp_range.start = mend + 1; + temp_range.end = end; + } else if (mstart != start) + mem->ranges[i].end = mstart - 1; + else + mem->ranges[i].start = mend + 1; + break; + } + + /* If a split happened, add the split to array */ + if (!temp_range.end) + return 0; + + /* Split happened */ + if (i == CRASH_MAX_RANGES - 1) { + pr_err("Too many crash ranges after split\n"); + return -ENOMEM; + } + + /* Location where new range should go */ + j = i + 1; + if (j < mem->nr_ranges) { + /* Move over all ranges one slot towards the end */ + for (i = mem->nr_ranges - 1; i >= j; i--) + mem->ranges[i + 1] = mem->ranges[i]; + } + + mem->ranges[j].start = temp_range.start; + mem->ranges[j].end = temp_range.end; + mem->nr_ranges++; + return 0; +} + +/* + * Look for any unwanted ranges between mstart, mend and remove them. This + * might lead to split and split ranges are put in ced->mem.ranges[] array + */ +static int elf_header_exclude_ranges(struct crash_elf_data *ced, + unsigned long long mstart, unsigned long long mend) +{ + struct crash_mem *cmem = &ced->mem; + int ret = 0; + + memset(cmem->ranges, 0, sizeof(cmem->ranges)); + + cmem->ranges[0].start = mstart; + cmem->ranges[0].end = mend; + cmem->nr_ranges = 1; + + /* Exclude crashkernel region */ + ret = exclude_mem_range(cmem, crashk_res.start, crashk_res.end); + if (ret) + return ret; + +#ifdef CONFIG_X86_64 + if (crashk_low_res.end) { + ret = exclude_mem_range(cmem, crashk_low_res.start, + crashk_low_res.end); + if (ret) + return ret; + } +#endif + + return ret; +} + +static int prepare_elf64_ram_headers_callback(u64 start, u64 end, void *arg) +{ + struct crash_elf_data *ced = arg; + Elf64_Ehdr *ehdr; + Elf64_Phdr *phdr; + unsigned long mstart, mend; +#ifdef CONFIG_X86_64 + struct kimage *image = ced->image; +#endif + struct crash_mem *cmem; + int ret, i; + + ehdr = ced->ehdr; + + /* Exclude unwanted mem ranges */ + ret = elf_header_exclude_ranges(ced, start, end); + if (ret) + return ret; + + /* Go through all the ranges in ced->mem.ranges[] and prepare phdr */ + cmem = &ced->mem; + + for (i = 0; i < cmem->nr_ranges; i++) { + mstart = cmem->ranges[i].start; + mend = cmem->ranges[i].end; + + phdr = ced->bufp; + ced->bufp += sizeof(Elf64_Phdr); + + phdr->p_type = PT_LOAD; + phdr->p_flags = PF_R|PF_W|PF_X; + phdr->p_offset = mstart; + +#ifdef CONFIG_X86_64 + /* + * If a range matches backup region, adjust offset to backup + * segment. + */ + if (mstart == image->arch.backup_src_start && + (mend - mstart + 1) == image->arch.backup_src_sz) + phdr->p_offset = image->arch.backup_load_addr; +#endif + + phdr->p_paddr = mstart; + phdr->p_vaddr = (unsigned long long) __va(mstart); + phdr->p_filesz = phdr->p_memsz = mend - mstart + 1; + phdr->p_align = 0; + ehdr->e_phnum++; + pr_debug("Crash PT_LOAD elf header. phdr=%p vaddr=0x%llx, paddr=0x%llx, sz=0x%llx e_phnum=%d p_offset=0x%llx\n", + phdr, phdr->p_vaddr, phdr->p_paddr, phdr->p_filesz, + ehdr->e_phnum, phdr->p_offset); + } + + return ret; +} + +static int prepare_elf64_headers(struct crash_elf_data *ced, + void **addr, unsigned long *sz) +{ + Elf64_Ehdr *ehdr; + Elf64_Phdr *phdr; + unsigned long nr_cpus = num_possible_cpus(), nr_phdr, elf_sz; + unsigned char *buf, *bufp; + unsigned int cpu; + unsigned long long notes_addr; + int ret; + + /* extra phdr for vmcoreinfo elf note */ + nr_phdr = nr_cpus + 1; + nr_phdr += ced->max_nr_ranges; + + /* + * kexec-tools creates an extra PT_LOAD phdr for kernel text mapping + * area on x86_64 (ffffffff80000000 - ffffffffa0000000). + * I think this is required by tools like gdb. So same physical + * memory will be mapped in two elf headers. One will contain kernel + * text virtual addresses and other will have __va(physical) addresses. + */ + + nr_phdr++; + elf_sz = sizeof(Elf64_Ehdr) + nr_phdr * sizeof(Elf64_Phdr); + elf_sz = ALIGN(elf_sz, ELF_CORE_HEADER_ALIGN); + + buf = vzalloc(elf_sz); + if (!buf) + return -ENOMEM; + + bufp = buf; + ehdr = (Elf64_Ehdr *)bufp; + bufp += sizeof(Elf64_Ehdr); + memcpy(ehdr->e_ident, ELFMAG, SELFMAG); + ehdr->e_ident[EI_CLASS] = ELFCLASS64; + ehdr->e_ident[EI_DATA] = ELFDATA2LSB; + ehdr->e_ident[EI_VERSION] = EV_CURRENT; + ehdr->e_ident[EI_OSABI] = ELF_OSABI; + memset(ehdr->e_ident + EI_PAD, 0, EI_NIDENT - EI_PAD); + ehdr->e_type = ET_CORE; + ehdr->e_machine = ELF_ARCH; + ehdr->e_version = EV_CURRENT; + ehdr->e_phoff = sizeof(Elf64_Ehdr); + ehdr->e_ehsize = sizeof(Elf64_Ehdr); + ehdr->e_phentsize = sizeof(Elf64_Phdr); + + /* Prepare one phdr of type PT_NOTE for each present cpu */ + for_each_present_cpu(cpu) { + phdr = (Elf64_Phdr *)bufp; + bufp += sizeof(Elf64_Phdr); + phdr->p_type = PT_NOTE; + notes_addr = per_cpu_ptr_to_phys(per_cpu_ptr(crash_notes, cpu)); + phdr->p_offset = phdr->p_paddr = notes_addr; + phdr->p_filesz = phdr->p_memsz = sizeof(note_buf_t); + (ehdr->e_phnum)++; + } + + /* Prepare one PT_NOTE header for vmcoreinfo */ + phdr = (Elf64_Phdr *)bufp; + bufp += sizeof(Elf64_Phdr); + phdr->p_type = PT_NOTE; + phdr->p_offset = phdr->p_paddr = paddr_vmcoreinfo_note(); + phdr->p_filesz = phdr->p_memsz = VMCOREINFO_NOTE_SIZE; + (ehdr->e_phnum)++; + +#ifdef CONFIG_X86_64 + /* Prepare PT_LOAD type program header for kernel text region */ + phdr = (Elf64_Phdr *)bufp; + bufp += sizeof(Elf64_Phdr); + phdr->p_type = PT_LOAD; + phdr->p_flags = PF_R|PF_W|PF_X; + phdr->p_vaddr = (Elf64_Addr)_text; + phdr->p_filesz = phdr->p_memsz = _end - _text; + phdr->p_offset = phdr->p_paddr = __pa_symbol(_text); + (ehdr->e_phnum)++; +#endif + + /* Prepare PT_LOAD headers for system ram chunks. */ + ced->ehdr = ehdr; + ced->bufp = bufp; + ret = walk_system_ram_res(0, -1, ced, + prepare_elf64_ram_headers_callback); + if (ret < 0) + return ret; + + *addr = buf; + *sz = elf_sz; + return 0; +} + +/* Prepare elf headers. Return addr and size */ +int prepare_elf_headers(struct kimage *image, void **addr, unsigned long *sz) +{ + struct crash_elf_data *ced; + int ret; + + ced = kzalloc(sizeof(*ced), GFP_KERNEL); + if (!ced) + return -ENOMEM; + + fill_up_crash_elf_data(ced, image); + + /* By default prepare 64bit headers */ + ret = prepare_elf64_headers(ced, addr, sz); + kfree(ced); + return ret; +} diff --git a/kernel/kexec_internal.h b/kernel/kexec_internal.h index 50dfcb039a41..3c7a034f1fe1 100644 --- a/kernel/kexec_internal.h +++ b/kernel/kexec_internal.h @@ -16,6 +16,26 @@ extern struct mutex kexec_mutex; #ifdef CONFIG_KEXEC_FILE #include + +/* Alignment required for elf header segment */ +#define ELF_CORE_HEADER_ALIGN 4096 + +/* Misc data about ram ranges needed to prepare elf headers */ +struct crash_elf_data { + struct kimage *image; + /* + * Total number of ram ranges we have after various adjustments for + * crash reserved region, etc. + */ + unsigned int max_nr_ranges; + + /* Pointer to elf header */ + void *ehdr; + /* Pointer to next phdr */ + void *bufp; + struct crash_mem mem; +}; + void kimage_file_post_load_cleanup(struct kimage *image); extern char kexec_purgatory[]; extern size_t kexec_purgatory_size; From patchwork Mon Oct 2 06:14:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 114551 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp325748qgn; Sun, 1 Oct 2017 23:13:07 -0700 (PDT) X-Received: by 10.98.152.28 with SMTP id q28mr13535506pfd.80.1506924787668; Sun, 01 Oct 2017 23:13:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506924787; cv=none; d=google.com; s=arc-20160816; b=vHdM/1BT1ewaUF39Ax7vr4+uzB47HafanaVbXa049lCubwcLTBn2AZaIuy/qnt5HkW 8H3kjo3iQ331pGlTdf4KPAJNCZBhCxbCaZkrjMlvtUiI7duVHCamvb6FFIbsoBI64iqV I/FtZHSuckjKs0BEefoSeernkqdlZerp9F8eRNtcb79zVH+tfIgpEIisoziBvTjANd0o mwYrL8J7odgmjMXK0gIu/sMm0uPCsPQWyjyOfYZhjbAt1PVa7C5c725adVjqLGNDf5uw pOWYi/RbRL4I+FyFMlZYc4o1YldJHr+nfPh0Ex1NNEqZ8133ma8jwaLnAijwCOsRjB3f +s2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=XQ2hfwuqOxZtO/79mPkNiInqsdauHyfcRiwhgMReb/c=; b=qEndlUPT7kietSIp+T+JTw/gKIOV54HkTzXAYPj6T2qP0Dc2VzO09Vmu/ykRInZPdu 0FzsQRkkmeN6CYyLfjq0kpbTOaAxmOE3+i/rLuNdaa+uAKtnAG65aJaCuG45dSQPd4yh REgHj+wd6eKR8uuzm4U+dziqdgWeyvJTbBPpnGZM2C6Quv6n0lLxFgH7aoFZem+sj30g F+9yIWkQm+GWFss2n8vvH5TZZJnFFQ5Q26ENHztlP0sTU2wG+J/3zIynFLx/jaKtPbUw Qgje1BHYtJEN15gYGSKEpByhSkQdZOLHD5FQib7lBAqNyGetZkOpuoav7VEsWKVUIuci ixcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aXyhANtf; 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 b3si7448122plb.751.2017.10.01.23.13.07; Sun, 01 Oct 2017 23:13:07 -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=aXyhANtf; 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 S1751357AbdJBGNE (ORCPT + 26 others); Mon, 2 Oct 2017 02:13:04 -0400 Received: from mail-pf0-f175.google.com ([209.85.192.175]:46815 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751312AbdJBGM6 (ORCPT ); Mon, 2 Oct 2017 02:12:58 -0400 Received: by mail-pf0-f175.google.com with SMTP id r68so2441457pfj.3 for ; Sun, 01 Oct 2017 23:12:58 -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:in-reply-to:references; bh=XQ2hfwuqOxZtO/79mPkNiInqsdauHyfcRiwhgMReb/c=; b=aXyhANtftldCGgrzXW7t9YPhe5A9leOSBCX1gtKnbHbO6CjCs0IyoWMSZL7y9xpYfI bYPM17RNEjq+EAb2SEqCF/JZ/mZ1WIuSvNeBTt1f2ZgTUM1PMLX2YxnBjPequExF+Gml UpXvUVGsr+eEVkCg9RUPXDuHu3iWHxwFxmWUA= 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:in-reply-to :references; bh=XQ2hfwuqOxZtO/79mPkNiInqsdauHyfcRiwhgMReb/c=; b=KBjNbC0wuAfp6RoxM0pY4GbWCGrkKSvH3pQB60uB2m+PQhqIf7DxUIL0ht5S+DTnKO dzhEc3mK28eHqheeEdepup//ipCi812DXw2vvqO5oeQoENnym08I9c6YPlTZOkyei5Ww QGxavfddJGXSLItvPRGpmT/K6simSVsAp6/j1AM6/bUg5hMp9eoE4rcBIdOwb9IuCNIn R1orV9q7SUwMyeh2/vXJFblRDKz0gEmcyA08yuGkkm/x2DmXfhnTmwGWgVfqwM/LgTCK iXm3rWPn2xmYhhcWQ76qJL5uVsNOPwrJQ9tEA17iaeOlWyH2gtDjefAic1fmjk5K2cJK W6Eg== X-Gm-Message-State: AHPjjUgwNNGe1mTbxjUs1bXSbbWtWkfWvscFM7PgtS+46qTuHbk5fDe0 4qF/9f6SmlgPZ1jqS3dF6ggGXA== X-Google-Smtp-Source: AOwi7QAllDtzz1zxG9j863Sph/Sp5as/umh9+gwfPiAP6H7HcIMtrE90Qa6m+n58KBLwZxr/lfIsKA== X-Received: by 10.98.192.136 with SMTP id g8mr13679954pfk.96.1506924777711; Sun, 01 Oct 2017 23:12:57 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id t17sm15604318pfl.61.2017.10.01.23.12.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 23:12:57 -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 v4 05/10] asm-generic: add kexec_file_load system call to unistd.h Date: Mon, 2 Oct 2017 15:14:26 +0900 Message-Id: <20171002061431.11117-6-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171002061431.11117-1-takahiro.akashi@linaro.org> References: <20171002061431.11117-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The initial user of this system call number is arm64. Signed-off-by: AKASHI Takahiro Acked-by: Arnd Bergmann --- include/uapi/asm-generic/unistd.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.14.1 diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index 061185a5eb51..086697fe3917 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -731,9 +731,11 @@ __SYSCALL(__NR_pkey_alloc, sys_pkey_alloc) __SYSCALL(__NR_pkey_free, sys_pkey_free) #define __NR_statx 291 __SYSCALL(__NR_statx, sys_statx) +#define __NR_kexec_file_load 292 +__SYSCALL(__NR_kexec_file_load, sys_kexec_file_load) #undef __NR_syscalls -#define __NR_syscalls 292 +#define __NR_syscalls 293 /* * All syscalls below here should go away really, From patchwork Mon Oct 2 06:14:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 114556 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp326688qgn; Sun, 1 Oct 2017 23:14:25 -0700 (PDT) X-Received: by 10.84.229.1 with SMTP id b1mr3120413plk.405.1506924865080; Sun, 01 Oct 2017 23:14:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506924865; cv=none; d=google.com; s=arc-20160816; b=pwvKkKp4b3wByr3SU9VmOW5h0DyYo5VslZXYUm/GILpxT4YC1+2L0JxiZdp9aA6YFo zG62qCb0ZWKhXFEbkA9oudbbw7ILIcv0PEvUBK58KdkN6vJrNafGuH5x9SGdAQIokE2A 4e5b6vGDCzFhpviwbpbAzQTsdN7zOli1EM+4uHfOjs2zFdDKpjnQgd0A/ucbzPZOwULN candx1VkNluVBI74iFRXRXusN3Yi69EUdb2AQzK4x1shKhIiITTCQCfEV+lm1Sd66RT1 ZiCsE3kRURxe5Qe1JzQ5EWngzPZrgwj/ckc1GR7e6xS6AK8RAtU0/0jWJTEW/odFDVAO KjIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=YaKBzkr/cIWgFVTBEsCUvwM4WhsObL1dHTAi6/jIrrg=; b=qqbfTi/Dzap559QBVtFIL2zRm+lkU0rUOuvYqfjAdAKCk5UfxmqMxFrTbAviJQQZF+ fX2quLA3NGavD8T5syMcp16N6yVXtJqQB8SQPhMEch+WGpMjSIDwbzSZeOQ0U5/XrO8E dU5Z9mZ46gREAS6RoEpT3oWErzMEpi+lY+yJMJa2s+EG+X7j+zUyO7wKrFoHy5bUyK65 OwC4iE1sRPKYppcJbC7C41bhBy0TMANzSlwJZFsVMua2Fg9n4KZmGuIVdl4CqzRyTWtV IsVDVJsiwQec/5Kf73H+0Ldj85Xe6H2SYxE8hzyPtlLuzfM/jqiS//oyyeMrawHoksL0 QXJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XdVvYQ7F; 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 g2si7066291pgf.680.2017.10.01.23.14.24; Sun, 01 Oct 2017 23:14:25 -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=XdVvYQ7F; 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 S1751784AbdJBGOX (ORCPT + 26 others); Mon, 2 Oct 2017 02:14:23 -0400 Received: from mail-pf0-f174.google.com ([209.85.192.174]:50282 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751082AbdJBGNC (ORCPT ); Mon, 2 Oct 2017 02:13:02 -0400 Received: by mail-pf0-f174.google.com with SMTP id m63so2437319pfk.7 for ; Sun, 01 Oct 2017 23:13:02 -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:in-reply-to:references; bh=YaKBzkr/cIWgFVTBEsCUvwM4WhsObL1dHTAi6/jIrrg=; b=XdVvYQ7FscC9a7iRQj/v96vgpBtbd7v1dQ82eYpctwcnn7NeuslKbZ9FLAqhfTwofV D/Xc5oz/xJVgnGq/dFDgp0HxlVrNU2STF0WNM0aMr2bGWYJqqFRpJBI4I3k0kwUUlYXa 8kcgmup/CpGq3P+c3ZhM/N7yiauBSbybXZ04o= 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:in-reply-to :references; bh=YaKBzkr/cIWgFVTBEsCUvwM4WhsObL1dHTAi6/jIrrg=; b=eBdRTdCklIuzmH2Ed471OR7UqN9rc8/BmWXPYrqStJAuh4G8E+u3Tx1KUyIchTa6Zz 6FBiTOQC5BmHdPJ4QkgOgiJ7FVzhhM89MP0oEfrq/YVosSbUsw687QcInImeWofsYEdJ wi5hBe6z5v4Yw4yzqwSpS4X/6PVcBP85fjKYej0PfOqnm2nC9EevPHNAGF2RvTaU+Ga9 dnSYAh2uVcCNSihk+IuCq/MmWBp5c8dr3hMij4lmfUqd7ggk7LsAl6yz6vis5XNhUlR0 gN5qbHz+RnVjq7k7CNyqjnF0wN+Y/4Q7KGAUyyK5iFq55sBy5geuk5RQph0WoajdeEvf +SaA== X-Gm-Message-State: AHPjjUjVCTW6ButQLchmzuPEnhsKzOcjVMaje3mi+rQJH4vyksRbd7Z8 sZ60gdhHnZ57zcBrnqZfkPo9IQ== X-Google-Smtp-Source: AOwi7QAaD7pmDFoBnY30zUJJQ+KOxUF5tu0IZDrOHpp+uGC3hQPRHAgPdlVvyaRa7t/3/kUxyJJ1bg== X-Received: by 10.84.235.198 with SMTP id m6mr13109390plt.57.1506924782078; Sun, 01 Oct 2017 23:13:02 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id n18sm14764393pfg.44.2017.10.01.23.13.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 23:13:01 -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 v4 06/10] arm64: kexec_file: create purgatory Date: Mon, 2 Oct 2017 15:14:27 +0900 Message-Id: <20171002061431.11117-7-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171002061431.11117-1-takahiro.akashi@linaro.org> References: <20171002061431.11117-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a basic purgatory, or a kind of glue code between the two kernels, for arm64. Since purgatory is assumed to be relocatable (not executable) object by kexec generic code, arch_kexec_apply_relocations_add() is required in general. Arm64's purgatory, however, is a simple asm and all the references can be resolved as local, no re-linking is needed here. Please note that even if we don't support digest check at purgatory we need purgatory_sha_regions and purgatory_sha256_digest as they are referenced by generic kexec code. Signed-off-by: AKASHI Takahiro Cc: Catalin Marinas Cc: Will Deacon --- arch/arm64/Makefile | 1 + arch/arm64/purgatory/Makefile | 24 +++++++++++++++++++ arch/arm64/purgatory/entry.S | 55 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 arch/arm64/purgatory/Makefile create mode 100644 arch/arm64/purgatory/entry.S -- 2.14.1 diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 939b310913cf..cf39ec3baf5a 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -110,6 +110,7 @@ core-$(CONFIG_XEN) += arch/arm64/xen/ core-$(CONFIG_CRYPTO) += arch/arm64/crypto/ libs-y := arch/arm64/lib/ $(libs-y) core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a +core-$(CONFIG_KEXEC_FILE) += arch/arm64/purgatory/ # Default target when executing plain make boot := arch/arm64/boot diff --git a/arch/arm64/purgatory/Makefile b/arch/arm64/purgatory/Makefile new file mode 100644 index 000000000000..c2127a2cbd51 --- /dev/null +++ b/arch/arm64/purgatory/Makefile @@ -0,0 +1,24 @@ +OBJECT_FILES_NON_STANDARD := y + +purgatory-y := entry.o + +targets += $(purgatory-y) +PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y)) + +LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined \ + -nostdlib -z nodefaultlib +targets += purgatory.ro + +$(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE + $(call if_changed,ld) + +targets += kexec_purgatory.c + +CMD_BIN2C = $(objtree)/scripts/basic/bin2c +quiet_cmd_bin2c = BIN2C $@ + cmd_bin2c = $(CMD_BIN2C) kexec_purgatory < $< > $@ + +$(obj)/kexec_purgatory.c: $(obj)/purgatory.ro FORCE + $(call if_changed,bin2c) + +obj-${CONFIG_KEXEC_FILE} += kexec_purgatory.o diff --git a/arch/arm64/purgatory/entry.S b/arch/arm64/purgatory/entry.S new file mode 100644 index 000000000000..fe6e968076db --- /dev/null +++ b/arch/arm64/purgatory/entry.S @@ -0,0 +1,55 @@ +/* + * kexec core purgatory + */ +#include +#include + +#define SHA256_DIGEST_SIZE 32 /* defined in crypto/sha.h */ + +.text + +ENTRY(purgatory_start) + /* Start new image. */ + ldr x17, __kernel_entry + ldr x0, __dtb_addr + mov x1, xzr + mov x2, xzr + mov x3, xzr + br x17 +END(purgatory_start) + +/* + * data section: + * kernel_entry and dtb_addr are global but also labelled as local, + * "__xxx:", to avoid unwanted re-linking. + * + * purgatory_sha_regions and purgatory_sha256_digest are referenced + * by kexec generic code and so must exist, but not actually used + * here because hash check is not that useful in purgatory. + */ +.align 3 + +.globl kernel_entry +kernel_entry: +__kernel_entry: + .quad 0 +END(kernel_entry) + +.globl dtb_addr +dtb_addr: +__dtb_addr: + .quad 0 +END(dtb_addr) + +.globl purgatory_sha_regions +purgatory_sha_regions: + .rept KEXEC_SEGMENT_MAX + .quad 0 + .quad 0 + .endr +END(purgatory_sha_regions) + +.globl purgatory_sha256_digest +purgatory_sha256_digest: + .skip SHA256_DIGEST_SIZE +END(purgatory_sha256_digest) From patchwork Mon Oct 2 06:14:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 114552 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp325852qgn; Sun, 1 Oct 2017 23:13:15 -0700 (PDT) X-Received: by 10.84.247.8 with SMTP id n8mr13758756pll.318.1506924795795; Sun, 01 Oct 2017 23:13:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506924795; cv=none; d=google.com; s=arc-20160816; b=g0VnTBXF2XG0cki68lWRzZL0i7BGb/oW0hTqlpWn+TsoDEQtsfwCfIoyXPvHSpgr2J oL7Kj6IVV6kvkGGW27RoTLzB2uLxNcnTupKszmmK05MgMuONWCdAaok2uRNwTU/GIDTc cNqzg/zI2ECEf7hKeOXsFNgGVKtuSZ198zb4oLLawobBbzaXh8sIEK+JsLCHoS9/+MCJ huZMyC9ubGhTJNZ2hE9TTQfd6n/e4zCdIhF6/bYu8eFbJPujdtxdK8bNBqh6eyj7Dx0E yd7QaFUpIAsL3KA/OdsuMBZfIqli5xFrVhJ54Ynba98YKQjED0EYteULxkPsKTWqVpgP 6J5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=pFzlnQZFfUue3YObmZeqgxLVqZBu71Ft9PEvP+Km26I=; b=hOLHnuj+p+TVrtxxRVzEnvrZY3/nyJ1wxcG0zR2lvT8z/kMXJyaZXme7dp8fGiDevd QDuH/kRDkPRaZrUC/SDQwUfcpjf8/Th2zCoqIMwtKT5sonsDg+KfczqMNPRc537VWI88 8MuPiGbkDMOdC4yFJLMul8vYGY/NqsFOpw/cciM7taD2+xKsx8sJ9sdbvO7Ydt1loahX FYO1Tf6aWkmURhu+elIyW9J9H/pktojh/ujPOHdozM8hhL1aU0eUCqdutBjy2avxIbAF CQm3uI1gEvd2dcJW8jAAuf/qsgX185RAyGEtu5YWh1DIYJHRqRs1kMTaw38dSJRulXld pVYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z+YTVhra; 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 b3si7448122plb.751.2017.10.01.23.13.15; Sun, 01 Oct 2017 23:13:15 -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=Z+YTVhra; 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 S1751420AbdJBGNM (ORCPT + 26 others); Mon, 2 Oct 2017 02:13:12 -0400 Received: from mail-pf0-f177.google.com ([209.85.192.177]:48424 "EHLO mail-pf0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751373AbdJBGNG (ORCPT ); Mon, 2 Oct 2017 02:13:06 -0400 Received: by mail-pf0-f177.google.com with SMTP id n24so2439181pfk.5 for ; Sun, 01 Oct 2017 23:13:06 -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:in-reply-to:references; bh=pFzlnQZFfUue3YObmZeqgxLVqZBu71Ft9PEvP+Km26I=; b=Z+YTVhrawF1TAOyK2RUtKo4mVUli5k0nqW6D6mn/Lx7g+vyVKy8TiavbDRlSJjr0Yn PR48+kIf+tw2DqIE+N4ZXN0uU1IQdroDdafhNzsx38NYrmFPfjZ4L4TJul1vv4DD80ck GDNGe0Or1FVqtJ3MMI3+KYE+z7sIDQo/9a6vc= 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:in-reply-to :references; bh=pFzlnQZFfUue3YObmZeqgxLVqZBu71Ft9PEvP+Km26I=; b=S49JrbXL56sAHYdCpj9eSKy31dKh+mg0df6qS67ifloVI6wKPJecuF9RCkvIqLtagN QJCKlzn9y025BgQmfMNZMkTZzj3WAhgL5R7LXLvOqCDmDoPYeGVvagBeD9/1WS+vTIaJ VD0wKLl5OPhQYGsh5f6gBUMeLxeuPokbZ43FMt4uXngEBkpRyU5hDVhbUWpN6qeBVCax qtJcjIr5s2Ws9fw1ljNswtgVTfM0euiDJmwFT98NpTalPF3hSw/5ifMlgvbbXknOBRTp UHpoma2WX5NtmsYrezfZtvWglEa0sqUDuMkcwBX8nh4BX1MVzY5wEXej6XNhfVPVZv63 bC6w== X-Gm-Message-State: AMCzsaWzpbRd+Mo9vCz8B5r2OMZIbqFqvbQ41VLjTVro2ovghWiJs5ru JLIWpWVsGobpwHgZ2TmMRXfvdQ== X-Google-Smtp-Source: AOwi7QDJ4lqdpXYrG1SNp9xzJLrHtlDqMLrt7zEUDaUab6cNZ6KTHO4O4YsV0xw7hdCSvrgJZhJdWg== X-Received: by 10.99.160.71 with SMTP id u7mr4588981pgn.22.1506924786023; Sun, 01 Oct 2017 23:13:06 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id c185sm16326605pfb.57.2017.10.01.23.13.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 23:13:05 -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 v4 07/10] arm64: kexec_file: load initrd, device-tree and purgatory segments Date: Mon, 2 Oct 2017 15:14:28 +0900 Message-Id: <20171002061431.11117-8-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171002061431.11117-1-takahiro.akashi@linaro.org> References: <20171002061431.11117-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org load_other_segments() sets up and adds all the memory segments necessary other than kernel, including initrd, device-tree blob and purgatory. Most of the code was borrowed from kexec-tools' counterpart. arch_kimage_kernel_post_load_cleanup() is meant to free arm64-specific data allocated for loading kernel. Signed-off-by: AKASHI Takahiro Cc: Catalin Marinas Cc: Will Deacon --- arch/arm64/include/asm/kexec.h | 22 ++++ arch/arm64/kernel/Makefile | 3 +- arch/arm64/kernel/machine_kexec_file.c | 213 +++++++++++++++++++++++++++++++++ 3 files changed, 237 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/kernel/machine_kexec_file.c -- 2.14.1 diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h index e17f0529a882..2fadd3cbf3af 100644 --- a/arch/arm64/include/asm/kexec.h +++ b/arch/arm64/include/asm/kexec.h @@ -93,6 +93,28 @@ static inline void crash_prepare_suspend(void) {} static inline void crash_post_resume(void) {} #endif +#ifdef CONFIG_KEXEC_FILE +#define ARCH_HAS_KIMAGE_ARCH + +struct kimage_arch { + void *dtb_buf; +}; + +struct kimage; + +#define arch_kimage_file_post_load_cleanup arch_kimage_file_post_load_cleanup +extern int arch_kimage_file_post_load_cleanup(struct kimage *image); + +extern int setup_dtb(struct kimage *image, + unsigned long initrd_load_addr, unsigned long initrd_len, + char *cmdline, unsigned long cmdline_len, + char **dtb_buf, size_t *dtb_buf_len); +extern int load_other_segments(struct kimage *image, + unsigned long kernel_load_addr, + char *initrd, unsigned long initrd_len, + char *cmdline, unsigned long cmdline_len); +#endif + #endif /* __ASSEMBLY__ */ #endif diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index f2b4e816b6de..5df003d6157c 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -48,8 +48,9 @@ arm64-obj-$(CONFIG_ARM64_ACPI_PARKING_PROTOCOL) += acpi_parking_protocol.o arm64-obj-$(CONFIG_PARAVIRT) += paravirt.o arm64-obj-$(CONFIG_RANDOMIZE_BASE) += kaslr.o arm64-obj-$(CONFIG_HIBERNATION) += hibernate.o hibernate-asm.o -arm64-obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o \ +arm64-obj-$(CONFIG_KEXEC_CORE) += machine_kexec.o relocate_kernel.o \ cpu-reset.o +arm64-obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file.o arm64-obj-$(CONFIG_ARM64_RELOC_TEST) += arm64-reloc-test.o arm64-reloc-test-y := reloc_test_core.o reloc_test_syms.o arm64-obj-$(CONFIG_CRASH_DUMP) += crash_dump.o diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c new file mode 100644 index 000000000000..8a09d89f6266 --- /dev/null +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -0,0 +1,213 @@ +/* + * kexec_file for arm64 + * + * Copyright (C) 2017 Linaro Limited + * Author: AKASHI Takahiro + * + * Most code is derived from arm64 port of kexec-tools + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#define pr_fmt(fmt) "kexec_file: " fmt + +#include +#include +#include +#include +#include +#include + +static int __dt_root_addr_cells; +static int __dt_root_size_cells; + +const struct kexec_file_ops * const kexec_file_loaders[] = { + NULL +}; + +int arch_kimage_file_post_load_cleanup(struct kimage *image) +{ + vfree(image->arch.dtb_buf); + image->arch.dtb_buf = NULL; + + return _kexec_kernel_post_load_cleanup(image); +} + +int arch_kexec_walk_mem(struct kexec_buf *kbuf, int (*func)(u64, u64, void *)) +{ + if (kbuf->image->type == KEXEC_TYPE_CRASH) + return walk_iomem_res_desc(crashk_res.desc, + IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY, + crashk_res.start, crashk_res.end, + kbuf, func); + else if (kbuf->top_down) + return walk_system_ram_res_rev(0, ULONG_MAX, kbuf, func); + else + return walk_system_ram_res(0, ULONG_MAX, kbuf, func); +} + +int setup_dtb(struct kimage *image, + unsigned long initrd_load_addr, unsigned long initrd_len, + char *cmdline, unsigned long cmdline_len, + char **dtb_buf, size_t *dtb_buf_len) +{ + char *buf = NULL; + size_t buf_size; + int nodeoffset; + u64 value; + int range_len; + int ret; + + /* duplicate dt blob */ + buf_size = fdt_totalsize(initial_boot_params); + range_len = (__dt_root_addr_cells + __dt_root_size_cells) * sizeof(u32); + + if (initrd_load_addr) + buf_size += fdt_prop_len("initrd-start", sizeof(u64)) + + fdt_prop_len("initrd-end", sizeof(u64)); + + if (cmdline) + buf_size += fdt_prop_len("bootargs", cmdline_len + 1); + + buf = vmalloc(buf_size); + if (!buf) { + ret = -ENOMEM; + goto out_err; + } + + ret = fdt_open_into(initial_boot_params, buf, buf_size); + if (ret) + goto out_err; + + nodeoffset = fdt_path_offset(buf, "/chosen"); + if (nodeoffset < 0) + goto out_err; + + /* add bootargs */ + if (cmdline) { + ret = fdt_setprop(buf, nodeoffset, "bootargs", + cmdline, cmdline_len + 1); + if (ret) + goto out_err; + } + + /* add initrd-* */ + if (initrd_load_addr) { + value = cpu_to_fdt64(initrd_load_addr); + ret = fdt_setprop(buf, nodeoffset, "initrd-start", + &value, sizeof(value)); + if (ret) + goto out_err; + + value = cpu_to_fdt64(initrd_load_addr + initrd_len); + ret = fdt_setprop(buf, nodeoffset, "initrd-end", + &value, sizeof(value)); + if (ret) + goto out_err; + } + + /* trim a buffer */ + fdt_pack(buf); + *dtb_buf = buf; + *dtb_buf_len = fdt_totalsize(buf); + + return 0; + +out_err: + vfree(buf); + return ret; +} + +int load_other_segments(struct kimage *image, unsigned long kernel_load_addr, + char *initrd, unsigned long initrd_len, + char *cmdline, unsigned long cmdline_len) +{ + struct kexec_buf kbuf; + unsigned long initrd_load_addr = 0; + unsigned long purgatory_load_addr, dtb_load_addr; + char *dtb = NULL; + unsigned long dtb_len; + int ret = 0; + + kbuf.image = image; + /* not allocate anything below the kernel */ + kbuf.buf_min = kernel_load_addr; + + /* Load initrd */ + if (initrd) { + kbuf.buffer = initrd; + kbuf.bufsz = initrd_len; + kbuf.memsz = initrd_len; + kbuf.buf_align = PAGE_SIZE; + /* within 1GB-aligned window of up to 32GB in size */ + kbuf.buf_max = round_down(kernel_load_addr, SZ_1G) + + (unsigned long)SZ_1G * 31; + kbuf.top_down = 0; + + ret = kexec_add_buffer(&kbuf); + if (ret) + goto out_err; + initrd_load_addr = kbuf.mem; + + pr_debug("Loaded initrd at 0x%lx bufsz=0x%lx memsz=0x%lx\n", + initrd_load_addr, initrd_len, initrd_len); + } + + /* Load dtb blob */ + ret = setup_dtb(image, initrd_load_addr, initrd_len, + cmdline, cmdline_len, &dtb, &dtb_len); + if (ret) { + pr_err("Preparing for new dtb failed\n"); + goto out_err; + } + + kbuf.buffer = dtb; + kbuf.bufsz = dtb_len; + kbuf.memsz = dtb_len; + /* not across 2MB boundary */ + kbuf.buf_align = SZ_2M; + kbuf.buf_max = ULONG_MAX; + kbuf.top_down = 1; + + ret = kexec_add_buffer(&kbuf); + if (ret) + goto out_err; + dtb_load_addr = kbuf.mem; + image->arch.dtb_buf = dtb; + + pr_debug("Loaded dtb at 0x%lx bufsz=0x%lx memsz=0x%lx\n", + dtb_load_addr, dtb_len, dtb_len); + + /* Load purgatory */ + ret = kexec_load_purgatory(image, kernel_load_addr, ULONG_MAX, 1, + &purgatory_load_addr); + if (ret) { + pr_err("Loading purgatory failed\n"); + goto out_err; + } + + ret = kexec_purgatory_get_set_symbol(image, "kernel_entry", + &kernel_load_addr, sizeof(kernel_load_addr), 0); + if (ret) { + pr_err("Setting symbol (kernel_entry) failed.\n"); + goto out_err; + } + + ret = kexec_purgatory_get_set_symbol(image, "dtb_addr", + &dtb_load_addr, sizeof(dtb_load_addr), 0); + if (ret) { + pr_err("Setting symbol (dtb_addr) failed.\n"); + goto out_err; + } + + pr_debug("Loaded purgatory at 0x%lx\n", purgatory_load_addr); + + return 0; + +out_err: + vfree(dtb); + image->arch.dtb_buf = NULL; + return ret; +} From patchwork Mon Oct 2 06:14:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 114555 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp326481qgn; Sun, 1 Oct 2017 23:14:08 -0700 (PDT) X-Received: by 10.98.194.148 with SMTP id w20mr14019005pfk.299.1506924848043; Sun, 01 Oct 2017 23:14:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506924848; cv=none; d=google.com; s=arc-20160816; b=NdgQ5Nrw6RFbwsja0bkcRfXcwYqaAdqOyqmyIYOWXQOtWmbp7pZjlC/YBu3aai2uLa ayY41sO7GkTsM+pvtn3q4B9aqfQFWQQtmdI8BVfPUL5utHmg3ZmaKTrlNdlqQw/wcHqG 0Bu8i2SUhDUzqK8OeXVYWQ/01TQRRGZupTb474pZ+xPCbygIpyryf7OGXSpmb2Simp7+ G/mGlkujZ9dc4WiRK1FvNTUMtswcXZQTQn4LAbxrjYZF6lmIm2a3RUJNFreRotmfOlTi 2L79tOmbqXsPjHQOtb3v3dyGUNUlmXKZ3n5Yh20uBMz5b3DqzOmfl7q1M2ol1r/rRr4O LaLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=mJYD94UT5cuxWRjqNJdN+pOM6RL8vVrmPb/Z2ozfJPI=; b=TMbFtrSHMn5YkdvWnBxSXuky4ERbWEPeqrN3lMzJ0q0IdGYcAunLvCmP3bEbalo7u0 +M7kcWKEkO1HkkIm++x1vkYUU+iE6O5h83Zo3Qs92HYlYos1tq5p5mcwWjRNIkGdMH8Z yLj29LomeVxwznWc+/jdpqvZG6hwFxxz2tB1FbtMMatESoYu/uIixei5Vxl8FI+3Izw5 O53g2WqZDlxEROEdgbTayi8T5xDISW7+nS9GcIxXd+cL9kgS4DXEghS94dKFGmK/7z+q pV9SmzGAj8Zvk0o76lHUwgxYf0zadKVsIeeJL3Kyq8gUil22Ry9AlE/S/g8ZTvL7C1Ze DOng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cQuuef4q; 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 g2si7066291pgf.680.2017.10.01.23.14.07; Sun, 01 Oct 2017 23:14:08 -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=cQuuef4q; 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 S1751371AbdJBGOG (ORCPT + 26 others); Mon, 2 Oct 2017 02:14:06 -0400 Received: from mail-pf0-f176.google.com ([209.85.192.176]:47915 "EHLO mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751312AbdJBGNK (ORCPT ); Mon, 2 Oct 2017 02:13:10 -0400 Received: by mail-pf0-f176.google.com with SMTP id u12so2442158pfl.4 for ; Sun, 01 Oct 2017 23:13:10 -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:in-reply-to:references; bh=mJYD94UT5cuxWRjqNJdN+pOM6RL8vVrmPb/Z2ozfJPI=; b=cQuuef4qAjSA1BhWnKFjhOyKDUsSOW0u7DwCM6TwSSVi8cJQ7zTbFJvQACdAbqYzHE 0/eyV4YGzPmUQ6sCNcWGeIAFavnrbOvz5ZgddDZV/rvgi9MjrJUsCY+5cxPBoavTuo+p eOx0r/2zRpoyhTUAAzYHg/K+Ia6VkfVhS+LuE= 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:in-reply-to :references; bh=mJYD94UT5cuxWRjqNJdN+pOM6RL8vVrmPb/Z2ozfJPI=; b=TwJVWOvnSevNnlM2DQX+JKvDodpRxKYRhSO7zqpWjyZBLsHpN3aUIivDUkNGG+/qtB dVBKEkvyAa/bCVW1RP3HOrc+vp9bhqzjP7LOYWIP3TIzLftDzIexJWzg0dliFaBX8+ay bdMNMTMV1Vw6rYNDyKeFbwYylh7N559S8IviTCwqfzskgRgmTD5cAHHf0tZDV1h2uajU sp73irF/1TkE6StJKHPTKLNeNqclY+pPGm6hbSByFoB8lcEUcRbRAVi87YUhsTzyYC25 mf2kWh8LtzlF7AccHii6ncpy2yeLgQTNtpEo4uv3UMbQJgUjmT4y7WBo0reWwF432tPf OQ5Q== X-Gm-Message-State: AHPjjUhWQuWC0hdS9cxPqPMGUL6W0MzkBH5HHewTypfma+eHB4apy9Jq AgFjSksoEbfv5zSU1GnIx8vvfg== X-Google-Smtp-Source: AOwi7QAusEWaQaL2eVFRCg+XgDXuCnNP88hUEqDlTcFcZxR/QNzRHnlM1C067DqCMsWBI7UxJxOP6w== X-Received: by 10.99.148.17 with SMTP id m17mr8499915pge.114.1506924789996; Sun, 01 Oct 2017 23:13:09 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id k24sm2420042pfj.151.2017.10.01.23.13.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 23:13:09 -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 v4 08/10] arm64: kexec_file: set up for crash dump adding elf core header Date: Mon, 2 Oct 2017 15:14:29 +0900 Message-Id: <20171002061431.11117-9-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171002061431.11117-1-takahiro.akashi@linaro.org> References: <20171002061431.11117-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org load_crashdump_segments() creates and loads a memory segment of elf core header for crash dump. "linux,usable-memory-range" and "linux,elfcorehdr" will add to the 2nd kernel's device-tree blob. The logic of this cod is also from kexec-tools. Signed-off-by: AKASHI Takahiro Cc: Catalin Marinas Cc: Will Deacon --- arch/arm64/include/asm/kexec.h | 5 ++ arch/arm64/kernel/machine_kexec_file.c | 149 +++++++++++++++++++++++++++++++++ kernel/kexec_file.c | 2 +- 3 files changed, 155 insertions(+), 1 deletion(-) -- 2.14.1 diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h index 2fadd3cbf3af..edb702e64a8a 100644 --- a/arch/arm64/include/asm/kexec.h +++ b/arch/arm64/include/asm/kexec.h @@ -98,6 +98,10 @@ static inline void crash_post_resume(void) {} struct kimage_arch { void *dtb_buf; + /* Core ELF header buffer */ + void *elf_headers; + unsigned long elf_headers_sz; + unsigned long elf_load_addr; }; struct kimage; @@ -113,6 +117,7 @@ extern int load_other_segments(struct kimage *image, unsigned long kernel_load_addr, char *initrd, unsigned long initrd_len, char *cmdline, unsigned long cmdline_len); +extern int load_crashdump_segments(struct kimage *image); #endif #endif /* __ASSEMBLY__ */ diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c index 8a09d89f6266..1d30b4773af5 100644 --- a/arch/arm64/kernel/machine_kexec_file.c +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -32,6 +32,10 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image) vfree(image->arch.dtb_buf); image->arch.dtb_buf = NULL; + vfree(image->arch.elf_headers); + image->arch.elf_headers = NULL; + image->arch.elf_headers_sz = 0; + return _kexec_kernel_post_load_cleanup(image); } @@ -48,6 +52,77 @@ int arch_kexec_walk_mem(struct kexec_buf *kbuf, int (*func)(u64, u64, void *)) return walk_system_ram_res(0, ULONG_MAX, kbuf, func); } +static int __init arch_kexec_file_init(void) +{ + /* Those values are used later on loading the kernel */ + __dt_root_addr_cells = dt_root_addr_cells; + __dt_root_size_cells = dt_root_size_cells; + + return 0; +} +late_initcall(arch_kexec_file_init); + +#define FDT_ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1)) +#define FDT_TAGALIGN(x) (FDT_ALIGN((x), FDT_TAGSIZE)) + +static int fdt_prop_len(const char *prop_name, int len) +{ + return (strlen(prop_name) + 1) + + sizeof(struct fdt_property) + + FDT_TAGALIGN(len); +} + +static bool cells_size_fitted(unsigned long base, unsigned long size) +{ + /* if *_cells >= 2, cells can hold 64-bit values anyway */ + if ((__dt_root_addr_cells == 1) && (base >= (1ULL << 32))) + return false; + + if ((__dt_root_size_cells == 1) && (size >= (1ULL << 32))) + return false; + + return true; +} + +static void fill_property(void *buf, u64 val64, int cells) +{ + u32 val32; + int i; + + if (cells == 1) { + val32 = cpu_to_fdt32((u32)val64); + memcpy(buf, &val32, sizeof(val32)); + } else { + for (i = 0; i < (cells * sizeof(u32) - sizeof(u64)); i++) + *(char *)buf++ = 0; + + val64 = cpu_to_fdt64(val64); + memcpy(buf, &val64, sizeof(val64)); + } +} + +static int fdt_setprop_range(void *fdt, int nodeoffset, const char *name, + unsigned long addr, unsigned long size) +{ + u64 range[2]; + void *prop; + size_t buf_size; + int result; + + prop = range; + buf_size = (__dt_root_addr_cells + __dt_root_size_cells) * sizeof(u32); + + fill_property(prop, addr, __dt_root_addr_cells); + prop += __dt_root_addr_cells * sizeof(u32); + + fill_property(prop, size, __dt_root_size_cells); + prop += __dt_root_size_cells * sizeof(u32); + + result = fdt_setprop(fdt, nodeoffset, name, range, buf_size); + + return result; +} + int setup_dtb(struct kimage *image, unsigned long initrd_load_addr, unsigned long initrd_len, char *cmdline, unsigned long cmdline_len, @@ -60,10 +135,26 @@ int setup_dtb(struct kimage *image, int range_len; int ret; + /* check ranges against root's #address-cells and #size-cells */ + if (image->type == KEXEC_TYPE_CRASH && + (!cells_size_fitted(image->arch.elf_load_addr, + image->arch.elf_headers_sz) || + !cells_size_fitted(crashk_res.start, + crashk_res.end - crashk_res.start + 1))) { + pr_err("Crash memory region doesn't fit into DT's root cell sizes.\n"); + ret = -EINVAL; + goto out_err; + } + /* duplicate dt blob */ buf_size = fdt_totalsize(initial_boot_params); range_len = (__dt_root_addr_cells + __dt_root_size_cells) * sizeof(u32); + if (image->type == KEXEC_TYPE_CRASH) + buf_size += fdt_prop_len("linux,elfcorehdr", range_len) + + fdt_prop_len("linux,usable-memory-range", + range_len); + if (initrd_load_addr) buf_size += fdt_prop_len("initrd-start", sizeof(u64)) + fdt_prop_len("initrd-end", sizeof(u64)); @@ -85,6 +176,23 @@ int setup_dtb(struct kimage *image, if (nodeoffset < 0) goto out_err; + if (image->type == KEXEC_TYPE_CRASH) { + /* add linux,elfcorehdr */ + ret = fdt_setprop_range(buf, nodeoffset, "linux,elfcorehdr", + image->arch.elf_load_addr, + image->arch.elf_headers_sz); + if (ret) + goto out_err; + + /* add linux,usable-memory-range */ + ret = fdt_setprop_range(buf, nodeoffset, + "linux,usable-memory-range", + crashk_res.start, + crashk_res.end - crashk_res.start + 1); + if (ret) + goto out_err; + } + /* add bootargs */ if (cmdline) { ret = fdt_setprop(buf, nodeoffset, "bootargs", @@ -211,3 +319,44 @@ int load_other_segments(struct kimage *image, unsigned long kernel_load_addr, image->arch.dtb_buf = NULL; return ret; } + +int load_crashdump_segments(struct kimage *image) +{ + void *elf_addr; + unsigned long elf_sz; + struct kexec_buf kbuf; + int ret; + + if (image->type != KEXEC_TYPE_CRASH) + return 0; + + /* Prepare elf headers and add a segment */ + ret = prepare_elf_headers(image, &elf_addr, &elf_sz); + if (ret) { + pr_err("Preparing elf core header failed\n"); + return ret; + } + + kbuf.image = image; + kbuf.buffer = elf_addr; + kbuf.bufsz = elf_sz; + kbuf.memsz = elf_sz; + kbuf.buf_align = PAGE_SIZE; + kbuf.buf_min = crashk_res.start; + kbuf.buf_max = crashk_res.end + 1; + kbuf.top_down = 1; + + ret = kexec_add_buffer(&kbuf); + if (ret) { + vfree(elf_addr); + return ret; + } + image->arch.elf_headers = elf_addr; + image->arch.elf_headers_sz = elf_sz; + image->arch.elf_load_addr = kbuf.mem; + + pr_debug("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n", + image->arch.elf_load_addr, elf_sz, elf_sz); + + return ret; +} diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 8a7f029c5995..82a98f284cf5 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -1340,7 +1340,7 @@ static int prepare_elf64_headers(struct crash_elf_data *ced, phdr->p_filesz = phdr->p_memsz = VMCOREINFO_NOTE_SIZE; (ehdr->e_phnum)++; -#ifdef CONFIG_X86_64 +#if defined(CONFIG_X86_64) || defined(CONFIG_ARM64) /* Prepare PT_LOAD type program header for kernel text region */ phdr = (Elf64_Phdr *)bufp; bufp += sizeof(Elf64_Phdr); From patchwork Mon Oct 2 06:14:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 114553 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp325941qgn; Sun, 1 Oct 2017 23:13:23 -0700 (PDT) X-Received: by 10.98.134.206 with SMTP id x197mr13667779pfd.26.1506924803659; Sun, 01 Oct 2017 23:13:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506924803; cv=none; d=google.com; s=arc-20160816; b=KexgWrd4Ve0DmyP8usxSudwFcWfGR+be2unECShlxuy+nF0p53cB60nWMOlGOwTlBn TbVGiKGCSfMR0nxbFqAPELhyoC/Rwn+Ywmj2bHbqQGnOZL8cgsK5yijMdf+UhEY0qLbU gliOFzxo1jfJkW1wgr+UcHhFna1Ss75BjW0VdOQJfZxU38lG2Q6gwA7U9o1vID4n63cf FrtbbLsgAzZCJspZuU8mnEuCib73RXlbtVAwo79/aQ8RU3CcXvTW0cdSmE2tT+/0BzkD xOU3QrVc2qanGsANDCEiLkcuVfzO92dIjiSNcBndyUWrXUa1POAUPmL/SJ1UmScNZ5ry +CrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=LfjyO5OybSisJOU4rvyfBiASP38tRI2/fuL2HzcwuHs=; b=bojCz2xMQg5jh5HoMEJbSopWqeL8Xb6Om2uK+mWJwkmwdblhl4D7aHq7cT/DIyyGSb Ux9Yfb0Cd/8YZnFyw55R633Hh+JKgyWn9F6VOc+Ed9BPiv9y5DU/hRCtA8l6OgvdHzR4 WHn335OKXDYmEMq+vfOaJbDrpWF3UQ84k60BG5O8IdWCpqPUuKPqKDjnYcPB0l92WczQ ZXxsWFgNnMGdzb/RTLC6ydQQys5zusBTlGwnkp7UgxruzBXSlpM62w3l0bpYGloxvUTM lqpTHEsBjQ3N6crwdCGKIdEIwP8Gq1hY3J9Wd4xz7MlRrQxu94YXsHE6lklwLbLIOVox sX9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ys+EZI2U; 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 t17si1715286plo.623.2017.10.01.23.13.23; Sun, 01 Oct 2017 23:13:23 -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=Ys+EZI2U; 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 S1751560AbdJBGNU (ORCPT + 26 others); Mon, 2 Oct 2017 02:13:20 -0400 Received: from mail-pg0-f49.google.com ([74.125.83.49]:49751 "EHLO mail-pg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751514AbdJBGNQ (ORCPT ); Mon, 2 Oct 2017 02:13:16 -0400 Received: by mail-pg0-f49.google.com with SMTP id v13so2491199pgq.6 for ; Sun, 01 Oct 2017 23:13:16 -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:in-reply-to:references; bh=LfjyO5OybSisJOU4rvyfBiASP38tRI2/fuL2HzcwuHs=; b=Ys+EZI2Ul+1yQQrXEfgu5b/P/+guVO+8jFvMNtxV36KBORcDJdJ9JVVf3AH8GCARio KgxbGy3MsjV4PvUQDY98E5OQe57JJWxxAFr77pmTnjtoeaPIqW1jzcSIoXeP9nwsCaJ/ ifCZ7xMN+yFPAhkfwjh4SRQ06o3kDkJUqDmk4= 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:in-reply-to :references; bh=LfjyO5OybSisJOU4rvyfBiASP38tRI2/fuL2HzcwuHs=; b=VFwuXh9DFP5X0qdFG1LKMYZv7A26Sd1TzvPSynpLGaW6voGYLtchIFE8FgGDRhUQfl mvfMNPTplQKR7Te2397kI9883K87zhnFMqemdVhxIkYMwtaCnjYFYfFz+HIfkGNEVILi QqJVlzt715rxDpL+wYuAfZcqSlcAYWAXQewQDIiTfNvHRI8F6j3pIGt0hWfn2oHb5DPr w6WUrxvv1uHBNkuKn+17eKmwnJSJfHQlLu1w2app/gW6gx6i9QTG6PeXu7a8upcnzxZT HrG3RHrNlmHJzvQkjyaLz38z6geimnG8EvuWpmdQXvidxEmLeCTPgCbBEk6ix3luOiqc G61g== X-Gm-Message-State: AMCzsaVDMIC2+y9RNrqid1j7rWlF1/FY0LGX2ZuANhnP0kvo4IrxAotH sqpssUn2z7DEjSwjDGj6s/eEXg== X-Google-Smtp-Source: AOwi7QC0QJO8F4xrrj/+4cA4NnLOln5ZvMABt9LcUSnmwuLumBbCqud3JIJ/VyklFYGvlG1jqJScnA== X-Received: by 10.84.217.131 with SMTP id p3mr6123572pli.126.1506924795612; Sun, 01 Oct 2017 23:13:15 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id 207sm15333578pfu.0.2017.10.01.23.13.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 23:13:15 -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 v4 09/10] arm64: enable KEXEC_FILE config Date: Mon, 2 Oct 2017 15:14:30 +0900 Message-Id: <20171002061431.11117-10-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171002061431.11117-1-takahiro.akashi@linaro.org> References: <20171002061431.11117-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Modify arm64/Kconfig and Makefile to enable kexec_file_load support. Signed-off-by: AKASHI Takahiro Cc: Catalin Marinas Cc: Will Deacon --- arch/arm64/Kconfig | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 2.14.1 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 0df64a6a56d4..e37be8a59a88 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -757,6 +757,28 @@ config KEXEC but it is independent of the system firmware. And like a reboot you can start any kernel with it, not just Linux. +config KEXEC_FILE + bool "kexec file based system call" + select KEXEC_CORE + select BUILD_BIN2C + ---help--- + This is new version of kexec system call. This system call is + file based and takes file descriptors as system call argument + for kernel and initramfs as opposed to list of segments as + accepted by previous system call. + + In addition to this option, you need to enable a specific type + of image support. + +config KEXEC_VERIFY_SIG + bool "Verify kernel signature during kexec_file_load() syscall" + depends on KEXEC_FILE + select SYSTEM_DATA_VERIFICATION + ---help--- + Select this option to verify a signature with loaded kernel + image. If configured, any attempt of loading a image without + valid signature will fail. + config CRASH_DUMP bool "Build kdump crash kernel" help From patchwork Mon Oct 2 06:14:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 114554 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp326010qgn; Sun, 1 Oct 2017 23:13:29 -0700 (PDT) X-Received: by 10.98.201.1 with SMTP id k1mr13479935pfg.335.1506924809136; Sun, 01 Oct 2017 23:13:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506924809; cv=none; d=google.com; s=arc-20160816; b=RayTDX6CTVtyQKySTSp7bB/bchHyqosp4XVYwRNB2p+HhUb5AIY8C/ZeP1u0i/V+GT G03bY30ZrnDyeuXJ62baOuJxxO9VCLVv0PK+4WkN93n3ZcwIqv2XtSCZW7s6+0YJz0D9 ndXvjyoNDzJT6WRR6CqEAIQVJpPQSx2qRdGnobXS4wQUIqzsUYMAZZFIc2npBkfP9wvM 3Sru5RvEyb5bEK4RR9gzBwuSvjbzduYoU1oIxXBTQBZ/JdAfmDyCQPHBwWRRXmVscgce S6jtAoss6URk+Y4AcKLji3IU3jUUjNTjoIYWQ9akK537eOQNfv6HM6v52rZzGaETcZUU gCpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=xch+dYn8eo4K54+mXowg/xcFqCMZaBkDPDJHGY9hSD4=; b=eSp+AaluBnhW761squaN01DuxHhwhgndLXs+yAAQocdHpPXdoz+GbYpywvCtkOdYtZ RDieoDtkXETkH4VQP+G4EKfyBbXmaHz5obKDMCGk++iUcbvV/PcLSoQ+Ekrbg2VEH6Lz Gt5K6MQOK0AUhLel8INCmkMVbDzKysbZT5esWMoBNglBhxxS4FMRUqnWJhQQdU9uvL6a WjhGwGlLVDk7OKDBZZEKQoUT8dpNd4TaADX2tdT2NSTBGEeKqCvGfeirTBfZXz0jerdn Xx1mWqFd6hV4FA+s+8LGYCgxlwJ99GCdZPUy5QhzNmz2y6VLpwTDiltaY7bhNbMAmRh4 cRyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SeGWrToY; 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 t17si1715286plo.623.2017.10.01.23.13.28; Sun, 01 Oct 2017 23:13:29 -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=SeGWrToY; 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 S1751684AbdJBGN0 (ORCPT + 26 others); Mon, 2 Oct 2017 02:13:26 -0400 Received: from mail-pg0-f52.google.com ([74.125.83.52]:57093 "EHLO mail-pg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751514AbdJBGNV (ORCPT ); Mon, 2 Oct 2017 02:13:21 -0400 Received: by mail-pg0-f52.google.com with SMTP id n1so1791329pgt.13 for ; Sun, 01 Oct 2017 23:13:20 -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:in-reply-to:references; bh=xch+dYn8eo4K54+mXowg/xcFqCMZaBkDPDJHGY9hSD4=; b=SeGWrToY+o5Q9J6/gclDNj+/idHx8rmqoBWf1lDKpYi8atovbU4MJ9LeQsXFmHi/JF KN0a+D31vbkZ+dCVDpMqo3Or5h65aw1zNDED0Wrkulf+9yWNsMx8SQ8CH2Joo60JCSIx T5hdrfpZ2Gka7Gs4IkFIbygLC2wcAgYrno2hY= 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:in-reply-to :references; bh=xch+dYn8eo4K54+mXowg/xcFqCMZaBkDPDJHGY9hSD4=; b=PAHFHQL3tlgMkcgbwrcmdeMYk9GcZ2SgO437grlJtckzIRoJ06/R1VUSKg1VRhcsfH nomF5Cq4K9ALXi+oo9UpyQS9JAQGy9slGDGlbtUNqwgbPW7J+f/KR/6/3oEFPoFUfZkI pb+CQ6WJwMupeglozyn2VzBwMpjs+ivv40T5zazTFr6bRc6mAQloVZ2IQLs6/nlZh8xQ zLPWa5iSHpb9R6lB5n5U/VZnLMCz31jOBkpu+X1+s7B7pThneElopgaVgru8jAAzKyN5 NlJhVgFDCSKy8wjuTVrQDo3/BxQHGxXlVDlDE9X4cSqmQ//hUQXqw8VsuDF9TPqIyuzc X48A== X-Gm-Message-State: AMCzsaVk9uoRrwJYiMOXAgjKQr3diN3TCHBjfx96UAY2unGaG6WKsqGE bJioSBw29MjrDdZwJYiI9n9ctw== X-Google-Smtp-Source: AOwi7QCFeZxXciTVk79hRNJUJcsRn2GkzzpK6wWGazbbqIgPtqvMmGrwrftVwztnX5pxFKQLMg8dRg== X-Received: by 10.99.0.4 with SMTP id 4mr475235pga.417.1506924800313; Sun, 01 Oct 2017 23:13:20 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id m185sm3330007pfm.181.2017.10.01.23.13.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Oct 2017 23:13:19 -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 v4 10/10] arm64: kexec_file: add Image format support Date: Mon, 2 Oct 2017 15:14:31 +0900 Message-Id: <20171002061431.11117-11-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171002061431.11117-1-takahiro.akashi@linaro.org> References: <20171002061431.11117-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The "Image" binary will be loaded at the offset of TEXT_OFFSET from the start of system memory. TEXT_OFFSET is determined from the header of the image. Regarding kernel signature verification, it will be done through verify_pefile_signature() as arm64's "Image" binary can be seen as in PE format. This approach is consistent with x86 implementation. we can sign an image with sbsign command. Signed-off-by: AKASHI Takahiro Cc: Catalin Marinas Cc: Will Deacon --- arch/arm64/Kconfig | 7 +++ arch/arm64/include/asm/kexec.h | 66 +++++++++++++++++++++ arch/arm64/kernel/Makefile | 1 + arch/arm64/kernel/kexec_image.c | 105 +++++++++++++++++++++++++++++++++ arch/arm64/kernel/machine_kexec_file.c | 3 + 5 files changed, 182 insertions(+) create mode 100644 arch/arm64/kernel/kexec_image.c -- 2.14.1 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index e37be8a59a88..a9ef277faa3e 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -770,10 +770,17 @@ config KEXEC_FILE In addition to this option, you need to enable a specific type of image support. +config KEXEC_FILE_IMAGE_FMT + bool "Enable Image support" + depends on KEXEC_FILE + ---help--- + Select this option to enable 'Image' kernel loading. + config KEXEC_VERIFY_SIG bool "Verify kernel signature during kexec_file_load() syscall" depends on KEXEC_FILE select SYSTEM_DATA_VERIFICATION + select SIGNED_PE_FILE_VERIFICATION if KEXEC_FILE_IMAGE_FMT ---help--- Select this option to verify a signature with loaded kernel image. If configured, any attempt of loading a image without diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h index edb702e64a8a..2a63bf5f32ea 100644 --- a/arch/arm64/include/asm/kexec.h +++ b/arch/arm64/include/asm/kexec.h @@ -104,6 +104,72 @@ struct kimage_arch { unsigned long elf_load_addr; }; +/** + * struct arm64_image_header - arm64 kernel image header + * + * @pe_sig: Optional PE format 'MZ' signature + * @branch_code: Instruction to branch to stext + * @text_offset: Image load offset, little endian + * @image_size: Effective image size, little endian + * @flags: + * Bit 0: Kernel endianness. 0=little endian, 1=big endian + * @reserved: Reserved + * @magic: Magic number, "ARM\x64" + * @pe_header: Optional offset to a PE format header + **/ + +struct arm64_image_header { + u8 pe_sig[2]; + u8 pad[2]; + u32 branch_code; + u64 text_offset; + u64 image_size; + u64 flags; + u64 reserved[3]; + u8 magic[4]; + u32 pe_header; +}; + +static const u8 arm64_image_magic[4] = {'A', 'R', 'M', 0x64U}; +static const u8 arm64_image_pe_sig[2] = {'M', 'Z'}; + +/** + * arm64_header_check_magic - Helper to check the arm64 image header. + * + * Returns non-zero if header is OK. + */ + +static inline int arm64_header_check_magic(const struct arm64_image_header *h) +{ + if (!h) + return 0; + + if (!h->text_offset) + return 0; + + return (h->magic[0] == arm64_image_magic[0] + && h->magic[1] == arm64_image_magic[1] + && h->magic[2] == arm64_image_magic[2] + && h->magic[3] == arm64_image_magic[3]); +} + +/** + * arm64_header_check_pe_sig - Helper to check the arm64 image header. + * + * Returns non-zero if 'MZ' signature is found. + */ + +static inline int arm64_header_check_pe_sig(const struct arm64_image_header *h) +{ + if (!h) + return 0; + + return (h->pe_sig[0] == arm64_image_pe_sig[0] + && h->pe_sig[1] == arm64_image_pe_sig[1]); +} + +extern const struct kexec_file_ops kexec_image_ops; + struct kimage; #define arch_kimage_file_post_load_cleanup arch_kimage_file_post_load_cleanup diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 5df003d6157c..a1161bab6810 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -51,6 +51,7 @@ arm64-obj-$(CONFIG_HIBERNATION) += hibernate.o hibernate-asm.o arm64-obj-$(CONFIG_KEXEC_CORE) += machine_kexec.o relocate_kernel.o \ cpu-reset.o arm64-obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file.o +arm64-obj-$(CONFIG_KEXEC_FILE_IMAGE_FMT) += kexec_image.o arm64-obj-$(CONFIG_ARM64_RELOC_TEST) += arm64-reloc-test.o arm64-reloc-test-y := reloc_test_core.o reloc_test_syms.o arm64-obj-$(CONFIG_CRASH_DUMP) += crash_dump.o diff --git a/arch/arm64/kernel/kexec_image.c b/arch/arm64/kernel/kexec_image.c new file mode 100644 index 000000000000..b840b6ed6ed9 --- /dev/null +++ b/arch/arm64/kernel/kexec_image.c @@ -0,0 +1,105 @@ +/* + * Kexec image loader + + * Copyright (C) 2017 Linaro Limited + * Author: AKASHI Takahiro + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#define pr_fmt(fmt) "kexec_file(Image): " fmt + +#include +#include +#include +#include +#include +#include +#include + +static int image_probe(const char *kernel_buf, unsigned long kernel_len) +{ + const struct arm64_image_header *h; + + h = (const struct arm64_image_header *)(kernel_buf); + + if ((kernel_len < sizeof(*h)) || !arm64_header_check_magic(h)) + return -EINVAL; + + pr_debug("PE format: %s\n", + (arm64_header_check_pe_sig(h) ? "yes" : "no")); + + return 0; +} + +static void *image_load(struct kimage *image, char *kernel, + unsigned long kernel_len, char *initrd, + unsigned long initrd_len, char *cmdline, + unsigned long cmdline_len) +{ + struct kexec_buf kbuf; + struct arm64_image_header *h = (struct arm64_image_header *)kernel; + unsigned long text_offset, kernel_load_addr; + int ret; + + /* Create elf core header segment */ + ret = load_crashdump_segments(image); + if (ret) + goto out; + + /* Load the kernel */ + kbuf.image = image; + if (image->type == KEXEC_TYPE_CRASH) { + kbuf.buf_min = crashk_res.start; + kbuf.buf_max = crashk_res.end + 1; + } else { + kbuf.buf_min = 0; + kbuf.buf_max = ULONG_MAX; + } + kbuf.top_down = 0; + + kbuf.buffer = kernel; + kbuf.bufsz = kernel_len; + kbuf.memsz = le64_to_cpu(h->image_size); + text_offset = le64_to_cpu(h->text_offset); + kbuf.buf_align = SZ_2M; + + /* Adjust kernel segment with TEXT_OFFSET */ + kbuf.memsz += text_offset; + + ret = kexec_add_buffer(&kbuf); + if (ret) + goto out; + + image->segment[image->nr_segments - 1].mem += text_offset; + image->segment[image->nr_segments - 1].memsz -= text_offset; + kernel_load_addr = kbuf.mem + text_offset; + + pr_debug("Loaded kernel at 0x%lx bufsz=0x%lx memsz=0x%lx\n", + kernel_load_addr, kbuf.bufsz, kbuf.memsz); + + /* Load additional data */ + ret = load_other_segments(image, kernel_load_addr, + initrd, initrd_len, cmdline, cmdline_len); + +out: + return ERR_PTR(ret); +} + +#ifdef CONFIG_KEXEC_VERIFY_SIG +static int image_verify_sig(const char *kernel, unsigned long kernel_len) +{ + return verify_pefile_signature(kernel, kernel_len, NULL, + VERIFYING_KEXEC_PE_SIGNATURE); +} +#endif + +const struct kexec_file_ops kexec_image_ops = { + .probe = image_probe, + .load = image_load, +#ifdef CONFIG_KEXEC_VERIFY_SIG + .verify_sig = image_verify_sig, +#endif +}; diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c index 1d30b4773af5..24f1144ab2ab 100644 --- a/arch/arm64/kernel/machine_kexec_file.c +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -24,6 +24,9 @@ static int __dt_root_addr_cells; static int __dt_root_size_cells; const struct kexec_file_ops * const kexec_file_loaders[] = { +#ifdef CONFIG_KEXEC_FILE_IMAGE_FMT + &kexec_image_ops, +#endif NULL };