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;
From:   Shea Levy <shea@shealevy.com>
To:     linux-riscv@lists.infradead.org
Cc:     Palmer Dabbelt <palmer@sifive.com>, Albert Ou <albert@sifive.com>,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] RISC-V: Load modules within relative jump range of the kernel text.
In-Reply-To: <20180409125800.5000-1-shea@shealevy.com>
References: <20180409125800.5000-1-shea@shealevy.com>
Date:   Sun, 22 Apr 2018 08:53:56 -0400
Message-ID: <87lgdfieqj.fsf@xps13.shealevy.com>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
        micalg=pgp-sha256; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi Palmer,

Shea Levy <shea@shealevy.com> writes:

> Signed-off-by: Shea Levy <shea@shealevy.com>
> ---
>
> Note that this patch worked in my old modules patchset and seems to be
> working now, but my kernel boot locks up on top of
> riscv-for-linus-4.17-mw0 and I don't know if it's due to this patch or
> something else that's changed in the mean time.
>
> ---
>  arch/riscv/include/asm/pgtable.h |  9 +++++++++
>  arch/riscv/kernel/module.c       | 11 +++++++++++
>  2 files changed, 20 insertions(+)
>
> diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pg=
table.h
> index 16301966d65b..b08ded13364a 100644
> --- a/arch/riscv/include/asm/pgtable.h
> +++ b/arch/riscv/include/asm/pgtable.h
> @@ -25,6 +25,7 @@
>  #include <asm/page.h>
>  #include <asm/tlbflush.h>
>  #include <linux/mm_types.h>
> +#include <linux/sizes.h>
>=20=20
>  #ifdef CONFIG_64BIT
>  #include <asm/pgtable-64.h>
> @@ -425,6 +426,14 @@ static inline void pgtable_cache_init(void)
>  #define TASK_SIZE VMALLOC_START
>  #endif
>=20=20
> +/*
> + * The module space lives between the addresses given by TASK_SIZE
> + * and PAGE_OFFSET - it must be within 2G of the kernel text.
> + */
> +#define MODULES_SIZE		(SZ_128M)
> +#define MODULES_VADDR		(PAGE_OFFSET - MODULES_SIZE)
> +#define MODULES_END		(VMALLOC_END)
> +
>  #include <asm-generic/pgtable.h>
>=20=20
>  #endif /* !__ASSEMBLY__ */
> diff --git a/arch/riscv/kernel/module.c b/arch/riscv/kernel/module.c
> index 5dddba301d0a..1b382c7de095 100644
> --- a/arch/riscv/kernel/module.c
> +++ b/arch/riscv/kernel/module.c
> @@ -16,6 +16,8 @@
>  #include <linux/err.h>
>  #include <linux/errno.h>
>  #include <linux/moduleloader.h>
> +#include <linux/vmalloc.h>
> +#include <asm/pgtable.h>
>=20=20
>  static int apply_r_riscv_64_rela(struct module *me, u32 *location, Elf_A=
ddr v)
>  {
> @@ -382,3 +384,12 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char=
 *strtab,
>=20=20
>  	return 0;
>  }
> +
> +void *module_alloc(unsigned long size)
> +{
> +	return __vmalloc_node_range(size, 1, MODULES_VADDR,
> +				    MODULES_END, GFP_KERNEL,
> +				    PAGE_KERNEL_EXEC, 0,
> +				    NUMA_NO_NODE,
> +				    __builtin_return_address(0));
> +}
> --=20
> 2.16.2

Any thoughts on this?

Thanks,
Shea

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

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

iQIzBAEBCAAdFiEE6ESKvwKkwnxgMLnaXAvWlX2G/icFAlrcheQACgkQXAvWlX2G
/icsgQ//aheaP3z4bDAGD/7lFGD6JgiZWtTT66KDgfDMI+yL4JfyxcRPmBkD/8CL
cuqLsmd7WqowWF99EFD6yRu+UbT8ZInzuYvY+lQrRLjC3KmH3PX6IXZLRtS91X9I
80lP1PKKGXt0fv1JLvhRS5Syuq7Ob3tgMdQ3QDMq4K4xf9BHTIEaXUVtw4m/O/aU
zCt8NFE6ZjyHbOOiKdaYXjTw52TprsDZHP8RhGSaqlOJ9MN1aPeh+ws33wjb4Hi+
hBI6v1gDEsj+R61wZF6tN2xB9lk6tebG1/vocbmCMIM4cZ0Vir8/+9Cbsn10vLQ6
XFpjsP2MdjdekylpwBNmERCS8gPMbpSWwqTaqXJCZrqXB/53VPpqzp1qFtZBGvjC
GPCRQm2Xst9tIxSoQUcNLbcTwrXT8D38FenxX2oM9IJfY4D0TyRSVvjkPfoPqz1w
rq+Y04U6Ozxeys4DvrO7Rl0S4T3vgbSMFTCtnLtxKOJSeP4P3Fhz6gCof9YgzYYw
5J1+KZaI5x3P7L0XnzTTtY93q46DxRtoIxljqcOoH/oVRDbDQxVC+scNqPSPg1WU
9+yrQVXG6KoqN0BmEuPG6t6h25lxvf8mL41ismjMsG9dqJ7yDpOI3p8uth/T2o9a
ksx1SJUkTujBxPvHHHywdh7sVfvK6V6jVnqVStovldLuio1RZ9k=
=Hrqm
-----END PGP SIGNATURE-----
--=-=-=--