From patchwork Fri Oct 28 07:55:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 9401465 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 33BAA60588 for ; Fri, 28 Oct 2016 07:56:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2337A2A5EF for ; Fri, 28 Oct 2016 07:56:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 17D382A5F3; Fri, 28 Oct 2016 07:56:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8712F2A5EF for ; Fri, 28 Oct 2016 07:56:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S942209AbcJ1H4U (ORCPT ); Fri, 28 Oct 2016 03:56:20 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:57630 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936373AbcJ1H4S (ORCPT ); Fri, 28 Oct 2016 03:56:18 -0400 X-IronPort-AV: E=Sophos;i="5.31,556,1473091200"; d="scan'";a="28345184" Received: from mail-sn1nam02lp0020.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([216.32.180.20]) by ob1.hgst.iphmx.com with ESMTP; 28 Oct 2016 15:56:16 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=deaCTcVL4uI2Eo9hqXi6TGzkiPURySRlewBvtxBh8nE=; b=AoI3T6oHezs5GGsnGWSUM9fWiRHQXEzn1rJTar40G7iFfMmNwUxBiw6PgRUuXT5A4i/DnkwNSvKcnHdDi15BgqgXHffrpgkFUXrli1rp79mRPVi19Dnd524a9/qpUcw5lXKfDzCnxyVQ23CZ3cpMoixB4UCuPTYT/CA5mmKxf8Q= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Damien.LeMoal@wdc.com; Received: from washi.fujisawa.hgst.com (199.255.44.5) by BL2PR04MB1972.namprd04.prod.outlook.com (10.167.97.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.679.12; Fri, 28 Oct 2016 07:56:12 +0000 From: Damien Le Moal To: , CC: , , Hannes Reinecke , Shaun Tancheff , Damien Le Moal Subject: [PATCH 7/9] f2fs: Cache zoned block devices zone type Date: Fri, 28 Oct 2016 16:55:35 +0900 Message-ID: <1477641337-12321-8-git-send-email-damien.lemoal@wdc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477641337-12321-1-git-send-email-damien.lemoal@wdc.com> References: <1477641337-12321-1-git-send-email-damien.lemoal@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.5] X-ClientProxiedBy: CY4PR02CA0042.namprd02.prod.outlook.com (10.175.57.156) To BL2PR04MB1972.namprd04.prod.outlook.com (10.167.97.144) X-MS-Office365-Filtering-Correlation-Id: dfd4a082-ea3d-44cd-d68e-08d3ff07e3eb X-Microsoft-Exchange-Diagnostics: 1; BL2PR04MB1972; 2:ByZRoA8KyYBB6dkbSml/Uf4v3vRq6aMzHeGWSJHAyPjsJvdOdSPdoeY0Dxm+az1Uv81uTKFxm+eUMSGwuxaFuNXKkVHY2/hACCnpU4xognnAOzs40Pxr9jvHlKOfmGhQJQmzKA9t1ZRPHv91hG6TmanHZ8HU3IwYS1zCbJA2gtmddUoUUr4tQmBkzs83yMBj6n9ymYWGphniziOPHT+fqQ==; 3:LQIW2gKqg4i9rCoCdBHHoL+0TSdCzCeys3iImoyCPy5hSX+IfBLtMVpxDiYr/GDlhKc3HJb69HC3VgUzzOL9aglEIUopwengm9mAiS/yNxkFPUs6PwdsQcgkdXyCbj2CGtsgo/UUk6EL1RyJtq/WyA==; 25:IFxxF2Ug4+NkpRJMjzMP9f8S0VkJi8uZLCzmgMyKZ5ec1wPkUf0qAoHgmPEjsUHFs5eBeTwDGkQ75nEl3A2EBYwNvxvN1jPsa9kCC8SJibh6YLVCewCvoqtcLsl8bxmLSKZgGvmkG9joTM9/asTYtCeyXMeyXhiTECCnqA4tp9ns6iyOUxvJUbsJbP4dvnOvQkJZnNbgoAuDMPTnq99R2toTHv7DLnthYkqalIyW6S7odwpjHtwJNqkmj40M1xHh4UZa8tgzxpMlIxdOgLxjiQxvVwNp06uxO7mbSbJGp+Ts7DpcRpXa1ORkVBFLLN0DrmG2j2GuL3Ihje44oy2m4L0afGP0UriWr2Ur/KZif1DU/KajssaojQrY7ezZwSIGg7/E5ATY81XzI83ZIiv0ySKkWs1rnI7/lYeRetHdcrHsHioo2IQbpdE3hTpea6hK X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2PR04MB1972; X-Microsoft-Exchange-Diagnostics: 1; BL2PR04MB1972; 31:nAxUN8dkYYqaYT3QNmBmMO/Yz07QZLYbviyuxU/XuD6PmbkLehEvNNTsmMqXfQLb4YCbCXKNjKtYY7+G03HCfYTt7fR4UHPXrjpT6yz4jkG9aj6guliKKB/TN8JvEQk19YjlDk7akAJPyVtmrAWUCR8QFINLXyRZebVM3XFV9/zHjL3ol6m2d+uN+ey+u/HXp+De9TENBoJzMxVtzB6epmpRhHW/WYxiRq8b+8sZ/IwS5zpgShFs9B89fdHnrWNA; 20:fw27U0GkUfr4qFkXxWVdos8q6npNmnZKBdxipnITKwLPgy5Q/zufhimSjL/J2OPd7xJU63BUqsu66DOg6BXrSuyCEeJjx1ex6IbYjU12+oEgM1Ajj+IHYT/iTTPreDT2Qfr09TBgSCEwsinEoHCSTGmCo+jxIK8MBnJaqbaPIYaDBY2FLnHrx3VpursuOuS92mzdQMLjF3fXic8+HlA+pYtgYS6sWTRh8HLbXTM8OZZB2ZTIYLl0gsIzfWhRaJNOoxVxGl6qX2OLN9jexVLphi+PrBET7ZnXX61qHKhR5+niigEFoTC0kD4dwSAydWJqJIVdqmAi3ch915IxqRhJ52aenAPmuSNBX8C4k7a4YNlSzKWy/hXwD0hGTSpuOCwKGb02Xf/+lvWce1PorfQNWqAAipQhjA1wwqvzkrhYPIUHyRKH7RpitJdMJA3gQwUgumuSjIGdmIcWe5hYKBjXOvkgZmzyR8oTZSMS/bCURG+kT+OCB3FQC4nsbaP660H1 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6055026); SRVR:BL2PR04MB1972; BCL:0; PCL:0; RULEID:; SRVR:BL2PR04MB1972; X-Microsoft-Exchange-Diagnostics: 1; BL2PR04MB1972; 4:6z+3rL4Is6i2nyThhKkzqE1lTy88HzxQehgrZ8CPYKa5XfpWWTANs8KOq3YbV5hWl6jKw1Yw6/n1O9CMrNKCxMPZGvOTD8iz3d1K+xla46bMEUn6SU/o/1388Ki8G/Gqv5fzt3Y/m9uV4aDRh68kFMYfKMKB8iAx07IAv9fQxiXxCH8g0i5EVt4eZ8OBV4/uWCefEC7g1BQDHvGifenuDjzIKOdhO+TwI0sbXVJio0YDY4UkUcaqUWm+dRqVZBvRDaT+GAS6S74UUoSmLAsR+4qtpeBGIk/1gJorkyY4vNki0aePC02rlG6Abw/CrztUI3yV62cYxzmOKzsIc5+gT3MAY110ifovPsQwQ+PG5CRYI1IyxOykryFGnIM+LmxLd03sprAKTVzNceDzHyS8dn/Im3RdgVhdecIa5/AdsbY= X-Forefront-PRVS: 0109D382B0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(7736002)(305945005)(7846002)(81166006)(77096005)(92566002)(4326007)(5003940100001)(6666003)(2950100002)(3846002)(76176999)(50986999)(68736007)(2906002)(50226002)(81156014)(8676002)(6116002)(47776003)(586003)(66066001)(19580395003)(5001770100001)(19580405001)(33646002)(106356001)(105586002)(229853001)(101416001)(189998001)(97736004)(36756003)(50466002)(48376002)(42186005)(86362001)(5660300001)(7099028)(5005270100013)(357404004); DIR:OUT; SFP:1102; SCL:1; SRVR:BL2PR04MB1972; H:washi.fujisawa.hgst.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: wdc.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL2PR04MB1972; 23:vvXDamwZh6b4wga74rprGmUK38XFHqdVPcdSZeAMb?= =?us-ascii?Q?jRPI+NAo5TDcyY3hLzgVijKzZvjhPGOH33s/0Iy1kV9LxzUNBYL7xrOqdIon?= =?us-ascii?Q?aSWhIPwokGRvqws4tDtfyLkwsXW0wRijhBBgy8xJJbUI3x6javC9XYFzdNcp?= =?us-ascii?Q?alBzezwzXROYUhK6PJBmv6Nuy8siwPINGNzi4paYLjFgNK5ZfKWhaMRtdn+u?= =?us-ascii?Q?5qswCypnzmaXU9+Ih6rO6VTrBorQwFxnoNCXVqJqSKPGrRi5Ckjo7vn8HWTU?= =?us-ascii?Q?XdC+w3m5Mgl6vmHrvSLIKAui4rUcuYJlLwQe5CiNxSNu5AfNGVgkYgjRnOMr?= =?us-ascii?Q?q77f2Hyb4P7LCqTezq+OCsrrs2nQmSjrHQ5878qbC/mF9KB265963OTaJY72?= =?us-ascii?Q?X4uis3VLpWufncj9JiY5aqcBfxwFKmLIQJSH2mKQR3TQGwEmacnh6KfvZanI?= =?us-ascii?Q?xwKtEoc6Gox8d+oJX8dZUc3k/eKXVKDXbT//mzKZnmFQD3lR+dF50t2tDu1a?= =?us-ascii?Q?DsMkCRELyug7mDfpN2B5IIA+HYmCSGZQMurj1b8qujdP8c07sqoBink7+jhF?= =?us-ascii?Q?oGaWegMzyRfoBexEU3vaqiGlsQwvRtTLdfxMwmXunHKJiB8348rIMgICzYsl?= =?us-ascii?Q?yPZFcAlk/FpOWqPPgjSMPxk1EjXslH/8EuynG2Ei54Aup3GiwJlavHBL2+ZQ?= =?us-ascii?Q?x7yIovfgTV7at7TXLihR629rGfV9/dxFgQn4ExGcq/NmJcgmajtWpGlNtrlT?= =?us-ascii?Q?L3ncfSLEoVgE7O+ozjx5Ijn1MU9x7ckXZZO3VGLrdxA3wpGWIWmWkYInTZhI?= =?us-ascii?Q?tjYjwmnliBd055dCj61lO4NsyeL9TtoA3v5D3fbpZTYvek9Zfw1bz1+aa+n6?= =?us-ascii?Q?z2gi+aDmT/LSht8rVPahTLvQsuHVBkOXiIDj8CLjT78SLejGP6BF6UAAfxZ0?= =?us-ascii?Q?YK8mg0wSE0ogv6MMSEtNrZUvdOaVN0dIOIroTKVgrkfrh9050TeV6rDclWsl?= =?us-ascii?Q?kjlozrQ9xCTxb9F5zjx5pdTYJqtDl79oHqVjXg02iOVYGzhjGCUAc9B/ZUge?= =?us-ascii?Q?rpcDi4nr0z2CYQylqwqXdzyAO3IAUMN1NdfeE3KfGXFsL3tDyZ2+VEEkiI7u?= =?us-ascii?Q?qAB2OX40/F/ymmIXfTbt8c1KrlAmxvN?= X-Microsoft-Exchange-Diagnostics: 1; BL2PR04MB1972; 6:n8mo4m4L1R9PnHEQIwp1JIyn2YNqNPl1e+uUVLu6/8VeE+IevEKTAbhlzySD8LKWmI2bkOCYKHdnhQDNfmi/7WTJcq4fGipwyWv700ia6Idcd8OczxSIKuI1KCUzNPPx0PesQlUU2APv/RXoR2tTM4fiQrI4/TOV9hJheAW7ZusQEyGs2hkVqVhGPDj/NkjHlao05H/w35HISiG7H6ASp64ckCJ4/FsrnhKEAU7EjytP0nzXTQzBeRtuL7jLW7QqcNX6pyvaQEAuwSTpPU0LAuhUAItmYWFnNK+VGo92DqGzPMZz3C3E0lBWcuUAxonN5uSep1s9hSmZNVXHHyWOZKUub2kU/gFeeZonqgDdQcI=; 5:E/mn7resApS3IhMb6Ny4iNaLGlF4tQhf81ZYipbl1/BhRi7YD4+/tdAely+aw6WvqN2vGflBzccHv1dfeq7rT0TaDo+QTE4DGXC2ibx8OAZeQoAEZhQ70alTRqsniBz+sHQGvM1tq6eAzyXuCGanIw==; 24:VaygRT3Z4+UREoPCPsJ+2eZju+iSiykY4r8dplZzR8U0t4N5clpdwDH/E9O78/btMV7yiWjcsWyVK269tggB1KkP26wCFx0QeAaXkziazL4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BL2PR04MB1972; 7:99qlgWIRlmoV3vGYPtqvvVZoDO4jW01Cor72r8xpB9LOmgXB0C6v2fUj7k5P6E5Zhp7h8coWTXNCyEt+GpnGcFS6FGvD7InkmXW8C3ygACDgaWe8bpmXvKvIjTXDeqth5KywcZiJcvjA7Be09EP+gdJl4z+U4z1W0UkHMzy0jeRW9IP5WChWUt7usEGgoYdWp1H2BCZ0pVAuAShSmHkVildz7XfiO2RJ2zD225EnWLxmgY4Df5R0iNgQnVlxXYmbd3Njf2W1+B3gG06NuEMp/l4V5nBYWXSRktURsYrsTTmkg/kcszaoDmGdyuLc6EnrZPb+L+KgMAYLnrnLoUdYUPbq7lta6WVW5nA00sPLlRM=; 20:7fAh2E49gDkvzdK0bPL0q/XD39qm+MFfpqB0fAHVfo28+saJhaKQW2qQ8zV1Zapqq9mhc80JIhWHNwz92nh9yTYvPpS+u72ufCtrPUpfvX1yAvSQ7UUopl7s3o+9T9rCB2LNS8a8uRWWBWdUiZNn53zVq2xe8r/eHWEmlOTJcBRijyLtgHTmt2OsGg49C3hsZBZHtn/399by08i8Z66+fkgcg7pP9Vv1MTAoI0QqgO/SqXIexwHNEihW4giT3+jI X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2016 07:56:12.2572 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR04MB1972 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With the zoned block device feature enabled, section discard need to do a zone reset for sections contained in sequential zones, and a regular discard (if supported) for sections stored in conventional zones. Avoid the need for a costly report zones to obtain a section zone type when discarding it by caching the types of the device zones in the super block information. This cache is initialized at mount time for mounts with the zoned block device feature enabled. Signed-off-by: Damien Le Moal --- fs/f2fs/f2fs.h | 16 +++++++++++++ fs/f2fs/super.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index beb2093..1600f4b 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -750,6 +750,14 @@ struct f2fs_sb_info { u8 key_prefix[F2FS_KEY_DESC_PREFIX_SIZE]; u8 key_prefix_size; #endif + +#ifdef CONFIG_BLK_DEV_ZONED + unsigned int nr_blkz; /* Total number of zones */ + unsigned int blocks_per_blkz; /* F2FS blocks per zone */ + unsigned int log_blocks_per_blkz; /* log2 F2FS blocks per zone */ + u8 *blkz_type; /* Array of zones type */ +#endif + /* for node-related operations */ struct f2fs_nm_info *nm_info; /* node manager */ struct inode *node_inode; /* cache node blocks */ @@ -2410,6 +2418,14 @@ static inline int f2fs_sb_mounted_blkzoned(struct super_block *sb) return F2FS_HAS_FEATURE(sb, F2FS_FEATURE_BLKZONED); } +static inline int get_blkz_type(struct f2fs_sb_info *sbi, + block_t blkaddr) +{ + unsigned int zno = blkaddr >> sbi->log_blocks_per_blkz; + + return sbi->blkz_type[zno]; +} + static inline bool f2fs_discard_en(struct f2fs_sb_info *sbi) { struct request_queue *q = bdev_get_queue(sbi->sb->s_bdev); diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 58fd69d..dacaa1b 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1515,6 +1515,66 @@ static int init_percpu_info(struct f2fs_sb_info *sbi) GFP_KERNEL); } +static int init_blkz_info(struct f2fs_sb_info *sbi) +{ +#ifdef CONFIG_BLK_DEV_ZONED + struct block_device *bdev = sbi->sb->s_bdev; + sector_t nr_sectors = bdev->bd_part->nr_sects; + sector_t sector = 0; + struct blk_zone *zones; + unsigned int i, nr_zones; + unsigned int n = 0; + int err = -EIO; + + if (!f2fs_sb_mounted_blkzoned(sbi->sb)) + return 0; + + sbi->blocks_per_blkz = SECTOR_TO_BLOCK(bdev_zone_size(bdev)); + sbi->log_blocks_per_blkz = __ilog2_u32(sbi->blocks_per_blkz); + sbi->nr_blkz = SECTOR_TO_BLOCK(nr_sectors) >> + sbi->log_blocks_per_blkz; + if (nr_sectors & (bdev_zone_size(bdev) - 1)) + sbi->nr_blkz++; + + sbi->blkz_type = kmalloc(sbi->nr_blkz, GFP_KERNEL); + if (!sbi->blkz_type) + return -ENOMEM; + +#define F2FS_REPORT_NR_ZONES 4096 + + zones = kcalloc(F2FS_REPORT_NR_ZONES, sizeof(struct blk_zone), + GFP_KERNEL); + if (!zones) + return -ENOMEM; + + /* Get block zones type */ + while (zones && sector < nr_sectors) { + + nr_zones = F2FS_REPORT_NR_ZONES; + err = blkdev_report_zones(bdev, sector, + zones, &nr_zones, + GFP_KERNEL); + if (err) + break; + if (!nr_zones) { + err = -EIO; + break; + } + + for (i = 0; i < nr_zones; i++) { + sbi->blkz_type[n] = zones[i].type; + sector += zones[i].len; + n++; + } + } + + kfree(zones); + + return err; +#endif + return 0; +} + /* * Read f2fs raw super block. * Because we have two copies of super block, so read both of them @@ -1761,6 +1821,13 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) init_ino_entry_info(sbi); + err = init_blkz_info(sbi); + if (err) { + f2fs_msg(sb, KERN_ERR, + "Failed to initialize F2FS blkzone information"); + goto free_blkz; + } + /* setup f2fs internal modules */ err = build_segment_manager(sbi); if (err) { @@ -1932,6 +1999,8 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) destroy_node_manager(sbi); free_sm: destroy_segment_manager(sbi); +free_blkz: + kfree(sbi->blkz_type); kfree(sbi->ckpt); free_meta_inode: make_bad_inode(sbi->meta_inode);