From patchwork Mon May 21 16:01:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Manzanares X-Patchwork-Id: 10415837 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C4ECE6032C for ; Mon, 21 May 2018 16:03:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B6F9E27C2D for ; Mon, 21 May 2018 16:03:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ABACB28738; Mon, 21 May 2018 16:03:11 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable 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 3458D27C2D for ; Mon, 21 May 2018 16:03:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753006AbeEUQCg (ORCPT ); Mon, 21 May 2018 12:02:36 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:27273 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752623AbeEUQC3 (ORCPT ); Mon, 21 May 2018 12:02:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1526918549; x=1558454549; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=PrpgEIgR0gQrOyJO/aH1HjHCRHuiRx5HDBuoXs7sTEg=; b=YP9faxrHBI1i06uAZJU0x99FlFbzLJKh4Isf8QMU+ETG1v6+GP+hFiWs yk6/LmDXJdJ97DCPy0WMl6v0hDeqIuBLR/kjngANZwD2xcHxLsxxTYEsy eIkYOblqfZMWeheImDUsMGHvHrjmUvQG2+8Brum9yYHZoA5YE/cZqetWh EU+LFHqM+uUz/rvl0pRj7XZAd7xjl7ZWrs8+i2gmCkmJHLkh1l93Nq8wh fFml3/ksBL1yxBGDrEvgL602smoKKHngTJ3JPhqzG04TxiK1Hl6cVbRvN 1O78SQkrs7cetBow0QQf1V5nLdz6fugFCBwxVDsPUimLMJVo4H7ow6Iw+ g==; X-IronPort-AV: E=Sophos;i="5.49,426,1520870400"; d="scan'208";a="79445394" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 22 May 2018 00:02:29 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP; 21 May 2018 08:53:26 -0700 Received: from penguito-adamm.sdcorp.global.sandisk.com ([10.11.47.13]) by uls-op-cesaip02.wdc.com with ESMTP; 21 May 2018 09:02:29 -0700 From: adam.manzanares@wdc.com To: viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, axboe@kernel.dk, bcrl@kvack.org Cc: tglx@linutronix.de, mingo@kernel.org, pombredanne@nexb.com, kstewart@linuxfoundation.org, gregkh@linuxfoundation.org, bigeasy@linutronix.de, jack@suse.cz, darrick.wong@oracle.com, rgoldwyn@suse.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-aio@kvack.org, linux-api@vger.kernel.org, hch@infradread.org, Adam Manzanares Subject: [PATCH v5 3/5] fs: Add aio iopriority support Date: Mon, 21 May 2018 09:01:45 -0700 Message-Id: <20180521160147.2372-4-adam.manzanares@wdc.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180521160147.2372-1-adam.manzanares@wdc.com> References: <20180521160147.2372-1-adam.manzanares@wdc.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Adam Manzanares This is the per-I/O equivalent of the ioprio_set system call. When IOCB_FLAG_IOPRIO is set on the iocb aio_flags field, then we set the newly added kiocb ki_ioprio field to the value in the iocb aio_reqprio field. We set the blkdev bio iopriority unconditionally, so we need to guarantee the kiocb is initialized properly. Added changes to the loopback driver and init_sync_kiocb to achieve this. This patch depends on block: add ioprio_check_cap function. Signed-off-by: Adam Manzanares Reviewed-by: Jeff Moyer Reviewed-by: Christoph Hellwig --- drivers/block/loop.c | 3 +++ fs/aio.c | 16 ++++++++++++++++ include/linux/fs.h | 3 +++ include/uapi/linux/aio_abi.h | 1 + 4 files changed, 23 insertions(+) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 5d4e31655d96..dd98dfd97f5e 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -76,6 +76,8 @@ #include #include #include +#include + #include "loop.h" #include @@ -559,6 +561,7 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, cmd->iocb.ki_filp = file; cmd->iocb.ki_complete = lo_rw_aio_complete; cmd->iocb.ki_flags = IOCB_DIRECT; + cmd->iocb.ki_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_NONE, 0); if (cmd->css) kthread_associate_blkcg(cmd->css); diff --git a/fs/aio.c b/fs/aio.c index f3eae5d5771b..44b4572be524 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -1451,6 +1451,22 @@ static int aio_prep_rw(struct kiocb *req, struct iocb *iocb) if (iocb->aio_flags & IOCB_FLAG_RESFD) req->ki_flags |= IOCB_EVENTFD; req->ki_hint = file_write_hint(req->ki_filp); + if (iocb->aio_flags & IOCB_FLAG_IOPRIO) { + /* + * If the IOCB_FLAG_IOPRIO flag of aio_flags is set, then + * aio_reqprio is interpreted as an I/O scheduling + * class and priority. + */ + ret = ioprio_check_cap(iocb->aio_reqprio); + if (ret) { + pr_debug("aio ioprio check cap error\n"); + return -EINVAL; + } + + req->ki_ioprio = iocb->aio_reqprio; + } else + req->ki_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_NONE, 0); + ret = kiocb_set_rw_flags(req, iocb->aio_rw_flags); if (unlikely(ret)) fput(req->ki_filp); diff --git a/include/linux/fs.h b/include/linux/fs.h index 50de40dbbb85..73b749ed3ea1 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -302,6 +303,7 @@ struct kiocb { void *private; int ki_flags; u16 ki_hint; + u16 ki_ioprio; /* See linux/ioprio.h */ } __randomize_layout; static inline bool is_sync_kiocb(struct kiocb *kiocb) @@ -1942,6 +1944,7 @@ static inline void init_sync_kiocb(struct kiocb *kiocb, struct file *filp) .ki_filp = filp, .ki_flags = iocb_flags(filp), .ki_hint = ki_hint_validate(file_write_hint(filp)), + .ki_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_NONE, 0), }; } diff --git a/include/uapi/linux/aio_abi.h b/include/uapi/linux/aio_abi.h index 2c0a3415beee..d4e768d55d14 100644 --- a/include/uapi/linux/aio_abi.h +++ b/include/uapi/linux/aio_abi.h @@ -55,6 +55,7 @@ enum { * is valid. */ #define IOCB_FLAG_RESFD (1 << 0) +#define IOCB_FLAG_IOPRIO (1 << 1) /* read() from /dev/aio returns these structures. */ struct io_event {