From patchwork Wed Jan 23 15:35:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10777411 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 0EF0514E5 for ; Wed, 23 Jan 2019 15:35:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1A682CA5A for ; Wed, 23 Jan 2019 15:35:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E58F12CF75; Wed, 23 Jan 2019 15:35:45 +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=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 90C302CA5A for ; Wed, 23 Jan 2019 15:35:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726028AbfAWPfp (ORCPT ); Wed, 23 Jan 2019 10:35:45 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:45594 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726002AbfAWPfo (ORCPT ); Wed, 23 Jan 2019 10:35:44 -0500 Received: by mail-pl1-f193.google.com with SMTP id a14so1335784plm.12 for ; Wed, 23 Jan 2019 07:35:44 -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=AAKxls5Es8ExKqpwMiUOBUcGduRQU3BNIbRWpRo7VtQ=; b=W8fYjlmAap63dXhJL/NIfdg1UICeIQcibXB+Ya3X+dNvzkJ7I2Dc4zbnZhGJp/g0V6 Nh+DWdA2MrqO/TFRcmmVYfUr377DyjwGF8xYT5Hg/CndrKW5ZWZfkYt93s7DIpXnHAba ZOHtQOIr1Rm+8V35Eh56pjLs/72Bz+NjOz/eviWnd8156qYT5UV5nzCUGhu1LOhUwguV 8VkK8gUJ587KUh9lRS94ABra15+qHwEECPOpUQT/ZRcvOZKBhqU4wqJaLxXQGu2PcVfn PJ+P7PY+dTgj72o76h41eHJf6yYS1eWwofNyCl5f7kAWpCMjfGYdzTIzwX2q/TlHqBJL gwRA== 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=AAKxls5Es8ExKqpwMiUOBUcGduRQU3BNIbRWpRo7VtQ=; b=IIAUGbPRZKMEwSQsea1eWNfPZAoz99pfiTWkhZ/oIG0Qa6ORccCznIv0psTfk45aRp rbch2OXmDH2j8rdXiZy1Tq2zecMiue6flvThXuECFm36v9/cA81GWGOLCBnsBKmJ0U/1 xQnKAo/3neTeCLZe42Rw2E2adOURlp/x3PKLz1sK/Ap7/lMdU0uTsc+WNXAC+pmZ6Hk2 GCqY9IfS2jfj5B3yYuENi9gIrv8tpeGKmpdql3xo9esNEisYF46gtnAdLYInTGMiboNR gy2pSTQ6mAFe4zL8sIFBKwsOhE2rA5fXMZuZCMbCbKvdL5gtCNfv1pKbH0kaSdrJA8bJ /diw== X-Gm-Message-State: AJcUukcUeuaFtyfeBAXMLC3jUxdfAaPCu6zO+taFHXC9gnHDukNDf/b9 B9+JRLo3rQPnLsc/BmgvWBI3q06Turun4g== X-Google-Smtp-Source: ALg8bN7W1OD3h5dC2dDYAUwqgDJEvYg7lbbxzk7H291+n4oKzPzQfC/ahvZgaq8S1ZwcnbLnJOieHA== X-Received: by 2002:a17:902:f20b:: with SMTP id gn11mr2556559plb.274.1548257743614; Wed, 23 Jan 2019 07:35:43 -0800 (PST) Received: from x1.localdomain (66.29.188.166.static.utbb.net. [66.29.188.166]) by smtp.gmail.com with ESMTPSA id u8sm30731715pfl.16.2019.01.23.07.35.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Jan 2019 07:35:42 -0800 (PST) From: Jens Axboe To: linux-fsdevel@vger.kernel.org, linux-aio@kvack.org, linux-block@vger.kernel.org Cc: hch@lst.de, jmoyer@redhat.com, avi@scylladb.com, Jens Axboe Subject: [PATCH 01/18] fs: add an iopoll method to struct file_operations Date: Wed, 23 Jan 2019 08:35:12 -0700 Message-Id: <20190123153536.7081-2-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190123153536.7081-1-axboe@kernel.dk> References: <20190123153536.7081-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 From: Christoph Hellwig This new methods is used to explicitly poll for I/O completion for an iocb. It must be called for any iocb submitted asynchronously (that is with a non-null ki_complete) which has the IOCB_HIPRI flag set. The method is assisted by a new ki_cookie field in struct iocb to store the polling cookie. TODO: we can probably union ki_cookie with the existing hint and I/O priority fields to avoid struct kiocb growth. Reviewed-by: Johannes Thumshirn Signed-off-by: Christoph Hellwig Signed-off-by: Jens Axboe --- Documentation/filesystems/vfs.txt | 3 +++ include/linux/fs.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt index 8dc8e9c2913f..761c6fd24a53 100644 --- a/Documentation/filesystems/vfs.txt +++ b/Documentation/filesystems/vfs.txt @@ -857,6 +857,7 @@ struct file_operations { ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *); ssize_t (*read_iter) (struct kiocb *, struct iov_iter *); ssize_t (*write_iter) (struct kiocb *, struct iov_iter *); + int (*iopoll)(struct kiocb *kiocb, bool spin); int (*iterate) (struct file *, struct dir_context *); int (*iterate_shared) (struct file *, struct dir_context *); __poll_t (*poll) (struct file *, struct poll_table_struct *); @@ -902,6 +903,8 @@ otherwise noted. write_iter: possibly asynchronous write with iov_iter as source + iopoll: called when aio wants to poll for completions on HIPRI iocbs + iterate: called when the VFS needs to read the directory contents iterate_shared: called when the VFS needs to read the directory contents diff --git a/include/linux/fs.h b/include/linux/fs.h index 811c77743dad..ccb0b7a63aa5 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -310,6 +310,7 @@ struct kiocb { int ki_flags; u16 ki_hint; u16 ki_ioprio; /* See linux/ioprio.h */ + unsigned int ki_cookie; /* for ->iopoll */ } __randomize_layout; static inline bool is_sync_kiocb(struct kiocb *kiocb) @@ -1786,6 +1787,7 @@ struct file_operations { ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *); ssize_t (*read_iter) (struct kiocb *, struct iov_iter *); ssize_t (*write_iter) (struct kiocb *, struct iov_iter *); + int (*iopoll)(struct kiocb *kiocb, bool spin); int (*iterate) (struct file *, struct dir_context *); int (*iterate_shared) (struct file *, struct dir_context *); __poll_t (*poll) (struct file *, struct poll_table_struct *);