UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

fuse: change interrupt requests allocation algorithm 

Using of two unconnected IDs req->in.h.unique and req->intr_unique does not
allow to link requests to a hash table. We need can't use none of them as a
key to calculate hash.

This patch changes the algorithm of allocation of IDs for a request. Plain
requests obtain even ID, while interrupt requests are encoded in the low
bit. So, in next patches we will be able to use the rest of ID bits to
calculate hash, and the hash will be the same for plain and interrupt
requests.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
Kirill Tkhai 2018-09-11 13:11:56 +03:00 committed by Miklos Szeredi
parent 63825b4e1d
commit c59fd85e4f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/fuse/dev.c
View File

@ -25,6 +25,10 @@
MODULE_ALIAS_MISCDEV(FUSE_MINOR); MODULE_ALIAS_MISCDEV(FUSE_MINOR);
MODULE_ALIAS("devname:fuse"); MODULE_ALIAS("devname:fuse");
/* Ordinary requests have even IDs, while interrupts IDs are odd */
#define FUSE_INT_REQ_BIT (1ULL << 0)
#define FUSE_REQ_ID_STEP (1ULL << 1)
static struct kmem_cache *fuse_req_cachep; static struct kmem_cache *fuse_req_cachep;
static struct fuse_dev *fuse_get_dev(struct file *file) static struct fuse_dev *fuse_get_dev(struct file *file)
@ -319,7 +323,8 @@ static unsigned len_args(unsigned numargs, struct fuse_arg *args)
static u64 fuse_get_unique(struct fuse_iqueue *fiq) static u64 fuse_get_unique(struct fuse_iqueue *fiq)
{ {
return ++fiq->reqctr; fiq->reqctr += FUSE_REQ_ID_STEP;
return fiq->reqctr;
} }
static void queue_request(struct fuse_iqueue *fiq, struct fuse_req *req) static void queue_request(struct fuse_iqueue *fiq, struct fuse_req *req)
@ -1090,7 +1095,7 @@ __releases(fiq->waitq.lock)
int err; int err;
list_del_init(&req->intr_entry); list_del_init(&req->intr_entry);
req->intr_unique = fuse_get_unique(fiq); req->intr_unique = (req->in.h.unique | FUSE_INT_REQ_BIT);
memset(&ih, 0, sizeof(ih)); memset(&ih, 0, sizeof(ih));
memset(&arg, 0, sizeof(arg)); memset(&arg, 0, sizeof(arg));
ih.len = reqsize; ih.len = reqsize;