From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S974905AbdDXQkx (ORCPT ); Mon, 24 Apr 2017 12:40:53 -0400 Received: from mail-eopbgr50100.outbound.protection.outlook.com ([40.107.5.100]:48736 "EHLO EUR03-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S973366AbdDXQkZ (ORCPT ); Mon, 24 Apr 2017 12:40:25 -0400 Authentication-Results: zeniv.linux.org.uk; dkim=none (message not signed) header.d=none;zeniv.linux.org.uk; dmarc=none action=none header.from=virtuozzo.com; From: Andrey Ryabinin To: Alexander Viro CC: Andrey Ryabinin , , Konrad Rzeszutek Wilk , Ross Zwisler , Andrew Morton , Jan Kara , Jens Axboe , Johannes Weiner , Alexey Kuznetsov , Christoph Hellwig , Nikolay Borisov , , , Subject: [PATCH v2 1/4] fs: fix data invalidation in the cleancache during direct IO Date: Mon, 24 Apr 2017 19:41:32 +0300 Message-ID: <20170424164135.22350-2-aryabinin@virtuozzo.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170424164135.22350-1-aryabinin@virtuozzo.com> References: <20170414140753.16108-1-aryabinin@virtuozzo.com> <20170424164135.22350-1-aryabinin@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: AM4PR0101CA0014.eurprd01.prod.exchangelabs.com (2603:10a6:200:2e::24) To AM4PR0801MB2723.eurprd08.prod.outlook.com (2603:10a6:200:14::25) X-MS-Office365-Filtering-Correlation-Id: 754fc5b4-a938-45d1-afab-08d48b309a41 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075)(201703031133081);SRVR:AM4PR0801MB2723; X-Microsoft-Exchange-Diagnostics: 1;AM4PR0801MB2723;3:wBt1fj21hX5jud/4Po4+SsOcNaqB5XPHEa6WaDWSYzU75sOkBmD5gMrLaCpIiiyEzU9Jsm6HKugkbhnb4ytd34ieu8s4wnunQW1LOu/vOjsEGE703ViHADRUk96X94e91HkcqEE0yInWYCs+STXG/OxmKFOomIxCQ4ptIReUDmkYOtt/kyFLtHrqEpl2uIhypook/s3uvOyIRAFhC0PVlY/vlqw0MNu40HZfs5B1UG9KdjQw5mV/UcmJt/jk12QIal9wIF+BWTT/nb6hA03ky+4q1Pi+PqLPbv/d0AJTsuOU09tvAaGOFbEkx/GprAv8CC6aHVIPc0nqOrVgx4XKHA==;25:LNCYORsSdJnDPM4r1YORq68yX4tLh6HmbaN4ZwYSN1bVy3OJGM8VNAcr9TcbKYCflLnnm3iUfrHXC/8SoucRHm9liHHKMBHjCBU0Zey1vghqqVsi1GdEOsEHMlOSNa+jK+KOT4oxIwy/ZseVwqEEGCWTxwSKYAXScXQiE6O2CCBaBJYioQSSr7K+21TlCpDivGvYfvKnO7S2SyOGbV64Fo6u94D7pT0kR2dD+X2HtsRFW6QFKxruENX2jpYDhqunZofkjdXyCaAhyGCNpQk2R3ShJ7nB1W2luRz/Nr6wJ8fCjo/KdBNsODB5KvldmE5s8uMD5KEJjAaUqM1pl5h63/S/u8U+T56uOoMOuW3JEk+msqStA/WkJjHtYnaPYM8tdhH4aCcRgyvOeMOU+MCvjLof5hWQnUX+oE9+uAovt2tq6nopovh9CIgECoKWEqOiWD8ESOPwsGcbzIG9Th14ig== X-Microsoft-Exchange-Diagnostics: 1;AM4PR0801MB2723;31:CCHh/LC2er4zT0BMY7+2XJAc7GFLjQuKW9VzvOvzpSeJGpxfcdCw0rGWBq3xhUZWnckkpN4hXUGVMVBb02i3MWeO/p2R1cIybSgS5wr/xL+qdgELyWE9amDy0+xgh2ODdTcoUqpbsyFP8+XMs7oaG1N50PaHUiIo0MynEGfBCVOVVsjvpvgZ3CkaoVlUij6DuOUIdicOdrnetI/NNMtWwqxDKNMj43bloaAUO9JsZHiPvI08Ha44To3WLltiuYJq;20:PX8j+0TaGcIG+FmOW3MwH992VO8D5O6+uIkIFq0JZ2whOxsnYuza2KKVFplsH6bYVgNGgKH14WUrfl4/jgdSul+tSfF5OGl45pVLCG/D9ZChGrXosR/EnqcNMkHQA4aSDBag1fjQyYvNrK56h8rX6Y8260Vn9OY1+BxsEAHJjovu14r0Q7cBGE2g0q4DTbY1pnoZfRO/31ynI3Eg/Fa6IqdxwGS/dP97k2bqKvPrbJINU6u+5TOpuKXR4IJ97Ec84zKvzGniGEfMrz31mt7nMT+F4hIqm52oJ3yJKpqVzLDTPT102Ry6BpOWLO04SltkX9d3Dsl+ESQHZawzdL0u5NPJqytdUPg2mhqee4MdKtoI0v7CkVH4hhmw1ttHVGHvNtcYvlGtCDb9CI6aEHuBtQbxU3wTYeD9dn06/OKL9fU= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(146099531331640); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(6041248)(201703131423075)(201702281528075)(201703061421075)(20161123560025)(20161123562025)(20161123555025)(20161123564025)(6072148);SRVR:AM4PR0801MB2723;BCL:0;PCL:0;RULEID:;SRVR:AM4PR0801MB2723; X-Microsoft-Exchange-Diagnostics: 1;AM4PR0801MB2723;4:RIGkUfVAQyToqv0iMd1Jse77HejQMONARkaO2/gy5r2vL6b1kTLhWxo0v7SwhVRxzoAkdYMecqwYIaRdSfzcUHElKyrON0CHk4RVdnnFwDKGLeJFiDEMshWnh1mKjcc6+MSWv9fuNxiPBGFU4qz8Ez6VlSM3wZEcW2QhbXJI/3+8oI2FXTEJHDHn2q1qd9pfJGcyslrApx4b2GgqJqC50rx+Y/iUsFKNexf0ibFkcXg6jNsKSA9naCt9XP83gs1Nn0WtT4C+9IQmO9LOXMUZMLzxkJwMVVo/5bBw3M5tJvqzW2Fc7mlbf5KXnJbHIPQBiF3u9eWtRRMF+Jy2IjGeY2Ztz+o0khEJrbbFogdVX0A1vk9PwyrWHtLAH5Lf3p5ZnQZ9fvCFePaWv6V+xKOmtmCyckRVJc9S8FjeWrJ9KOFX12hRJ7+sbOOjvy5YAqRhfFb0ACrNsYWj/36/2Q2X8veBdJgs0SwTeUQY+PGZGuLOjUZipGmo1lUSNDLmVOdiBa4HNvIYhiIPJ9Kh8EEELolZky7BFInCl9PyfCTH+/a19GA7kBITMVMh5xR2MzZlcOod9H5AFT4JUEJ+kpWWubTio9o7FaUnD74qtcOKR05JPDnlWESDp7iEZ5QfYaFvTRtK7N8kSktvqW42rtkFcvKlOpEvq09MEX41eIKa7we6yXGXQ65isAMPJeVCOeNAttOCDpl1CJ2935NHdxXtfU38i16RVCz4nUC7jCZiodE6wrhQx+DNd+n22L3Mm/VHVi5MBvgIv4NiZl7mkgbebth5WkjX9HlUyzDCM2lNCyQ= X-Forefront-PRVS: 0287BBA78D X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(6069001)(39410400002)(39400400002)(39840400002)(39450400003)(1076002)(3846002)(7416002)(38730400002)(36756003)(110136004)(50226002)(4326008)(6116002)(50986999)(76176999)(53936002)(25786009)(86362001)(6506006)(189998001)(6486002)(2950100002)(2906002)(6512007)(33646002)(50466002)(48376002)(6916009)(5660300001)(6666003)(5003940100001)(54906002)(42186005)(7736002)(47776003)(81166006)(66066001)(8676002)(76506005)(53416004)(305945005);DIR:OUT;SFP:1102;SCL:1;SRVR:AM4PR0801MB2723;H:localhost.sw.ru;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;AM4PR0801MB2723;23:rf/r09dtsydVmtuQKnf8EPBmoxNRAbFmnR8yvIX?= =?us-ascii?Q?KYLCy/RQD3QUKSoG435D/IuFw9xvwqjy9SMu46LEIVWcIc7WNrGKfrFc9pin?= =?us-ascii?Q?8CvA2rfRx6rdi76EYWBY3RWXY6nRZXGUX5G+UNzcVIhdsfGTvA6nQHYEucJi?= =?us-ascii?Q?lBdHN5iNLxV43PFp7GJi/m7BUV8kuF4RMBFnJcBp9qQlzd0oyHPmqQkulvmt?= =?us-ascii?Q?4X3MYTsbFh8NHn9JyTsVAQgaV5EQXogmeTRrptXkUW0bIhWfkpN04iJ2M2r8?= =?us-ascii?Q?cWOwCPY2yFGjs4xPgCdux7XRLchi4MjK0xemJeDDq/lrW08f0dOxOlzsPBBD?= =?us-ascii?Q?Bfiglq+y0EKLGBT8t5OUooROHVJdSf/4+5VmaEUl2gXYHcKzXNoRkEX1jv0G?= =?us-ascii?Q?7y+YncTlfgUfIGWMbvW+3OPXUINK05gZqcv/RBjwBW5JlJBPXNCMIa0rmYOz?= =?us-ascii?Q?hKvcRbG3A6dmwFgqeCIAlPMPYgubQZUYI3kt50JIZEqRDEuYCBX7ga5tPGTh?= =?us-ascii?Q?4IknAxVa/GSaZVPlaYU0IOwVDp3JHUGAuks3iDfEBsubBTbxDiqdIqESAFsU?= =?us-ascii?Q?QQHkh/n1XnTcKFCpRy7xheKbxzKnHde4CzyIeBfj974mJ4qc5RfnnApKLBNC?= =?us-ascii?Q?zWWZfsdVFbBW4LbrAHbvYQd/d6hACgiewobg5Y4l+VAziJvu8IFuOE2XScLM?= =?us-ascii?Q?uHNa1OawMxzw/09aB/C6csXgjFoWDvw8zwqTgvDRjiPYJjRJH4gTaCBqIHYA?= =?us-ascii?Q?jcF8a96iGLQ5oEuS/iWZDIRmfEsFrQduCG1sA7J1iokzu0EWa9Iu0d2dXnDt?= =?us-ascii?Q?qUsGiqooKWSFgzYDUALeL2AnSIJwP9JcDZ7mLU//hIFyhU1ef3S1JNEcZmuL?= =?us-ascii?Q?H2YsGsfyuJ8HkXI76spBmeWSlO5f1/n0Ty0liLDkYnOo2gb2LmP+gQ6Cew06?= =?us-ascii?Q?zT1j4CzoyTsx3pj+0QL76UtqUIAKdTUEfDgqGMzMoVX6GwkNa9cccjFc1xt7?= =?us-ascii?Q?S64j2VolDrg4SuP/LOMQor1rieGa8Fsewhr7ySIyW3mxJK+NS52SEr8DZWm+?= =?us-ascii?Q?oCJ94BjV/oXcu8BHV9lWj5bmnIWNPIfBm9Use1nEs4v0+JkeOvQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;AM4PR0801MB2723;6:VgMRDYheldbYFlcuzT4REymGJOVpwqtLUkacleAoyl4t8b2Agw2PMFw3JaGFhMrhbbP5w1Xpcz6uYZdvpl90+jHW2zcAdLUdETfkMWw/+kKARX/ZWrue59nzJRt0nSOMv7kDrJT487k5NwOj8zr/N0M59bd0hw6NI4s9L9OVq2+o+LGeY3G69/K6nLZjMoWYUe28YmyaG64WWTyDDNjANA0UaFln2xtTvHivN8/29RP5FXwXN2HZp3httJKG59j0o8nNVIUEnu35TIhp5gxSEJr+ODgS6dZzdwKD7Mz4Ko8VtEMgHCk5+fQKFy9GVM/8nsZJO0SCUJze2jiFdHnJu3q83rHTqiuwAwcUa8dHliOUPeBkpdtI5N+RO4/kvLbKHtPt1TQx1BVsO06ukGNhskr/FQAtEulC2s4/FCjjKCECO9qA3z3JNXhUMi8FsEbzveZ7G/CeUPQvLVo3cQNg3x3sYzqu3RShEQPLmvas+Nn/NugI7gmYdkMa6T/RF4BDjLcwSACdJ7Kd95xlLsaBoA==;5:fXPuBSH0BxsUjeMHkUHVvF74D+52em8QEqeyud74C8q10rnsDnA+z+5ywpT94Y3msHi9xMasfYMpaUTi6xiXkCKSpspuabeojAC+FyRz81PreGI0jgb1znkWI/sdOVCQdNCxcrqvkEcgEZieLngEZQ==;24:DtCdSGHEP9U9SFWqK8qmWImOKafvwDwUusJyRdLbojcZJ5dkuLwBGcgxIV0SxTcNUngF+yXPomJTM5LEcN/oHedDHk/Lfs4HiBGgFzrjA64= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AM4PR0801MB2723;7:tAAQmmz1bdPbfgfZ1+Qp9imxzxFShuZg/9LjmAas5nEK1UsUcmPB3hE9dTKNzVRjZg7l67nbvdKyJkn3k0bo5qjTntifqt7O7oeUsjURS2vGM89pDY5UPBuB4sw3rWe7VtSeDyz4Bzoi0d1EIycfxq2v7JEBBqo+ZYqtAGrWscJdVHd3ge/V0yiRE9t4ilDfj6bgLDW6XYiDprfT+yzRH8vuiqTf3Peq0E5KWVoGfcZ3DsOqFLgvmQYX2mvjel2lXpuZl/tixIpNsWI8/q4lCLlEhyMeWiTySTzfiLriU7IWYBBpZRaMW6HmfcB62d4ollSBVX2/0uVpKbCPQ7sj9g==;20:z4diQOu4HpRRk8fz0SbfN7jBO9bV/jRWQk2qRzNgjXhLZtpwtMM91z5NbK5rg6Tl09cB1p3dfYBUJWb/wuo1Ygms5lZbqAP0rzv3Z+b8gqZTASF9xtF358uIvrb+xzJZTJn4iVyxD3a2TbaAkSK+sYXh3Fmzp+fHDLad3gHjioI= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2017 16:40:19.7198 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR0801MB2723 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some direct IO write fs hooks call invalidate_inode_pages2[_range]() conditionally iff mapping->nrpages is not zero. This can't be right, because invalidate_inode_pages2[_ragne]() also invalidate data in the cleancache via cleancache_invalidate_inode() call. So if page cache is empty but there is some data in the cleancache, buffered read after direct IO write would get stale data from the cleancache. Also it doesn't feel right to check only for ->nrpages because invalidate_inode_pages2[_range] invalidates exceptional entries as well. Fix this by calling invalidate_inode_pages2[_range]() regardless of nrpages state. Note: nfs,cifs,9p doesn't need similar fix because the never call cleancache_get_page() (nor directly, nor via mpage_readpage[s]()), so they are not affected by this bug. Fixes: c515e1fd361c ("mm/fs: add hooks to support cleancache") Signed-off-by: Andrey Ryabinin Acked-by: Konrad Rzeszutek Wilk Cc: --- fs/iomap.c | 18 ++++++++---------- mm/filemap.c | 26 +++++++++++--------------- 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/fs/iomap.c b/fs/iomap.c index cdeed39..f6a6013 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -881,16 +881,14 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, flags |= IOMAP_WRITE; } - if (mapping->nrpages) { - ret = filemap_write_and_wait_range(mapping, start, end); - if (ret) - goto out_free_dio; + ret = filemap_write_and_wait_range(mapping, start, end); + if (ret) + goto out_free_dio; - ret = invalidate_inode_pages2_range(mapping, - start >> PAGE_SHIFT, end >> PAGE_SHIFT); - WARN_ON_ONCE(ret); - ret = 0; - } + ret = invalidate_inode_pages2_range(mapping, + start >> PAGE_SHIFT, end >> PAGE_SHIFT); + WARN_ON_ONCE(ret); + ret = 0; inode_dio_begin(inode); @@ -945,7 +943,7 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, * one is a pretty crazy thing to do, so we don't support it 100%. If * this invalidation fails, tough, the write still worked... */ - if (iov_iter_rw(iter) == WRITE && mapping->nrpages) { + if (iov_iter_rw(iter) == WRITE) { int err = invalidate_inode_pages2_range(mapping, start >> PAGE_SHIFT, end >> PAGE_SHIFT); WARN_ON_ONCE(err); diff --git a/mm/filemap.c b/mm/filemap.c index 9eab40e..b7b973b 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2720,18 +2720,16 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from) * about to write. We do this *before* the write so that we can return * without clobbering -EIOCBQUEUED from ->direct_IO(). */ - if (mapping->nrpages) { - written = invalidate_inode_pages2_range(mapping, + written = invalidate_inode_pages2_range(mapping, pos >> PAGE_SHIFT, end); - /* - * If a page can not be invalidated, return 0 to fall back - * to buffered write. - */ - if (written) { - if (written == -EBUSY) - return 0; - goto out; - } + /* + * If a page can not be invalidated, return 0 to fall back + * to buffered write. + */ + if (written) { + if (written == -EBUSY) + return 0; + goto out; } written = mapping->a_ops->direct_IO(iocb, from); @@ -2744,10 +2742,8 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from) * so we don't support it 100%. If this invalidation * fails, tough, the write still worked... */ - if (mapping->nrpages) { - invalidate_inode_pages2_range(mapping, - pos >> PAGE_SHIFT, end); - } + invalidate_inode_pages2_range(mapping, + pos >> PAGE_SHIFT, end); if (written > 0) { pos += written; -- 2.10.2