p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

apparmor: use per file locks for transactional queries 

As made mention of in commit 1dea3b41e8 ("apparmor: speed up
transactional queries"), a single lock is currently used to synchronize
transactional queries. We can, use the lock allocated for each file by
VFS instead.

Signed-off-by: Hamza Mahfooz <someguy@effective-light.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
Hamza Mahfooz 2021-07-30 01:23:55 -04:00 committed by John Johansen
parent aa4ceed7c3
commit d0d845a790
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
security/apparmor/apparmorfs.c
View File

@ -811,8 +811,6 @@ struct multi_transaction {
}; };
#define MULTI_TRANSACTION_LIMIT (PAGE_SIZE - sizeof(struct multi_transaction)) #define MULTI_TRANSACTION_LIMIT (PAGE_SIZE - sizeof(struct multi_transaction))
/* TODO: replace with per file lock */
static DEFINE_SPINLOCK(multi_transaction_lock);
static void multi_transaction_kref(struct kref *kref) static void multi_transaction_kref(struct kref *kref)
{ {
@ -846,10 +844,10 @@ static void multi_transaction_set(struct file *file,
AA_BUG(n > MULTI_TRANSACTION_LIMIT); AA_BUG(n > MULTI_TRANSACTION_LIMIT);
new->size = n; new->size = n;
spin_lock(&multi_transaction_lock); spin_lock(&file->f_lock);
old = (struct multi_transaction *) file->private_data; old = (struct multi_transaction *) file->private_data;
file->private_data = new; file->private_data = new;
spin_unlock(&multi_transaction_lock); spin_unlock(&file->f_lock);
put_multi_transaction(old); put_multi_transaction(old);
} }
@ -878,9 +876,10 @@ static ssize_t multi_transaction_read(struct file *file, char __user *buf,
struct multi_transaction *t; struct multi_transaction *t;
ssize_t ret; ssize_t ret;
spin_lock(&multi_transaction_lock); spin_lock(&file->f_lock);
t = get_multi_transaction(file->private_data); t = get_multi_transaction(file->private_data);
spin_unlock(&multi_transaction_lock); spin_unlock(&file->f_lock);
if (!t) if (!t)
return 0; return 0;