Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 31 May 2022 07:58:03 +0200
From:   Uwe =?utf-8?Q?Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
To:     Palmer Dabbelt <palmer@rivosinc.com>
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 <sfr@canb.auug.org.au>, alex@ghiti.fr,
        christophe.leroy@csgroup.eu, naveen.n.rao@linux.vnet.ibm.com,
        lizhengyu3@huawei.com, aou@eecs.berkeley.edu,
        liaochang1@huawei.com, Paul Walmsley <paul.walmsley@sifive.com>,
        Bjorn Topel <bjorn.topel@gmail.com>, 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
Subject: Re: [PATCH] RISC-V: Prepare dropping week attribute from
 arch_kexec_apply_relocations[_add]
Message-ID: <20220531055803.prq5fj6lajzqiiiu@pengutronix.de>
References: <20220530194133.udwdjsb2l33hsiil@pengutronix.de>
 <mhng-99e09fbd-fa71-40fc-92da-ff4af0d209a5@palmer-mbp2014>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="yslkboxts2p5evg7"
Content-Disposition: inline
In-Reply-To: <mhng-99e09fbd-fa71-40fc-92da-ff4af0d209a5@palmer-mbp2014>
Precedence: bulk


--yslkboxts2p5evg7
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, May 30, 2022 at 04:11:27PM -0700, Palmer Dabbelt wrote:
> On Mon, 30 May 2022 12:41:33 PDT (-0700), u.kleine-koenig@pengutronix.de =
wrote:
> > Hello,
> >=20
> > On Mon, May 30, 2022 at 11:58:16AM -0700, Palmer Dabbelt wrote:
> > > On Mon, 30 May 2022 00:42:02 PDT (-0700), u.kleine-koenig@pengutronix=
=2Ede 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 chan=
ge to
> > > > arch_kexec_apply_relocations.
> > > > > Fixes: 838b3e28488f ("RISC-V: Load purgatory in kexec_file")
> > > > Looks-good-to: liaochang (A) <liaochang1@huawei.com>
> > > > Signed-off-by: Uwe Kleine-K=F6nig <u.kleine-koenig@pengutronix.de>
> > > > ---
> > > > > 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_norelo=
cate;
> > > > > >  >  #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_relo=
cations_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 ap=
ply 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.
> > >=20
> > > 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?
> >=20
> > Sorry, I don't understand your request. I found
> > https://lore.kernel.org/linux-riscv/20220530180408.16239-1-palmer@rivos=
inc.com/
> >=20
> > but I don't know what a full-on patch is and what stops you merging my
> > patch.
> >=20
> > Is it that it's in reply to a patch series and b4 fails to fetch the
> > right patch and you ask to send it in a new thread?
>=20
> Ya, with the reply bits in there my mail merge (which unfortunately isn't
> b4, I haven't gotten around to converting yet) got tripped up.  It's kind=
 of
> easy to for me to screw something up trying to pull bits out of replies a=
nd
> such, but I think this one was pretty simple (looks like maybe some PGP or
> MIME thing was the issue).
>=20
> I just put <https://git.kernel.org/pub/scm/linux/kernel/git/palmer/linux.=
git/commit/?h=3Dfor-next&id=3D7699f7aacf3ebfee51c670b6f796b2797f0f7487>
> on my staging branch, it looks OK to me but LMK if there's a problem.

there is indeed a problem, but caused by me: If you are ready to rewrite
it, please do s/week/weak/ in the subject line. Otherwise looks good to
me.

Best regards and thanks,
Uwe

--=20
Pengutronix e.K.                           | Uwe Kleine-K=F6nig            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

--yslkboxts2p5evg7
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAABCgAdFiEEfnIqFpAYrP8+dKQLwfwUeK3K7AkFAmKVrmgACgkQwfwUeK3K
7Almtgf/cMTh8gUXGvy16o7kg3cs7a7GFj0o1WI4oidOclFTc/fWRvKtowa8AzI/
6zEA161snauy6f6RwV4kPudFteGkKV7AuNL93UYf5cLx1yEel9XMhht0KJU+HEPw
2eaZboB92XdTrvCfnxSanTst4F33A+LK6bD6Yz+B1QZF5gCHB7GqAoTNYTK8EguB
oHEUMlx6qCWHeC1qBGj8ldLK4kvZqL8eC3yKHezMZVa94PJJsE6KbAKBQGB3D1KN
GfSkmkRa3fENCxe+2/WOrhLU6qhEFJqwPfEwz7V5xmQgmzlml6xdM5oxccN6E3EC
o3yYJzG+N0fIbD3b1gHR61LRNFn5rg==
=23PP
-----END PGP SIGNATURE-----

--yslkboxts2p5evg7--