From patchwork Wed Oct 7 01:06:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jerome Glisse X-Patchwork-Id: 11819553 Return-Path: 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 37B9917CF for ; Wed, 7 Oct 2020 01:07:57 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DF7B12080A for ; Wed, 7 Oct 2020 01:07:56 +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="i5zzWfSl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF7B12080A 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 8E9D66B007B; Tue, 6 Oct 2020 21:07:52 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 833D66B007D; Tue, 6 Oct 2020 21:07:52 -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 6D6B36B007E; Tue, 6 Oct 2020 21:07:52 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0222.hostedemail.com [216.40.44.222]) by kanga.kvack.org (Postfix) with ESMTP id 3439F6B007B for ; Tue, 6 Oct 2020 21:07:52 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id C926B8249980 for ; Wed, 7 Oct 2020 01:07:51 +0000 (UTC) X-FDA: 77343342342.25.smell50_49009c9271cb Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id A82C31804E3A0 for ; Wed, 7 Oct 2020 01:07:51 +0000 (UTC) X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,jglisse@redhat.com,,RULES_HIT: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;04y846xxkhqyu58gdr9sxg91p7syuocqdr9yp1zr4rwaacu8dd34cutump4nz1h.hz1q4z8mt8xzkzi6t8s7m1x4bruj6u6copmem7kirjkgwgj1keujm1ga8s6jscb.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:23,LUA_SUMMARY:none X-HE-Tag: smell50_49009c9271cb X-Filterd-Recvd-Size: 11140 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf28.hostedemail.com (Postfix) with ESMTP for ; Wed, 7 Oct 2020 01:07:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602032870; 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=dIjWvKp1A0e0W4GIot1k+x52KQno6rPc1gzlEYRF8k0=; b=i5zzWfSl/4Xiaib0aw3r7H/cWzzCQQo0H9sep78xj2j5EuUI0ZXU3Kt0yMA6dhpG5RnJ3R Mp5xhiDkvVIBwKlC2EKW9c2VpaeM1UtPuVfl/dllDTwwp6Q3Ld8VqXOPNR0DVrK6L/yuCR 4NnEsu3+0/9wxKY+rPCCdqqFRrgtTzQ= 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-411-Wl-T1OHfPe-QKuHoKN7tOw-1; Tue, 06 Oct 2020 21:07:46 -0400 X-MC-Unique: Wl-T1OHfPe-QKuHoKN7tOw-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 AAC4A425D1; Wed, 7 Oct 2020 01:07:44 +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 9FFFB5D9D2; Wed, 7 Oct 2020 01:07:43 +0000 (UTC) From: jglisse@redhat.com To: linux-kernel@vger.kernel.org Cc: =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Andrew Morton , Alexander Viro , Tejun Heo , Jan Kara , Josef Bacik Subject: [PATCH 13/14] mm: add struct address_space to isolate_page() callback Date: Tue, 6 Oct 2020 21:06:02 -0400 Message-Id: <20201007010603.3452458-14-jglisse@redhat.com> In-Reply-To: <20201007010603.3452458-1-jglisse@redhat.com> References: <20201007010603.3452458-1-jglisse@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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: From: Jérôme Glisse 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 isolate_page() 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 isolate_page. // 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 = {..., .isolate_page = 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() // ------------------------------------------------------------------- // Part 2 modify callback // Add address_space argument to the function (isolate_page callback one) @p2r1 depends on part2@ identifier virtual.fn; identifier I1, I2; type R, T1, T2; @@ R fn( +struct address_space *__mapping, T1 I1, T2 I2) { ... } @p2r2 depends on part2@ identifier virtual.fn; identifier I1, I2; type R, T1, T2; @@ R fn( +struct address_space *__mapping, T1 I1, T2 I2); @p2r3 depends on part2@ identifier virtual.fn; expression E1, E2; @@ fn( +MAPPING_NULL, E1, E2) // ---------------------------------------------------------------------------- // Part 3 is grepping all function that are use the callback for isolate_page. // 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->isolate_page(E2, E3) | E1->a_ops->isolate_page(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() // ------------------------------------------------------------------- // Part 4 generic modification @p4r1 depends on part4@ type R; @@ struct address_space_operations { ... R (*isolate_page)( +struct address_space *, struct page *, ...); ... }; @p4r2 depends on part4@ expression E1, E2, E3; @@ E1.a_ops->isolate_page( +MAPPING_NULL, E2, E3) @p4r3 depends on part4@ expression E1, E2, E3; @@ E1->a_ops->isolate_page( +MAPPING_NULL, E2, E3) -------------------------------------------------------------------->% Signed-off-by: Jérôme Glisse Cc: linux-mm@kvack.org Cc: linux-fsdevel@vger.kernel.org Cc: Andrew Morton Cc: Alexander Viro Cc: linux-fsdevel@vger.kernel.org Cc: Tejun Heo Cc: Jan Kara Cc: Josef Bacik --- include/linux/balloon_compaction.h | 5 +++-- include/linux/fs.h | 3 ++- mm/balloon_compaction.c | 3 ++- mm/migrate.c | 2 +- mm/z3fold.c | 3 ++- mm/zsmalloc.c | 3 ++- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/include/linux/balloon_compaction.h b/include/linux/balloon_compaction.h index 07b235161d040..c1e45339a53c1 100644 --- a/include/linux/balloon_compaction.h +++ b/include/linux/balloon_compaction.h @@ -80,8 +80,9 @@ static inline void balloon_devinfo_init(struct balloon_dev_info *balloon) #ifdef CONFIG_BALLOON_COMPACTION extern const struct address_space_operations balloon_aops; -extern bool balloon_page_isolate(struct page *page, - isolate_mode_t mode); +extern bool balloon_page_isolate(struct address_space *__mapping, + struct page *page, + isolate_mode_t mode); extern void balloon_page_putback(struct address_space *__mapping, struct page *page); extern int balloon_page_migrate(struct address_space *mapping, diff --git a/include/linux/fs.h b/include/linux/fs.h index 21f179e7c5daa..6798a13e3c980 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -408,7 +408,8 @@ struct address_space_operations { */ int (*migratepage) (struct address_space *, struct page *, struct page *, enum migrate_mode); - bool (*isolate_page)(struct page *, isolate_mode_t); + bool (*isolate_page)(struct address_space *, struct page *, + isolate_mode_t); void (*putback_page)(struct address_space *, struct page *); int (*launder_page) (struct address_space *, struct page *); int (*is_partially_uptodate) (struct address_space *, struct page *, diff --git a/mm/balloon_compaction.c b/mm/balloon_compaction.c index abc4a63df9903..ed9120e6c9bfe 100644 --- a/mm/balloon_compaction.c +++ b/mm/balloon_compaction.c @@ -203,7 +203,8 @@ EXPORT_SYMBOL_GPL(balloon_page_dequeue); #ifdef CONFIG_BALLOON_COMPACTION -bool balloon_page_isolate(struct page *page, isolate_mode_t mode) +bool balloon_page_isolate(struct address_space *__mapping, struct page *page, + isolate_mode_t mode) { struct balloon_dev_info *b_dev_info = balloon_page_device(page); diff --git a/mm/migrate.c b/mm/migrate.c index 3fba7429151bf..a3220050fbe05 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -126,7 +126,7 @@ int isolate_movable_page(struct page *page, isolate_mode_t mode) mapping = page_mapping(page); VM_BUG_ON_PAGE(!mapping, page); - if (!mapping->a_ops->isolate_page(page, mode)) + if (!mapping->a_ops->isolate_page(MAPPING_NULL, page, mode)) goto out_no_isolated; /* Driver shouldn't use PG_isolated bit of page->flags */ diff --git a/mm/z3fold.c b/mm/z3fold.c index 37453a14257a4..4ca02bb55a56b 100644 --- a/mm/z3fold.c +++ b/mm/z3fold.c @@ -1566,7 +1566,8 @@ static u64 z3fold_get_pool_size(struct z3fold_pool *pool) return atomic64_read(&pool->pages_nr); } -static bool z3fold_page_isolate(struct page *page, isolate_mode_t mode) +static bool z3fold_page_isolate(struct address_space *__mapping, + struct page *page, isolate_mode_t mode) { struct z3fold_header *zhdr; struct z3fold_pool *pool; diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 99d74c6e98216..c896f069e5b0a 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1914,7 +1914,8 @@ static void replace_sub_page(struct size_class *class, struct zspage *zspage, __SetPageMovable(newpage, page_mapping(oldpage)); } -static bool zs_page_isolate(struct page *page, isolate_mode_t mode) +static bool zs_page_isolate(struct address_space *__mapping, + struct page *page, isolate_mode_t mode) { struct zs_pool *pool; struct size_class *class;