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:     Palmer Dabbelt <palmer@sifive.com>
Cc:     linux-riscv@lists.infradead.org, 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: <mhng-0a2f9574-9b23-4f26-ae76-18ed7f2c8533@palmer-si-x1c4>
References: <mhng-0a2f9574-9b23-4f26-ae76-18ed7f2c8533@palmer-si-x1c4>
Date:   Tue, 24 Apr 2018 07:54:18 -0400
Message-ID: <87d0yoizv9.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,

Palmer Dabbelt <palmer@sifive.com> writes:

> On Sun, 22 Apr 2018 05:53:56 PDT (-0700), shea@shealevy.com wrote:
>> 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/=
pgtable.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=
_Addr v)
>>>  {
>>> @@ -382,3 +384,12 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const ch=
ar *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?
>
> The concept looks good, but does this actually keep the modules within 2G=
iB of=20
> the text if PAGE_OFFSET is large?

It's been some time since I wrote this, but I thought PAGE_OFFSET was
where the kernel text *started*? So unless the text itself is bigger
than 2G - 128 M, in which case we're SOL anyway, it seems like this
should work. Is there something better we can do, without a large memory
model?

Thanks,
Shea

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

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

iQIzBAEBCAAdFiEE6ESKvwKkwnxgMLnaXAvWlX2G/icFAlrfGuoACgkQXAvWlX2G
/idBZxAA0NWUguvJC61Y4lCB7jT7jOnPkcZD/AC0w8nFCBdRN0r6gmIyxUO1tZ23
ufrdQESHOBdR+wKtrLRWqCX7cQ3djWspT6SkMapMGYhHKwzDYV4XmscfWdLqV7iV
M2paC8L2+4U6GLApFodG9sC71C1CvPjVDyApC2NqUGlDkwu/q+1CxsHhMbSE85L4
fuSWTXPGV0k85Ne5pwE8a8V0lguXiDcUbxEsF/b0MLypAQSgvT+NEHabHjh+QVzO
GVWBa8CvGe1o2cJSQRmOfCnIgU0P7DCOqLut7XUQDYYSsT2IbjSDt8+vMIpsp1+A
VivzBoO8Hwd9YqLw06fwSR1Rnx2naOE4s5vl0LTIm5n/TaBXqKsoU5FOhrD1KUCK
vNYF2hBHnwMUnEjjymAs8zwu6OQ1/j6AcKDqc33tiL7+SvLMYl7TSzrud7f+znkJ
vKOKLRri+Qd3Dsb2uNYPdXkA2YmBfr24svM0U6nGJtZhJNLJP0PhmwekR29Eho0n
QndPqHEbFVw+2SUCpAsAXOgppe5Gy//pEV0DN+AA9bAoqKVUNC56T3A4siDiC3Xe
CWvHr25rl1JzoUosZIMKf0HP0wmAUWqJJn+sxIJgFSO6DLSCEu94eOw5nR6cRlGy
UhEa+6hXnmOWmdP+W0ewSeRW0u3C4JqviyDSXAds86D8pMbblb0=
=VMpJ
-----END PGP SIGNATURE-----
--=-=-=--