From patchwork Mon Feb 10 18:32:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 11373877 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 EE49192A for ; Mon, 10 Feb 2020 18:32:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CE6802085B for ; Mon, 10 Feb 2020 18:32:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="RfIPzLD0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727518AbgBJScd (ORCPT ); Mon, 10 Feb 2020 13:32:33 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:25711 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726991AbgBJScc (ORCPT ); Mon, 10 Feb 2020 13:32:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1581359552; x=1612895552; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=z2X4aHgnvPPXZMjaOmCVZ7Drr3KtgumDXJtALPCwaAw=; b=RfIPzLD0GsMLcZ37DoJAAeBkiBxY/sE/d2/Yt0JZm0LKdOcrfJTX3HcO yg7tctWOaWpbzU+BCN6znSGNqMBnBzMVGlypUWkClBt9UICQORRb4IJzK cVW8bFvrzh4WDsUDWrjzBoUrMveocTKuLS9LEyzJI9zyJllAoQ79poB+t Dsh9jKDkhx58/Lp12fiqYv1cs456GaJkBdkxPdmxzhfogfY3BEah2/PUx a9qq9g2McsduJ7SJg+J5K+u4OnuI86B4Xp/fNVCWnVHk6e84BIiRJGE6A mA7imlTjb1xZ2Po2r+azoBSxS0bwH95J90HrIBabP3LiR2SprlatToq+B w==; IronPort-SDR: 9lYzFGX7TXZf5MTkBs7HqTSBDc3dH82KsGC7w64vvezbCwwFffnXDJyIr1jM1AwJcGiRbT8GZ+ yl5efUlrTBoUba9YECudjb6/rGblCCFY1NHUL5GxOxlyvvLICwxYnqlU7sYha3FAqEWO+Lcx+f /g3iAHfwPGiarwBA4a+mh5JdwGqUqYSb6P+nLUmhqK78zunEgp1OuFqkO/PjrVTyUmyF/I/Jmm ULUjcRON7hsf+hbVK0g1xDQgEsOSBxDvl0Y3qa+SRJJPsMq9A6P3zwcKR1akb6GV0hyg/MMQUV LL8= X-IronPort-AV: E=Sophos;i="5.70,425,1574092800"; d="scan'208";a="237529176" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 11 Feb 2020 02:32:32 +0800 IronPort-SDR: /FXR5E0yUenzIzUedSmoxwhSY2kdcCskmCL4DaAMNgWwznOHO6Vbw45zfdM7YHqBjlhpBklDJg WQjZJeRXs+SnGPuMwVVRblxIqoP3+btUgpeHl2iUMk9qcbTMToL6TJFTjAvjzG0BZSs99CPgzx ibC/zuUOD0ArlbrxRfEwU0nvg40i6njKFIAFjbMux/+ZXKVS6YYkEq+4aD+0IUz3X4zTkO219c 0sgeyERR42wJLEwtYgbcN8OR0ciUB1oq9ITTljOC8Yzwg08kRurgqw73lBx9k7r4YwMcEHryO3 N1/1WMJVn+F2X62LwPWdz+vj Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2020 10:25:24 -0800 IronPort-SDR: /fqFLO6zCoLUkon4jeduT4mYt6U7Eb2I6wuE0GqMXD76UCoZbdxlFophAqk5MQynqWyCSWnPdo ExGpYHxYN2K5CLCZJcTqccYirzDN7T0qE3rbbjzT44n+r/JEPRM3Tw1fVzVvVOI2zah6C8GQxV tPL+00Q7ZrFt0gZG9/DzukCiWZID/ZDlT2dTt3N7hy4es5KF5Uz1FR5kUd4GPjvq0yIOF4MYMO vhMCQERStXL5Kdh8jiyVDldkWQF0tJV5VKIn2p5v4DqT3zYH4uNVdz8Eoj0IaiKxIw09rMbfQQ 7JA= WDCIronportException: Internal Received: from unknown (HELO redsun60.ssa.fujisawa.hgst.com) ([10.149.66.36]) by uls-op-cesaip02.wdc.com with ESMTP; 10 Feb 2020 10:32:31 -0800 From: Johannes Thumshirn To: David Sterba Cc: Nikolay Borisov , Josef Bacik , "linux-btrfs @ vger . kernel . org" , Christoph Hellwig , Johannes Thumshirn Subject: [PATCH v6 1/7] btrfs: Export btrfs_release_disk_super Date: Tue, 11 Feb 2020 03:32:19 +0900 Message-Id: <20200210183225.10137-2-johannes.thumshirn@wdc.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200210183225.10137-1-johannes.thumshirn@wdc.com> References: <20200210183225.10137-1-johannes.thumshirn@wdc.com> MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Nikolay Borisov Preparatory patch for removal of buffer_head usage in btrfs. Signed-off-by: Nikolay Borisov Signed-off-by: Johannes Thumshirn --- fs/btrfs/volumes.c | 2 +- fs/btrfs/volumes.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index b092021e41e9..6ebdd95b798d 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1247,7 +1247,7 @@ int btrfs_open_devices(struct btrfs_fs_devices *fs_devices, return ret; } -static void btrfs_release_disk_super(struct page *page) +void btrfs_release_disk_super(struct page *page) { kunmap(page); put_page(page); diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index 690d4f5a0653..b7f2edbc6581 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -483,6 +483,7 @@ int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans, int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset); struct extent_map *btrfs_get_chunk_map(struct btrfs_fs_info *fs_info, u64 logical, u64 length); +void btrfs_release_disk_super(struct page *page); static inline void btrfs_dev_stat_inc(struct btrfs_device *dev, int index) From patchwork Mon Feb 10 18:32:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 11373879 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 94C2413A4 for ; Mon, 10 Feb 2020 18:32:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 77F9F2085B for ; Mon, 10 Feb 2020 18:32:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="nXO8UEhe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727540AbgBJSce (ORCPT ); Mon, 10 Feb 2020 13:32:34 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:25711 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726991AbgBJSce (ORCPT ); Mon, 10 Feb 2020 13:32:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1581359553; x=1612895553; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vQK7f590uXyS4KfFENEdWXR1w8x+Y6JgvW+SsUuXZXs=; b=nXO8UEheYK6KVr9jG0Tmb6h865P1qKAanD/yOxKvCB9qw+M/9al92SEn xz1kHd4os+0bhrZm9FShxHeipnAJV7voMEYIztNtQRxZFAyIAm7vKKCMo QscwLHa3GmGPka8SL59xrAnXGfeSeP8+f3rvOrNIPL+V5MqE0Atz0Tygv HXe1Q/n379Np0NZ37h/8e8SjbdNZ/wqlwk6ukjF4jcQlYFXsBjXQPPW8P Y/sa4iG3Mwo4mAt+JP2FuUfRrzK1y3tiIAGR8v5YTiLHOQgS/oZs0jEkn jSRm5UH0sZ2qFurAJ4lTWsk5OlJCBzD+Lk65Q84NS9qK5Roh/UBn+Zgrk g==; IronPort-SDR: 7r3xajdUuRdrbHpu3FxDELlHBXMp9xjr7U2XVD4XjhOuNOpe0T7SLoYgpsdFA+1uQCTDRk8yD+ J2pZTXzngGyqyfxRFQbfjrwGKsUaTPwd/w6h9LZLEQ+hwzpyG4mLqSIOJXvpZ6LHix7Iqaz5dY hrRNpFA+Ns3ANIgDTgtwGKQ2OK15UJ4K28R6fKdZ1BNNotLE2ouG3Py8t8FvgfgH3DUn4UbEex v72HWWuo8Hi5yfLBMTkuknCP8mcGi67AKH04dLpkSiNrM+mGMZDrnayTaznsbxz7yXkA6+xlDI Rg8= X-IronPort-AV: E=Sophos;i="5.70,425,1574092800"; d="scan'208";a="237529180" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 11 Feb 2020 02:32:33 +0800 IronPort-SDR: Wn04wXPxUH2fcgd2V4/IxMlbiJkHn4mnM9VpA7XymglQILGwI2vGiU/uXx2hsgYpA5wdBLepyh piWH0XdqlVdBjvpY2fOZ5bNMGfZOesoz+HRzDwl3gnfqKnHA5FjqUK5NDc4Jje4+P4fwzodvVO /r9kg3c8pcZnx4Rxg/RiVCTPKW5WOgSyiSHTrQIDrN9BZ9F/O5kebpZpgDpM7idFO4v+avNyOs 3s7fMKuh6VzIUexoD0S3ow4z5+KhX8sQ0kxgNFjcX4gHdO6UtaZzoeNNprX6JPduGsB5pPuS3U KiJRKhcU78qQ9RLEwOcmtKL4 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2020 10:25:25 -0800 IronPort-SDR: XRcdI8cpoKVYBoWR3pVKhxk6N4Ya3W1Ypz5tipTpKPuL4Z8y8iSKahNviwOSF+EPwPuKFPoWdJ SrleKFFWTZbCw9DuAgmhI16ZiXSyVYynTAxQ52JtOB9J0Xf77BlyjmNRVtdsim+FSqDFXTvxox uzDRuYQhz8b669fkZUw0OUo6znPEEGQW59GM4mMj9ecHl3F5armT731V8uRQFXYIahUbFUPnJ7 Z5wYzBpQIARqSCi10Jo580QDdcgVYQvcjhe2nXmEWDGJzg0HmIoe0y79qF3qQAXUuSFuyYni97 a/g= WDCIronportException: Internal Received: from unknown (HELO redsun60.ssa.fujisawa.hgst.com) ([10.149.66.36]) by uls-op-cesaip02.wdc.com with ESMTP; 10 Feb 2020 10:32:32 -0800 From: Johannes Thumshirn To: David Sterba Cc: Nikolay Borisov , Josef Bacik , "linux-btrfs @ vger . kernel . org" , Christoph Hellwig , Johannes Thumshirn Subject: [PATCH v6 2/7] btrfs: don't kmap() pages from block devices Date: Tue, 11 Feb 2020 03:32:20 +0900 Message-Id: <20200210183225.10137-3-johannes.thumshirn@wdc.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200210183225.10137-1-johannes.thumshirn@wdc.com> References: <20200210183225.10137-1-johannes.thumshirn@wdc.com> MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Block device mappings are never in highmem so kmap() / kunmap() calls for pages from block devices are unneeded. Use page_address() instead of kmap() to get to the virtual addreses. While we're at it, read_cache_page_gfp() doesn't return NULL on error, only an ERR_PTR, so use IS_ERR() to check for errors. Suggested-by: Christoph Hellwig Signed-off-by: Johannes Thumshirn --- fs/btrfs/volumes.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 6ebdd95b798d..620794f1ea64 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1249,7 +1249,6 @@ int btrfs_open_devices(struct btrfs_fs_devices *fs_devices, void btrfs_release_disk_super(struct page *page) { - kunmap(page); put_page(page); } @@ -1277,10 +1276,10 @@ static int btrfs_read_disk_super(struct block_device *bdev, u64 bytenr, *page = read_cache_page_gfp(bdev->bd_inode->i_mapping, index, GFP_KERNEL); - if (IS_ERR_OR_NULL(*page)) + if (IS_ERR(*page)) return 1; - p = kmap(*page); + p = page_address(*page); /* align our pointer to the offset of the super block */ *disk_super = p + offset_in_page(bytenr); From patchwork Mon Feb 10 18:32:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 11373881 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 5B2B313A4 for ; Mon, 10 Feb 2020 18:32:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C97D2085B for ; Mon, 10 Feb 2020 18:32:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="cpfH+v12" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727573AbgBJScg (ORCPT ); Mon, 10 Feb 2020 13:32:36 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:25711 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726991AbgBJScf (ORCPT ); Mon, 10 Feb 2020 13:32:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1581359555; x=1612895555; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=D47LXCA8t39xx5Hzc5XN65jU2t+Yt2tDcZkQmt56CMM=; b=cpfH+v12k8kUaXJJqodqxjCloXDrc1zYenXd88jaODH2XIsIjo7YPM85 M9FP0n+usYBuFKSwOkZbb2Evp5DLV2QKlhSwdEfrZdsuPvBc+DafEQH8z 0lLRVvAcUp6wTcEdxfMcoaHQfDtPmjt+j21B5kj8U9Vw8mSN6ZftkK1px uxt/ubpr8H0j2MApp09QbaTk2X6fbvIJ9YFX4HCq1J6uMPl5FfF9U1GVs 5hdVQ8jjdwDpkTBcpewuCwfJK5XkDyTlIGVa2XcG1un1MQHBpQEL1LdXD 6kEvbd5pVrS69tYUWgrY4vTAMOJyys+d8rzARepheGuc/F8iBV7BgkHkJ g==; IronPort-SDR: QPsM0MnyGd2pYSpm9Dyeqe9FPqGID0ggFKl89Blp9fTWiH+fwwDN4BO1fpSyWORl9UjaTIzq/x LjO23lGbvQcsjwITARfMqWe6KmLl5nba2rL+rW7LESw4VWsxPCEWvCY1a6BKCGsJrsRK3F+Mpv ub75QzgcurlAWKl2JrGzZtJ45cvkpSsoaCawkPXMLx4olf5UM7t2cxHi6xYPfXx+oWad9e8h6g Q2e20IyNhStAi5EPhxv/GoJs5IfWbQleN1bcgYYDZewcSA1Uix93v1vBcVFCM8+hu1pLVifeKh siQ= X-IronPort-AV: E=Sophos;i="5.70,425,1574092800"; d="scan'208";a="237529184" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 11 Feb 2020 02:32:34 +0800 IronPort-SDR: SqomkfQAmjEglYQkutuAoDN5cN8dQ/wk+uHVmPHfH3DZ7hPAO7pXlQuqS87TWJFYVmSqHq2kDQ xHBxm23+ruAJbpysKFp9GiYf+EJvGXz2TcFAIKXk34DmTN1mGszrvRaVnTvrfXaQp9/g4yi511 7Eb1/AJMPx0xMWnZyoV6qK9zrhLnJ7W9Y4zGWvBSWstwtuaAeEecKrMCy1leaLvQL+eTpyIlYY EpAlUcUSX1uSSi3tjVB05ytX3ApvmauSBi1sOwdo87rUnpcvAlKVidA3c23ZXvgEt4z+5Hlazl UQi2LeT7WtuF754Wi7QiRQHp Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2020 10:25:27 -0800 IronPort-SDR: 8Q1vrceP9jTOAPxi1sW7QhdC2dCtljPOq3Q8/PSq1HgeTzPO/d+jEI4tQqr0zcdX2vaIQDq2os 3NBv34J3Aj5x8wBes9zuljN0Fz/J3w/Jd3EFpy1CtA7sImIU4+1OVrpCvJ11mVXcZlL4VmkxCB NcUeD46UncVR7MXNo4Vqg+WRRKvGMNv6j3jKyrgDjy2oPJqQBCxZV97pntNMbmsmXyvz4dtcs6 pS+so8t0ByEtYBEZmx909GFStFm9JSYBSnuK7em3i4NivIUruYNzR0F9twHT4xRojNcsYuERTo l30= WDCIronportException: Internal Received: from unknown (HELO redsun60.ssa.fujisawa.hgst.com) ([10.149.66.36]) by uls-op-cesaip02.wdc.com with ESMTP; 10 Feb 2020 10:32:33 -0800 From: Johannes Thumshirn To: David Sterba Cc: Nikolay Borisov , Josef Bacik , "linux-btrfs @ vger . kernel . org" , Christoph Hellwig , Johannes Thumshirn Subject: [PATCH v6 3/7] btrfs: use the page-cache for super block reading Date: Tue, 11 Feb 2020 03:32:21 +0900 Message-Id: <20200210183225.10137-4-johannes.thumshirn@wdc.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200210183225.10137-1-johannes.thumshirn@wdc.com> References: <20200210183225.10137-1-johannes.thumshirn@wdc.com> MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Super-block reading in BTRFS is done using buffer_heads. Buffer_heads have some drawbacks, like not being able to propagate errors from the lower layers. Directly use the page cache for reading the super-blocks from disk or invalidating an on-disk super-block. We have to use the page-cache so to avoid races between mkfs and udev. See also 6f60cbd3ae44 ("btrfs: access superblock via pagecache in scan_one_device"). Signed-off-by: Johannes Thumshirn --- Changes to v5: - Removed kmap()/kunmap() calls (hch/David) Changes to v4: - Remove mapping_gfp_constraint() and GFP_NOFAIL (hch) Changes to v3: - Use read_cache_pages() and write_one_page() for IO (hch) - Changed subject (David) - Dropped Josef's R-b due to change Changes to v2: - open-code kunmap() + put_page() (David) - fix double kunmap() (David) - don't use bi_set_op_attrs() (David) Changes to v1: - move 'super_page' into for-loop in btrfs_scratch_superblocks() (Nikolay) - switch to using pagecahce instead of alloc_pages() (Nikolay, David) --- fs/btrfs/disk-io.c | 74 +++++++++++++++++++--------------------------- fs/btrfs/disk-io.h | 6 ++-- fs/btrfs/volumes.c | 59 ++++++++++++++++++------------------ fs/btrfs/volumes.h | 4 +-- 4 files changed, 65 insertions(+), 78 deletions(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 018681ec159b..9f422edd6cce 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -2850,7 +2850,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device u64 features; u16 csum_type; struct btrfs_key location; - struct buffer_head *bh; struct btrfs_super_block *disk_super; struct btrfs_fs_info *fs_info = btrfs_sb(sb); struct btrfs_root *tree_root; @@ -2891,9 +2890,9 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device /* * Read super block and check the signature bytes only */ - bh = btrfs_read_dev_super(fs_devices->latest_bdev); - if (IS_ERR(bh)) { - err = PTR_ERR(bh); + disk_super = btrfs_read_dev_super(fs_devices->latest_bdev); + if (IS_ERR(disk_super)) { + err = PTR_ERR(disk_super); goto fail_alloc; } @@ -2901,18 +2900,19 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device * Verify the type first, if that or the the checksum value are * corrupted, we'll find out */ - csum_type = btrfs_super_csum_type((struct btrfs_super_block *)bh->b_data); + csum_type = btrfs_super_csum_type(disk_super); if (!btrfs_supported_super_csum(csum_type)) { btrfs_err(fs_info, "unsupported checksum algorithm: %u", csum_type); err = -EINVAL; - brelse(bh); + btrfs_release_disk_super(disk_super); goto fail_alloc; } ret = btrfs_init_csum_hash(fs_info, csum_type); if (ret) { err = ret; + btrfs_release_disk_super(disk_super); goto fail_alloc; } @@ -2920,10 +2920,10 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device * We want to check superblock checksum, the type is stored inside. * Pass the whole disk block of size BTRFS_SUPER_INFO_SIZE (4k). */ - if (btrfs_check_super_csum(fs_info, bh->b_data)) { + if (btrfs_check_super_csum(fs_info, (u8 *) disk_super)) { btrfs_err(fs_info, "superblock checksum mismatch"); err = -EINVAL; - brelse(bh); + btrfs_release_disk_super(disk_super); goto fail_alloc; } @@ -2932,8 +2932,8 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device * following bytes up to INFO_SIZE, the checksum is calculated from * the whole block of INFO_SIZE */ - memcpy(fs_info->super_copy, bh->b_data, sizeof(*fs_info->super_copy)); - brelse(bh); + memcpy(fs_info->super_copy, disk_super, sizeof(*fs_info->super_copy)); + btrfs_release_disk_super(disk_super); disk_super = fs_info->super_copy; @@ -3419,45 +3419,38 @@ static void btrfs_end_buffer_write_sync(struct buffer_head *bh, int uptodate) put_bh(bh); } -int btrfs_read_dev_one_super(struct block_device *bdev, int copy_num, - struct buffer_head **bh_ret) +struct btrfs_super_block *btrfs_read_dev_one_super(struct block_device *bdev, + int copy_num) { - struct buffer_head *bh; struct btrfs_super_block *super; + struct page *page; u64 bytenr; + struct address_space *mapping = bdev->bd_inode->i_mapping; bytenr = btrfs_sb_offset(copy_num); if (bytenr + BTRFS_SUPER_INFO_SIZE >= i_size_read(bdev->bd_inode)) - return -EINVAL; + return ERR_PTR(-EINVAL); - bh = __bread(bdev, bytenr / BTRFS_BDEV_BLOCKSIZE, BTRFS_SUPER_INFO_SIZE); - /* - * If we fail to read from the underlying devices, as of now - * the best option we have is to mark it EIO. - */ - if (!bh) - return -EIO; + page = read_cache_page_gfp(mapping, bytenr >> PAGE_SHIFT, GFP_NOFS); + if (IS_ERR(page)) + return ERR_PTR(-ENOMEM); - super = (struct btrfs_super_block *)bh->b_data; + super = page_address(page); if (btrfs_super_bytenr(super) != bytenr || btrfs_super_magic(super) != BTRFS_MAGIC) { - brelse(bh); - return -EINVAL; + btrfs_release_disk_super(super); + return ERR_PTR(-EINVAL); } - *bh_ret = bh; - return 0; + return super; } -struct buffer_head *btrfs_read_dev_super(struct block_device *bdev) +struct btrfs_super_block *btrfs_read_dev_super(struct block_device *bdev) { - struct buffer_head *bh; - struct buffer_head *latest = NULL; - struct btrfs_super_block *super; + struct btrfs_super_block *super, *latest = NULL; int i; u64 transid = 0; - int ret = -EINVAL; /* we would like to check all the supers, but that would make * a btrfs mount succeed after a mkfs from a different FS. @@ -3465,25 +3458,20 @@ struct buffer_head *btrfs_read_dev_super(struct block_device *bdev) * later supers, using BTRFS_SUPER_MIRROR_MAX instead */ for (i = 0; i < 1; i++) { - ret = btrfs_read_dev_one_super(bdev, i, &bh); - if (ret) + super = btrfs_read_dev_one_super(bdev, i); + if (IS_ERR(super)) continue; - super = (struct btrfs_super_block *)bh->b_data; - if (!latest || btrfs_super_generation(super) > transid) { - brelse(latest); - latest = bh; + if (latest) + btrfs_release_disk_super(super); + + latest = super; transid = btrfs_super_generation(super); - } else { - brelse(bh); } } - if (!latest) - return ERR_PTR(ret); - - return latest; + return super; } /* diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h index db21ab614357..59c885860bf8 100644 --- a/fs/btrfs/disk-io.h +++ b/fs/btrfs/disk-io.h @@ -56,9 +56,9 @@ int __cold open_ctree(struct super_block *sb, char *options); void __cold close_ctree(struct btrfs_fs_info *fs_info); int write_all_supers(struct btrfs_fs_info *fs_info, int max_mirrors); -struct buffer_head *btrfs_read_dev_super(struct block_device *bdev); -int btrfs_read_dev_one_super(struct block_device *bdev, int copy_num, - struct buffer_head **bh_ret); +struct btrfs_super_block *btrfs_read_dev_super(struct block_device *bdev); +struct btrfs_super_block *btrfs_read_dev_one_super(struct block_device *bdev, + int copy_num); int btrfs_commit_super(struct btrfs_fs_info *fs_info); struct btrfs_root *btrfs_read_tree_root(struct btrfs_root *tree_root, struct btrfs_key *key); diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 620794f1ea64..d338dd0921d1 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -500,7 +499,7 @@ static struct btrfs_fs_devices *find_fsid_with_metadata_uuid( static int btrfs_get_bdev_and_sb(const char *device_path, fmode_t flags, void *holder, int flush, struct block_device **bdev, - struct buffer_head **bh) + struct btrfs_super_block **disk_super) { int ret; @@ -519,9 +518,9 @@ btrfs_get_bdev_and_sb(const char *device_path, fmode_t flags, void *holder, goto error; } invalidate_bdev(*bdev); - *bh = btrfs_read_dev_super(*bdev); - if (IS_ERR(*bh)) { - ret = PTR_ERR(*bh); + *disk_super = btrfs_read_dev_super(*bdev); + if (IS_ERR(*disk_super)) { + ret = PTR_ERR(*disk_super); blkdev_put(*bdev, flags); goto error; } @@ -530,7 +529,6 @@ btrfs_get_bdev_and_sb(const char *device_path, fmode_t flags, void *holder, error: *bdev = NULL; - *bh = NULL; return ret; } @@ -611,7 +609,6 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices, { struct request_queue *q; struct block_device *bdev; - struct buffer_head *bh; struct btrfs_super_block *disk_super; u64 devid; int ret; @@ -622,17 +619,16 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices, return -EINVAL; ret = btrfs_get_bdev_and_sb(device->name->str, flags, holder, 1, - &bdev, &bh); + &bdev, &disk_super); if (ret) return ret; - disk_super = (struct btrfs_super_block *)bh->b_data; devid = btrfs_stack_device_id(&disk_super->dev_item); if (devid != device->devid) - goto error_brelse; + goto error_free_page; if (memcmp(device->uuid, disk_super->dev_item.uuid, BTRFS_UUID_SIZE)) - goto error_brelse; + goto error_free_page; device->generation = btrfs_super_generation(disk_super); @@ -641,7 +637,7 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices, BTRFS_FEATURE_INCOMPAT_METADATA_UUID) { pr_err( "BTRFS: Invalid seeding and uuid-changed device detected\n"); - goto error_brelse; + goto error_free_page; } clear_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state); @@ -667,12 +663,12 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices, fs_devices->rw_devices++; list_add_tail(&device->dev_alloc_list, &fs_devices->alloc_list); } - brelse(bh); + btrfs_release_disk_super(disk_super); return 0; -error_brelse: - brelse(bh); +error_free_page: + btrfs_release_disk_super(disk_super); blkdev_put(bdev, flags); return -EINVAL; @@ -1247,8 +1243,10 @@ int btrfs_open_devices(struct btrfs_fs_devices *fs_devices, return ret; } -void btrfs_release_disk_super(struct page *page) +void btrfs_release_disk_super(struct btrfs_super_block *super) { + struct page *page = virt_to_page(super); + put_page(page); } @@ -1286,7 +1284,7 @@ static int btrfs_read_disk_super(struct block_device *bdev, u64 bytenr, if (btrfs_super_bytenr(*disk_super) != bytenr || btrfs_super_magic(*disk_super) != BTRFS_MAGIC) { - btrfs_release_disk_super(*page); + btrfs_release_disk_super(p); return 1; } @@ -1349,7 +1347,7 @@ struct btrfs_device *btrfs_scan_one_device(const char *path, fmode_t flags, btrfs_free_stale_devices(path, device); } - btrfs_release_disk_super(page); + btrfs_release_disk_super(disk_super); error_bdev_put: blkdev_put(bdev, flags); @@ -2208,14 +2206,14 @@ static struct btrfs_device *btrfs_find_device_by_path( u64 devid; u8 *dev_uuid; struct block_device *bdev; - struct buffer_head *bh; struct btrfs_device *device; ret = btrfs_get_bdev_and_sb(device_path, FMODE_READ, - fs_info->bdev_holder, 0, &bdev, &bh); + fs_info->bdev_holder, 0, &bdev, + &disk_super); if (ret) return ERR_PTR(ret); - disk_super = (struct btrfs_super_block *)bh->b_data; + devid = btrfs_stack_device_id(&disk_super->dev_item); dev_uuid = disk_super->dev_item.uuid; if (btrfs_fs_incompat(fs_info, METADATA_UUID)) @@ -2225,7 +2223,7 @@ static struct btrfs_device *btrfs_find_device_by_path( device = btrfs_find_device(fs_info->fs_devices, devid, dev_uuid, disk_super->fsid, true); - brelse(bh); + btrfs_release_disk_super(disk_super); if (!device) device = ERR_PTR(-ENOENT); blkdev_put(bdev, FMODE_READ); @@ -7318,7 +7316,6 @@ int btrfs_get_dev_stats(struct btrfs_fs_info *fs_info, void btrfs_scratch_superblocks(struct block_device *bdev, const char *device_path) { - struct buffer_head *bh; struct btrfs_super_block *disk_super; int copy_num; @@ -7327,16 +7324,20 @@ void btrfs_scratch_superblocks(struct block_device *bdev, const char *device_pat for (copy_num = 0; copy_num < BTRFS_SUPER_MIRROR_MAX; copy_num++) { + struct page *page; - if (btrfs_read_dev_one_super(bdev, copy_num, &bh)) + disk_super = btrfs_read_dev_one_super(bdev, copy_num); + if (IS_ERR(disk_super)) continue; - disk_super = (struct btrfs_super_block *)bh->b_data; - memset(&disk_super->magic, 0, sizeof(disk_super->magic)); - set_buffer_dirty(bh); - sync_dirty_buffer(bh); - brelse(bh); + + page = virt_to_page(disk_super); + set_page_dirty(page); + lock_page(page); /* write_on_page() unlocks the page */ + write_one_page(page); + btrfs_release_disk_super(disk_super); + } /* Notify udev that device has changed */ diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index b7f2edbc6581..ed44c45ef199 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -17,8 +17,6 @@ extern struct mutex uuid_mutex; #define BTRFS_STRIPE_LEN SZ_64K -struct buffer_head; - struct btrfs_io_geometry { /* remaining bytes before crossing a stripe */ u64 len; @@ -483,7 +481,7 @@ int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans, int btrfs_remove_chunk(struct btrfs_trans_handle *trans, u64 chunk_offset); struct extent_map *btrfs_get_chunk_map(struct btrfs_fs_info *fs_info, u64 logical, u64 length); -void btrfs_release_disk_super(struct page *page); +void btrfs_release_disk_super(struct btrfs_super_block *super); static inline void btrfs_dev_stat_inc(struct btrfs_device *dev, int index) From patchwork Mon Feb 10 18:32:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 11373883 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 B7A7492A for ; Mon, 10 Feb 2020 18:32:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 913472085B for ; Mon, 10 Feb 2020 18:32:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="AYBNnlWa" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727584AbgBJSch (ORCPT ); Mon, 10 Feb 2020 13:32:37 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:25711 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726991AbgBJSch (ORCPT ); Mon, 10 Feb 2020 13:32:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1581359556; x=1612895556; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TSLibXESaLa+r35WM1/Knr7nO68CgtE4V5pJaROATsg=; b=AYBNnlWaHro3rFyDXekcIBwx6CEG4H0yi4bw0ZmFGyRH95BmvTpNvIuk 6uEGKxhU6MueczVgKsVO7y2cSy9oYHImp5HY0J7L3UvbeVO6nJUZIb288 zNoEx8kqKFUSvgiNNZGtAHR5sLq2hJytIaWeyGLmUr7ai9684GLZfsczf LWpegr+rb3nR2CGbQpwUpSsCmWdBx1Ah9tZqMKJtk3wJNbezdN0xF9Iwx bK7z4hrNI+bdUOCQ1ARZEqmg8YcuZJ6jftEz1rV+VINUtkmcOtdsH8MRD CLsZz4y7W9VIuyA+GGtRRspBmdOrymOOMiFByYziSgMt4Vvq+itY/56w5 w==; IronPort-SDR: +1p7Sxlv1TrWFgdgVeb04ceqO0b4msBy0nUvZ2SUsaMCpkUxyJFzC2wZy44MAXjuGnn4k6TKZd 7ILOJODvF+SXP5kQymqsszvkZ0nOKSLvJMdT/DZmJPJvd7jfhZCUOkTYEYsVkjzAyXMyybtrtn ekQdMqyu+imUdqBZTcFlVazsd48gN7Og0rXm/1oBdIeirp7cGR5P2s3s1v6PjVLe8QU2Dq0+kQ z1ANrMm3oFnPfc761Blc+Il4j1SK0XzBU6kNwTSUJi3Py/3six37kx/9+tAh3swd2OokQZ1bhI EN8= X-IronPort-AV: E=Sophos;i="5.70,425,1574092800"; d="scan'208";a="237529185" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 11 Feb 2020 02:32:36 +0800 IronPort-SDR: rrFhhbTPLMe2CcA4ZAOVVCbbhkN6Ab8NlJFpcXfQdjvluQsLYUy2Zfy8SXyBY2jJSzI2IP7vYG 2OG3J9LJAlEkHRYs3dVOdTmVQWn7oxyXVxSnzage0J7+5DQrIQ0Eqb4Nhyi+AgkfupPUyu44DZ Rmd7lbQ61rhtbT5TBwmcQPYxOsf7qs3lxg1pFh+dYioACwaJjabstMJHxt4Sghp4z6uWBJEbNb TXBC0xIHWt5rxPg+WmMODDnTK3baxc90tRLAXjuTYiQNT0xPNlGlUMDfr6hv+mW3X9rFmDglp3 zUa9D85seX12q3/WsRmEIVxN Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2020 10:25:28 -0800 IronPort-SDR: 17SxM2AYTmIztgP4oAJaq91JP+10q9nfS4H5JJG7T41z0q4SOVKKE8v3awUdSFMUM/9haYimA1 +OU6bizykf3uutUwjLV2u/4JZbU82QTpdqqK0WV/QUh8Vv425AMOyG08O9FvcDx0V57RAnGaqX 9TyTxDzQz2vAGx9CInMLJIkANW4ghHNi6dB6J2Wh+CJ4i9iNUjdlkh/AI70lInudLNL2EoDTaQ wvQNTPfu+Gso8i3SWzw+Kq5wrbGOgZ3B0v76xxYAEKES6qJNaJ6XzdlmQXCPbL1OdRWOp/3Xt4 KLo= WDCIronportException: Internal Received: from unknown (HELO redsun60.ssa.fujisawa.hgst.com) ([10.149.66.36]) by uls-op-cesaip02.wdc.com with ESMTP; 10 Feb 2020 10:32:34 -0800 From: Johannes Thumshirn To: David Sterba Cc: Nikolay Borisov , Josef Bacik , "linux-btrfs @ vger . kernel . org" , Christoph Hellwig , Johannes Thumshirn Subject: [PATCH v6 4/7] btrfs: use BIOs instead of buffer_heads from superblock writeout Date: Tue, 11 Feb 2020 03:32:22 +0900 Message-Id: <20200210183225.10137-5-johannes.thumshirn@wdc.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200210183225.10137-1-johannes.thumshirn@wdc.com> References: <20200210183225.10137-1-johannes.thumshirn@wdc.com> MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Similar to the superblock read path, change the write path to using BIOs and pages instead of buffer_heads. This allows us to skip over the buffer_head code, for writing the superblock to disk. This is based on a patch originally authored by Nikolay Borisov. Co-developed-by: Nikolay Borisov Signed-off-by: Nikolay Borisov Signed-off-by: Johannes Thumshirn Reviewed-by: Nikolay Borisov Reviewed-by: Josef Bacik --- Changes to v4: - get rid of op_flags (hch) - don't use mapping_gfp_constraint() (hch) - print errno on error (hch) - use typed pointer (hch) Changes to v2: - Don't use bi_set_op_attrs() (David) Changes to v1: - Remove left-over buffer_head.h include (David) --- fs/btrfs/disk-io.c | 117 ++++++++++++++++++++++++++------------------- 1 file changed, 67 insertions(+), 50 deletions(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 9f422edd6cce..906a48f6c996 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include @@ -3398,25 +3397,34 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device } ALLOW_ERROR_INJECTION(open_ctree, ERRNO); -static void btrfs_end_buffer_write_sync(struct buffer_head *bh, int uptodate) +static void btrfs_end_super_write(struct bio *bio) { - if (uptodate) { - set_buffer_uptodate(bh); - } else { - struct btrfs_device *device = (struct btrfs_device *) - bh->b_private; - - btrfs_warn_rl_in_rcu(device->fs_info, - "lost page write due to IO error on %s", - rcu_str_deref(device->name)); - /* note, we don't set_buffer_write_io_error because we have - * our own ways of dealing with the IO errors - */ - clear_buffer_uptodate(bh); - btrfs_dev_stat_inc_and_print(device, BTRFS_DEV_STAT_WRITE_ERRS); + struct btrfs_device *device = bio->bi_private; + struct bio_vec *bvec; + struct bvec_iter_all iter_all; + struct page *page; + + bio_for_each_segment_all(bvec, bio, iter_all) { + page = bvec->bv_page; + + if (bio->bi_status) { + btrfs_warn_rl_in_rcu(device->fs_info, + "lost page write due to IO error on %s (%d)", + rcu_str_deref(device->name), + blk_status_to_errno(bio->bi_status)); + ClearPageUptodate(page); + SetPageError(page); + btrfs_dev_stat_inc_and_print(device, + BTRFS_DEV_STAT_WRITE_ERRS); + } else { + SetPageUptodate(page); + } + + put_page(page); + unlock_page(page); } - unlock_buffer(bh); - put_bh(bh); + + bio_put(bio); } struct btrfs_super_block *btrfs_read_dev_one_super(struct block_device *bdev, @@ -3482,19 +3490,17 @@ struct btrfs_super_block *btrfs_read_dev_super(struct block_device *bdev) * the expected device size at commit time. Note that max_mirrors must be * same for write and wait phases. * - * Return number of errors when buffer head is not found or submission fails. + * Return number of errors when page is not found or submission fails. */ static int write_dev_supers(struct btrfs_device *device, struct btrfs_super_block *sb, int max_mirrors) { struct btrfs_fs_info *fs_info = device->fs_info; + struct address_space *mapping = device->bdev->bd_inode->i_mapping; SHASH_DESC_ON_STACK(shash, fs_info->csum_shash); - struct buffer_head *bh; int i; - int ret; int errors = 0; u64 bytenr; - int op_flags; if (max_mirrors == 0) max_mirrors = BTRFS_SUPER_MIRROR_MAX; @@ -3502,6 +3508,10 @@ static int write_dev_supers(struct btrfs_device *device, shash->tfm = fs_info->csum_shash; for (i = 0; i < max_mirrors; i++) { + struct page *page; + struct bio *bio; + struct btrfs_super_block *disk_super; + bytenr = btrfs_sb_offset(i); if (bytenr + BTRFS_SUPER_INFO_SIZE >= device->commit_total_bytes) @@ -3514,37 +3524,44 @@ static int write_dev_supers(struct btrfs_device *device, BTRFS_SUPER_INFO_SIZE - BTRFS_CSUM_SIZE); crypto_shash_final(shash, sb->csum); - /* One reference for us, and we leave it for the caller */ - bh = __getblk(device->bdev, bytenr / BTRFS_BDEV_BLOCKSIZE, - BTRFS_SUPER_INFO_SIZE); - if (!bh) { + page = find_or_create_page(mapping, bytenr >> PAGE_SHIFT, + GFP_NOFS); + if (!page) { btrfs_err(device->fs_info, - "couldn't get super buffer head for bytenr %llu", + "couldn't get superblock page for bytenr %llu", bytenr); errors++; continue; } - memcpy(bh->b_data, sb, BTRFS_SUPER_INFO_SIZE); + /* Bump the refcount for wait_dev_supers() */ + get_page(page); - /* one reference for submit_bh */ - get_bh(bh); + disk_super = page_address(page); + memcpy(disk_super, sb, BTRFS_SUPER_INFO_SIZE); - set_buffer_uptodate(bh); - lock_buffer(bh); - bh->b_end_io = btrfs_end_buffer_write_sync; - bh->b_private = device; + /* + * Directly use BIOs here instead of relying on the page-cache + * to do I/O, so we don't loose the ability to do integrity + * checking. + */ + bio = bio_alloc(GFP_NOFS, 1); + bio_set_dev(bio, device->bdev); + bio->bi_iter.bi_sector = bytenr >> SECTOR_SHIFT; + bio->bi_private = device; + bio->bi_end_io = btrfs_end_super_write; + __bio_add_page(bio, page, BTRFS_SUPER_INFO_SIZE, + offset_in_page(bytenr)); /* - * we fua the first super. The others we allow + * We fua the first super. The others we allow * to go down lazy. */ - op_flags = REQ_SYNC | REQ_META | REQ_PRIO; + bio->bi_opf = REQ_OP_WRITE | REQ_SYNC | REQ_META | REQ_PRIO; if (i == 0 && !btrfs_test_opt(device->fs_info, NOBARRIER)) - op_flags |= REQ_FUA; - ret = btrfsic_submit_bh(REQ_OP_WRITE, op_flags, bh); - if (ret) - errors++; + bio->bi_opf |= REQ_FUA; + + btrfsic_submit_bio(bio); } return errors < i ? 0 : -1; } @@ -3553,12 +3570,11 @@ static int write_dev_supers(struct btrfs_device *device, * Wait for write completion of superblocks done by write_dev_supers, * @max_mirrors same for write and wait phases. * - * Return number of errors when buffer head is not found or not marked up to + * Return number of errors when page is not found or not marked up to * date. */ static int wait_dev_supers(struct btrfs_device *device, int max_mirrors) { - struct buffer_head *bh; int i; int errors = 0; bool primary_failed = false; @@ -3568,32 +3584,33 @@ static int wait_dev_supers(struct btrfs_device *device, int max_mirrors) max_mirrors = BTRFS_SUPER_MIRROR_MAX; for (i = 0; i < max_mirrors; i++) { + struct page *page; + bytenr = btrfs_sb_offset(i); if (bytenr + BTRFS_SUPER_INFO_SIZE >= device->commit_total_bytes) break; - bh = __find_get_block(device->bdev, - bytenr / BTRFS_BDEV_BLOCKSIZE, - BTRFS_SUPER_INFO_SIZE); - if (!bh) { + page = find_get_page(device->bdev->bd_inode->i_mapping, + bytenr >> PAGE_SHIFT); + if (!page) { errors++; if (i == 0) primary_failed = true; continue; } - wait_on_buffer(bh); - if (!buffer_uptodate(bh)) { + wait_on_page_locked(page); + if (PageError(page)) { errors++; if (i == 0) primary_failed = true; } /* drop our reference */ - brelse(bh); + put_page(page); /* drop the reference from the writing run */ - brelse(bh); + put_page(page); } /* log error, force error return */ From patchwork Mon Feb 10 18:32:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 11373885 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 B0D4E92A for ; Mon, 10 Feb 2020 18:32:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 934DE2085B for ; Mon, 10 Feb 2020 18:32:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="aDXYT3RQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727606AbgBJSci (ORCPT ); Mon, 10 Feb 2020 13:32:38 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:25711 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727582AbgBJSci (ORCPT ); Mon, 10 Feb 2020 13:32:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1581359557; x=1612895557; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DY2WAUOAB3R4OVQ1t9StJaVgz7kaMPPbDphATbQMRVE=; b=aDXYT3RQ6VhlGcHm7kb2hOPlwlkl8R4k9uJVQgt4JSXnxWAUx9GQBmSq Y7jYPkX3kxweXbDyxrer8t7ZEA13zgoECTru8sV7FO1AdeIkFb39D+OCM I8xlyFHhKxhMbeApDNQmCCT2XvVIFeR/VpKYEY3rZJqagdXXWIdFPqY6x RFoZPUj3ZOVPNfSsQDL/hhNmmtrbuQabWS2iIU5fEHEvigFRurG4A38Bg UUX9u7lJVJP8+/BRKgH5tINqwOBEPuvUNd1JV1mv9vT2+RfL5WPiZCcz/ KCStRtf52Y+EAwHZrqzwixnpF9zFbse/nrcKu0VlQ1es30O+Mglf8ThhA Q==; IronPort-SDR: EsjIpyVPVLNahS0KTm7YeyFVjfA0ku17QZSUcJ8Cmr8hyaXuV3JtcqrE2lmLFHT4gJstX2rqfm fzZ1ECu0n2GOyTT4KFoSJicpq+vYH5ffDU416El7VRMlb1oXXankvbh2wMzphJf/S2+oxOj0CR k/z3CWv0j8sbKas0a3UMAvNnJXbwHQDAA/+xhqTFEDsmsQGN+Mz5s/QXrBArFOVppvDHbfouRS lXOBovTjYTaOu+2S2ZFAg98hwKOtcFzT8lG5hYXpPL8UsrNmgDQfXJaE5sWjdbMVTXFCBFj4/D hkY= X-IronPort-AV: E=Sophos;i="5.70,425,1574092800"; d="scan'208";a="237529187" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 11 Feb 2020 02:32:37 +0800 IronPort-SDR: hHJWi3541O+cwVJZ34YoACZMOd1CGVviVB0jwFe9BCQiCO/bP7GYLR9DYYcA9BO5UiAkbjfNZ+ 4FKPQ46v9YtS4ArtJgxN/TYN2C/qGs/ZhroC75zBpOlLecQ266X3rQYIdx/waCCYqVureGwxWO 53IGO5Wsntd5RglKXXWvVoREwg7/AYC6Fw3+AEUTzslMPJ9BFculicDkhl6tf2/XkzJwhyHH8a qtGKn7VNiBEuNeOtd5TD/3nVnwqGfDlMqF/GgYGjLUM6bRcb4cM2zvEVF767fu5xHYQAKEnli6 z0wY/Cx4KFYveS9exegDbCC4 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2020 10:25:29 -0800 IronPort-SDR: TXoJhZbRHXnce1fIOFhO+B/delu60DwmWM1ldBmsiIOU6bPaRDEU80SFFsWLZnaFobk9KAXByA 7W9T67uxRcyip2MkAAevBgStLcdetX6m/5qvHBl1Lv+Bp2DpnNxNJn4gKKPJbBYkDmcfmkl0eA NsV7+PAFi6J01zVqED3jbLoc7hJkRe3LZnj79OjN1M6vWqX50ejxAFUy5mss/ao7KXucuCPDhU q61EY7ZE7dLwTkfaZWJRBC5WxtpyyAOkC3Kt9SYM5oLyFJe3TgI0+kPqe0cV199jssARFpXn8f Vf8= WDCIronportException: Internal Received: from unknown (HELO redsun60.ssa.fujisawa.hgst.com) ([10.149.66.36]) by uls-op-cesaip02.wdc.com with ESMTP; 10 Feb 2020 10:32:36 -0800 From: Johannes Thumshirn To: David Sterba Cc: Nikolay Borisov , Josef Bacik , "linux-btrfs @ vger . kernel . org" , Christoph Hellwig , Johannes Thumshirn Subject: [PATCH v6 5/7] btrfs: remove btrfsic_submit_bh() Date: Tue, 11 Feb 2020 03:32:23 +0900 Message-Id: <20200210183225.10137-6-johannes.thumshirn@wdc.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200210183225.10137-1-johannes.thumshirn@wdc.com> References: <20200210183225.10137-1-johannes.thumshirn@wdc.com> MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Now that the last use of btrfsic_submit_bh() is gone, remove the function as well. Signed-off-by: Johannes Thumshirn Reviewed-by: Nikolay Borisov Reviewed-by: Josef Bacik --- fs/btrfs/check-integrity.c | 57 -------------------------------------- fs/btrfs/check-integrity.h | 2 -- 2 files changed, 59 deletions(-) diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index a0ce69f2d27c..e7507985435e 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c @@ -2730,63 +2730,6 @@ static struct btrfsic_dev_state *btrfsic_dev_state_lookup(dev_t dev) &btrfsic_dev_state_hashtable); } -int btrfsic_submit_bh(int op, int op_flags, struct buffer_head *bh) -{ - struct btrfsic_dev_state *dev_state; - - if (!btrfsic_is_initialized) - return submit_bh(op, op_flags, bh); - - mutex_lock(&btrfsic_mutex); - /* since btrfsic_submit_bh() might also be called before - * btrfsic_mount(), this might return NULL */ - dev_state = btrfsic_dev_state_lookup(bh->b_bdev->bd_dev); - - /* Only called to write the superblock (incl. FLUSH/FUA) */ - if (NULL != dev_state && - (op == REQ_OP_WRITE) && bh->b_size > 0) { - u64 dev_bytenr; - - dev_bytenr = BTRFS_BDEV_BLOCKSIZE * bh->b_blocknr; - if (dev_state->state->print_mask & - BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH) - pr_info("submit_bh(op=0x%x,0x%x, blocknr=%llu (bytenr %llu), size=%zu, data=%p, bdev=%p)\n", - op, op_flags, (unsigned long long)bh->b_blocknr, - dev_bytenr, bh->b_size, bh->b_data, bh->b_bdev); - btrfsic_process_written_block(dev_state, dev_bytenr, - &bh->b_data, 1, NULL, - NULL, bh, op_flags); - } else if (NULL != dev_state && (op_flags & REQ_PREFLUSH)) { - if (dev_state->state->print_mask & - BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH) - pr_info("submit_bh(op=0x%x,0x%x FLUSH, bdev=%p)\n", - op, op_flags, bh->b_bdev); - if (!dev_state->dummy_block_for_bio_bh_flush.is_iodone) { - if ((dev_state->state->print_mask & - (BTRFSIC_PRINT_MASK_SUBMIT_BIO_BH | - BTRFSIC_PRINT_MASK_VERBOSE))) - pr_info("btrfsic_submit_bh(%s) with FLUSH but dummy block already in use (ignored)!\n", - dev_state->name); - } else { - struct btrfsic_block *const block = - &dev_state->dummy_block_for_bio_bh_flush; - - block->is_iodone = 0; - block->never_written = 0; - block->iodone_w_error = 0; - block->flush_gen = dev_state->last_flush_gen + 1; - block->submit_bio_bh_rw = op_flags; - block->orig_bio_bh_private = bh->b_private; - block->orig_bio_bh_end_io.bh = bh->b_end_io; - block->next_in_same_bio = NULL; - bh->b_private = block; - bh->b_end_io = btrfsic_bh_end_io; - } - } - mutex_unlock(&btrfsic_mutex); - return submit_bh(op, op_flags, bh); -} - static void __btrfsic_submit_bio(struct bio *bio) { struct btrfsic_dev_state *dev_state; diff --git a/fs/btrfs/check-integrity.h b/fs/btrfs/check-integrity.h index 9bf4359cc44c..bcc730a06cb5 100644 --- a/fs/btrfs/check-integrity.h +++ b/fs/btrfs/check-integrity.h @@ -7,11 +7,9 @@ #define BTRFS_CHECK_INTEGRITY_H #ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY -int btrfsic_submit_bh(int op, int op_flags, struct buffer_head *bh); void btrfsic_submit_bio(struct bio *bio); int btrfsic_submit_bio_wait(struct bio *bio); #else -#define btrfsic_submit_bh submit_bh #define btrfsic_submit_bio submit_bio #define btrfsic_submit_bio_wait submit_bio_wait #endif From patchwork Mon Feb 10 18:32:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 11373887 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 53D4F13A4 for ; Mon, 10 Feb 2020 18:32:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2D0882085B for ; Mon, 10 Feb 2020 18:32:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="HVIiBIKs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727640AbgBJSck (ORCPT ); Mon, 10 Feb 2020 13:32:40 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:25711 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727582AbgBJScj (ORCPT ); Mon, 10 Feb 2020 13:32:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1581359558; x=1612895558; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yDh38LT1oa9sKRSCEDcdZL8IbUvuFF4JQYQJ249BioA=; b=HVIiBIKsTU8cXuGnYS6Twwy5dpzf259CXqx+Myh4LqAIncJpy4vA9Qwr Iu/SHYjMZ61cU1whE4VWmMPP7ggqfXS6XpfL0WEJlmPtrajZ7AGAzEm0D rfolvlgLY4BjiQFm5AloQKaYjbt43VbtHEgCcSgoaPk6a1RLuXDw6HRoq P3GxJs1tubcDt3KVXCwY9Y6jTmmU4NSguH+/C7xN4L/bKkQ4nZR30rhkF NskwMLbUpWpQlwYsFsoXtuMt+Jk9BcTQAoLhDlvDh/qYngKkoN/OH6UnP LaVJiqfmsK2lNi8IEeGbzSgGunQK2XQ8+JJ0AiS02rhdnOti9CLCpijSo A==; IronPort-SDR: jy3jA9BJk1QaXq7HgAVcvQAz5j/oVj8z7w96k3ciujinYfqyD04J6DEAmY25sMjokxYZA4qNE5 tzus+XZrl7jtCw4uWDwDblVp1LRVQsWQe/d3pU1hl/FAzg2F0mQZWoqDuQmgJLlhtqBgB0RDzP CZODYuQa1hwN4WDQSgwwq8bu1Dt1g128civ+hSOLY62yOT55EGajaKlIjRtShcHGcB0GZx1PZp sGmVKbAEplJPJbDpp0p6D25Kye7RoyiPvJSgLQVDJEkLAAiJBWFB712gBDtB1nIdMeen8fk2hn uFU= X-IronPort-AV: E=Sophos;i="5.70,425,1574092800"; d="scan'208";a="237529189" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 11 Feb 2020 02:32:38 +0800 IronPort-SDR: PfjSQJnP9AKDRHYafQ1jZwbRPtQ3y0O52nwyJjHcBAdm6X96i1y8JZFlMjl0u/4cJ+++86zfrc gpK0cyKNeop5lzyEikcwkwxv1fpSAXhHEZ2m10ywDDKzWDFcVK46yKB/U8c6MReBF3xgfgHYi2 RwTYY5iFITHWLRNDfXkl8zxmBLe7142gbHza6LdUpnGGJpsmko3iSzo8f9bdI12O46p3lir8vl DfFWUgX73OuA0TtCDr0SFIs/5Jh0BH+ifsb1B9GY0FUCO91GLfC1l70gmsgsRClDBgbtCA50DA teX7EU9HuKT5MlTHgxd+4bT0 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2020 10:25:31 -0800 IronPort-SDR: H4m/jk8XLUOItAEC5B+ZMlqCl5QtMk39MUWL0QJwkIzEUZH2/I90j+TEAvTOHUOHUstr3WFGfo Qpr1DxLBHPLC7V3oPMh75VEk4OsuZgieAdQzaZfELqYcja5EKBrgRhwKAlTvaWwMC4ZqJq6Hkg fM7D4WiNFMX0CGcnjWuvyKEoBIS5IjrZaizTCB2Yr32dpZ3ExYdRPSaVr2tTRsvMApRKYzUM1e cdqGz4Yp4BVXKver8SfVHgE/iMfDOWIGsW6usMuwhmQRT/o8A7S6TXQrumHMzvRqw28bEhyEA7 XIs= WDCIronportException: Internal Received: from unknown (HELO redsun60.ssa.fujisawa.hgst.com) ([10.149.66.36]) by uls-op-cesaip02.wdc.com with ESMTP; 10 Feb 2020 10:32:37 -0800 From: Johannes Thumshirn To: David Sterba Cc: Nikolay Borisov , Josef Bacik , "linux-btrfs @ vger . kernel . org" , Christoph Hellwig , Johannes Thumshirn Subject: [PATCH v6 6/7] btrfs: remove buffer_heads from btrfsic_process_written_block() Date: Tue, 11 Feb 2020 03:32:24 +0900 Message-Id: <20200210183225.10137-7-johannes.thumshirn@wdc.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200210183225.10137-1-johannes.thumshirn@wdc.com> References: <20200210183225.10137-1-johannes.thumshirn@wdc.com> MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Now that the last caller of btrfsic_process_written_block() with buffer_heads is gone, remove the buffer_head processing path from it as well. Signed-off-by: Johannes Thumshirn Reviewed-by: Josef Bacik Reviewed-by: Nikolay Borisov --- fs/btrfs/check-integrity.c | 103 +++++++++---------------------------- 1 file changed, 25 insertions(+), 78 deletions(-) diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index e7507985435e..4f6db2fe482a 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c @@ -152,11 +152,8 @@ struct btrfsic_block { struct list_head ref_to_list; /* list */ struct list_head ref_from_list; /* list */ struct btrfsic_block *next_in_same_bio; - void *orig_bio_bh_private; - union { - bio_end_io_t *bio; - bh_end_io_t *bh; - } orig_bio_bh_end_io; + void *orig_bio_private; + bio_end_io_t *orig_bio_end_io; int submit_bio_bh_rw; u64 flush_gen; /* only valid if !never_written */ }; @@ -325,14 +322,12 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state, u64 dev_bytenr, char **mapped_datav, unsigned int num_pages, struct bio *bio, int *bio_is_patched, - struct buffer_head *bh, int submit_bio_bh_rw); static int btrfsic_process_written_superblock( struct btrfsic_state *state, struct btrfsic_block *const block, struct btrfs_super_block *const super_hdr); static void btrfsic_bio_end_io(struct bio *bp); -static void btrfsic_bh_end_io(struct buffer_head *bh, int uptodate); static int btrfsic_is_block_ref_by_superblock(const struct btrfsic_state *state, const struct btrfsic_block *block, int recursion_level); @@ -399,8 +394,8 @@ static void btrfsic_block_init(struct btrfsic_block *b) b->never_written = 0; b->mirror_num = 0; b->next_in_same_bio = NULL; - b->orig_bio_bh_private = NULL; - b->orig_bio_bh_end_io.bio = NULL; + b->orig_bio_private = NULL; + b->orig_bio_end_io = NULL; INIT_LIST_HEAD(&b->collision_resolving_node); INIT_LIST_HEAD(&b->all_blocks_node); INIT_LIST_HEAD(&b->ref_to_list); @@ -1743,7 +1738,6 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state, u64 dev_bytenr, char **mapped_datav, unsigned int num_pages, struct bio *bio, int *bio_is_patched, - struct buffer_head *bh, int submit_bio_bh_rw) { int is_metadata; @@ -1902,9 +1896,9 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state, block->is_iodone = 0; BUG_ON(NULL == bio_is_patched); if (!*bio_is_patched) { - block->orig_bio_bh_private = + block->orig_bio_private = bio->bi_private; - block->orig_bio_bh_end_io.bio = + block->orig_bio_end_io = bio->bi_end_io; block->next_in_same_bio = NULL; bio->bi_private = block; @@ -1916,25 +1910,17 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state, bio->bi_private; BUG_ON(NULL == chained_block); - block->orig_bio_bh_private = - chained_block->orig_bio_bh_private; - block->orig_bio_bh_end_io.bio = - chained_block->orig_bio_bh_end_io. - bio; + block->orig_bio_private = + chained_block->orig_bio_private; + block->orig_bio_end_io = + chained_block->orig_bio_end_io; block->next_in_same_bio = chained_block; bio->bi_private = block; } - } else if (NULL != bh) { - block->is_iodone = 0; - block->orig_bio_bh_private = bh->b_private; - block->orig_bio_bh_end_io.bh = bh->b_end_io; - block->next_in_same_bio = NULL; - bh->b_private = block; - bh->b_end_io = btrfsic_bh_end_io; } else { block->is_iodone = 1; - block->orig_bio_bh_private = NULL; - block->orig_bio_bh_end_io.bio = NULL; + block->orig_bio_private = NULL; + block->orig_bio_end_io = NULL; block->next_in_same_bio = NULL; } } @@ -2042,8 +2028,8 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state, block->is_iodone = 0; BUG_ON(NULL == bio_is_patched); if (!*bio_is_patched) { - block->orig_bio_bh_private = bio->bi_private; - block->orig_bio_bh_end_io.bio = bio->bi_end_io; + block->orig_bio_private = bio->bi_private; + block->orig_bio_end_io = bio->bi_end_io; block->next_in_same_bio = NULL; bio->bi_private = block; bio->bi_end_io = btrfsic_bio_end_io; @@ -2054,24 +2040,17 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state, bio->bi_private; BUG_ON(NULL == chained_block); - block->orig_bio_bh_private = - chained_block->orig_bio_bh_private; - block->orig_bio_bh_end_io.bio = - chained_block->orig_bio_bh_end_io.bio; + block->orig_bio_private = + chained_block->orig_bio_private; + block->orig_bio_end_io = + chained_block->orig_bio_end_io; block->next_in_same_bio = chained_block; bio->bi_private = block; } - } else if (NULL != bh) { - block->is_iodone = 0; - block->orig_bio_bh_private = bh->b_private; - block->orig_bio_bh_end_io.bh = bh->b_end_io; - block->next_in_same_bio = NULL; - bh->b_private = block; - bh->b_end_io = btrfsic_bh_end_io; } else { block->is_iodone = 1; - block->orig_bio_bh_private = NULL; - block->orig_bio_bh_end_io.bio = NULL; + block->orig_bio_private = NULL; + block->orig_bio_end_io = NULL; block->next_in_same_bio = NULL; } if (state->print_mask & BTRFSIC_PRINT_MASK_VERBOSE) @@ -2112,8 +2091,8 @@ static void btrfsic_bio_end_io(struct bio *bp) iodone_w_error = 1; BUG_ON(NULL == block); - bp->bi_private = block->orig_bio_bh_private; - bp->bi_end_io = block->orig_bio_bh_end_io.bio; + bp->bi_private = block->orig_bio_private; + bp->bi_end_io = block->orig_bio_end_io; do { struct btrfsic_block *next_block; @@ -2146,38 +2125,6 @@ static void btrfsic_bio_end_io(struct bio *bp) bp->bi_end_io(bp); } -static void btrfsic_bh_end_io(struct buffer_head *bh, int uptodate) -{ - struct btrfsic_block *block = (struct btrfsic_block *)bh->b_private; - int iodone_w_error = !uptodate; - struct btrfsic_dev_state *dev_state; - - BUG_ON(NULL == block); - dev_state = block->dev_state; - if ((dev_state->state->print_mask & BTRFSIC_PRINT_MASK_END_IO_BIO_BH)) - pr_info("bh_end_io(error=%d) for %c @%llu (%s/%llu/%d)\n", - iodone_w_error, - btrfsic_get_block_type(dev_state->state, block), - block->logical_bytenr, block->dev_state->name, - block->dev_bytenr, block->mirror_num); - - block->iodone_w_error = iodone_w_error; - if (block->submit_bio_bh_rw & REQ_PREFLUSH) { - dev_state->last_flush_gen++; - if ((dev_state->state->print_mask & - BTRFSIC_PRINT_MASK_END_IO_BIO_BH)) - pr_info("bh_end_io() new %s flush_gen=%llu\n", - dev_state->name, dev_state->last_flush_gen); - } - if (block->submit_bio_bh_rw & REQ_FUA) - block->flush_gen = 0; /* FUA completed means block is on disk */ - - bh->b_private = block->orig_bio_bh_private; - bh->b_end_io = block->orig_bio_bh_end_io.bh; - block->is_iodone = 1; /* for FLUSH, this releases the block */ - bh->b_end_io(bh, uptodate); -} - static int btrfsic_process_written_superblock( struct btrfsic_state *state, struct btrfsic_block *const superblock, @@ -2781,7 +2728,7 @@ static void __btrfsic_submit_bio(struct bio *bio) btrfsic_process_written_block(dev_state, dev_bytenr, mapped_datav, segs, bio, &bio_is_patched, - NULL, bio->bi_opf); + bio->bi_opf); bio_for_each_segment(bvec, bio, iter) kunmap(bvec.bv_page); kfree(mapped_datav); @@ -2805,8 +2752,8 @@ static void __btrfsic_submit_bio(struct bio *bio) block->iodone_w_error = 0; block->flush_gen = dev_state->last_flush_gen + 1; block->submit_bio_bh_rw = bio->bi_opf; - block->orig_bio_bh_private = bio->bi_private; - block->orig_bio_bh_end_io.bio = bio->bi_end_io; + block->orig_bio_private = bio->bi_private; + block->orig_bio_end_io = bio->bi_end_io; block->next_in_same_bio = NULL; bio->bi_private = block; bio->bi_end_io = btrfsic_bio_end_io; From patchwork Mon Feb 10 18:32:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 11373889 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 13CFA1820 for ; Mon, 10 Feb 2020 18:32:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E9F332085B for ; Mon, 10 Feb 2020 18:32:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="PfYfXMXy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727658AbgBJScl (ORCPT ); Mon, 10 Feb 2020 13:32:41 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:25711 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727613AbgBJSck (ORCPT ); Mon, 10 Feb 2020 13:32:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1581359560; x=1612895560; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KhzX+Ed9N8URGpxMD3mmu5ZshsLiHOwaKqwRZ/TRbbc=; b=PfYfXMXyJyKcqHfKFf/o3wI6ivo+UHDcrhzJ8sX62gXzVOxadC+UZMXU 5vsYuZYU5MhQVwDoOSEgTeDeV+xFbnz/fXoqlXKbLK7NXp7PKvMo7KWra n2cFur74l4nq776l5vs4uZalWVqse7yoDlsKE2SpxmClHQsn9PZcRvwf4 luBOpvDq//l9noXv+c7dIOxXH/VnFxUkO4DpO/L5jGnlaJNm1IqlLcJj3 m5Q/v+1q0am4xEz3k5YV7gTeiZfOa2xtZHYvfRQNpU6/CRFMX6qUgdMv5 wKrhka5jAjGEHVrBCWcyrAYI+RYsHVb+izZ9s/BbS25/3CQhlGb/1sle6 Q==; IronPort-SDR: m3RrBjkleyo1KS2fL4HrhiC5Zw5Vn3UaULIA28hR/enT7/MWtB9Ftmsg7ajSkOFZjhnCGMAr54 Fq7dBvdhTt+69Za3tumgzOdcovFixz/oP6BEow4biQy2ffewArtL7A+kDWQiP+66lNmqnq9aUm BiS304EShU4k16VCF5qP8mpvq1NNtDLWRcflUmRoKib+FCe+fdxvnogq/zsS+UIo0VAzbNJD5/ F6c1hCsDxQyHoTwrXQzaJbGNK3iMaqnMhhRCDuoV23TMDIc8VfFgy1kGVM+HV2HcscBGoa8FvL +fA= X-IronPort-AV: E=Sophos;i="5.70,425,1574092800"; d="scan'208";a="237529192" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 11 Feb 2020 02:32:39 +0800 IronPort-SDR: mo46sD/oISD8AHT817oaE1YcjkqhO5TTxn2j7ajjK/TTTC3VHZjjkZBdPBc7G18XSB3yhO0xlM +BUQ15WeHi3QZFPiUh9RsT8iirSV9Q5cjXhqkjEyzsSSLJaO7BsHVXZIZl+rSU3NW69umpGNf+ M6jdQE/3nQYHvTXUgYGyHNGebUvjovguwoSH42cXfPSA/KviEdYAaAaS7e4X74eUh/+BQ3SRDE tVl/8ACv5PXKhIveKWVmEqFHIxg9t1q76i7aBTWFL1HOR21LoV/QoTb50o8m4luCG56YZSr7qF nBA8HmlkgV0q2H4QVji60QIM Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2020 10:25:32 -0800 IronPort-SDR: 34NeLRmFk4ET/rDkjU/TXdugPwLjfoNyno91V8B8S9RzZk4hB4fL1gz/e+rtprIx6dP/IuQ1rJ GFpSC0PBsUjRLEk+VQGyvnDo0GLSoi5D8jEKnrBYE2+/Ml3WqpGzyngss7khZGrcl/rOv0Wv32 pNFfjlJVfobyJwCrzCCaDfz/Ft52KKS1Hax8jZWCsiDX/ywCNN5xmzNYqlQAn82j56x2BwmBTM /6PfyFONYhZa4z3AbDCu8DMR1UlHAKzTJx/tur5xhEES+Bym7pQXY++DYm3Gy7m5Ll0V8D8Afx ZyE= WDCIronportException: Internal Received: from unknown (HELO redsun60.ssa.fujisawa.hgst.com) ([10.149.66.36]) by uls-op-cesaip02.wdc.com with ESMTP; 10 Feb 2020 10:32:38 -0800 From: Johannes Thumshirn To: David Sterba Cc: Nikolay Borisov , Josef Bacik , "linux-btrfs @ vger . kernel . org" , Christoph Hellwig , Johannes Thumshirn Subject: [PATCH v6 7/7] btrfs: remove buffer_heads form superblock mirror integrity checking Date: Tue, 11 Feb 2020 03:32:25 +0900 Message-Id: <20200210183225.10137-8-johannes.thumshirn@wdc.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200210183225.10137-1-johannes.thumshirn@wdc.com> References: <20200210183225.10137-1-johannes.thumshirn@wdc.com> MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org The integrity checking code for the superblock mirrors is the last remaining user of buffer_heads in BTRFS, change it to using plain BIOs as well. Signed-off-by: Johannes Thumshirn Reviewed-by: Josef Bacik Reviewed-by: Nikolay Borisov --- Changes to v4: - Remove mapping_gfp_constraint() Changes to v2: - Open-code kunmap() + put_page() (David) - Remove __GFP_NOFAIL from allocation (Josef) - Merge error paths (David) Changes to v1: - Convert from alloc_page() to find_or_create_page() --- fs/btrfs/check-integrity.c | 55 +++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index 4f6db2fe482a..e10a27d6db08 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c @@ -77,7 +77,6 @@ #include #include -#include #include #include #include @@ -762,29 +761,45 @@ static int btrfsic_process_superblock_dev_mirror( struct btrfs_fs_info *fs_info = state->fs_info; struct btrfs_super_block *super_tmp; u64 dev_bytenr; - struct buffer_head *bh; struct btrfsic_block *superblock_tmp; int pass; struct block_device *const superblock_bdev = device->bdev; + struct page *page; + struct bio bio; + struct bio_vec bio_vec; + struct address_space *mapping = superblock_bdev->bd_inode->i_mapping; + int ret; /* super block bytenr is always the unmapped device bytenr */ dev_bytenr = btrfs_sb_offset(superblock_mirror_num); if (dev_bytenr + BTRFS_SUPER_INFO_SIZE > device->commit_total_bytes) return -1; - bh = __bread(superblock_bdev, dev_bytenr / BTRFS_BDEV_BLOCKSIZE, - BTRFS_SUPER_INFO_SIZE); - if (NULL == bh) + + page = find_or_create_page(mapping, dev_bytenr >> PAGE_SHIFT, GFP_NOFS); + if (!page) + return -1; + + bio_init(&bio, &bio_vec, 1); + bio.bi_iter.bi_sector = dev_bytenr >> SECTOR_SHIFT; + bio_set_dev(&bio, superblock_bdev); + bio_set_op_attrs(&bio, REQ_OP_READ, 0); + bio_add_page(&bio, page, BTRFS_SUPER_INFO_SIZE, 0); + + ret = submit_bio_wait(&bio); + if (ret) return -1; - super_tmp = (struct btrfs_super_block *) - (bh->b_data + (dev_bytenr & (BTRFS_BDEV_BLOCKSIZE - 1))); + + unlock_page(page); + + super_tmp = kmap(page); if (btrfs_super_bytenr(super_tmp) != dev_bytenr || btrfs_super_magic(super_tmp) != BTRFS_MAGIC || memcmp(device->uuid, super_tmp->dev_item.uuid, BTRFS_UUID_SIZE) || btrfs_super_nodesize(super_tmp) != state->metablock_size || btrfs_super_sectorsize(super_tmp) != state->datablock_size) { - brelse(bh); - return 0; + ret = 0; + goto out_unmap; } superblock_tmp = @@ -795,8 +810,8 @@ static int btrfsic_process_superblock_dev_mirror( superblock_tmp = btrfsic_block_alloc(); if (NULL == superblock_tmp) { pr_info("btrfsic: error, kmalloc failed!\n"); - brelse(bh); - return -1; + ret = -1; + goto out_unmap; } /* for superblock, only the dev_bytenr makes sense */ superblock_tmp->dev_bytenr = dev_bytenr; @@ -880,8 +895,8 @@ static int btrfsic_process_superblock_dev_mirror( mirror_num)) { pr_info("btrfsic: btrfsic_map_block(bytenr @%llu, mirror %d) failed!\n", next_bytenr, mirror_num); - brelse(bh); - return -1; + ret = -1; + goto out_unmap; } next_block = btrfsic_block_lookup_or_add( @@ -890,8 +905,8 @@ static int btrfsic_process_superblock_dev_mirror( mirror_num, NULL); if (NULL == next_block) { btrfsic_release_block_ctx(&tmp_next_block_ctx); - brelse(bh); - return -1; + ret = -1; + goto out_unmap; } next_block->disk_key = tmp_disk_key; @@ -902,16 +917,18 @@ static int btrfsic_process_superblock_dev_mirror( BTRFSIC_GENERATION_UNKNOWN); btrfsic_release_block_ctx(&tmp_next_block_ctx); if (NULL == l) { - brelse(bh); - return -1; + ret = -1; + goto out_unmap; } } } if (state->print_mask & BTRFSIC_PRINT_MASK_INITIAL_ALL_TREES) btrfsic_dump_tree_sub(state, superblock_tmp, 0); - brelse(bh); - return 0; +out_unmap: + kunmap(page); + put_page(page); + return ret; } static struct btrfsic_stack_frame *btrfsic_stack_frame_alloc(void)