Skip to content

Commit

Permalink
AUDIT: Reduce contention in audit_serial()
Browse files Browse the repository at this point in the history
... by generating serial numbers only if an audit context is actually
_used_, rather than doing so at syscall entry even when the context
isn't necessarily marked auditable.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
  • Loading branch information
David Woodhouse committed Jul 18, 2005
1 parent d5b454f commit ce625a8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion kernel/audit.c
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,9 @@ unsigned int audit_serial(void)
unsigned int ret;

spin_lock_irqsave(&serial_lock, flags);
ret = serial++;
do {
ret = ++serial;
} while (unlikely(!ret));
spin_unlock_irqrestore(&serial_lock, flags);

return ret;
Expand Down
4 changes: 3 additions & 1 deletion kernel/auditsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -984,7 +984,7 @@ void audit_syscall_entry(struct task_struct *tsk, int arch, int major,
if (likely(state == AUDIT_DISABLED))
return;

context->serial = audit_serial();
context->serial = 0;
context->ctime = CURRENT_TIME;
context->in_syscall = 1;
context->auditable = !!(state == AUDIT_RECORD_CONTEXT);
Expand Down Expand Up @@ -1138,6 +1138,8 @@ void audit_inode(const char *name, const struct inode *inode, unsigned flags)
void auditsc_get_stamp(struct audit_context *ctx,
struct timespec *t, unsigned int *serial)
{
if (!ctx->serial)
ctx->serial = audit_serial();
t->tv_sec = ctx->ctime.tv_sec;
t->tv_nsec = ctx->ctime.tv_nsec;
*serial = ctx->serial;
Expand Down

0 comments on commit ce625a8

Please sign in to comment.