Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions security/lua/kvcache.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ static int kvcache_node_cmp(struct kvcache_node *n1, struct kvcache_node *n2)

RB_GENERATE_STATIC(kvcache, kvcache_node, node, kvcache_node_cmp);

static void __kvcache_dict_init(struct kvcache_dict *dict)
static void kvcache_dict_init(struct kvcache_dict *dict)
{
rwlock_init(&dict->lock);
RB_INIT(&dict->root);
Expand Down Expand Up @@ -111,7 +111,7 @@ static int kvcache_dict_init_once(struct kvcache_dict *dict)
*/
if (atomic_try_cmpxchg(&dict->state, &state,
KVCACHE_DICT_INITING)) {
__kvcache_dict_init(dict);
kvcache_dict_init(dict);
atomic_set_release(&dict->state, KVCACHE_DICT_READY);
goto out_bh;
}
Expand Down Expand Up @@ -549,13 +549,6 @@ void kvcache_dict_free(struct kvcache_dict *dict)
WARN_ON(atomic_read(&dict->count) != 0);
}

void kvcache_dict_init(struct kvcache_dict *dict)
{
atomic_set(&dict->state, KVCACHE_DICT_INITING);
__kvcache_dict_init(dict);
atomic_set_release(&dict->state, KVCACHE_DICT_READY);
}

/******************************** object cache *******************************/

const int _module_sentinel;
Expand Down Expand Up @@ -592,8 +585,10 @@ int lua_object_get(lua_State *L, struct kvcache_dict *dict)
{
struct lua_lsm_module *module;

if (!dict)
return 0;
if (!dict) {
lua_pushnil(L);
return 1;
}

module = module_from_object_fenv(L, 1);
if (!module)
Expand All @@ -605,6 +600,9 @@ int lua_object_incr(lua_State *L, struct kvcache_dict *dict)
{
struct lua_lsm_module *module;

if (IS_ERR(dict))
return kvcache_result(L, PTR_ERR(dict));

if (!dict)
return kvcache_result(L, -ESRCH);

Expand Down Expand Up @@ -660,6 +658,9 @@ int lua_object_newindex(lua_State *L, struct kvcache_dict *dict)
{
struct lua_lsm_module *module;

if (IS_ERR(dict))
return kvcache_result(L, PTR_ERR(dict));

if (!dict)
return kvcache_result(L, -ESRCH);

Expand Down Expand Up @@ -715,6 +716,11 @@ static int shdict_tostring(lua_State *L)
struct kvcache_dict *shdict = toshdict(L, 1);
unsigned long flags;

if (!kvcache_dict_ready(shdict)) {
lua_pushfstring(L, "shdict (%d / %d)", 0, CACHE_CAPACITY);
return 1;
}

read_lock_irqsave(&shdict->lock, flags);
lua_pushfstring(L, "shdict (%d / %d)",
atomic_read(&shdict->count), shdict->capacity);
Expand Down
1 change: 0 additions & 1 deletion security/lua/kvcache.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ void kvcache_stats_show(struct seq_file *m);

int kvcache_module_nodes_gc(struct lua_lsm_module *module);
void kvcache_dict_free(struct kvcache_dict *dict);
void kvcache_dict_init(struct kvcache_dict *dict);

/******************************** object cache *******************************/

Expand Down
Loading