[04/14] mm: add struct address_space to readpage() callback

From: Jérôme Glisse <jglisse@redhat.com>

From: Jérôme Glisse <jglisse@redhat.com>

This is part of patchset to remove dependency on struct page.mapping
field so that we can temporarily update it to point to a special
structure tracking temporary page state (note that original mapping
pointer is preserved and can still be accessed but at a cost).

Add struct address_space to readpage() callback arguments.

Note that this patch does not make use of the new argument, nor does
it use a valid one at call site (by default this patch just use NULL
for new argument value).

Use following script (from root of linux kernel tree):

./that-script.sh that-semantic-patch.spatch

%<--------------------------------------------------------------------
#!/bin/sh
spatch_file=$1

echo PART1 ===========================================================

# P1 find callback functions name
spatch  --dir . --no-includes -D part1 --sp-file $spatch_file

echo PART2 ===========================================================

# P2 change callback function prototype
cat /tmp/unicorn-functions | sort | uniq | while read func ; do
    for file in $( git grep -l $func -- '*.[ch]' ) ; do
        echo $file
        spatch --no-includes --in-place -D part2 \
               -D fn=$func --sp-file $spatch_file $file
    done
done

echo PART 3 ==========================================================

# P3 find all function which call the callback
spatch --dir . --include-headers -D part3 --sp-file $spatch_file

echo PART 4===========================================================

# P4 change all funcitons which call the callback
cat /tmp/unicorn-files | sort | uniq | while read file ; do
    echo $file
    spatch --no-includes --in-place -D part4 \
           --sp-file $spatch_file $file
done
-------------------------------------------------------------------->%

With the following semantic patch:

%<--------------------------------------------------------------------
virtual part1, part2, part3, part4

// ----------------------------------------------------------------------------
// Part 1 is grepping all function that are use as callback for readpage.

// initialize file where we collect all function name (erase it)
@initialize:python depends on part1@
@@
file=open('/tmp/unicorn-functions', 'w')
file.close()

// match function name use as a callback
@p1r2 depends on part1@
identifier I1, FN;
@@
struct address_space_operations I1 = {..., .readpage = FN, ...};

@script:python p1r3 depends on p1r2@
funcname << p1r2.FN;
@@
if funcname != "NULL":
  file=open('/tmp/unicorn-functions', 'a')
  file.write(funcname + '\n')
  file.close()

@p1r4 depends on part1 exists@
expression E1, E2, E3;
identifier FN;
type T1;
@@
{...
(
read_cache_page(E1, E2, (T1)FN, E3)
|
read_cache_pages(E1, E2, (T1)FN, E3)
)
...}

@script:python p1r5 depends on p1r4@
funcname << p1r4.FN;
@@
if funcname != "NULL":
  file=open('/tmp/unicorn-functions', 'a')
  file.write(funcname + '\n')
  print(funcname)
  file.close()

// -------------------------------------------------------------------
// Part 2 modify callback

// Add address_space argument to the function (readpage callback one)
@p2r1 depends on part2@
identifier virtual.fn;
identifier I1, I2;
type T1, T2;
@@
int fn(T1 I1,
+struct address_space *__mapping,
T2 I2) { ... }

@p2r2 depends on part2@
identifier virtual.fn;
identifier I1, I2;
type T1, T2;
@@
int fn(T1 I1,
+struct address_space *__mapping,
T2 I2);

@p2r3 depends on part2@
identifier virtual.fn;
type T1, T2;
@@
int fn(T1,
+struct address_space *,
T2);

@p2r4 depends on part2@
identifier virtual.fn;
expression E1, E2;
@@
fn(E1,
+MAPPING_NULL,
E2)

// ----------------------------------------------------------------------------
// Part 3 is grepping all function that are use the callback for readpage.

