diff mbox series

riscv: compat_vdso: install compat_vdso.so.dbg to /lib/modules/*/vdso/

Message ID 20231117125807.1058477-1-masahiroy@kernel.org (mailing list archive)
State Accepted
Commit 4b0bf9a0127029054c2fa18ba5b3f3ddc45f54ed
Headers show
Series riscv: compat_vdso: install compat_vdso.so.dbg to /lib/modules/*/vdso/ | expand

Checks

Context Check Description
conchuod/vmtest-for-next-PR success PR summary
conchuod/patch-1-test-1 success .github/scripts/patches/tests/build_rv32_defconfig.sh
conchuod/patch-1-test-2 success .github/scripts/patches/tests/build_rv64_clang_allmodconfig.sh
conchuod/patch-1-test-3 success .github/scripts/patches/tests/build_rv64_gcc_allmodconfig.sh
conchuod/patch-1-test-4 success .github/scripts/patches/tests/build_rv64_nommu_k210_defconfig.sh
conchuod/patch-1-test-5 success .github/scripts/patches/tests/build_rv64_nommu_virt_defconfig.sh
conchuod/patch-1-test-6 success .github/scripts/patches/tests/checkpatch.sh
conchuod/patch-1-test-7 success .github/scripts/patches/tests/dtb_warn_rv64.sh
conchuod/patch-1-test-8 success .github/scripts/patches/tests/header_inline.sh
conchuod/patch-1-test-9 success .github/scripts/patches/tests/kdoc.sh
conchuod/patch-1-test-10 success .github/scripts/patches/tests/module_param.sh
conchuod/patch-1-test-11 success .github/scripts/patches/tests/verify_fixes.sh
conchuod/patch-1-test-12 success .github/scripts/patches/tests/verify_signedoff.sh

Commit Message

Masahiro Yamada Nov. 17, 2023, 12:58 p.m. UTC
'make vdso_install' installs debug vdso files to /lib/modules/*/vdso/.

Only for the compat vdso on riscv, the installation destination differs;
compat_vdso.so.dbg is installed to /lib/module/*/compat_vdso/.

To follow the standard install destination and simplify the vdso_install
logic, change the install destination to standard /lib/modules/*/vdso/.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 arch/riscv/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Masahiro Yamada Jan. 20, 2024, 9:48 p.m. UTC | #1
On Fri, Nov 17, 2023 at 9:58 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> 'make vdso_install' installs debug vdso files to /lib/modules/*/vdso/.
>
> Only for the compat vdso on riscv, the installation destination differs;
> compat_vdso.so.dbg is installed to /lib/module/*/compat_vdso/.
>
> To follow the standard install destination and simplify the vdso_install
> logic, change the install destination to standard /lib/modules/*/vdso/.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---


Ping?
(in case "yet more RISC-V updates" happens)




>
>  arch/riscv/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
> index a74be78678eb..5cbe596345c1 100644
> --- a/arch/riscv/Makefile
> +++ b/arch/riscv/Makefile
> @@ -146,7 +146,7 @@ endif
>  endif
>
>  vdso-install-y                 += arch/riscv/kernel/vdso/vdso.so.dbg
> -vdso-install-$(CONFIG_COMPAT)  += arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg:../compat_vdso/compat_vdso.so
> +vdso-install-$(CONFIG_COMPAT)  += arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg
>
>  ifneq ($(CONFIG_XIP_KERNEL),y)
>  ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_ARCH_CANAAN),yy)
> --
> 2.40.1
>
Masahiro Yamada Feb. 24, 2024, 3:37 a.m. UTC | #2
Ping x 2 ?





