From patchwork Sat Jan 12 21:29:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10761101 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 319E71390 for ; Sat, 12 Jan 2019 21:30:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 25D982901C for ; Sat, 12 Jan 2019 21:30:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1A5FC2904F; Sat, 12 Jan 2019 21:30:27 +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 C57AF2901C for ; Sat, 12 Jan 2019 21:30:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726558AbfALVaZ (ORCPT ); Sat, 12 Jan 2019 16:30:25 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:42066 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726547AbfALVaY (ORCPT ); Sat, 12 Jan 2019 16:30:24 -0500 Received: by mail-pg1-f195.google.com with SMTP id d72so7785577pga.9 for ; Sat, 12 Jan 2019 13:30:24 -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=IbkWyHpTil5Vluy4ET88nT33hqg2kUPldnzNz+Wucw8=; b=hEwFXZQtjXrOzXhD4Yz0yWcj8gFtgx2EWPEeNFcgu9qrhvQ0sdYdtUfb+ahkkLHiSu xO1HhJX+Qm/Eq5aNGzM0DlqgV9TWFSKaKFqiUCZxrlohyK6zELYUQ1JYmiQ+N3PA72lx cQgWw20iM6ZC1vxVVyaLcOxzxaZJkmFxqDkkaKvv1Lm0q/ht3yaGvVJUwVJEFo/Ygtsa QbcnoNTr2DbdBS8x6iBuYzhasVsKs6EjFWTxD4RTY4QTJ3yM3AXv1S1hqsottdSTTr+D d8RyuKnM3uPN9ztuho2m8MnVx2pLogGGkEp85iUw6qIMX3v6pBsnBwnKGSHAnWNP5Lch 0cKw== 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=IbkWyHpTil5Vluy4ET88nT33hqg2kUPldnzNz+Wucw8=; b=Ze1oanP5YKx5G6LrwdQWEuNkRyQO0cLG7S8FRZAntxMtmSW0CKVnAOgQja5alv0pKY vsqHXTaqQl0nt0UV/yTMhotRi+npheUSOEFqK/RwG4pCRm1KlKnoplYkJ62ypQ/OHfGr ZbamzVPAk87ImOuowQz7OwoencJCFeDsz1OhBEb58mguUjiuohfHc5P2qsu8NOex7WtI JR62H3NFjx5IXc6b2HH9UtUCqjXAYw3Z1xGm/4cKMm/dlDwguMT0iQ3c8twb/5pglXBe iW/gb5bTTj5TCkUtczt5igcD0BWDsdyXSipLjV6CyOi/N7/LESw4IiP5VTKFxcqVOUcA MVOA== X-Gm-Message-State: AJcUukeXCU3K7y6MWj+6sQN6kZH343LwaSINORFMoN4lq0ORF0L8hcyn OZH/BGuhEztyfDtBql7ey/HTZwiG+Spiiw== X-Google-Smtp-Source: ALg8bN6gkCrheGgHX73DQ7wTT8lxPShgYnnFvASqs6aBuQzj6C3BXNp0GksNuI9UsfbrPgwBBMbL4A== X-Received: by 2002:a63:e051:: with SMTP id n17mr7848083pgj.258.1547328623477; Sat, 12 Jan 2019 13:30:23 -0800 (PST) Received: from x1.localdomain (66.29.188.166.static.utbb.net. [66.29.188.166]) by smtp.gmail.com with ESMTPSA id y6sm151629818pfd.104.2019.01.12.13.30.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Jan 2019 13:30:22 -0800 (PST) From: Jens Axboe To: linux-fsdevel@vger.kernel.org, linux-aio@kvack.org, linux-block@vger.kernel.org, linux-arch@vger.kernel.org Cc: hch@lst.de, jmoyer@redhat.com, avi@scylladb.com, Jens Axboe Subject: [PATCH 02/16] block: wire up block device iopoll method Date: Sat, 12 Jan 2019 14:29:57 -0700 Message-Id: <20190112213011.1439-3-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190112213011.1439-1-axboe@kernel.dk> References: <20190112213011.1439-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 Just call blk_poll on the iocb cookie, we can derive the block device from the inode trivially. Reviewed-by: Johannes Thumshirn Signed-off-by: Christoph Hellwig Signed-off-by: Jens Axboe --- fs/block_dev.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/fs/block_dev.c b/fs/block_dev.c index c546cdce77e6..5415579f3e14 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -279,6 +279,14 @@ struct blkdev_dio { static struct bio_set blkdev_dio_pool; +static int blkdev_iopoll(struct kiocb *kiocb, bool wait) +{ + struct block_device *bdev = I_BDEV(kiocb->ki_filp->f_mapping->host); + struct request_queue *q = bdev_get_queue(bdev); + + return blk_poll(q, READ_ONCE(kiocb->ki_cookie), wait); +} + static void blkdev_bio_end_io(struct bio *bio) { struct blkdev_dio *dio = bio->bi_private; @@ -396,6 +404,7 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages) bio->bi_opf |= REQ_HIPRI; qc = submit_bio(bio); + WRITE_ONCE(iocb->ki_cookie, qc); break; } @@ -2068,6 +2077,7 @@ const struct file_operations def_blk_fops = { .llseek = block_llseek, .read_iter = blkdev_read_iter, .write_iter = blkdev_write_iter, + .iopoll = blkdev_iopoll, .mmap = generic_file_mmap, .fsync = blkdev_fsync, .unlocked_ioctl = block_ioctl,