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=-10.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 BAB86C433E2 for ; Wed, 2 Sep 2020 15:45:08 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7746C2083B for ; Wed, 2 Sep 2020 15:45:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hpiNi11g" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7746C2083B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 20FD1900008; Wed, 2 Sep 2020 11:45:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1CA4E6B0098; Wed, 2 Sep 2020 11:45:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0399C900008; Wed, 2 Sep 2020 11:45:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0209.hostedemail.com [216.40.44.209]) by kanga.kvack.org (Postfix) with ESMTP id DC4C86B0096 for ; Wed, 2 Sep 2020 11:45:07 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 8EF25180AD806 for ; Wed, 2 Sep 2020 15:45:07 +0000 (UTC) X-FDA: 77218545054.13.paint07_5c0a383270a2 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin13.hostedemail.com (Postfix) with ESMTP id 1D07E18140B69 for ; Wed, 2 Sep 2020 15:45:07 +0000 (UTC) X-HE-Tag: paint07_5c0a383270a2 X-Filterd-Recvd-Size: 4871 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by imf09.hostedemail.com (Postfix) with ESMTP for ; Wed, 2 Sep 2020 15:45:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599061505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kp3dpQdctOfjShp2Jh9eA0jkHjcP1v7EI9LyqzTLfMc=; b=hpiNi11gl1BFgRmOyNH2kGf4GLeAamF00pXSzwvHIe9S7DjcaJmr3wxfH7JpQ7J9IRXWXo pRw+3YafdywlGSY5AnitfMe96kBp54vVVyP14ubUQeLsNRUSSu/EOwjVtYnr8JFH5KC1sU bEeGurvjo/waDv/drYeAU2zmYYgmkJY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-299-n6zxdSpLNKSl960WC9bibQ-1; Wed, 02 Sep 2020 11:45:03 -0400 X-MC-Unique: n6zxdSpLNKSl960WC9bibQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3E1FA1DE02; Wed, 2 Sep 2020 15:45:02 +0000 (UTC) Received: from warthog.procyon.org.uk (ovpn-113-6.rdu2.redhat.com [10.10.113.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3332B1002D73; Wed, 2 Sep 2020 15:45:01 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [RFC PATCH 6/6] mm: Pass a file_ra_state struct into force_page_cache_readahead() [ver #2] From: David Howells To: willy@infradead.org Cc: dhowells@redhat.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Date: Wed, 02 Sep 2020 16:45:00 +0100 Message-ID: <159906150036.663183.11566577279669811013.stgit@warthog.procyon.org.uk> In-Reply-To: <159906145700.663183.3678164182141075453.stgit@warthog.procyon.org.uk> References: <159906145700.663183.3678164182141075453.stgit@warthog.procyon.org.uk> User-Agent: StGit/0.23 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Rspamd-Queue-Id: 1D07E18140B69 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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: Pass a file_ra_state struct into force_page_cache_readahead(). One caller has one that should be passed in and the other doesn't, but the former needs to pass its in. Signed-off-by: David Howells --- mm/fadvise.c | 3 ++- mm/internal.h | 3 ++- mm/readahead.c | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mm/fadvise.c b/mm/fadvise.c index 997f7c16690a..e1b09975caaa 100644 --- a/mm/fadvise.c +++ b/mm/fadvise.c @@ -106,7 +106,8 @@ int generic_fadvise(struct file *file, loff_t offset, loff_t len, int advice) { DEFINE_READAHEAD(rac, file, mapping, start_index); - force_page_cache_readahead(&rac, nrpages); + force_page_cache_readahead(&rac, &rac.file->f_ra, + nrpages); } break; case POSIX_FADV_NOREUSE: diff --git a/mm/internal.h b/mm/internal.h index d62df5559500..ff7b549f6a9d 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -49,7 +49,8 @@ void unmap_page_range(struct mmu_gather *tlb, unsigned long addr, unsigned long end, struct zap_details *details); -void force_page_cache_readahead(struct readahead_control *, unsigned long); +void force_page_cache_readahead(struct readahead_control *, struct file_ra_state *, + unsigned long); void __do_page_cache_readahead(struct readahead_control *, unsigned long nr_to_read, unsigned long lookahead_size); diff --git a/mm/readahead.c b/mm/readahead.c index d8e3e59e4c46..3f3ce65afc64 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -272,11 +272,10 @@ void __do_page_cache_readahead(struct readahead_control *rac, * memory at once. */ void force_page_cache_readahead(struct readahead_control *rac, - unsigned long nr_to_read) + struct file_ra_state *ra, unsigned long nr_to_read) { struct address_space *mapping = rac->mapping; struct backing_dev_info *bdi = inode_to_bdi(mapping->host); - struct file_ra_state *ra = &rac->file->f_ra; unsigned long max_pages, index; if (unlikely(!mapping->a_ops->readpage && !mapping->a_ops->readpages && @@ -655,7 +654,7 @@ void page_cache_sync_readahead(struct readahead_control *rac, /* be dumb */ if (rac->file && (rac->file->f_mode & FMODE_RANDOM)) { - force_page_cache_readahead(rac, req_count); + force_page_cache_readahead(rac, ra, req_count); return; }