// initialize file where we collect all function name (erase it)
@initialize:python depends on part3@
@@
file=open('/tmp/unicorn-files', 'w')
file.write("./include/linux/pagemap.h\n")
file.write("./include/linux/mm.h\n")
file.write("./include/linux/fs.h\n")
file.write("./mm/readahead.c\n")
file.write("./mm/filemap.c\n")
file.close()

@p3r1 depends on part3 exists@
expression E1, E2, E3;
identifier FN;
position P;
@@
FN@P(...) {...
(
E1.a_ops->readpage(E2, E3)
|
E1->a_ops->readpage(E2, E3)
)
...}

@script:python p3r2 depends on p3r1@
P << p3r1.P;
@@
file=open('/tmp/unicorn-files', 'a')
file.write(P[0].file + '\n')
file.close()

@p3r4 depends on part3 exists@
expression E1, E2, E3, E4;
identifier FN;
position P;
@@
FN@P(...) {...
(
read_cache_page(E1, E2, E3, E4)
|
read_cache_pages(E1, E2, E3, E4)
)
...}

@script:python p3r5 depends on p3r4@
P << p3r4.P;
@@
file=open('/tmp/unicorn-files', 'a')
file.write(P[0].file + '\n')
file.close()

// -------------------------------------------------------------------
// Part 4 generic modification
@p4r1 depends on part4@
@@
struct address_space_operations { ... int (*readpage)(struct file *,
+struct address_space *,
struct page *); ... };

@p4r2 depends on part4@
expression E1, E2, E3;
@@
E1.a_ops->readpage(E2,
+MAPPING_NULL,
E3)

@p4r3 depends on part4@
expression E1, E2, E3;
@@
E1->a_ops->readpage(E2,
+MAPPING_NULL,
E3)

@p4r4 depends on part4@
@@
-typedef int (*filler_t)(void *, struct page *);
+typedef int (*filler_t)(void *, struct address_space *, struct page *);

@p4r5 depends on part4 exists@
identifier FN, I1;
expression E1, E2;
@@
FN(..., filler_t I1, ...) {...
I1(E1,
+MAPPING_NULL,
E2)
...}

@p4r6 depends on part4 exists@
struct address_space_operations *aops;
expression E1, E2;
@@
aops->readpage(E1,
+MAPPING_NULL,
E2)
-------------------------------------------------------------------->%

