Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
95cd6232
K
Kernel
项目概览
openeuler
/
Kernel
1 年多 前同步成功
通知
8
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
95cd6232
编写于
6年前
作者:
T
Trond Myklebust
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
SUNRPC: Clean up the AUTH cache code
Signed-off-by:
N
Trond Myklebust
<
trond.myklebust@hammerspace.com
>
上级
86bbd742
无相关合并请求
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
87 addition
and
62 deletion
+87
-62
net/sunrpc/auth.c
net/sunrpc/auth.c
+86
-61
net/sunrpc/auth_null.c
net/sunrpc/auth_null.c
+1
-1
未找到文件。
net/sunrpc/auth.c
浏览文件 @
95cd6232
...
...
@@ -291,25 +291,30 @@ rpcauth_release(struct rpc_auth *auth)
static
DEFINE_SPINLOCK
(
rpc_credcache_lock
);
static
void
/*
* On success, the caller is responsible for freeing the reference
* held by the hashtable
*/
static
bool
rpcauth_unhash_cred_locked
(
struct
rpc_cred
*
cred
)
{
if
(
!
test_and_clear_bit
(
RPCAUTH_CRED_HASHED
,
&
cred
->
cr_flags
))
return
false
;
hlist_del_rcu
(
&
cred
->
cr_hash
);
smp_mb__before_atomic
();
clear_bit
(
RPCAUTH_CRED_HASHED
,
&
cred
->
cr_flags
);
return
true
;
}
static
int
static
bool
rpcauth_unhash_cred
(
struct
rpc_cred
*
cred
)
{
spinlock_t
*
cache_lock
;
int
ret
;
bool
ret
;
if
(
!
test_bit
(
RPCAUTH_CRED_HASHED
,
&
cred
->
cr_flags
))
return
false
;
cache_lock
=
&
cred
->
cr_auth
->
au_credcache
->
lock
;
spin_lock
(
cache_lock
);
ret
=
atomic_read
(
&
cred
->
cr_count
)
==
0
;
if
(
ret
)
rpcauth_unhash_cred_locked
(
cred
);
ret
=
rpcauth_unhash_cred_locked
(
cred
);
spin_unlock
(
cache_lock
);
return
ret
;
}
...
...
@@ -388,6 +393,44 @@ void rpcauth_destroy_credlist(struct list_head *head)
}
}
static
void
rpcauth_lru_add_locked
(
struct
rpc_cred
*
cred
)
{
if
(
!
list_empty
(
&
cred
->
cr_lru
))
return
;
number_cred_unused
++
;
list_add_tail
(
&
cred
->
cr_lru
,
&
cred_unused
);
}
static
void
rpcauth_lru_add
(
struct
rpc_cred
*
cred
)
{
if
(
!
list_empty
(
&
cred
->
cr_lru
))
return
;
spin_lock
(
&
rpc_credcache_lock
);
rpcauth_lru_add_locked
(
cred
);
spin_unlock
(
&
rpc_credcache_lock
);
}
static
void
rpcauth_lru_remove_locked
(
struct
rpc_cred
*
cred
)
{
if
(
list_empty
(
&
cred
->
cr_lru
))
return
;
number_cred_unused
--
;
list_del_init
(
&
cred
->
cr_lru
);
}
static
void
rpcauth_lru_remove
(
struct
rpc_cred
*
cred
)
{
if
(
list_empty
(
&
cred
->
cr_lru
))
return
;
spin_lock
(
&
rpc_credcache_lock
);
rpcauth_lru_remove_locked
(
cred
);
spin_unlock
(
&
rpc_credcache_lock
);
}
/*
* Clear the RPC credential cache, and delete those credentials
* that are not referenced.
...
...
@@ -407,13 +450,10 @@ rpcauth_clear_credcache(struct rpc_cred_cache *cache)
head
=
&
cache
->
hashtable
[
i
];
while
(
!
hlist_empty
(
head
))
{
cred
=
hlist_entry
(
head
->
first
,
struct
rpc_cred
,
cr_hash
);
get_rpccred
(
cred
);
if
(
!
list_empty
(
&
cred
->
cr_lru
))
{
list_del
(
&
cred
->
cr_lru
);
number_cred_unused
--
;
}
list_add_tail
(
&
cred
->
cr_lru
,
&
free
);
rpcauth_unhash_cred_locked
(
cred
);
/* Note: We now hold a reference to cred */
rpcauth_lru_remove_locked
(
cred
);
list_add_tail
(
&
cred
->
cr_lru
,
&
free
);
}
}
spin_unlock
(
&
cache
->
lock
);
...
...
@@ -447,7 +487,6 @@ EXPORT_SYMBOL_GPL(rpcauth_destroy_credcache);
static
long
rpcauth_prune_expired
(
struct
list_head
*
free
,
int
nr_to_scan
)
{
spinlock_t
*
cache_lock
;
struct
rpc_cred
*
cred
,
*
next
;
unsigned
long
expired
=
jiffies
-
RPC_AUTH_EXPIRY_MORATORIUM
;
long
freed
=
0
;
...
...
@@ -456,32 +495,24 @@ rpcauth_prune_expired(struct list_head *free, int nr_to_scan)
if
(
nr_to_scan
--
==
0
)
break
;
if
(
atomic_read
(
&
cred
->
cr_count
)
>
1
)
{
rpcauth_lru_remove_locked
(
cred
);
continue
;
}
/*
* Enforce a 60 second garbage collection moratorium
* Note that the cred_unused list must be time-ordered.
*/
if
(
time_in_range
(
cred
->
cr_expire
,
expired
,
jiffies
)
&&
test_bit
(
RPCAUTH_CRED_HASHED
,
&
cred
->
cr_flags
)
!=
0
)
{
freed
=
SHRINK_STOP
;
break
;
}
list_del_init
(
&
cred
->
cr_lru
);
number_cred_unused
--
;
freed
++
;
if
(
atomic_read
(
&
cred
->
cr_count
)
!=
0
)
if
(
!
time_in_range
(
cred
->
cr_expire
,
expired
,
jiffies
))
continue
;
if
(
!
rpcauth_unhash_cred
(
cred
))
continue
;
cache_lock
=
&
cred
->
cr_auth
->
au_credcache
->
lock
;
spin_lock
(
cache_lock
);
if
(
atomic_read
(
&
cred
->
cr_count
)
==
0
)
{
get_rpccred
(
cred
);
list_add_tail
(
&
cred
->
cr_lru
,
free
);
rpcauth_unhash_cred_locked
(
cred
);
}
spin_unlock
(
cache_lock
);
rpcauth_lru_remove_locked
(
cred
);
freed
++
;
list_add_tail
(
&
cred
->
cr_lru
,
free
);
}
return
freed
;
return
freed
?
freed
:
SHRINK_STOP
;
}
static
unsigned
long
...
...
@@ -595,6 +626,7 @@ rpcauth_lookup_credcache(struct rpc_auth *auth, struct auth_cred * acred,
if
(
cred
==
NULL
)
{
cred
=
new
;
set_bit
(
RPCAUTH_CRED_HASHED
,
&
cred
->
cr_flags
);
atomic_inc
(
&
cred
->
cr_count
);
hlist_add_head_rcu
(
&
cred
->
cr_hash
,
&
cache
->
hashtable
[
nr
]);
}
else
list_add_tail
(
&
new
->
cr_lru
,
&
free
);
...
...
@@ -709,36 +741,29 @@ put_rpccred(struct rpc_cred *cred)
{
if
(
cred
==
NULL
)
return
;
/* Fast path for unhashed credentials */
if
(
test_bit
(
RPCAUTH_CRED_HASHED
,
&
cred
->
cr_flags
)
==
0
)
{
rcu_read_lock
();
if
(
atomic_dec_and_test
(
&
cred
->
cr_count
))
goto
destroy
;
if
(
atomic_read
(
&
cred
->
cr_count
)
!=
1
||
!
test_bit
(
RPCAUTH_CRED_HASHED
,
&
cred
->
cr_flags
))
goto
out
;
if
(
test_bit
(
RPCAUTH_CRED_UPTODATE
,
&
cred
->
cr_flags
)
!=
0
)
{
cred
->
cr_expire
=
jiffies
;
rpcauth_lru_add
(
cred
);
/* Race breaker */
if
(
unlikely
(
!
test_bit
(
RPCAUTH_CRED_HASHED
,
&
cred
->
cr_flags
)))
rpcauth_lru_remove
(
cred
);
}
else
if
(
rpcauth_unhash_cred
(
cred
))
{
rpcauth_lru_remove
(
cred
);
if
(
atomic_dec_and_test
(
&
cred
->
cr_count
))
cred
->
cr_ops
->
crdestroy
(
cred
);
return
;
}
if
(
!
atomic_dec_and_lock
(
&
cred
->
cr_count
,
&
rpc_credcache_lock
))
return
;
if
(
!
list_empty
(
&
cred
->
cr_lru
))
{
number_cred_unused
--
;
list_del_init
(
&
cred
->
cr_lru
);
}
if
(
test_bit
(
RPCAUTH_CRED_HASHED
,
&
cred
->
cr_flags
)
!=
0
)
{
if
(
test_bit
(
RPCAUTH_CRED_UPTODATE
,
&
cred
->
cr_flags
)
!=
0
)
{
cred
->
cr_expire
=
jiffies
;
list_add_tail
(
&
cred
->
cr_lru
,
&
cred_unused
);
number_cred_unused
++
;
goto
out_nodestroy
;
}
if
(
!
rpcauth_unhash_cred
(
cred
))
{
/* We were hashed and someone looked us up... */
goto
out_nodestroy
;
}
goto
destroy
;
}
spin_unlock
(
&
rpc_credcache_lock
);
cred
->
cr_ops
->
crdestroy
(
cred
);
out:
rcu_read_unlock
(
);
return
;
out_nodestroy:
spin_unlock
(
&
rpc_credcache_lock
);
destroy:
rcu_read_unlock
();
cred
->
cr_ops
->
crdestroy
(
cred
);
}
EXPORT_SYMBOL_GPL
(
put_rpccred
);
...
...
This diff is collapsed.
Click to expand it.
net/sunrpc/auth_null.c
浏览文件 @
95cd6232
...
...
@@ -138,6 +138,6 @@ struct rpc_cred null_cred = {
.
cr_lru
=
LIST_HEAD_INIT
(
null_cred
.
cr_lru
),
.
cr_auth
=
&
null_auth
,
.
cr_ops
=
&
null_credops
,
.
cr_count
=
ATOMIC_INIT
(
1
),
.
cr_count
=
ATOMIC_INIT
(
2
),
.
cr_flags
=
1UL
<<
RPCAUTH_CRED_UPTODATE
,
};
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部