2016-10-23 13:14:47

by Alexander Kuleshov

[permalink] [raw]
Subject: [PATCH v2] x86/entry64: remove unused audit related macros

These macro ocured in the 86a1c34a929f commit (x86_64 syscall audit
fast-path by Roland McGrath <[email protected]>).

These defines were used in two-phase sycalls entry tracing, but
this functionality was moved to the syscall_trace_enter() from
arch/x86/entry/common.c in the 1f484aa69 commit (x86/entry: Move
C entry and exit code to arch/x86/entry/common.c by Andy Lutomirski
<[email protected]>).

The syscall_trace_enter() now uses same defines from <linux/audit.h>,
so these defines are no longer used anywhere in entry_64.S and we may
remove them.

Signed-off-by: Alexander Kuleshov <[email protected]>
---
ChangeLog:

v1 -> v2:
- Added more details in the commit message.

arch/x86/entry/entry_64.S | 6 ------
1 file changed, 6 deletions(-)

diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index ef766a3..4362f1c 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -38,12 +38,6 @@
#include <asm/export.h>
#include <linux/err.h>

-/* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
-#include <linux/elf-em.h>
-#define AUDIT_ARCH_X86_64 (EM_X86_64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
-#define __AUDIT_ARCH_64BIT 0x80000000
-#define __AUDIT_ARCH_LE 0x40000000
-
.code64
.section .entry.text, "ax"

--
2.8.0.rc3.1353.gea9bdc0


2016-10-23 13:33:19

by Borislav Petkov

[permalink] [raw]
Subject: Re: [PATCH v2] x86/entry64: remove unused audit related macros

On Sun, Oct 23, 2016 at 07:14:36PM +0600, Alexander Kuleshov wrote:
> These macro ocured in the 86a1c34a929f commit (x86_64 syscall audit
> fast-path by Roland McGrath <[email protected]>).
>
> These defines were used in two-phase sycalls entry tracing, but
> this functionality was moved to the syscall_trace_enter() from
> arch/x86/entry/common.c in the 1f484aa69 commit (x86/entry: Move
> C entry and exit code to arch/x86/entry/common.c by Andy Lutomirski
> <[email protected]>).
>
> The syscall_trace_enter() now uses same defines from <linux/audit.h>,
> so these defines are no longer used anywhere in entry_64.S and we may
> remove them.

Good, it is getting there. Very close to what I had in mind, thanks!

Now, I went and made it a bit more readable and put the commit IDs and
their names on separate lines, like we do in tip:

"These macros were added in commit

86a1c34a929f ("x86_64 syscall audit fast-path").

They were used for sycalls auditing, but this functionality was moved to
the arch/x86/entry/common.c:syscall_trace_enter() in

1f484aa69046 ("x86/entry: Move C entry and exit code to arch/x86/entry/common.c")

syscall_trace_enter() now uses the same defines from <linux/audit.h>,
so these defines are no longer used anywhere in entry_64.S and we may
remove them."

Also, we abbreviate git commits to 12 chars. What you could do is add
this to your .gitconfig:

[alias]
one = show -s --pretty='format:%h (\"%s\")'

and then simply do

$ git one 1f484aa69

and it'll format it properly for ya.

Anyway, just a couple of things to pay attention to in the future.

With this, you can add

Reviewed-by: Borislav Petkov <[email protected]>

to your v3.

Thanks.

--
Regards/Gruss,
Boris.

ECO tip #101: Trim your mails when you reply.

2016-10-23 13:48:08

by Alexander Kuleshov

[permalink] [raw]
Subject: Re: [PATCH v2] x86/entry64: remove unused audit related macros

On 10-23-16, Borislav Petkov wrote:
> Now, I went and made it a bit more readable and put the commit IDs and
> their names on separate lines, like we do in tip:
>
> "These macros were added in commit
>
> 86a1c34a929f ("x86_64 syscall audit fast-path").
>
> They were used for sycalls auditing, but this functionality was moved to
> the arch/x86/entry/common.c:syscall_trace_enter() in
>
> 1f484aa69046 ("x86/entry: Move C entry and exit code to arch/x86/entry/common.c")
>
> syscall_trace_enter() now uses the same defines from <linux/audit.h>,
> so these defines are no longer used anywhere in entry_64.S and we may
> remove them."
>

Agree, this looks more readable. I will take into account this formatting.

> Also, we abbreviate git commits to 12 chars. What you could do is add
> this to your .gitconfig:
>
> [alias]
> one = show -s --pretty='format:%h (\"%s\")'
>
> and then simply do
>
> $ git one 1f484aa69
>
> and it'll format it properly for ya.
>
> Anyway, just a couple of things to pay attention to in the future.

Yes, thanks for this.

> With this, you can add
>
> Reviewed-by: Borislav Petkov <[email protected]>
>
> to your v3.

Thank you.