From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E22AC43387 for ; Tue, 15 Jan 2019 10:19:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DDA472085A for ; Tue, 15 Jan 2019 10:19:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728458AbfAOKTz (ORCPT ); Tue, 15 Jan 2019 05:19:55 -0500 Received: from relay.sw.ru ([185.231.240.75]:36324 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728202AbfAOKTz (ORCPT ); Tue, 15 Jan 2019 05:19:55 -0500 Received: from [172.16.25.169] (helo=localhost.localdomain) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1gjLp3-000136-Q7; Tue, 15 Jan 2019 13:19:53 +0300 Subject: [PATCH 7/7] fuse: Kill fuse_pqueue::io list and avoid taking fpq->lock on hot paths From: Kirill Tkhai To: miklos@szeredi.hu, ktkhai@virtuozzo.com, linux-fsdevel@vger.kernel.org Date: Tue, 15 Jan 2019 13:19:53 +0300 Message-ID: <154754759346.4244.16770136881400272907.stgit@localhost.localdomain> In-Reply-To: <154754701031.4244.8089449938935364463.stgit@localhost.localdomain> References: <154754701031.4244.8089449938935364463.stgit@localhost.localdomain> User-Agent: StGit/0.18 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org This list was used to make fuse_abort_conn() end some of requests under io. But it is not used anymore. This allows to avoid taking unneeded fpq->lock in two hot paths: fuse_dev_do_write() and fuse_dev_do_read(). Signed-off-by: Kirill Tkhai --- fs/fuse/dev.c | 16 +++------------- fs/fuse/fuse_i.h | 3 --- fs/fuse/inode.c | 1 - 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index c3bacf9191a6..b4ce37dda353 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -1339,9 +1339,6 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, request_end(fc, req); goto restart; } - spin_lock(&fpq->lock); - list_add(&req->list, &fpq->io); - spin_unlock(&fpq->lock); cs->req = req; err = fuse_copy_one(cs, &in->h, sizeof(in->h)); if (!err) @@ -1362,7 +1359,7 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, goto out_end; } hash = fuse_req_hash(req->in.h.unique); - list_move_tail(&req->list, &fpq->processing[hash]); + list_add_tail(&req->list, &fpq->processing[hash]); __fuse_get_request(req); set_bit(FR_SENT, &req->flags); spin_unlock(&fpq->lock); @@ -1375,7 +1372,6 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, return reqsize; out_end: - list_del_init(&req->list); spin_unlock(&fpq->lock); request_end(fc, req); return err; @@ -1951,7 +1947,7 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud, } clear_bit(FR_SENT, &req->flags); - list_move(&req->list, &fpq->io); + list_del_init(&req->list); req->out.h = oh; spin_unlock(&fpq->lock); cs->req = req; @@ -1961,13 +1957,8 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud, err = copy_out_args(cs, &req->out, nbytes); fuse_copy_finish(cs); - spin_lock(&fpq->lock); - if (!fpq->connected) - err = -ENOENT; - else if (err) + if (err) req->out.h.error = -EIO; - list_del_init(&req->list); - spin_unlock(&fpq->lock); request_end(fc, req); out: @@ -2217,7 +2208,6 @@ int fuse_dev_release(struct inode *inode, struct file *file) unsigned int i; spin_lock(&fpq->lock); - WARN_ON(!list_empty(&fpq->io)); for (i = 0; i < FUSE_PQ_HASH_SIZE; i++) list_splice_init(&fpq->processing[i], &to_end); spin_unlock(&fpq->lock); diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 09ea5773ad81..e6b7087fd6b1 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -469,9 +469,6 @@ struct fuse_pqueue { /** Hash table of requests being processed */ struct list_head *processing; - - /** The list of requests under I/O */ - struct list_head io; }; /** diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 0361a3d62356..a36d2675471f 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -601,7 +601,6 @@ static void fuse_pqueue_init(struct fuse_pqueue *fpq) spin_lock_init(&fpq->lock); for (i = 0; i < FUSE_PQ_HASH_SIZE; i++) INIT_LIST_HEAD(&fpq->processing[i]); - INIT_LIST_HEAD(&fpq->io); fpq->connected = 1; }