From patchwork Tue Dec 4 23:37:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10712749 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ED5CD13AF for ; Tue, 4 Dec 2018 23:37:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE1B629C3A for ; Tue, 4 Dec 2018 23:37:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF74A29ED2; Tue, 4 Dec 2018 23:37:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 766A429C3A for ; Tue, 4 Dec 2018 23:37:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726647AbeLDXh6 (ORCPT ); Tue, 4 Dec 2018 18:37:58 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:43519 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726624AbeLDXh6 (ORCPT ); Tue, 4 Dec 2018 18:37:58 -0500 Received: by mail-pg1-f194.google.com with SMTP id v28so8088974pgk.10 for ; Tue, 04 Dec 2018 15:37:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Fw/O4zwzIPzN/w4BqDNf+gyUsaBSdiYM1Ss+7FBryao=; b=kjFVKuX27kUtJSUMX2coC/c20FfIZx9y/OTxfRiLxLm13H+dnDhuSfmoo/EiDXoORz xkDZh8kCC/vnqsqZp9mxQ5pmmuBdMw6reTtXaatWtGPepolGdzS53Tez4fcCS1Hm9fKb 1MG7Bv5EYsYBGjP9U84pnrn8QK+4hE3zphmo4JuKEFOmn37D4HD3lhy1hjk9NzxmogdH kN2EERERbGLbJNheu5Kk+K3dlJjCBdGg4XuD3be41hVDVj8siKBZI/K8V4hu/T93l5Dz rfdMGifSJl84vHut0x+o3fPrC4v9HCZZZXdp/W8qAoTydFdMJXoAjbe7UDhnVG+uCgh4 XPxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Fw/O4zwzIPzN/w4BqDNf+gyUsaBSdiYM1Ss+7FBryao=; b=oP9mFlr15VGkc9UhavcZySOvdPGiBcxgOM4z3wUZAWs2d6SrHzmoaepZSF0wCqM6OZ Bbmf3ainkW3BLLbPDF6rRM+VG2BA+uAHpPyl51g0TtRPmYXNo2AUnSZ8yiC8PoERVdlN FL6TR6F5GQYnXSzSJVqkhGNcRAVPvXNqFEAhjQSwDduAW7MF+c9IjIjC4aMlLDRvZWqT 5sww0oe/9VTLGT+c+0mrDm0SZ0UV0o7zWX/zJnte848fMGfpAI2bc9dX5uODl6f9ReFc 5DA+zlvQlP9j4YdjZxns/n9emkZ6NDB6fEwxvzBPHC15lRIyzpiWGqyrCd7mk8Onblla IZLg== X-Gm-Message-State: AA+aEWYuvHU+CUb6+V5uRWVvu67EXjnj6P7u6Jd4/BStq/UW+GR4Ek2X xCWlZmF2PAKxvVcWY86OI00IcA== X-Google-Smtp-Source: AFSGD/UvjaxhgXDJ1caBF/2wLeHQTob+emaAQr4xJ6WKznvV+7A1k3WWCt9NPbBbFHJj+dyAnTr6kA== X-Received: by 2002:a62:1212:: with SMTP id a18mr22779095pfj.217.1543966677020; Tue, 04 Dec 2018 15:37:57 -0800 (PST) Received: from x1.localdomain (66.29.188.166.static.utbb.net. [66.29.188.166]) by smtp.gmail.com with ESMTPSA id t13sm22527635pgr.42.2018.12.04.15.37.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Dec 2018 15:37:56 -0800 (PST) From: Jens Axboe To: linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-aio@kvack.org Cc: hch@lst.de, jmoyer@redhat.com, Jens Axboe Subject: [PATCH 09/26] aio: only use blk plugs for > 2 depth submissions Date: Tue, 4 Dec 2018 16:37:12 -0700 Message-Id: <20181204233729.26776-10-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181204233729.26776-1-axboe@kernel.dk> References: <20181204233729.26776-1-axboe@kernel.dk> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Plugging is meant to optimize submission of a string of IOs, if we don't have more than 2 being submitted, don't bother setting up a plug. Reviewed-by: Christoph Hellwig Signed-off-by: Jens Axboe --- fs/aio.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/fs/aio.c b/fs/aio.c index 522c04864d82..ed6c3914477a 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -69,6 +69,12 @@ struct aio_ring { struct io_event io_events[0]; }; /* 128 bytes + ring size */ +/* + * Plugging is meant to work with larger batches of IOs. If we don't + * have more than the below, then don't bother setting up a plug. + */ +#define AIO_PLUG_THRESHOLD 2 + #define AIO_RING_PAGES 8 struct kioctx_table { @@ -1919,7 +1925,8 @@ SYSCALL_DEFINE3(io_submit, aio_context_t, ctx_id, long, nr, if (nr > ctx->nr_events) nr = ctx->nr_events; - blk_start_plug(&plug); + if (nr > AIO_PLUG_THRESHOLD) + blk_start_plug(&plug); for (i = 0; i < nr; i++) { struct iocb __user *user_iocb; @@ -1932,7 +1939,8 @@ SYSCALL_DEFINE3(io_submit, aio_context_t, ctx_id, long, nr, if (ret) break; } - blk_finish_plug(&plug); + if (nr > AIO_PLUG_THRESHOLD) + blk_finish_plug(&plug); percpu_ref_put(&ctx->users); return i ? i : ret; @@ -1959,7 +1967,8 @@ COMPAT_SYSCALL_DEFINE3(io_submit, compat_aio_context_t, ctx_id, if (nr > ctx->nr_events) nr = ctx->nr_events; - blk_start_plug(&plug); + if (nr > AIO_PLUG_THRESHOLD) + blk_start_plug(&plug); for (i = 0; i < nr; i++) { compat_uptr_t user_iocb; @@ -1972,7 +1981,8 @@ COMPAT_SYSCALL_DEFINE3(io_submit, compat_aio_context_t, ctx_id, if (ret) break; } - blk_finish_plug(&plug); + if (nr > AIO_PLUG_THRESHOLD) + blk_finish_plug(&plug); percpu_ref_put(&ctx->users); return i ? i : ret;