From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4809EC43603 for ; Thu, 12 Dec 2019 19:01:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 03FA82073B for ; Thu, 12 Dec 2019 19:01:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="Vzr47eRV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 03FA82073B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 783EB8E0006; Thu, 12 Dec 2019 14:01:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 736658E0001; Thu, 12 Dec 2019 14:01:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5FDC08E0006; Thu, 12 Dec 2019 14:01:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0195.hostedemail.com [216.40.44.195]) by kanga.kvack.org (Postfix) with ESMTP id 4B14E8E0001 for ; Thu, 12 Dec 2019 14:01:41 -0500 (EST) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with SMTP id D63C72C8B for ; Thu, 12 Dec 2019 19:01:40 +0000 (UTC) X-FDA: 76257408360.26.play63_2bb3277a23a10 X-HE-Tag: play63_2bb3277a23a10 X-Filterd-Recvd-Size: 9492 Received: from mail-il1-f196.google.com (mail-il1-f196.google.com [209.85.166.196]) by imf23.hostedemail.com (Postfix) with ESMTP for ; Thu, 12 Dec 2019 19:01:39 +0000 (UTC) Received: by mail-il1-f196.google.com with SMTP id t9so2954716iln.4 for ; Thu, 12 Dec 2019 11:01:39 -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 :mime-version:content-transfer-encoding; bh=EURgosiuwacwBKKWTVFdoxY9333p7skGDIpbIB1Zdws=; b=Vzr47eRVotGYSh3EQMnnAe6Ot66q0hOOBDZojBAkzci5NUWtVNl3lneR1NJ/3wIZfK Fg7Hn9R0niEEs2DjJNtjZovqOx3Ee9i5zY/zRy7Imy+TZf3FCCEMrYzJk1iLwas0jnqf HKDwgUpPTo4vH6ewgmDGNe1vH3GKmuUvVz7bRcYweW3sbdUgDq/GSml9V9/MuKoxZkU+ YdCNiD2ilKqWV5xB629CB9WK1/JBVNG+Jsy+WPBbYWXG/YiZyOkR4UG1uOwKsvT7ZrZ9 fOlzBGNUItf64nch77z4IDMLTMFE4cNrLEH/sdi666IbGQ/+3QKETKHzFqVZ5gf/mSkF vPcA== 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:mime-version:content-transfer-encoding; bh=EURgosiuwacwBKKWTVFdoxY9333p7skGDIpbIB1Zdws=; b=WF+++E4Qjm+VqxVNHKtpkJw1L0XQrDm9js3OURCLqBPWlxUrWj+H4Ct3S/mEW/VMi0 fKcav4aJfpf+Ga0BP3YATPHzWGJBis6IeJj/QFYRiJjloCbAA+zEk+CEIlYQ/JfbLWhk MWBPVH7AK87A5o0xGwY8UMIqT8Y9hKCxTONRLwlTUAAk4ioxGo6ASYEs3Q8MW/1JojQ8 QTdjd4FXb6uUrnGRnzb6hBuzOebLtVPHh5zVS3S40j+Qj5BGA9TnAXTr6dCB1+dfqwdq BrLr19HWOZA5E/O9EjWRO92o+oGq0r48Jp6+sEBicPkQkH7rg4yuc3WP5GskN1o+85PJ yrPA== X-Gm-Message-State: APjAAAW8otWP2YSsxaKmlOv/Nu+wlz72IcC1PepmpkQMxHw4Bo4XmCer AT2bfGhbyj4ejQ+I7cbTT8kQVYLV2wUvRw== X-Google-Smtp-Source: APXvYqwTJOvHM9WtB0OBGg/KPxfufWu3Y/hk0jZpBwWYKUq7wMMB/eLDz2FyftDozy1WbYbk+WlZrg== X-Received: by 2002:a92:c9c8:: with SMTP id k8mr871646ilq.235.1576177298605; Thu, 12 Dec 2019 11:01:38 -0800 (PST) Received: from x1.thefacebook.com ([65.144.74.34]) by smtp.gmail.com with ESMTPSA id i22sm1957745ill.40.2019.12.12.11.01.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Dec 2019 11:01:37 -0800 (PST) From: Jens Axboe To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org Cc: willy@infradead.org, clm@fb.com, torvalds@linux-foundation.org, david@fromorbit.com, Jens Axboe Subject: [PATCH 1/5] fs: add read support for RWF_UNCACHED Date: Thu, 12 Dec 2019 12:01:29 -0700 Message-Id: <20191212190133.18473-2-axboe@kernel.dk> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191212190133.18473-1-axboe@kernel.dk> References: <20191212190133.18473-1-axboe@kernel.dk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: If RWF_UNCACHED is set for io_uring (or preadv2(2)), we'll use private pages for the buffered reads. These pages will never be inserted into the page cache, and they are simply droped when we have done the copy at the end of IO. If pages in the read range are already in the page cache, then use those for just copying the data instead of starting IO on private pages. A previous solution used the page cache even for non-cached ranges, but the cost of doing so was too high. Removing nodes at the end is expensive, even with LRU bypass. On top of that, repeatedly instantiating new xarray nodes is very costly, as it needs to memset 576 bytes of data, and freeing said nodes involve an RCU call per node as well. All that adds up, making uncached somewhat slower than O_DIRECT. With the current solition, we're basically at O_DIRECT levels of performance for RWF_UNCACHED IO. Protect against truncate the same way O_DIRECT does, by calling inode_dio_begin() to elevate the inode->i_dio_count. Signed-off-by: Jens Axboe --- include/linux/fs.h | 3 +++ include/uapi/linux/fs.h | 5 ++++- mm/filemap.c | 40 +++++++++++++++++++++++++++++++++------- 3 files changed, 40 insertions(+), 8 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index 98e0349adb52..092ea2a4319b 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -314,6 +314,7 @@ enum rw_hint { #define IOCB_SYNC (1 << 5) #define IOCB_WRITE (1 << 6) #define IOCB_NOWAIT (1 << 7) +#define IOCB_UNCACHED (1 << 8) =20 struct kiocb { struct file *ki_filp; @@ -3418,6 +3419,8 @@ static inline int kiocb_set_rw_flags(struct kiocb *= ki, rwf_t flags) ki->ki_flags |=3D (IOCB_DSYNC | IOCB_SYNC); if (flags & RWF_APPEND) ki->ki_flags |=3D IOCB_APPEND; + if (flags & RWF_UNCACHED) + ki->ki_flags |=3D IOCB_UNCACHED; return 0; } =20 diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h index 379a612f8f1d..357ebb0e0c5d 100644 --- a/include/uapi/linux/fs.h +++ b/include/uapi/linux/fs.h @@ -299,8 +299,11 @@ typedef int __bitwise __kernel_rwf_t; /* per-IO O_APPEND */ #define RWF_APPEND ((__force __kernel_rwf_t)0x00000010) =20 +/* drop cache after reading or writing data */ +#define RWF_UNCACHED ((__force __kernel_rwf_t)0x00000040) + /* mask of flags supported by the kernel */ #define RWF_SUPPORTED (RWF_HIPRI | RWF_DSYNC | RWF_SYNC | RWF_NOWAIT |\ - RWF_APPEND) + RWF_APPEND | RWF_UNCACHED) =20 #endif /* _UAPI_LINUX_FS_H */ diff --git a/mm/filemap.c b/mm/filemap.c index bf6aa30be58d..5d299d69b185 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1990,6 +1990,13 @@ static void shrink_readahead_size_eio(struct file = *filp, ra->ra_pages /=3D 4; } =20 +static void buffered_put_page(struct page *page, bool clear_mapping) +{ + if (clear_mapping) + page->mapping =3D NULL; + put_page(page); +} + /** * generic_file_buffered_read - generic file read routine * @iocb: the iocb to read @@ -2013,6 +2020,7 @@ static ssize_t generic_file_buffered_read(struct ki= ocb *iocb, struct address_space *mapping =3D filp->f_mapping; struct inode *inode =3D mapping->host; struct file_ra_state *ra =3D &filp->f_ra; + bool did_dio_begin =3D false; loff_t *ppos =3D &iocb->ki_pos; pgoff_t index; pgoff_t last_index; @@ -2032,6 +2040,7 @@ static ssize_t generic_file_buffered_read(struct ki= ocb *iocb, offset =3D *ppos & ~PAGE_MASK; =20 for (;;) { + bool clear_mapping =3D false; struct page *page; pgoff_t end_index; loff_t isize; @@ -2048,6 +2057,13 @@ static ssize_t generic_file_buffered_read(struct k= iocb *iocb, if (!page) { if (iocb->ki_flags & IOCB_NOWAIT) goto would_block; + /* UNCACHED implies no read-ahead */ + if (iocb->ki_flags & IOCB_UNCACHED) { + did_dio_begin =3D true; + /* block truncate for UNCACHED reads */ + inode_dio_begin(inode); + goto no_cached_page; + } page_cache_sync_readahead(mapping, ra, filp, index, last_index - index); @@ -2106,7 +2122,7 @@ static ssize_t generic_file_buffered_read(struct ki= ocb *iocb, isize =3D i_size_read(inode); end_index =3D (isize - 1) >> PAGE_SHIFT; if (unlikely(!isize || index > end_index)) { - put_page(page); + buffered_put_page(page, clear_mapping); goto out; } =20 @@ -2115,7 +2131,7 @@ static ssize_t generic_file_buffered_read(struct ki= ocb *iocb, if (index =3D=3D end_index) { nr =3D ((isize - 1) & ~PAGE_MASK) + 1; if (nr <=3D offset) { - put_page(page); + buffered_put_page(page, clear_mapping); goto out; } } @@ -2147,7 +2163,7 @@ static ssize_t generic_file_buffered_read(struct ki= ocb *iocb, offset &=3D ~PAGE_MASK; prev_offset =3D offset; =20 - put_page(page); + buffered_put_page(page, clear_mapping); written +=3D ret; if (!iov_iter_count(iter)) goto out; @@ -2189,7 +2205,7 @@ static ssize_t generic_file_buffered_read(struct ki= ocb *iocb, =20 if (unlikely(error)) { if (error =3D=3D AOP_TRUNCATED_PAGE) { - put_page(page); + buffered_put_page(page, clear_mapping); error =3D 0; goto find_page; } @@ -2206,7 +2222,7 @@ static ssize_t generic_file_buffered_read(struct ki= ocb *iocb, * invalidate_mapping_pages got it */ unlock_page(page); - put_page(page); + buffered_put_page(page, clear_mapping); goto find_page; } unlock_page(page); @@ -2221,7 +2237,7 @@ static ssize_t generic_file_buffered_read(struct ki= ocb *iocb, =20 readpage_error: /* UHHUH! A synchronous read error occurred. Report it */ - put_page(page); + buffered_put_page(page, clear_mapping); goto out; =20 no_cached_page: @@ -2234,7 +2250,15 @@ static ssize_t generic_file_buffered_read(struct k= iocb *iocb, error =3D -ENOMEM; goto out; } - error =3D add_to_page_cache_lru(page, mapping, index, + if (iocb->ki_flags & IOCB_UNCACHED) { + __SetPageLocked(page); + page->mapping =3D mapping; + page->index =3D index; + clear_mapping =3D true; + goto readpage; + } + + error =3D add_to_page_cache(page, mapping, index, mapping_gfp_constraint(mapping, GFP_KERNEL)); if (error) { put_page(page); @@ -2250,6 +2274,8 @@ static ssize_t generic_file_buffered_read(struct ki= ocb *iocb, would_block: error =3D -EAGAIN; out: + if (did_dio_begin) + inode_dio_end(inode); ra->prev_pos =3D prev_index; ra->prev_pos <<=3D PAGE_SHIFT; ra->prev_pos |=3D prev_offset; --=20 2.24.1