| Message ID | 20180703233430.14416-5-labbott@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi. 2018-07-04 8:34 GMT+09:00 Laura Abbott <labbott@redhat.com>: > > The vDSO needs to have a unique build id in a similar manner > to the kernel and modules. Use the build salt macro. > > Signed-off-by: Laura Abbott <labbott@redhat.com> > --- > v5: I was previously focused on x86 only but since powerpc gave a patch, > I figured I would do arm64 since the changes were also fairly simple. > --- > arch/arm64/kernel/vdso/note.S | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/arm64/kernel/vdso/note.S b/arch/arm64/kernel/vdso/note.S > index b82c85e5d972..2c429dfd3f45 100644 > --- a/arch/arm64/kernel/vdso/note.S > +++ b/arch/arm64/kernel/vdso/note.S > @@ -22,7 +22,10 @@ > #include <linux/uts.h> > #include <linux/version.h> > #include <linux/elfnote.h> > +#include <linux/build-salt.h> > > ELFNOTE_START(Linux, 0, "a") > .long LINUX_VERSION_CODE > ELFNOTE_END > + > +BUILD_SALT; I think this works, but I prefer no-semicolon in assembly files. For coding consistency, I want ';' as statement delimiter in .c files. But, only new line after each statement in .S files. For example, in arch/x86/xen/xen-head.S I see no semicolon after ELFNOTE(). I found this: http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0473k/dom1359731141352.html It says ';' starts a comment line although it is not the case of GAS. Same for 3/4.
On Tue, Jul 03, 2018 at 04:34:30PM -0700, Laura Abbott wrote: > > The vDSO needs to have a unique build id in a similar manner > to the kernel and modules. Use the build salt macro. > > Signed-off-by: Laura Abbott <labbott@redhat.com> > --- > v5: I was previously focused on x86 only but since powerpc gave a patch, > I figured I would do arm64 since the changes were also fairly simple. > --- > arch/arm64/kernel/vdso/note.S | 3 +++ > 1 file changed, 3 insertions(+) If you drop the trailing semicolon, then: Acked-by: Will Deacon <will.deacon@arm.com> Will > diff --git a/arch/arm64/kernel/vdso/note.S b/arch/arm64/kernel/vdso/note.S > index b82c85e5d972..2c429dfd3f45 100644 > --- a/arch/arm64/kernel/vdso/note.S > +++ b/arch/arm64/kernel/vdso/note.S > @@ -22,7 +22,10 @@ > #include <linux/uts.h> > #include <linux/version.h> > #include <linux/elfnote.h> > +#include <linux/build-salt.h> > > ELFNOTE_START(Linux, 0, "a") > .long LINUX_VERSION_CODE > ELFNOTE_END > + > +BUILD_SALT; > -- > 2.17.1 >
On 07/03/2018 08:55 PM, Masahiro Yamada wrote: > Hi. > > 2018-07-04 8:34 GMT+09:00 Laura Abbott <labbott@redhat.com>: >> >> The vDSO needs to have a unique build id in a similar manner >> to the kernel and modules. Use the build salt macro. >> >> Signed-off-by: Laura Abbott <labbott@redhat.com> >> --- >> v5: I was previously focused on x86 only but since powerpc gave a patch, >> I figured I would do arm64 since the changes were also fairly simple. >> --- >> arch/arm64/kernel/vdso/note.S | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/arch/arm64/kernel/vdso/note.S b/arch/arm64/kernel/vdso/note.S >> index b82c85e5d972..2c429dfd3f45 100644 >> --- a/arch/arm64/kernel/vdso/note.S >> +++ b/arch/arm64/kernel/vdso/note.S >> @@ -22,7 +22,10 @@ >> #include <linux/uts.h> >> #include <linux/version.h> >> #include <linux/elfnote.h> >> +#include <linux/build-salt.h> >> >> ELFNOTE_START(Linux, 0, "a") >> .long LINUX_VERSION_CODE >> ELFNOTE_END >> + >> +BUILD_SALT; > > > > I think this works, but > I prefer no-semicolon in assembly files. > > For coding consistency, > I want ';' as statement delimiter in .c files. > But, only new line after each statement in .S files. > > For example, in arch/x86/xen/xen-head.S > I see no semicolon after ELFNOTE(). > > I found this: > http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0473k/dom1359731141352.html > It says ';' starts a comment line > although it is not the case of GAS. > > > Same for 3/4. > > > Yes, that was a typo out of habit. Will fix.
diff --git a/arch/arm64/kernel/vdso/note.S b/arch/arm64/kernel/vdso/note.S index b82c85e5d972..2c429dfd3f45 100644 --- a/arch/arm64/kernel/vdso/note.S +++ b/arch/arm64/kernel/vdso/note.S @@ -22,7 +22,10 @@ #include <linux/uts.h> #include <linux/version.h> #include <linux/elfnote.h> +#include <linux/build-salt.h> ELFNOTE_START(Linux, 0, "a") .long LINUX_VERSION_CODE ELFNOTE_END + +BUILD_SALT;
The vDSO needs to have a unique build id in a similar manner to the kernel and modules. Use the build salt macro. Signed-off-by: Laura Abbott <labbott@redhat.com> --- v5: I was previously focused on x86 only but since powerpc gave a patch, I figured I would do arm64 since the changes were also fairly simple. --- arch/arm64/kernel/vdso/note.S | 3 +++ 1 file changed, 3 insertions(+)