Re: [PATCH 0/5] arm64: vdso: cleanups

Mark Rutland
2020-04-28T12:52:41Z

On Tue, Apr 28, 2020 at 01:49:46PM +0100, Will Deacon wrote:
> On Tue, Apr 14, 2020 at 11:42:47AM +0100, Mark Rutland wrote:
> > While attempting to review an arm64 vdso patch, I noticed some of the existing
> > code was somewhat baroque, making it harder than necessary to understand and
> > extend. These patches attempt to improve this by making the code more
> > consistent and avoiding unnecessary duplication.
> >
> > The first patch in the series fixes a bug in a boot time error path. This bug
> > was made obvious during the refactoring but I've moved it to the start so that
> > it can be backported more easily.
> >
> > The series is based on v5.7-rc1 and can be found in my arm64/vdso-cleanup
> > branch [1].
> >
> > Thanks,
> > Mark.
> >
> > [1] https://git.kernel.org/pub/scm/linux/kernel/git/mark/linux.git/log/?h=arm64/vdso-cleanup
> >
> > Mark Rutland (5):
> > arm64: vdso: don't free unallocated pages
> > arm64: vdso: remove aarch32_vdso_pages[]
> > arm64: vdso: simplify arch_vdso_type ifdeffery
> > arm64: vdso: use consistent 'abi' nomenclature
> > arm64: vdso: use consistent 'map' nomenclature
>
> I tried to queue 2-5 but the compat vDSO fails to build for me:
>
>
> arch/arm64/kernel/vdso.c:246:12: error: use of undeclared identifier 'VDSO_ABI_AARCH32'; did you mean 'VDSO_ABI_AA32'?
> vdso_info[VDSO_ABI_AARCH32].dm = &aarch32_vdso_maps[AA32_MAP_VVAR];
> ^~~~~~~~~~~~~~~~
> VDSO_ABI_AA32
> arch/arm64/kernel/vdso.c:39:2: note: 'VDSO_ABI_AA32' declared here
> VDSO_ABI_AA32,
> ^
> arch/arm64/kernel/vdso.c:247:12: error: use of undeclared identifier 'VDSO_ABI_AARCH32'; did you mean 'VDSO_ABI_AA32'?
> vdso_info[VDSO_ABI_AARCH32].cm = &aarch32_vdso_maps[AA32_MAP_VDSO];
> ^~~~~~~~~~~~~~~~
> VDSO_ABI_AA32
> arch/arm64/kernel/vdso.c:39:2: note: 'VDSO_ABI_AA32' declared here
> VDSO_ABI_AA32,
> ^
> 2 errors generated.

Sorry for that; I clearly messed up patch 5 when rebasing to rename
things.

I'll send out a v2 once I've fixed and build-tested.

Thanks,
Mark.