On Sun, Jan 21, 2024 at 6:48 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> On Fri, Nov 17, 2023 at 9:58 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
> >
> > 'make vdso_install' installs debug vdso files to /lib/modules/*/vdso/.
> >
> > Only for the compat vdso on riscv, the installation destination differs;
> > compat_vdso.so.dbg is installed to /lib/module/*/compat_vdso/.
> >
> > To follow the standard install destination and simplify the vdso_install
> > logic, change the install destination to standard /lib/modules/*/vdso/.
> >
> > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> > ---
>
>
> Ping?
> (in case "yet more RISC-V updates" happens)
>
>
>
>
> >
> >  arch/riscv/Makefile | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
> > index a74be78678eb..5cbe596345c1 100644
> > --- a/arch/riscv/Makefile
> > +++ b/arch/riscv/Makefile
> > @@ -146,7 +146,7 @@ endif
> >  endif
> >
> >  vdso-install-y                 += arch/riscv/kernel/vdso/vdso.so.dbg
> > -vdso-install-$(CONFIG_COMPAT)  += arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg:../compat_vdso/compat_vdso.so
> > +vdso-install-$(CONFIG_COMPAT)  += arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg
> >
> >  ifneq ($(CONFIG_XIP_KERNEL),y)
> >  ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_ARCH_CANAAN),yy)
> > --
> > 2.40.1
> >
>
>
> --
> Best Regards
> Masahiro Yamada



--
Best Regards
Masahiro Yamada
Alexandre Ghiti March 6, 2024, 8:12 p.m. UTC | #3
Hi Masahiro,

On 24/02/2024 04:37, Masahiro Yamada wrote:
> Ping x 2 ?
>
>
>
>
>
> On Sun, Jan 21, 2024 at 6:48 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
>> On Fri, Nov 17, 2023 at 9:58 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
>>> 'make vdso_install' installs debug vdso files to /lib/modules/*/vdso/.
>>>
>>> Only for the compat vdso on riscv, the installation destination differs;
>>> compat_vdso.so.dbg is installed to /lib/module/*/compat_vdso/.
>>>
>>> To follow the standard install destination and simplify the vdso_install
>>> logic, change the install destination to standard /lib/modules/*/vdso/.
>>>
>>> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
>>> ---
>>
>> Ping?
>> (in case "yet more RISC-V updates" happens)
>>
>>
>>
>>
>>>   arch/riscv/Makefile | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
>>> index a74be78678eb..5cbe596345c1 100644
>>> --- a/arch/riscv/Makefile
>>> +++ b/arch/riscv/Makefile
>>> @@ -146,7 +146,7 @@ endif
>>>   endif
>>>
>>>   vdso-install-y                 += arch/riscv/kernel/vdso/vdso.so.dbg
>>> -vdso-install-$(CONFIG_COMPAT)  += arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg:../compat_vdso/compat_vdso.so
>>> +vdso-install-$(CONFIG_COMPAT)  += arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg
>>>
>>>   ifneq ($(CONFIG_XIP_KERNEL),y)
>>>   ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_ARCH_CANAAN),yy)
>>> --
>>> 2.40.1
>>>
>>
>> --
>> Best Regards
>> Masahiro Yamada
>
>
> --
> Best Regards
> Masahiro Yamada
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv


Couldn't changing this library install path break some existing 
application? I mean it kind of breaks where the library is expected to 
be right?

Thanks,

