sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3:smbprofile: improve profiling for the security context switching.

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Stefan Metzmacher 2014-11-17 12:52:35 +01:00 committed by Jeremy Allison
parent e007c60a4f
commit 49f84f0719
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source3/include/smbprofile.h
View File

@ -28,7 +28,10 @@
\
SMBPROFILE_STATS_SECTION_START("SMBD loop") \
SMBPROFILE_STATS_COUNT(request) \
SMBPROFILE_STATS_COUNT(uid_changes) \
SMBPROFILE_STATS_BASIC(push_sec_ctx) \
SMBPROFILE_STATS_BASIC(set_sec_ctx) \
SMBPROFILE_STATS_BASIC(set_root_sec_ctx) \
SMBPROFILE_STATS_BASIC(pop_sec_ctx) \
SMBPROFILE_STATS_BASIC(smbd_idle) \
SMBPROFILE_STATS_SECTION_END \
\

24
source3/smbd/sec_ctx.c
View File

@ -66,7 +66,6 @@ static bool become_uid(uid_t uid)
set_effective_uid(uid);
DO_PROFILE_INC(uid_changes);
return True;
}
@ -196,6 +195,8 @@ bool push_sec_ctx(void)
{
struct sec_ctx *ctx_p;
START_PROFILE(push_sec_ctx);
/* Check we don't overflow our stack */
if (sec_ctx_stack_ndx == MAX_SEC_CTX_DEPTH) {
@ -232,6 +233,8 @@ bool push_sec_ctx(void)
ctx_p->ut.groups = NULL;
}
END_PROFILE(push_sec_ctx);
return True;
}
@ -306,7 +309,9 @@ static void set_unix_security_ctx(uid_t uid, gid_t gid, int ngroups, gid_t *grou
Set the current security context to a given user.
****************************************************************************/
void set_sec_ctx(uid_t uid, gid_t gid, int ngroups, gid_t *groups, const struct security_token *token)
static void set_sec_ctx_internal(uid_t uid, gid_t gid,
int ngroups, gid_t *groups,
const struct security_token *token)
{
struct sec_ctx *ctx_p = &sec_ctx_stack[sec_ctx_stack_ndx];
@ -358,6 +363,13 @@ void set_sec_ctx(uid_t uid, gid_t gid, int ngroups, gid_t *groups, const struct
current_user.nt_user_token = ctx_p->token;
}
void set_sec_ctx(uid_t uid, gid_t gid, int ngroups, gid_t *groups, const struct security_token *token)
{
START_PROFILE(set_sec_ctx);
set_sec_ctx_internal(uid, gid, ngroups, groups, token);
END_PROFILE(set_sec_ctx);
}
/****************************************************************************
Become root context.
****************************************************************************/
@ -366,7 +378,9 @@ void set_root_sec_ctx(void)
{
/* May need to worry about supplementary groups at some stage */
set_sec_ctx(0, 0, 0, NULL, NULL);
START_PROFILE(set_root_sec_ctx);
set_sec_ctx_internal(0, 0, 0, NULL, NULL);
END_PROFILE(set_root_sec_ctx);
}
/****************************************************************************
@ -378,6 +392,8 @@ bool pop_sec_ctx(void)
struct sec_ctx *ctx_p;
struct sec_ctx *prev_ctx_p;
START_PROFILE(pop_sec_ctx);
/* Check for stack underflow */
if (sec_ctx_stack_ndx == 0) {
@ -417,6 +433,8 @@ bool pop_sec_ctx(void)
current_user.ut.groups = prev_ctx_p->ut.groups;
current_user.nt_user_token = prev_ctx_p->token;
END_PROFILE(pop_sec_ctx);
DEBUG(4, ("pop_sec_ctx (%u, %u) - sec_ctx_stack_ndx = %d\n",
(unsigned int)geteuid(), (unsigned int)getegid(), sec_ctx_stack_ndx));