From patchwork Fri Jan 18 16:12:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10770765 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 7114A13B4 for ; Fri, 18 Jan 2019 16:12:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60B852F3B0 for ; Fri, 18 Jan 2019 16:12:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54EE52F432; Fri, 18 Jan 2019 16:12:38 +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 F24A02F571 for ; Fri, 18 Jan 2019 16:12:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727343AbfARQMh (ORCPT ); Fri, 18 Jan 2019 11:12:37 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:32916 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727630AbfARQMg (ORCPT ); Fri, 18 Jan 2019 11:12:36 -0500 Received: by mail-pf1-f195.google.com with SMTP id c123so6835788pfb.0 for ; Fri, 18 Jan 2019 08:12:36 -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=C9dElZo20Bxj0ZgMYG03l1rKb3R8/CuRHGH9nKq+ZlP0I6+4uXo5e/Uy7PYaL6Y7gR 8TIL8HgENThSnskWojwhmf/m+6Zln+R3GypmKVeAPegPqk6+DyseZ99hEMynMKnH1Hat hIUHKHHmJ/92OeeqeHdGb4H0YQ+d2qJg3m6p8Fu6eGK8cFBFAAATEKbi9GlUNIZb+LSd vYdWLNeqo1r2tHOKy+DQxbvbdSuBXrbuPjvLMcSv9YVc2DY+I0KssPTzWFYtspEw2xZu 9hJthWnPNfxyyV7KsTscqjsxeG8M03rnoJ+3ErP8dKKDDLMmxiI4TEZY6cLasMTg87n3 hwMw== 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=satd94D0mbUakTIOFFPU8hyzzQcM+nJjQ1xkqsuIQ67W0tBnXQub8jYeFXFY8WhGCm wuYl0DoOsI8vkHtISTZcCo9h/RN2NBWOzPk43SNycFIwFUADVCYw3InQ45Ly81qVnYnv o24ghSPLMCobW6uiHBs7beH6KipbM6Tn2rxOuXy45mn8y+X7YaqdRB2Jw8Su4JXerqco o320kq0Ms2CbQfyPK5/ls56BaET8wrScQl7X4KbwKYvWbcFVmFIBAzY8TVLvMM2f6plG LXfvkTtKy/TibVMvmG2j1QrzqSRWCCfhvG6P84ztFkJ0VSMN5kXIwyz1N5dtjZnhcnKA Y/rw== X-Gm-Message-State: AJcUukdQvrvvBcBug2+GkFouuBF792/HNuhKK5/EQ2vr3esrw0BXmj24 ZUlS/ZWv0pQS0sfTD7SsHw9Vd6iP1J6ZeA== X-Google-Smtp-Source: ALg8bN4x0Onz1U8hCv8wS7z6Taa1bDSDrgvlHIwvmxWcJBQvsZ9Ne9kqKSuP+La7r81bsgy+D0N2qw== X-Received: by 2002:a63:5ec6:: with SMTP id s189mr17525861pgb.357.1547827955403; Fri, 18 Jan 2019 08:12:35 -0800 (PST) Received: from x1.localdomain (66.29.188.166.static.utbb.net. [66.29.188.166]) by smtp.gmail.com with ESMTPSA id m20sm5317804pgv.93.2019.01.18.08.12.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 08:12:34 -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/17] fs: add an iopoll method to struct file_operations Date: Fri, 18 Jan 2019 09:12:09 -0700 Message-Id: <20190118161225.4545-2-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190118161225.4545-1-axboe@kernel.dk> References: <20190118161225.4545-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 *);