Alex
Masahiro Yamada March 15, 2024, 4:06 a.m. UTC | #4
On Thu, Mar 7, 2024 at 5:12 AM Alexandre Ghiti <alex@ghiti.fr> wrote:
>
> Hi Masahiro,
>
> On 24/02/2024 04:37, Masahiro Yamada wrote:
> > Ping x 2 ?
> >
> >
> >
> >
> >
> > On Sun, Jan 21, 2024 at 6:48 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
> >> On Fri, Nov 17, 2023 at 9:58 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
> >>> 'make vdso_install' installs debug vdso files to /lib/modules/*/vdso/.
> >>>
> >>> Only for the compat vdso on riscv, the installation destination differs;
> >>> compat_vdso.so.dbg is installed to /lib/module/*/compat_vdso/.
> >>>
> >>> To follow the standard install destination and simplify the vdso_install
> >>> logic, change the install destination to standard /lib/modules/*/vdso/.
> >>>
> >>> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> >>> ---
> >>
> >> Ping?
> >> (in case "yet more RISC-V updates" happens)
> >>
> >>
> >>
> >>
> >>>   arch/riscv/Makefile | 2 +-
> >>>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>>
> >>> diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
> >>> index a74be78678eb..5cbe596345c1 100644
> >>> --- a/arch/riscv/Makefile
> >>> +++ b/arch/riscv/Makefile
> >>> @@ -146,7 +146,7 @@ endif
> >>>   endif
> >>>
> >>>   vdso-install-y                 += arch/riscv/kernel/vdso/vdso.so.dbg
> >>> -vdso-install-$(CONFIG_COMPAT)  += arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg:../compat_vdso/compat_vdso.so
> >>> +vdso-install-$(CONFIG_COMPAT)  += arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg
> >>>
> >>>   ifneq ($(CONFIG_XIP_KERNEL),y)
> >>>   ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_ARCH_CANAAN),yy)
> >>> --
> >>> 2.40.1
> >>>
> >>
> >> --
> >> Best Regards
> >> Masahiro Yamada
> >
> >
> > --
> > Best Regards
> > Masahiro Yamada
> >
> > _______________________________________________
> > linux-riscv mailing list
> > linux-riscv@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-riscv
>
>
> Couldn't changing this library install path break some existing
> application? I mean it kind of breaks where the library is expected to
> be right?


Do you have a particular library in mind?


RISV-V is the only architecture that installs a debug vdso
to a different location than the
standard lib/modules/*/vdso/.


I regard this as a fix.
Alexandre Ghiti March 18, 2024, 8:53 p.m. UTC | #5
Hi Masahiro,

On 15/03/2024 05:06, Masahiro Yamada wrote:
> On Thu, Mar 7, 2024 at 5:12 AM Alexandre Ghiti <alex@ghiti.fr> wrote:
>> Hi Masahiro,
>>
>> On 24/02/2024 04:37, Masahiro Yamada wrote:
>>> Ping x 2 ?
>>>
>>>
>>>
>>>
>>>
>>> On Sun, Jan 21, 2024 at 6:48 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
>>>> On Fri, Nov 17, 2023 at 9:58 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
>>>>> 'make vdso_install' installs debug vdso files to /lib/modules/*/vdso/.
>>>>>
>>>>> Only for the compat vdso on riscv, the installation destination differs;
>>>>> compat_vdso.so.dbg is installed to /lib/module/*/compat_vdso/.
>>>>>
>>>>> To follow the standard install destination and simplify the vdso_install
>>>>> logic, change the install destination to standard /lib/modules/*/vdso/.
>>>>>
>>>>> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
>>>>> ---
>>>> Ping?
>>>> (in case "yet more RISC-V updates" happens)
>>>>
>>>>
>>>>
>>>>
>>>>>    arch/riscv/Makefile | 2 +-
>>>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
>>>>> index a74be78678eb..5cbe596345c1 100644
>>>>> --- a/arch/riscv/Makefile
>>>>> +++ b/arch/riscv/Makefile
>>>>> @@ -146,7 +146,7 @@ endif
>>>>>    endif
>>>>>
>>>>>    vdso-install-y                 += arch/riscv/kernel/vdso/vdso.so.dbg
>>>>> -vdso-install-$(CONFIG_COMPAT)  += arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg:../compat_vdso/compat_vdso.so
>>>>> +vdso-install-$(CONFIG_COMPAT)  += arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg
>>>>>
>>>>>    ifneq ($(CONFIG_XIP_KERNEL),y)
>>>>>    ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_ARCH_CANAAN),yy)
>>>>> --
>>>>> 2.40.1
>>>>>
>>>> --
>>>> Best Regards
>>>> Masahiro Yamada
>>>
>>> --
>>> Best Regards
>>> Masahiro Yamada
>>>
>>> _______________________________________________
>>> linux-riscv mailing list
>>> linux-riscv@lists.infradead.org
>>> http://lists.infradead.org/mailman/listinfo/linux-riscv
>>
>> Couldn't changing this library install path break some existing
>> application? I mean it kind of breaks where the library is expected to
>> be right?
>
> Do you have a particular library in mind?


None in particular.


>
>
> RISV-V is the only architecture that installs a debug vdso
> to a different location than the
> standard lib/modules/*/vdso/.
>
>
> I regard this as a fix.