Signed-off-by: Jérôme Glisse <jglisse@redhat.com>
Cc: linux-mm@kvack.org
Cc: linux-fsdevel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org
Cc: Tejun Heo <tj@kernel.org>
Cc: Jan Kara <jack@suse.cz>
Cc: Josef Bacik <jbacik@fb.com>
---
 fs/9p/vfs_addr.c            | 11 +++++++----
 fs/adfs/inode.c             |  3 ++-
 fs/affs/file.c              |  6 ++++--
 fs/affs/symlink.c           |  4 +++-
 fs/afs/file.c               |  6 ++++--
 fs/befs/linuxvfs.c          | 13 +++++++++----
 fs/bfs/file.c               |  3 ++-
 fs/block_dev.c              |  4 +++-
 fs/btrfs/ctree.h            |  3 ++-
 fs/btrfs/disk-io.c          |  3 ++-
 fs/btrfs/file.c             |  2 +-
 fs/btrfs/free-space-cache.c |  2 +-
 fs/btrfs/inode.c            |  5 +++--
 fs/btrfs/ioctl.c            |  2 +-
 fs/btrfs/relocation.c       |  2 +-
 fs/btrfs/send.c             |  2 +-
 fs/buffer.c                 |  2 +-
 fs/cachefiles/rdwr.c        |  6 +++---
 fs/ceph/addr.c              |  3 ++-
 fs/cifs/file.c              |  3 ++-
 fs/coda/symlink.c           |  4 +++-
 fs/cramfs/inode.c           |  3 ++-
 fs/ecryptfs/mmap.c          |  4 +++-
 fs/efs/inode.c              |  3 ++-
 fs/efs/symlink.c            |  4 +++-
 fs/erofs/data.c             |  4 +++-
 fs/erofs/zdata.c            |  4 +++-
 fs/exfat/inode.c            |  3 ++-
 fs/ext2/inode.c             |  3 ++-
 fs/ext4/inode.c             |  3 ++-
 fs/f2fs/data.c              |  4 +++-
 fs/fat/inode.c              |  3 ++-
 fs/freevxfs/vxfs_immed.c    |  6 ++++--
 fs/freevxfs/vxfs_subr.c     |  6 ++++--
 fs/fuse/dir.c               |  4 +++-
 fs/fuse/file.c              |  3 ++-
 fs/gfs2/aops.c              |  8 +++++---
 fs/hfs/inode.c              |  3 ++-
 fs/hfsplus/inode.c          |  4 +++-
 fs/hostfs/hostfs_kern.c     |  3 ++-
 fs/hpfs/file.c              |  3 ++-
 fs/hpfs/namei.c             |  4 +++-
 fs/isofs/compress.c         |  3 ++-
 fs/isofs/inode.c            |  3 ++-
 fs/isofs/rock.c             |  4 +++-
 fs/jffs2/file.c             | 11 +++++++----
 fs/jffs2/os-linux.h         |  3 ++-
 fs/jfs/inode.c              |  3 ++-
 fs/jfs/jfs_metapage.c       |  3 ++-
 fs/libfs.c                  |  3 ++-
 fs/minix/inode.c            |  3 ++-
 fs/nfs/dir.c                |  3 ++-
 fs/nfs/file.c               |  2 +-
 fs/nfs/read.c               |  6 ++++--
 fs/nfs/symlink.c            |  3 ++-
 fs/nilfs2/inode.c           |  3 ++-
 fs/ntfs/aops.c              |  3 ++-
 fs/ocfs2/aops.c             |  3 ++-
 fs/ocfs2/symlink.c          |  4 +++-
 fs/omfs/file.c              |  3 ++-
 fs/orangefs/inode.c         |  4 +++-
 fs/qnx4/inode.c             |  3 ++-
 fs/qnx6/inode.c             |  3 ++-
 fs/reiserfs/inode.c         |  3 ++-
 fs/romfs/super.c            |  3 ++-
 fs/squashfs/file.c          |  4 +++-
 fs/squashfs/symlink.c       |  4 +++-
 fs/sysv/itree.c             |  3 ++-
 fs/ubifs/file.c             |  3 ++-
 fs/udf/file.c               |  4 +++-
 fs/udf/inode.c              |  3 ++-
 fs/udf/symlink.c            |  4 +++-
 fs/ufs/inode.c              |  3 ++-
 fs/vboxsf/file.c            |  3 ++-
 fs/xfs/xfs_aops.c           |  2 +-
 fs/zonefs/super.c           |  3 ++-
 include/linux/fs.h          |  5 +++--
 include/linux/nfs_fs.h      |  2 +-
 include/linux/pagemap.h     |  2 +-
 mm/filemap.c                |  9 +++++----
 mm/page_io.c                |  2 +-
 mm/readahead.c              |  4 ++--
 82 files changed, 207 insertions(+), 106 deletions(-)

