From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C6D5C433FE for ; Mon, 30 May 2022 18:58:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239690AbiE3S6W (ORCPT ); Mon, 30 May 2022 14:58:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239684AbiE3S6S (ORCPT ); Mon, 30 May 2022 14:58:18 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 558E14F46D for ; Mon, 30 May 2022 11:58:17 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id p8so11212153pfh.8 for ; Mon, 30 May 2022 11:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=date:subject:in-reply-to:cc:from:to:message-id:mime-version :content-transfer-encoding; bh=FFd5J9hlrCh2QSfJ0U9Wq/vsfh13pMH0ZkFo1eZIXtA=; b=G2A0nuMRKJztXPtT1GUrPx85rUqGPGHpsq6URvVAWa2fAqIkqlfU4RngPrGYBoa1Ni M6NJlw8gvJTBgkCc39LSTpamjbz9roIDkZlQnC9RO7k8Rc/xTX31a3GgYujadTBpfIga JQwSMuZ1HKoUjn6bSrBPFJvBaAnJAoYYH3EqEdZ9ex71cFuQ884I0tNEZG45hvUsKFSe SdW5ZEoZd6rbSNFsE45uC0UD8kqMIeKOTMqVLl/EmGGsbxPQhZqogmDjAeWQ19R+ngDM 5BxwPho/sCen5YkWBuTX+8h/WXJiDTTq1gmrRwjtIax6oHnLs3pgInlqG/tnWA3am8JP E8ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:subject:in-reply-to:cc:from:to:message-id :mime-version:content-transfer-encoding; bh=FFd5J9hlrCh2QSfJ0U9Wq/vsfh13pMH0ZkFo1eZIXtA=; b=vjeH4g3XP1IEvaqYMDBw0DwRxgQoZNUebja9rnkREcPsDdxAfDgrjhZfJMKHrEDlZE GZKmbJRqy88sPQKjxWbsdp9p8aSFuS0EcNcBuh4PPomZWT0J4jZvT3UHLjOE/MsAIdN4 rta2lp0u9pHCJWIEW8LVPfyDkSTffK9c1laP1W6e2pBiw//5woWpfdZkT7vZjzyrfrXR az3SDixCk8OjalUSt9GoKf36R/Urmy0x1j/gjsVF4Pq/YkGRaC0tPTgwx3ATUP7hZXkE zS+Zwvrq7sg5i3mX8QJnSI5ZHGUI2+8/ovUIj0vgXK8E4rlzhZA0n12uYbUh+KYccUNR 08sw== X-Gm-Message-State: AOAM530kiiQB47LQ/LfLsQnVcXTV5+jd03xmz5gwtw0jnu106AWssiH+ at5xCRyPOUqP4L6MbO2Lsa0jKg== X-Google-Smtp-Source: ABdhPJxxJ8lgOI/t/BS91nMmuF/AA3XEFbCsJdbzVlMXQCjM93kfvxRGwUywbXar5ejrleDbO2A5Hg== X-Received: by 2002:a63:2026:0:b0:3fa:cefb:e408 with SMTP id g38-20020a632026000000b003facefbe408mr25103264pgg.57.1653937096823; Mon, 30 May 2022 11:58:16 -0700 (PDT) Received: from localhost (76-210-143-223.lightspeed.sntcca.sbcglobal.net. [76.210.143.223]) by smtp.gmail.com with ESMTPSA id n16-20020aa79050000000b00518c6887217sm9107889pfo.58.2022.05.30.11.58.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 11:58:16 -0700 (PDT) Date: Mon, 30 May 2022 11:58:16 -0700 (PDT) X-Google-Original-Date: Mon, 30 May 2022 11:58:13 PDT (-0700) Subject: Re: [PATCH] RISC-V: Prepare dropping week attribute from arch_kexec_apply_relocations[_add] In-Reply-To: <20220530074202.pydmbbgvbtaugw5j@pengutronix.de> CC: lizhengyu3@huawei.com, alex@ghiti.fr, aou@eecs.berkeley.edu, Bjorn Topel , guoren@linux.alibaba.com, jszhang@kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, mick@ics.forth.gr, Paul Walmsley , penberg@kernel.org, sunnanyong@huawei.com, wangkefeng.wang@huawei.com, christophe.leroy@csgroup.eu, liaochang1@huawei.com, Stephen Rothwell , akpm@linux-foundation.org, ebiederm@xmission.com, kernel@pengutronix.de, naveen.n.rao@linux.vnet.ibm.com, linuxppc-dev@lists.ozlabs.org, lizhengyu3@huawei.com From: Palmer Dabbelt To: u.kleine-koenig@pengutronix.de Message-ID: Mime-Version: 1.0 (MHng) Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 30 May 2022 00:42:02 PDT (-0700), u.kleine-koenig@pengutronix.de wrote: > Without this change arch/riscv/kernel/elf_kexec.c fails to compile once > commit 233c1e6c319c ("kexec_file: drop weak attribute from > arch_kexec_apply_relocations[_add]") is also contained in the tree. > This currently happens in next-20220527. > > Prepare the RISC-V similar to the s390 adaption done in 233c1e6c319c. > This is safe to do on top of the riscv change even without the change to > arch_kexec_apply_relocations. > > Fixes: 838b3e28488f ("RISC-V: Load purgatory in kexec_file") > Looks-good-to: liaochang (A) > Signed-off-by: Uwe Kleine-König > --- > > On Mon, May 30, 2022 at 09:43:26AM +0800, liaochang (A) wrote: >> > I can confirm that doing >> > >> > diff --git a/arch/riscv/include/asm/kexec.h b/arch/riscv/include/asm/kexec.h >> > index 206217b23301..eee260e8ab30 100644 >> > --- a/arch/riscv/include/asm/kexec.h >> > +++ b/arch/riscv/include/asm/kexec.h >> > @@ -55,6 +55,13 @@ extern riscv_kexec_method riscv_kexec_norelocate; >> > >> > #ifdef CONFIG_KEXEC_FILE >> > extern const struct kexec_file_ops elf_kexec_ops; >> > + >> > +struct purgatory_info; >> > +int arch_kexec_apply_relocations_add(struct purgatory_info *pi, >> > + Elf_Shdr *section, >> > + const Elf_Shdr *relsec, >> > + const Elf_Shdr *symtab); >> > +#define arch_kexec_apply_relocations_add arch_kexec_apply_relocations_add >> > #endif >> > >> > #endif >> >> LGTM, you could send a fixup patch to riscv, thanks. >> >> > >> > on top of 838b3e28488f results in a compilable tree. And when merging >> > 233c1e6c319c into this, it is still building. >> > >> > I'm not enough into kexec (and riscv) to judge if this is sensible, or >> > create a useful commit log but the obvious way forward is to apply the >> > above patch to the riscv tree before it hits Linus' tree. > > Ok, here comes a patch with a generic commit log. > > @riscv people: If you prefer, squash it into 838b3e28488f. Sorry, just saw this after I sent my version of the fix. They're the same, but do you mind sending a full-on patch so I can merge it? > > Best regards > Uwe > > arch/riscv/include/asm/kexec.h | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/arch/riscv/include/asm/kexec.h b/arch/riscv/include/asm/kexec.h > index 206217b23301..eee260e8ab30 100644 > --- a/arch/riscv/include/asm/kexec.h > +++ b/arch/riscv/include/asm/kexec.h > @@ -55,6 +55,13 @@ extern riscv_kexec_method riscv_kexec_norelocate; > > #ifdef CONFIG_KEXEC_FILE > extern const struct kexec_file_ops elf_kexec_ops; > + > +struct purgatory_info; > +int arch_kexec_apply_relocations_add(struct purgatory_info *pi, > + Elf_Shdr *section, > + const Elf_Shdr *relsec, > + const Elf_Shdr *symtab); > +#define arch_kexec_apply_relocations_add arch_kexec_apply_relocations_add > #endif > > #endif > > base-commit: 838b3e28488f702e2b5477b393f009b2639d2b1a > -- > 2.36.1 > > -- > Pengutronix e.K. | Uwe Kleine-König | > Industrial Linux Solutions | https://www.pengutronix.de/ | From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CBB94C433EF for ; Mon, 30 May 2022 18:58:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Mime-Version:Message-ID:To:From:CC:In-Reply-To: Subject:Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References:List-Owner; bh=Hi4vpR0j+OHayiUESJQkp2rsBzg4VL2E8ToOKEqydXU=; b=Ujrqdn9MKLleCbQXnIQ0eUWj30 VyVXPsSCBhpTn2y9x0HKEN7C12oJacvaD06bIQU2nnXqub9YAN6tOoZZFjgV9jrMwu3LtSt5dKUsm rBv0n1u/gL5x/ACyvh+zaEhm326yCfeir2p99qzidE9uXNq7kz9HYRyUmy1JOLtzsKKhKKDlSjsdy M6sC/0vgAegOl4nSoJ0T6CP2r8KO4GF7lD0o6pBGA7EyqXL3wfAoyL4ftepcegiMo7syM4JRj7ptn v0VkPPSkbDtLw2ks+tmWThQ1Xxj5hITzeM4PIg8Lm89D0LhJ+VvKr2aUZZf1e4e7QhmxDING2CM4A cEaB26uw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nvkaq-007xQU-Qy; Mon, 30 May 2022 18:58:20 +0000 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nvkan-007xPB-Ln for linux-riscv@lists.infradead.org; Mon, 30 May 2022 18:58:19 +0000 Received: by mail-pf1-x431.google.com with SMTP id j6so11196408pfe.13 for ; Mon, 30 May 2022 11:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=date:subject:in-reply-to:cc:from:to:message-id:mime-version :content-transfer-encoding; bh=FFd5J9hlrCh2QSfJ0U9Wq/vsfh13pMH0ZkFo1eZIXtA=; b=G2A0nuMRKJztXPtT1GUrPx85rUqGPGHpsq6URvVAWa2fAqIkqlfU4RngPrGYBoa1Ni M6NJlw8gvJTBgkCc39LSTpamjbz9roIDkZlQnC9RO7k8Rc/xTX31a3GgYujadTBpfIga JQwSMuZ1HKoUjn6bSrBPFJvBaAnJAoYYH3EqEdZ9ex71cFuQ884I0tNEZG45hvUsKFSe SdW5ZEoZd6rbSNFsE45uC0UD8kqMIeKOTMqVLl/EmGGsbxPQhZqogmDjAeWQ19R+ngDM 5BxwPho/sCen5YkWBuTX+8h/WXJiDTTq1gmrRwjtIax6oHnLs3pgInlqG/tnWA3am8JP E8ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:subject:in-reply-to:cc:from:to:message-id :mime-version:content-transfer-encoding; bh=FFd5J9hlrCh2QSfJ0U9Wq/vsfh13pMH0ZkFo1eZIXtA=; b=gHZ1YeW8NHE6qK3LBx+Z26mWUU15MvAhtM0wbARiNWTWHbMP3NYy+EXBGY/dfq1BaY ojFEjJBem5AJfoZG16/q43ots+OiBDdRrvbyIZnAfcmyVPw5KR0LZxJ226F0aAAzX/ow EQxzMXi5CsURxhsUwOUrQOl8+0r2MsUc5xWrWVuXq2zMn/vU7Apvuee/pEf4BgtqnMGA rNr8idwr4hZo5jYxh8FpwVUv+/n1J4J+GK4TD6qBKmtds4s/wFYEUD6PQvhzaFH1g5Al t4sDLIvwYvu5dINklwoSxNWb+Gp+2N+YzzrK6nUHNETuPzi3SD6nDDDb6ENFQGInX2Pp VEzQ== X-Gm-Message-State: AOAM532eFa11mJuzRRU+sEmhezklOuyKIKUZ019+M8IpUnNIHxU0zMBD ijyKYNN5ectdGG5j2zuZ4SxGwvuytFecGA== X-Google-Smtp-Source: ABdhPJxxJ8lgOI/t/BS91nMmuF/AA3XEFbCsJdbzVlMXQCjM93kfvxRGwUywbXar5ejrleDbO2A5Hg== X-Received: by 2002:a63:2026:0:b0:3fa:cefb:e408 with SMTP id g38-20020a632026000000b003facefbe408mr25103264pgg.57.1653937096823; Mon, 30 May 2022 11:58:16 -0700 (PDT) Received: from localhost (76-210-143-223.lightspeed.sntcca.sbcglobal.net. [76.210.143.223]) by smtp.gmail.com with ESMTPSA id n16-20020aa79050000000b00518c6887217sm9107889pfo.58.2022.05.30.11.58.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 11:58:16 -0700 (PDT) Date: Mon, 30 May 2022 11:58:16 -0700 (PDT) X-Google-Original-Date: Mon, 30 May 2022 11:58:13 PDT (-0700) Subject: Re: [PATCH] RISC-V: Prepare dropping week attribute from arch_kexec_apply_relocations[_add] In-Reply-To: <20220530074202.pydmbbgvbtaugw5j@pengutronix.de> CC: lizhengyu3@huawei.com, alex@ghiti.fr, aou@eecs.berkeley.edu, Bjorn Topel , guoren@linux.alibaba.com, jszhang@kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, mick@ics.forth.gr, Paul Walmsley , penberg@kernel.org, sunnanyong@huawei.com, wangkefeng.wang@huawei.com, christophe.leroy@csgroup.eu, liaochang1@huawei.com, Stephen Rothwell , akpm@linux-foundation.org, ebiederm@xmission.com, kernel@pengutronix.de, naveen.n.rao@linux.vnet.ibm.com, linuxppc-dev@lists.ozlabs.org, lizhengyu3@huawei.com From: Palmer Dabbelt To: u.kleine-koenig@pengutronix.de Message-ID: Mime-Version: 1.0 (MHng) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220530_115817_756696_DFCCD498 X-CRM114-Status: GOOD ( 30.74 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="utf-8"; Format="flowed" Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org T24gTW9uLCAzMCBNYXkgMjAyMiAwMDo0MjowMiBQRFQgKC0wNzAwKSwgdS5rbGVpbmUta29lbmln QHBlbmd1dHJvbml4LmRlIHdyb3RlOgo+IFdpdGhvdXQgdGhpcyBjaGFuZ2UgYXJjaC9yaXNjdi9r ZXJuZWwvZWxmX2tleGVjLmMgZmFpbHMgdG8gY29tcGlsZSBvbmNlCj4gY29tbWl0IDIzM2MxZTZj MzE5YyAoImtleGVjX2ZpbGU6IGRyb3Agd2VhayBhdHRyaWJ1dGUgZnJvbQo+IGFyY2hfa2V4ZWNf YXBwbHlfcmVsb2NhdGlvbnNbX2FkZF0iKSBpcyBhbHNvIGNvbnRhaW5lZCBpbiB0aGUgdHJlZS4K PiBUaGlzIGN1cnJlbnRseSBoYXBwZW5zIGluIG5leHQtMjAyMjA1MjcuCj4KPiBQcmVwYXJlIHRo ZSBSSVNDLVYgc2ltaWxhciB0byB0aGUgczM5MCBhZGFwdGlvbiBkb25lIGluIDIzM2MxZTZjMzE5 Yy4KPiBUaGlzIGlzIHNhZmUgdG8gZG8gb24gdG9wIG9mIHRoZSByaXNjdiBjaGFuZ2UgZXZlbiB3 aXRob3V0IHRoZSBjaGFuZ2UgdG8KPiBhcmNoX2tleGVjX2FwcGx5X3JlbG9jYXRpb25zLgo+Cj4g Rml4ZXM6IDgzOGIzZTI4NDg4ZiAoIlJJU0MtVjogTG9hZCBwdXJnYXRvcnkgaW4ga2V4ZWNfZmls ZSIpCj4gTG9va3MtZ29vZC10bzogbGlhb2NoYW5nIChBKSA8bGlhb2NoYW5nMUBodWF3ZWkuY29t Pgo+IFNpZ25lZC1vZmYtYnk6IFV3ZSBLbGVpbmUtS8O2bmlnIDx1LmtsZWluZS1rb2VuaWdAcGVu Z3V0cm9uaXguZGU+Cj4gLS0tCj4KPiBPbiBNb24sIE1heSAzMCwgMjAyMiBhdCAwOTo0MzoyNkFN ICswODAwLCBsaWFvY2hhbmcgKEEpIHdyb3RlOgo+PiA+IEkgY2FuIGNvbmZpcm0gdGhhdCBkb2lu Zwo+PiA+IAo+PiA+IGRpZmYgLS1naXQgYS9hcmNoL3Jpc2N2L2luY2x1ZGUvYXNtL2tleGVjLmgg Yi9hcmNoL3Jpc2N2L2luY2x1ZGUvYXNtL2tleGVjLmgKPj4gPiBpbmRleCAyMDYyMTdiMjMzMDEu LmVlZTI2MGU4YWIzMCAxMDA2NDQKPj4gPiAtLS0gYS9hcmNoL3Jpc2N2L2luY2x1ZGUvYXNtL2tl eGVjLmgKPj4gPiArKysgYi9hcmNoL3Jpc2N2L2luY2x1ZGUvYXNtL2tleGVjLmgKPj4gPiBAQCAt NTUsNiArNTUsMTMgQEAgZXh0ZXJuIHJpc2N2X2tleGVjX21ldGhvZCByaXNjdl9rZXhlY19ub3Jl bG9jYXRlOwo+PiA+ICAKPj4gPiAgI2lmZGVmIENPTkZJR19LRVhFQ19GSUxFCj4+ID4gIGV4dGVy biBjb25zdCBzdHJ1Y3Qga2V4ZWNfZmlsZV9vcHMgZWxmX2tleGVjX29wczsKPj4gPiArCj4+ID4g K3N0cnVjdCBwdXJnYXRvcnlfaW5mbzsKPj4gPiAraW50IGFyY2hfa2V4ZWNfYXBwbHlfcmVsb2Nh dGlvbnNfYWRkKHN0cnVjdCBwdXJnYXRvcnlfaW5mbyAqcGksCj4+ID4gKwkJCQkgICAgIEVsZl9T aGRyICpzZWN0aW9uLAo+PiA+ICsJCQkJICAgICBjb25zdCBFbGZfU2hkciAqcmVsc2VjLAo+PiA+ ICsJCQkJICAgICBjb25zdCBFbGZfU2hkciAqc3ltdGFiKTsKPj4gPiArI2RlZmluZSBhcmNoX2tl eGVjX2FwcGx5X3JlbG9jYXRpb25zX2FkZCBhcmNoX2tleGVjX2FwcGx5X3JlbG9jYXRpb25zX2Fk ZAo+PiA+ICAjZW5kaWYKPj4gPiAgCj4+ID4gICNlbmRpZgo+PiAKPj4gTEdUTSwgeW91IGNvdWxk IHNlbmQgYSBmaXh1cCBwYXRjaCB0byByaXNjdiwgdGhhbmtzLgo+PiAKPj4gPiAKPj4gPiBvbiB0 b3Agb2YgODM4YjNlMjg0ODhmIHJlc3VsdHMgaW4gYSBjb21waWxhYmxlIHRyZWUuIEFuZCB3aGVu IG1lcmdpbmcKPj4gPiAyMzNjMWU2YzMxOWMgaW50byB0aGlzLCBpdCBpcyBzdGlsbCBidWlsZGlu Zy4KPj4gPiAKPj4gPiBJJ20gbm90IGVub3VnaCBpbnRvIGtleGVjIChhbmQgcmlzY3YpIHRvIGp1 ZGdlIGlmIHRoaXMgaXMgc2Vuc2libGUsIG9yCj4+ID4gY3JlYXRlIGEgdXNlZnVsIGNvbW1pdCBs b2cgYnV0IHRoZSBvYnZpb3VzIHdheSBmb3J3YXJkIGlzIHRvIGFwcGx5IHRoZQo+PiA+IGFib3Zl IHBhdGNoIHRvIHRoZSByaXNjdiB0cmVlIGJlZm9yZSBpdCBoaXRzIExpbnVzJyB0cmVlLgo+Cj4g T2ssIGhlcmUgY29tZXMgYSBwYXRjaCB3aXRoIGEgZ2VuZXJpYyBjb21taXQgbG9nLiAKPgo+IEBy aXNjdiBwZW9wbGU6IElmIHlvdSBwcmVmZXIsIHNxdWFzaCBpdCBpbnRvIDgzOGIzZTI4NDg4Zi4K ClNvcnJ5LCBqdXN0IHNhdyB0aGlzIGFmdGVyIEkgc2VudCBteSB2ZXJzaW9uIG9mIHRoZSBmaXgu ICBUaGV5J3JlIHRoZSAKc2FtZSwgYnV0IGRvIHlvdSBtaW5kIHNlbmRpbmcgYSBmdWxsLW9uIHBh dGNoIHNvIEkgY2FuIG1lcmdlIGl0PwoKPgo+IEJlc3QgcmVnYXJkcwo+IFV3ZQo+Cj4gIGFyY2gv cmlzY3YvaW5jbHVkZS9hc20va2V4ZWMuaCB8IDcgKysrKysrKwo+ICAxIGZpbGUgY2hhbmdlZCwg NyBpbnNlcnRpb25zKCspCj4KPiBkaWZmIC0tZ2l0IGEvYXJjaC9yaXNjdi9pbmNsdWRlL2FzbS9r ZXhlYy5oIGIvYXJjaC9yaXNjdi9pbmNsdWRlL2FzbS9rZXhlYy5oCj4gaW5kZXggMjA2MjE3YjIz MzAxLi5lZWUyNjBlOGFiMzAgMTAwNjQ0Cj4gLS0tIGEvYXJjaC9yaXNjdi9pbmNsdWRlL2FzbS9r ZXhlYy5oCj4gKysrIGIvYXJjaC9yaXNjdi9pbmNsdWRlL2FzbS9rZXhlYy5oCj4gQEAgLTU1LDYg KzU1LDEzIEBAIGV4dGVybiByaXNjdl9rZXhlY19tZXRob2QgcmlzY3Zfa2V4ZWNfbm9yZWxvY2F0 ZTsKPiAgCj4gICNpZmRlZiBDT05GSUdfS0VYRUNfRklMRQo+ICBleHRlcm4gY29uc3Qgc3RydWN0 IGtleGVjX2ZpbGVfb3BzIGVsZl9rZXhlY19vcHM7Cj4gKwo+ICtzdHJ1Y3QgcHVyZ2F0b3J5X2lu Zm87Cj4gK2ludCBhcmNoX2tleGVjX2FwcGx5X3JlbG9jYXRpb25zX2FkZChzdHJ1Y3QgcHVyZ2F0 b3J5X2luZm8gKnBpLAo+ICsJCQkJICAgICBFbGZfU2hkciAqc2VjdGlvbiwKPiArCQkJCSAgICAg Y29uc3QgRWxmX1NoZHIgKnJlbHNlYywKPiArCQkJCSAgICAgY29uc3QgRWxmX1NoZHIgKnN5bXRh Yik7Cj4gKyNkZWZpbmUgYXJjaF9rZXhlY19hcHBseV9yZWxvY2F0aW9uc19hZGQgYXJjaF9rZXhl Y19hcHBseV9yZWxvY2F0aW9uc19hZGQKPiAgI2VuZGlmCj4gIAo+ICAjZW5kaWYKPgo+IGJhc2Ut Y29tbWl0OiA4MzhiM2UyODQ4OGY3MDJlMmI1NDc3YjM5M2YwMDliMjYzOWQyYjFhCj4gLS0gCj4g Mi4zNi4xCj4KPiAtLSAKPiBQZW5ndXRyb25peCBlLksuICAgICAgICAgICAgICAgICAgICAgICAg ICAgfCBVd2UgS2xlaW5lLUvDtm5pZyAgICAgICAgICAgIHwKPiBJbmR1c3RyaWFsIExpbnV4IFNv bHV0aW9ucyAgICAgICAgICAgICAgICAgfCBodHRwczovL3d3dy5wZW5ndXRyb25peC5kZS8gfAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtcmlz Y3YgbWFpbGluZyBsaXN0CmxpbnV4LXJpc2N2QGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xp c3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1yaXNjdgo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 58097C433EF for ; Mon, 30 May 2022 22:32:21 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4LBqsb6YN3z3dvQ for ; Tue, 31 May 2022 08:32:19 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=rivosinc-com.20210112.gappssmtp.com header.i=@rivosinc-com.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=G2A0nuMR; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=rivosinc.com (client-ip=2607:f8b0:4864:20::535; helo=mail-pg1-x535.google.com; envelope-from=palmer@rivosinc.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=rivosinc-com.20210112.gappssmtp.com header.i=@rivosinc-com.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=G2A0nuMR; dkim-atps=neutral Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4LBl6k1m0nz3015 for ; Tue, 31 May 2022 04:58:19 +1000 (AEST) Received: by mail-pg1-x535.google.com with SMTP id 137so10808846pgb.5 for ; Mon, 30 May 2022 11:58:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=date:subject:in-reply-to:cc:from:to:message-id:mime-version :content-transfer-encoding; bh=FFd5J9hlrCh2QSfJ0U9Wq/vsfh13pMH0ZkFo1eZIXtA=; b=G2A0nuMRKJztXPtT1GUrPx85rUqGPGHpsq6URvVAWa2fAqIkqlfU4RngPrGYBoa1Ni M6NJlw8gvJTBgkCc39LSTpamjbz9roIDkZlQnC9RO7k8Rc/xTX31a3GgYujadTBpfIga JQwSMuZ1HKoUjn6bSrBPFJvBaAnJAoYYH3EqEdZ9ex71cFuQ884I0tNEZG45hvUsKFSe SdW5ZEoZd6rbSNFsE45uC0UD8kqMIeKOTMqVLl/EmGGsbxPQhZqogmDjAeWQ19R+ngDM 5BxwPho/sCen5YkWBuTX+8h/WXJiDTTq1gmrRwjtIax6oHnLs3pgInlqG/tnWA3am8JP E8ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:subject:in-reply-to:cc:from:to:message-id :mime-version:content-transfer-encoding; bh=FFd5J9hlrCh2QSfJ0U9Wq/vsfh13pMH0ZkFo1eZIXtA=; b=n/hoybmYq7TqGPGGrJwvO0rI0Xc880S98b5IrMKm9crHTnrn5+SXEFM4HM2q+jisNp YywgbyxyK9H1nx3F+2Yssa2sdWBaQgSRenbzR+8sYgF2GTBPw3mDUjAqYncY7+XQM2G0 mQmB11hUPWQ1NTYPcS2m09keUhz8RBe5leQ0XOm/7pVSOcdNn3bQYaxo5Yj4tSqCbb11 1jzRyrpAQXixE9vGyf5zEVsdNlctDYZ9q9lkWC86FyZbZ46w/W7hrIBrr//reFrKpps8 DyQmMR6whYOG8DYgi2rx5P8uzi1fcVgf5RHj1sBhOu8PEbIiPv7/JrWSgUlEnGkSodwk vegQ== X-Gm-Message-State: AOAM530rprYEhmKtvdIR8ivk6BrWpSrXgqkRKYdfg7C3q4nf/XFUnYZz osicKGrRP2bAdojRX9aJKgkhwg== X-Google-Smtp-Source: ABdhPJxxJ8lgOI/t/BS91nMmuF/AA3XEFbCsJdbzVlMXQCjM93kfvxRGwUywbXar5ejrleDbO2A5Hg== X-Received: by 2002:a63:2026:0:b0:3fa:cefb:e408 with SMTP id g38-20020a632026000000b003facefbe408mr25103264pgg.57.1653937096823; Mon, 30 May 2022 11:58:16 -0700 (PDT) Received: from localhost (76-210-143-223.lightspeed.sntcca.sbcglobal.net. [76.210.143.223]) by smtp.gmail.com with ESMTPSA id n16-20020aa79050000000b00518c6887217sm9107889pfo.58.2022.05.30.11.58.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 11:58:16 -0700 (PDT) Date: Mon, 30 May 2022 11:58:16 -0700 (PDT) X-Google-Original-Date: Mon, 30 May 2022 11:58:13 PDT (-0700) Subject: Re: [PATCH] RISC-V: Prepare dropping week attribute from arch_kexec_apply_relocations[_add] In-Reply-To: <20220530074202.pydmbbgvbtaugw5j@pengutronix.de> From: Palmer Dabbelt To: u.kleine-koenig@pengutronix.de Message-ID: Mime-Version: 1.0 (MHng) Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Tue, 31 May 2022 08:25:41 +1000 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wangkefeng.wang@huawei.com, guoren@linux.alibaba.com, sunnanyong@huawei.com, jszhang@kernel.org, mick@ics.forth.gr, linux-riscv@lists.infradead.org, Stephen Rothwell , alex@ghiti.fr, naveen.n.rao@linux.vnet.ibm.com, lizhengyu3@huawei.com, aou@eecs.berkeley.edu, liaochang1@huawei.com, Paul Walmsley , Bjorn Topel , kexec@lists.infradead.org, linux-kernel@vger.kernel.org, penberg@kernel.org, ebiederm@xmission.com, kernel@pengutronix.de, akpm@linux-foundation.org, linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Mon, 30 May 2022 00:42:02 PDT (-0700), u.kleine-koenig@pengutronix.de wrote: > Without this change arch/riscv/kernel/elf_kexec.c fails to compile once > commit 233c1e6c319c ("kexec_file: drop weak attribute from > arch_kexec_apply_relocations[_add]") is also contained in the tree. > This currently happens in next-20220527. > > Prepare the RISC-V similar to the s390 adaption done in 233c1e6c319c. > This is safe to do on top of the riscv change even without the change to > arch_kexec_apply_relocations. > > Fixes: 838b3e28488f ("RISC-V: Load purgatory in kexec_file") > Looks-good-to: liaochang (A) > Signed-off-by: Uwe Kleine-König > --- > > On Mon, May 30, 2022 at 09:43:26AM +0800, liaochang (A) wrote: >> > I can confirm that doing >> > >> > diff --git a/arch/riscv/include/asm/kexec.h b/arch/riscv/include/asm/kexec.h >> > index 206217b23301..eee260e8ab30 100644 >> > --- a/arch/riscv/include/asm/kexec.h >> > +++ b/arch/riscv/include/asm/kexec.h >> > @@ -55,6 +55,13 @@ extern riscv_kexec_method riscv_kexec_norelocate; >> > >> > #ifdef CONFIG_KEXEC_FILE >> > extern const struct kexec_file_ops elf_kexec_ops; >> > + >> > +struct purgatory_info; >> > +int arch_kexec_apply_relocations_add(struct purgatory_info *pi, >> > + Elf_Shdr *section, >> > + const Elf_Shdr *relsec, >> > + const Elf_Shdr *symtab); >> > +#define arch_kexec_apply_relocations_add arch_kexec_apply_relocations_add >> > #endif >> > >> > #endif >> >> LGTM, you could send a fixup patch to riscv, thanks. >> >> > >> > on top of 838b3e28488f results in a compilable tree. And when merging >> > 233c1e6c319c into this, it is still building. >> > >> > I'm not enough into kexec (and riscv) to judge if this is sensible, or >> > create a useful commit log but the obvious way forward is to apply the >> > above patch to the riscv tree before it hits Linus' tree. > > Ok, here comes a patch with a generic commit log. > > @riscv people: If you prefer, squash it into 838b3e28488f. Sorry, just saw this after I sent my version of the fix. They're the same, but do you mind sending a full-on patch so I can merge it? > > Best regards > Uwe > > arch/riscv/include/asm/kexec.h | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/arch/riscv/include/asm/kexec.h b/arch/riscv/include/asm/kexec.h > index 206217b23301..eee260e8ab30 100644 > --- a/arch/riscv/include/asm/kexec.h > +++ b/arch/riscv/include/asm/kexec.h > @@ -55,6 +55,13 @@ extern riscv_kexec_method riscv_kexec_norelocate; > > #ifdef CONFIG_KEXEC_FILE > extern const struct kexec_file_ops elf_kexec_ops; > + > +struct purgatory_info; > +int arch_kexec_apply_relocations_add(struct purgatory_info *pi, > + Elf_Shdr *section, > + const Elf_Shdr *relsec, > + const Elf_Shdr *symtab); > +#define arch_kexec_apply_relocations_add arch_kexec_apply_relocations_add > #endif > > #endif > > base-commit: 838b3e28488f702e2b5477b393f009b2639d2b1a > -- > 2.36.1 > > -- > Pengutronix e.K. | Uwe Kleine-König | > Industrial Linux Solutions | https://www.pengutronix.de/ | From mboxrd@z Thu Jan 1 00:00:00 1970 From: Palmer Dabbelt Date: Mon, 30 May 2022 11:58:16 -0700 (PDT) Subject: [PATCH] RISC-V: Prepare dropping week attribute from arch_kexec_apply_relocations[_add] In-Reply-To: <20220530074202.pydmbbgvbtaugw5j@pengutronix.de> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kexec@lists.infradead.org On Mon, 30 May 2022 00:42:02 PDT (-0700), u.kleine-koenig at pengutronix.de wrote: > Without this change arch/riscv/kernel/elf_kexec.c fails to compile once > commit 233c1e6c319c ("kexec_file: drop weak attribute from > arch_kexec_apply_relocations[_add]") is also contained in the tree. > This currently happens in next-20220527. > > Prepare the RISC-V similar to the s390 adaption done in 233c1e6c319c. > This is safe to do on top of the riscv change even without the change to > arch_kexec_apply_relocations. > > Fixes: 838b3e28488f ("RISC-V: Load purgatory in kexec_file") > Looks-good-to: liaochang (A) > Signed-off-by: Uwe Kleine-K?nig > --- > > On Mon, May 30, 2022 at 09:43:26AM +0800, liaochang (A) wrote: >> > I can confirm that doing >> > >> > diff --git a/arch/riscv/include/asm/kexec.h b/arch/riscv/include/asm/kexec.h >> > index 206217b23301..eee260e8ab30 100644 >> > --- a/arch/riscv/include/asm/kexec.h >> > +++ b/arch/riscv/include/asm/kexec.h >> > @@ -55,6 +55,13 @@ extern riscv_kexec_method riscv_kexec_norelocate; >> > >> > #ifdef CONFIG_KEXEC_FILE >> > extern const struct kexec_file_ops elf_kexec_ops; >> > + >> > +struct purgatory_info; >> > +int arch_kexec_apply_relocations_add(struct purgatory_info *pi, >> > + Elf_Shdr *section, >> > + const Elf_Shdr *relsec, >> > + const Elf_Shdr *symtab); >> > +#define arch_kexec_apply_relocations_add arch_kexec_apply_relocations_add >> > #endif >> > >> > #endif >> >> LGTM, you could send a fixup patch to riscv, thanks. >> >> > >> > on top of 838b3e28488f results in a compilable tree. And when merging >> > 233c1e6c319c into this, it is still building. >> > >> > I'm not enough into kexec (and riscv) to judge if this is sensible, or >> > create a useful commit log but the obvious way forward is to apply the >> > above patch to the riscv tree before it hits Linus' tree. > > Ok, here comes a patch with a generic commit log. > > @riscv people: If you prefer, squash it into 838b3e28488f. Sorry, just saw this after I sent my version of the fix. They're the same, but do you mind sending a full-on patch so I can merge it? > > Best regards > Uwe > > arch/riscv/include/asm/kexec.h | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/arch/riscv/include/asm/kexec.h b/arch/riscv/include/asm/kexec.h > index 206217b23301..eee260e8ab30 100644 > --- a/arch/riscv/include/asm/kexec.h > +++ b/arch/riscv/include/asm/kexec.h > @@ -55,6 +55,13 @@ extern riscv_kexec_method riscv_kexec_norelocate; > > #ifdef CONFIG_KEXEC_FILE > extern const struct kexec_file_ops elf_kexec_ops; > + > +struct purgatory_info; > +int arch_kexec_apply_relocations_add(struct purgatory_info *pi, > + Elf_Shdr *section, > + const Elf_Shdr *relsec, > + const Elf_Shdr *symtab); > +#define arch_kexec_apply_relocations_add arch_kexec_apply_relocations_add > #endif > > #endif > > base-commit: 838b3e28488f702e2b5477b393f009b2639d2b1a > -- > 2.36.1 > > -- > Pengutronix e.K. | Uwe Kleine-K?nig | > Industrial Linux Solutions | https://www.pengutronix.de/ |