You're probably right, I don't see why the search path would be 
different on riscv, unless it was fixed in userspace but I think this is 
the right thing to do, so:

Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com>

Thanks,

Alex


>
>
>
>
>
Masahiro Yamada March 20, 2024, 3:27 p.m. UTC | #6
Hello Palmer,


Ping x 3.  Any chance for this to land during the MW?

It has been 4 months since the submission.



Masahiro








On Sat, Feb 24, 2024 at 12:37 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> Ping x 2 ?
>
>
>
>
>
> On Sun, Jan 21, 2024 at 6:48 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
> >
> > On Fri, Nov 17, 2023 at 9:58 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
> > >
> > > 'make vdso_install' installs debug vdso files to /lib/modules/*/vdso/.
> > >
> > > Only for the compat vdso on riscv, the installation destination differs;
> > > compat_vdso.so.dbg is installed to /lib/module/*/compat_vdso/.
> > >
> > > To follow the standard install destination and simplify the vdso_install
> > > logic, change the install destination to standard /lib/modules/*/vdso/.
> > >
> > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> > > ---
> >
> >
> > Ping?
> > (in case "yet more RISC-V updates" happens)
> >
> >
> >
> >
> > >
> > >  arch/riscv/Makefile | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
> > > index a74be78678eb..5cbe596345c1 100644
> > > --- a/arch/riscv/Makefile
> > > +++ b/arch/riscv/Makefile
> > > @@ -146,7 +146,7 @@ endif
> > >  endif
> > >
> > >  vdso-install-y                 += arch/riscv/kernel/vdso/vdso.so.dbg
> > > -vdso-install-$(CONFIG_COMPAT)  += arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg:../compat_vdso/compat_vdso.so
> > > +vdso-install-$(CONFIG_COMPAT)  += arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg
> > >
> > >  ifneq ($(CONFIG_XIP_KERNEL),y)
> > >  ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_ARCH_CANAAN),yy)
> > > --
> > > 2.40.1
> > >
> >
> >
> > --
> > Best Regards
> > Masahiro Yamada
>
>
>
> --
> Best Regards
> Masahiro Yamada
Palmer Dabbelt March 26, 2024, 9:08 p.m. UTC | #7
On Mon, 18 Mar 2024 13:53:42 PDT (-0700), alex@ghiti.fr wrote:
> Hi Masahiro,
>
> On 15/03/2024 05:06, Masahiro Yamada wrote:
>> On Thu, Mar 7, 2024 at 5:12 AM Alexandre Ghiti <alex@ghiti.fr> wrote:
>>> Hi Masahiro,
>>>
>>> On 24/02/2024 04:37, Masahiro Yamada wrote:
>>>> Ping x 2 ?
>>>>
>>>>
>>>>
>>>>
>>>>
>>>> On Sun, Jan 21, 2024 at 6:48 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
>>>>> On Fri, Nov 17, 2023 at 9:58 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
>>>>>> 'make vdso_install' installs debug vdso files to /lib/modules/*/vdso/.
>>>>>>
>>>>>> Only for the compat vdso on riscv, the installation destination differs;
>>>>>> compat_vdso.so.dbg is installed to /lib/module/*/compat_vdso/.
>>>>>>
>>>>>> To follow the standard install destination and simplify the vdso_install
>>>>>> logic, change the install destination to standard /lib/modules/*/vdso/.
>>>>>>
>>>>>> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
>>>>>> ---
>>>>> Ping?
>>>>> (in case "yet more RISC-V updates" happens)
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>>    arch/riscv/Makefile | 2 +-
>>>>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>>>>
>>>>>> diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
>>>>>> index a74be78678eb..5cbe596345c1 100644
>>>>>> --- a/arch/riscv/Makefile
>>>>>> +++ b/arch/riscv/Makefile
>>>>>> @@ -146,7 +146,7 @@ endif
>>>>>>    endif
>>>>>>
>>>>>>    vdso-install-y                 += arch/riscv/kernel/vdso/vdso.so.dbg
>>>>>> -vdso-install-$(CONFIG_COMPAT)  += arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg:../compat_vdso/compat_vdso.so
>>>>>> +vdso-install-$(CONFIG_COMPAT)  += arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg
>>>>>>
>>>>>>    ifneq ($(CONFIG_XIP_KERNEL),y)
>>>>>>    ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_ARCH_CANAAN),yy)
>>>>>> --
>>>>>> 2.40.1
>>>>>>
>>>>> --
>>>>> Best Regards
>>>>> Masahiro Yamada
>>>>
>>>> --
>>>> Best Regards
>>>> Masahiro Yamada
>>>>
>>>> _______________________________________________
>>>> linux-riscv mailing list
>>>> linux-riscv@lists.infradead.org
>>>> http://lists.infradead.org/mailman/listinfo/linux-riscv
>>>
>>> Couldn't changing this library install path break some existing
>>> application? I mean it kind of breaks where the library is expected to
>>> be right?
>>
>> Do you have a particular library in mind?
>
>
> None in particular.
>
>
>>
>>
>> RISV-V is the only architecture that installs a debug vdso
>> to a different location than the
>> standard lib/modules/*/vdso/.
>>
>>
>> I regard this as a fix.
>
>
> You're probably right, I don't see why the search path would be
> different on riscv, unless it was fixed in userspace but I think this is
> the right thing to do, so:

We do have some weirdness with multlib paths, but I don't think that's 
related to the VDSO paths.

>
> Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com>
>
> Thanks,
>
> Alex
>
>
>>
>>
>>
>>
>>
patchwork-bot+linux-riscv@kernel.org March 27, 2024, 2 p.m. UTC | #8
Hello:

This patch was applied to riscv/linux.git (fixes)
by Palmer Dabbelt <palmer@rivosinc.com>:

On Fri, 17 Nov 2023 21:58:07 +0900 you wrote:
> 'make vdso_install' installs debug vdso files to /lib/modules/*/vdso/.
> 
> Only for the compat vdso on riscv, the installation destination differs;
> compat_vdso.so.dbg is installed to /lib/module/*/compat_vdso/.
> 
> To follow the standard install destination and simplify the vdso_install
> logic, change the install destination to standard /lib/modules/*/vdso/.
> 
> [...]

Here is the summary with links:
  - riscv: compat_vdso: install compat_vdso.so.dbg to /lib/modules/*/vdso/
    https://git.kernel.org/riscv/c/4b0bf9a01270

You are awesome, thank you!
diff mbox series

Patch

diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
index a74be78678eb..5cbe596345c1 100644
--- a/arch/riscv/Makefile
+++ b/arch/riscv/Makefile
@@ -146,7 +146,7 @@  endif
 endif
 
 vdso-install-y			+= arch/riscv/kernel/vdso/vdso.so.dbg
-vdso-install-$(CONFIG_COMPAT)	+= arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg:../compat_vdso/compat_vdso.so
+vdso-install-$(CONFIG_COMPAT)	+= arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg
 
 ifneq ($(CONFIG_XIP_KERNEL),y)
 ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_ARCH_CANAAN),yy)