Message ID	20201007010603.3452458-5-jglisse@redhat.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=NXjw=DO=kvack.org=owner-linux-mm@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EA2CF14D5 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 7 Oct 2020 01:07:28 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7002A20760 for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 7 Oct 2020 01:07:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Us+fvdRP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7002A20760 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 30B8C6B006C; Tue, 6 Oct 2020 21:07:27 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2BD8B6B006E; Tue, 6 Oct 2020 21:07:27 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0BD14900002; Tue, 6 Oct 2020 21:07:27 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0030.hostedemail.com [216.40.44.30]) by kanga.kvack.org (Postfix) with ESMTP id AFE086B006C for <linux-mm@kvack.org>; Tue, 6 Oct 2020 21:07:26 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 467C4362A for <linux-mm@kvack.org>; Wed, 7 Oct 2020 01:07:26 +0000 (UTC) X-FDA: 77343341292.21.coal85_0017fcc271cb Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id 2975C180442C0 for <linux-mm@kvack.org>; Wed, 7 Oct 2020 01:07:26 +0000 (UTC) X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,jglisse@redhat.com,,RULES_HIT:30003:30029:30045:30054:30064:30070:30090,0,RBL:216.205.24.124:@redhat.com:.lbl8.mailshell.net-64.10.201.10 62.18.0.100;04yg5h67heerswmu1zdpqwip3tbdbypz7j6kn3p64czbng73qow6eok5oo4nzo1.955zn8kb4dhx3qen8us8jsouzn5r7i41yfzu7kuhxjisqwybuxa56tn8ccpszc4.k-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:ft,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:25,LUA_SUMMARY:none X-HE-Tag: coal85_0017fcc271cb X-Filterd-Recvd-Size: 61982 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf32.hostedemail.com (Postfix) with ESMTP for <linux-mm@kvack.org>; Wed, 7 Oct 2020 01:07:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602032844; 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=x9P1LLBMEqzQNwfhkpMvWTYhDdcbv8FiPKdWarVUmqA=; b=Us+fvdRP78UhsR8uBjvl0abe/9J1I3xTAtSFqBusBs3WHtK/2QCPU/uk6SoHkxwKwpw6JG DVuV5ff2wyILrlG/R3fqJeuYIlX3DpoS2JnW5zq/ihSyKiB1oaiujiUB/JjWyi7D0punyT 5lm0OI8/2yeyrT0slGApmwWiwtrYkpg= 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-251-qi7AfLtkMKeHTwZXSBKEdw-1; Tue, 06 Oct 2020 21:07:20 -0400 X-MC-Unique: qi7AfLtkMKeHTwZXSBKEdw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AFF4C803F5B; Wed, 7 Oct 2020 01:07:18 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-119-161.rdu2.redhat.com [10.10.119.161]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E6E25D9D2; Wed, 7 Oct 2020 01:07:17 +0000 (UTC) From: jglisse@redhat.com To: linux-kernel@vger.kernel.org Cc: =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= <jglisse@redhat.com>, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>, Alexander Viro <viro@zeniv.linux.org.uk>, Tejun Heo <tj@kernel.org>, Jan Kara <jack@suse.cz>, Josef Bacik <jbacik@fb.com> Subject: [PATCH 04/14] mm: add struct address_space to readpage() callback Date: Tue, 6 Oct 2020 21:05:53 -0400 Message-Id: <20201007010603.3452458-5-jglisse@redhat.com> In-Reply-To: <20201007010603.3452458-1-jglisse@redhat.com> References: <20201007010603.3452458-1-jglisse@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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: <linux-mm.kvack.org>
Series	Small step toward KSM for file back page. \| expand [00/14] Small step toward KSM for file back page. [02/14] fs: define filler_t as a function pointer type [03/14] fs: directly use a_ops->freepage() instead of a local copy of it. [04/14] mm: add struct address_space to readpage() callback [05/14] mm: add struct address_space to writepage() callback [06/14] mm: add struct address_space to set_page_dirty() callback [07/14] mm: add struct address_space to invalidatepage() callback [08/14] mm: add struct address_space to releasepage() callback [09/14] mm: add struct address_space to freepage() callback [10/14] mm: add struct address_space to putback_page() callback [11/14] mm: add struct address_space to launder_page() callback [12/14] mm: add struct address_space to is_partially_uptodate() callback [13/14] mm: add struct address_space to isolate_page() callback [14/14] mm: add struct address_space to is_dirty_writeback() callback

[04/14] mm: add struct address_space to readpage() callback

Commit Message

Patch