From patchwork Wed Jun 26 06:54:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 11017029 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8202B13B4 for ; Wed, 26 Jun 2019 06:54:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 71B93284F5 for ; Wed, 26 Jun 2019 06:54:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 660D5286AD; Wed, 26 Jun 2019 06:54:43 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 0859A284F5 for ; Wed, 26 Jun 2019 06:54:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726756AbfFZGym (ORCPT ); Wed, 26 Jun 2019 02:54:42 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:6026 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725797AbfFZGym (ORCPT ); Wed, 26 Jun 2019 02:54:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1561532082; x=1593068082; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Xd9/oVcSDaCiRyP6ZSQav/uWxyPwJP1u1o/XVGvEjuE=; b=N5GdcqSjcARB50Wr6O4NdifLdKhChQ429X6gYAuDqTkLapE666j2MerK elE1Vmz2yzuJ4T0kS/SUG9f8Ti46rxKnvXXm1iUQwJekO923ItLexpVGg iSsyTHn3F1aQVMWPy5TBhVyTR67qajnmxsg6o1nfp0Np7l4OE9e7oWBRA lVTtETARLJJ48qUDcbZvBhLB+9liWIunFTnXWu63OyQLdnyMousTOmZuP WmzLBv+V3gHzLm8LrScoMLNzbCd9bvzN9oSxYXjQ/X/IX9rqmP56+JsT6 vdBfgfadW5xyyb/m1TTT9WzeCR3uO6qWu5E0zkOZko03ePUktfUXQog+9 w==; X-IronPort-AV: E=Sophos;i="5.63,418,1557158400"; d="scan'208";a="113191697" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 26 Jun 2019 14:54:41 +0800 IronPort-SDR: hn6+WOC5hjv1X9OIbrN8lRZ/3Jn51W1MjOBK764Kq1REBTrRqepo8cy3PEbChCwkRWF5M5UNr8 AC+pssxYzTVuWYlXys+8ATkmKwTMlK9m5pRKKl7el6wgVAtDljEip29HZ+mBWDVfDbuxXwm93l ePxgZBiPq+zi7wsnfUbaPlZbtvYnob82ALYv6ZHGsF4jr12cBTdT8um+heEdHvqrt3LJwLVOeR 3od4uHBvRHNFpSxkZeVokuxajxMtOkl1IONhRBdOQX4LtrAn5Y2PViQl3SILwS091OTVl+8LTY b7PTIWlySmi+67/hysSoYZM/ Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP; 25 Jun 2019 23:53:57 -0700 IronPort-SDR: JPum1+LkLPWvK7CKjhfcSpwN4F4482rU1BehgFVXoBjg93bCr7BFVYcKoJHY+6y1qKizECvAjW AedHaQIxy2l1rxWPTFHEYC/CUtB5ACZuzwYz5EIcnJ2lzuo6fCRYuyIgrTz2nqhYngKthZPM6m ewsLL8bYuhoZC/oz3CLukeV7WyKaOMkRXhAqDEyTjFUBKzgJ5byEMxV5FN5zP97zYvvT/fvBfP +uL4q9hUOTzA2bggcEONBytAds+QRNjcZPQP+AORHSwtEJwk4DMC4CFobYpNd4iN6xQH0h1q67 +vw= Received: from washi.fujisawa.hgst.com ([10.149.53.254]) by uls-op-cesaip02.wdc.com with ESMTP; 25 Jun 2019 23:54:40 -0700 From: Damien Le Moal To: linux-scsi@vger.kernel.org, "Martin K . Petersen" , linux-block@vger.kernel.org, Jens Axboe Cc: Christoph Hellwig , Bart Van Assche Subject: [PATCH V3 1/3] block: Allow mapping of vmalloc-ed buffers Date: Wed, 26 Jun 2019 15:54:36 +0900 Message-Id: <20190626065438.19307-2-damien.lemoal@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190626065438.19307-1-damien.lemoal@wdc.com> References: <20190626065438.19307-1-damien.lemoal@wdc.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To allow the SCSI subsystem scsi_execute_req() function to issue requests using large buffers that are better allocated with vmalloc() rather than kmalloc(), modify bio_map_kern() to allow passing a buffer allocated with the vmalloc() function. To do so, simply test the buffer address using is_vmalloc_addr() and use vmalloc_to_page() instead of virt_to_page() to obtain the pages of vmalloc-ed buffers. Fixes: 515ce6061312 ("scsi: sd_zbc: Fix sd_zbc_report_zones() buffer allocation") Fixes: e76239a3748c ("block: add a report_zones method") Cc: stable@vger.kernel.org Signed-off-by: Damien Le Moal Reviewed-by: Bart Van Assche --- block/bio.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/block/bio.c b/block/bio.c index ce797d73bb43..05afcaf655f3 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1501,6 +1501,8 @@ struct bio *bio_map_kern(struct request_queue *q, void *data, unsigned int len, unsigned long end = (kaddr + len + PAGE_SIZE - 1) >> PAGE_SHIFT; unsigned long start = kaddr >> PAGE_SHIFT; const int nr_pages = end - start; + bool is_vmalloc = is_vmalloc_addr(data); + struct page *page; int offset, i; struct bio *bio; @@ -1518,7 +1520,11 @@ struct bio *bio_map_kern(struct request_queue *q, void *data, unsigned int len, if (bytes > len) bytes = len; - if (bio_add_pc_page(q, bio, virt_to_page(data), bytes, + if (is_vmalloc) + page = vmalloc_to_page(data); + else + page = virt_to_page(data); + if (bio_add_pc_page(q, bio, page, bytes, offset) < bytes) { /* we don't support partial mappings */ bio_put(bio); From patchwork Wed Jun 26 06:54:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 11017035 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 897901398 for ; Wed, 26 Jun 2019 06:54:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 77EB9284F5 for ; Wed, 26 Jun 2019 06:54:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A783286A8; Wed, 26 Jun 2019 06:54:45 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 B963A284F5 for ; Wed, 26 Jun 2019 06:54:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726796AbfFZGyo (ORCPT ); Wed, 26 Jun 2019 02:54:44 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:6030 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726731AbfFZGyn (ORCPT ); Wed, 26 Jun 2019 02:54:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1561532083; x=1593068083; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CwLS28xQNjjobwa+GFOpOrWYkyaDcf7etymAiHS1UQk=; b=d+NIU4e9A+OBcZk47Q6eSSnyNC7V3bmjGToSaL+bCQp1cNKhk5a8VPDS V/cLyoAVm5UCAB99qLwJPajXWYdjx3jNv4JdVa5HE3+2vZPBfpJfmXFOz kNBV2NB6a1PhA36INJ6zB2SvEgf5o9MeNGix43QQtj8Lr2rJfXoahwW2y LGZe1H+btiX9m41nQmOPwWsWTs2hiR1Ju1Jf9W2Km6YHwFzBuxTnPOGrj WE20FeBVJxk1bVasemUAPejgoHB511C70SZptgtlqm8VxTXTTBA1eF/BM w3TXHP4WKKuvks8bSkehI6UQAPs3guRSCbBKBw9qIkYumn5rK14UHPbOO Q==; X-IronPort-AV: E=Sophos;i="5.63,418,1557158400"; d="scan'208";a="113191699" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 26 Jun 2019 14:54:42 +0800 IronPort-SDR: XCRmoV76PkaQz3o/+ZzCxEJLRVJ4iJPxwCoHG563evpIy0ckX+vkSPfVwgCH5ipvEF2O1vQRIJ rcg5tEY96sQfbPiwONq5UiMwktybjpo/HHAlWy3kJDCwachx9xNNmrFz/EXcgDvMHqoC3VGrvr EoRJ7AfeqRJ3z1fzogy2Z3lSIGzQetktYuDXgf1RjoD3/4F3uB/3xgsFibYwFXgw1aSBy5TRwR Ug45R3TIx0MpfbpfZXIfFwPdgp8dqYXnroMgqxdx6jbbzUiTHmb0bjjR/d/hVP3UyfwHtIBHZv B/63tVZnWceG/kXWedbRXUtv Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP; 25 Jun 2019 23:53:58 -0700 IronPort-SDR: gywHzXAy+NsXDDvvVBsRDGZXOKJii7eWpJ/vptJWqQuET2gpaQO0YLCl+0Sv0ziQ8ep1WM74lh NYX4kaZEguCncEKR+gQeYAIDQnxqy7erNEfo5sXq64YuKfb6JeDQ82QyUrp7D7mjEghfjJx3GF jrBgAqtVUu/wnBkS6i9ayhvisqAd1ko+7mXQVjrOVh+RS5Z5VAtosnCBmyCEOFtlmdUkk3G9U1 a2WRn52sARC7Sd2KrfPHJ8avNaVd33qI9/o13/Qms7IZCFPEuV5LmRGhvrUY7k1WG1RmNMG9+k /tU= Received: from washi.fujisawa.hgst.com ([10.149.53.254]) by uls-op-cesaip02.wdc.com with ESMTP; 25 Jun 2019 23:54:41 -0700 From: Damien Le Moal To: linux-scsi@vger.kernel.org, "Martin K . Petersen" , linux-block@vger.kernel.org, Jens Axboe Cc: Christoph Hellwig , Bart Van Assche Subject: [PATCH V3 2/3] sd_zbc: Fix report zones buffer allocation Date: Wed, 26 Jun 2019 15:54:37 +0900 Message-Id: <20190626065438.19307-3-damien.lemoal@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190626065438.19307-1-damien.lemoal@wdc.com> References: <20190626065438.19307-1-damien.lemoal@wdc.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP During disk scan and revalidation done with sd_revalidate(), the zones of a zoned disk are checked using the helper function blk_revalidate_disk_zones() if a configuration change is detected (change in the number of zones or zone size). The function blk_revalidate_disk_zones() issues report_zones calls that are very large, that is, to obtain zone information for all zones of the disk with a single command. The size of the report zones command buffer necessary for such large request generally is lower than the disk max_hw_sectors and KMALLOC_MAX_SIZE (4MB) and succeeds on boot (no memory fragmentation), but often fail at run time (e.g. hot-plug event). This causes the disk revalidation to fail and the disk capacity to be changed to 0. This problem can be avoided by using vmalloc() instead of kmalloc() for the buffer allocation. To limit the amount of memory to be allocated, this patch also introduces the arbitrary SD_ZBC_REPORT_MAX_ZONES maximum number of zones to report with a single report zones command. This limit may be lowered further to satisfy the disk max_hw_sectors limit. Finally, to ensure that the vmalloc-ed buffer can always be mapped in a request, the buffer size is further limited to at most queue_max_segments() pages, allowing successful mapping of the buffer even in the worst case scenario where none of the buffer pages are contiguous. Fixes: 515ce6061312 ("scsi: sd_zbc: Fix sd_zbc_report_zones() buffer allocation") Fixes: e76239a3748c ("block: add a report_zones method") Cc: stable@vger.kernel.org Signed-off-by: Damien Le Moal --- drivers/scsi/sd_zbc.c | 88 ++++++++++++++++++++++++++++++++----------- 1 file changed, 67 insertions(+), 21 deletions(-) diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c index 7334024b64f1..d270b548feb5 100644 --- a/drivers/scsi/sd_zbc.c +++ b/drivers/scsi/sd_zbc.c @@ -9,6 +9,8 @@ */ #include +#include +#include #include @@ -50,7 +52,7 @@ static void sd_zbc_parse_report(struct scsi_disk *sdkp, u8 *buf, /** * sd_zbc_do_report_zones - Issue a REPORT ZONES scsi command. * @sdkp: The target disk - * @buf: Buffer to use for the reply + * @buf: vmalloc-ed buffer to use for the reply * @buflen: the buffer size * @lba: Start LBA of the report * @partial: Do partial report @@ -79,11 +81,16 @@ static int sd_zbc_do_report_zones(struct scsi_disk *sdkp, unsigned char *buf, put_unaligned_be32(buflen, &cmd[10]); if (partial) cmd[14] = ZBC_REPORT_ZONE_PARTIAL; + + flush_kernel_vmap_range(buf, buflen); memset(buf, 0, buflen); result = scsi_execute_req(sdp, cmd, DMA_FROM_DEVICE, buf, buflen, &sshdr, timeout, SD_MAX_RETRIES, NULL); + + invalidate_kernel_vmap_range(buf, buflen); + if (result) { sd_printk(KERN_ERR, sdkp, "REPORT ZONES lba %llu failed with %d/%d\n", @@ -103,6 +110,48 @@ static int sd_zbc_do_report_zones(struct scsi_disk *sdkp, unsigned char *buf, return 0; } +/* + * Maximum number of zones to get with one report zones command. + */ +#define SD_ZBC_REPORT_MAX_ZONES 8192U + +/** + * Allocate a buffer for report zones reply. + * @disk: The target disk + * @nr_zones: Maximum number of zones to report + * @buflen: Size of the buffer allocated + * @gfp_mask: Memory allocation mask + * + */ +static void *sd_zbc_alloc_report_buffer(struct request_queue *q, + unsigned int nr_zones, size_t *buflen, + gfp_t gfp_mask) +{ + size_t bufsize; + void *buf; + + /* + * Report zone buffer size should be at most 64B times the number of + * zones requested plus the 64B reply header, but should be at least + * SECTOR_SIZE for ATA devices. + * Make sure that this size does not exceed the hardware capabilities. + * Furthermore, since the report zone command cannot be split, make + * sure that the allocated buffer can always be mapped by limiting the + * number of pages allocated to the HBA max segments limit. + */ + nr_zones = min(nr_zones, SD_ZBC_REPORT_MAX_ZONES); + bufsize = roundup((nr_zones + 1) * 64, 512); + bufsize = min_t(size_t, bufsize, + queue_max_hw_sectors(q) << SECTOR_SHIFT); + bufsize = min_t(size_t, bufsize, queue_max_segments(q) << PAGE_SHIFT); + + buf = __vmalloc(bufsize, gfp_mask, PAGE_KERNEL); + if (buf) + *buflen = bufsize; + + return buf; +} + /** * sd_zbc_report_zones - Disk report zones operation. * @disk: The target disk @@ -118,9 +167,9 @@ int sd_zbc_report_zones(struct gendisk *disk, sector_t sector, gfp_t gfp_mask) { struct scsi_disk *sdkp = scsi_disk(disk); - unsigned int i, buflen, nrz = *nr_zones; + unsigned int i, nrz = *nr_zones; unsigned char *buf; - size_t offset = 0; + size_t buflen = 0, offset = 0; int ret = 0; if (!sd_is_zoned(sdkp)) @@ -132,16 +181,14 @@ int sd_zbc_report_zones(struct gendisk *disk, sector_t sector, * without exceeding the device maximum command size. For ATA disks, * buffers must be aligned to 512B. */ - buflen = min(queue_max_hw_sectors(disk->queue) << 9, - roundup((nrz + 1) * 64, 512)); - buf = kmalloc(buflen, gfp_mask); + buf = sd_zbc_alloc_report_buffer(disk->queue, nrz, &buflen, gfp_mask); if (!buf) return -ENOMEM; ret = sd_zbc_do_report_zones(sdkp, buf, buflen, sectors_to_logical(sdkp->device, sector), true); if (ret) - goto out_free_buf; + goto out; nrz = min(nrz, get_unaligned_be32(&buf[0]) / 64); for (i = 0; i < nrz; i++) { @@ -152,8 +199,8 @@ int sd_zbc_report_zones(struct gendisk *disk, sector_t sector, *nr_zones = nrz; -out_free_buf: - kfree(buf); +out: + kvfree(buf); return ret; } @@ -287,8 +334,6 @@ static int sd_zbc_check_zoned_characteristics(struct scsi_disk *sdkp, return 0; } -#define SD_ZBC_BUF_SIZE 131072U - /** * sd_zbc_check_zones - Check the device capacity and zone sizes * @sdkp: Target disk @@ -304,22 +349,23 @@ static int sd_zbc_check_zoned_characteristics(struct scsi_disk *sdkp, */ static int sd_zbc_check_zones(struct scsi_disk *sdkp, u32 *zblocks) { + size_t bufsize, buflen; u64 zone_blocks = 0; sector_t max_lba, block = 0; unsigned char *buf; unsigned char *rec; - unsigned int buf_len; - unsigned int list_length; int ret; u8 same; /* Get a buffer */ - buf = kmalloc(SD_ZBC_BUF_SIZE, GFP_KERNEL); + buf = sd_zbc_alloc_report_buffer(sdkp->disk->queue, + SD_ZBC_REPORT_MAX_ZONES, + &bufsize, GFP_NOIO); if (!buf) return -ENOMEM; /* Do a report zone to get max_lba and the same field */ - ret = sd_zbc_do_report_zones(sdkp, buf, SD_ZBC_BUF_SIZE, 0, false); + ret = sd_zbc_do_report_zones(sdkp, buf, bufsize, 0, false); if (ret) goto out_free; @@ -355,12 +401,12 @@ static int sd_zbc_check_zones(struct scsi_disk *sdkp, u32 *zblocks) do { /* Parse REPORT ZONES header */ - list_length = get_unaligned_be32(&buf[0]) + 64; + buflen = min_t(size_t, get_unaligned_be32(&buf[0]) + 64, + bufsize); rec = buf + 64; - buf_len = min(list_length, SD_ZBC_BUF_SIZE); /* Parse zone descriptors */ - while (rec < buf + buf_len) { + while (rec < buf + buflen) { u64 this_zone_blocks = get_unaligned_be64(&rec[8]); if (zone_blocks == 0) { @@ -376,8 +422,8 @@ static int sd_zbc_check_zones(struct scsi_disk *sdkp, u32 *zblocks) } if (block < sdkp->capacity) { - ret = sd_zbc_do_report_zones(sdkp, buf, SD_ZBC_BUF_SIZE, - block, true); + ret = sd_zbc_do_report_zones(sdkp, buf, bufsize, block, + true); if (ret) goto out_free; } @@ -408,7 +454,7 @@ static int sd_zbc_check_zones(struct scsi_disk *sdkp, u32 *zblocks) } out_free: - kfree(buf); + kvfree(buf); return ret; } From patchwork Wed Jun 26 06:54:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 11017039 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9B96F13B4 for ; Wed, 26 Jun 2019 06:54:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8AA75284F5 for ; Wed, 26 Jun 2019 06:54:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E9E3286A8; Wed, 26 Jun 2019 06:54:46 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 B776F28607 for ; Wed, 26 Jun 2019 06:54:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726823AbfFZGyo (ORCPT ); Wed, 26 Jun 2019 02:54:44 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:6026 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725797AbfFZGyo (ORCPT ); Wed, 26 Jun 2019 02:54:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1561532084; x=1593068084; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lg8pbEXqIGRxgTLVtp82Eq91m5uzXzwMVXBnCRVLznI=; b=SM3U5xNOZV7tLSs98JA3uEiHfVt/68zCr8lb1VVy9y8EticzcUwltiAR dWl8TTQvCxUraLBP7W//LTjXIqS22BSqKDA3ZNlFG7AjNPj095nFPGLpr VoQhYw5nnVLrJmXnsa7rB2ykzsd75D6YzkyxtZUPOcZcl9Buoxagyh5oV Lcfgltyv0osqKXd7T+pxbl09goOHxSfM5axo+lutVam80xdxtuWnmPRHC 545vTj4bGAt6AH6C62pqpogW7sTXi8ZbwZ+KS6FBMwEsEjgjL1/Xohg/F f4oycu0y7oIBH2y5XmqNEWZgDhHy4sVD/HGM+npE6EdAj5DwfMKfQ7zIr w==; X-IronPort-AV: E=Sophos;i="5.63,418,1557158400"; d="scan'208";a="113191703" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 26 Jun 2019 14:54:44 +0800 IronPort-SDR: bmORhHA7aTB2gYCjuZF4T880EfeucvE0q/RmsIuj9HaDHqBSvddiQ85Lm8rc6GZxzi0qO5eMGn B5Fp4P5QwMT3AbUMA8QYn3/njU4IpzlmD83+h+NS9oWfjLYC9p3XLUKv14PaxDM1o/FhWYkytV OsDDr4XcAkuIcMuqQteH8SdTypno29kgti5jggksoeKhWN8mF1DEdhMJj6zWyzp7jhpYNfyAPy kvhucwzgo+QVP4ysyBHOg5O8v833HUIL9zX+TAFoJPPMLI61NlauEUPRyH5IR2aM8fl0mbgdvl kIyvn4V9b5OOOkg75ZHFChBF Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP; 25 Jun 2019 23:53:59 -0700 IronPort-SDR: geqr5wrf7iTpSBlPFWkEbdWJAoVbqZr4G4trWXWPy1eZNlGWv0XAoFJnUULODTJQB6t0D7DWnE bu3Wk7/BE2SzyzWE9mD1r4kjkPwz/XDODk7+wxfF1BeCqkbpSUrxzM2v5QkIe8Jmv8HAVbgR9N 8lWlt+Kn79l57jlVSSlkXfP0qBv3SssKkCYTCIsaMyULvrJwZdIeRJ+udPrK1jjIAPm4h0F6uY cVNPbsOX7aFVOw9hHwdv7wl5i0LWBV0d9+17HJ/+0AMJlZ4BPv6pFH9AnL8cYmm53kAn/yZTba nQ8= Received: from washi.fujisawa.hgst.com ([10.149.53.254]) by uls-op-cesaip02.wdc.com with ESMTP; 25 Jun 2019 23:54:42 -0700 From: Damien Le Moal To: linux-scsi@vger.kernel.org, "Martin K . Petersen" , linux-block@vger.kernel.org, Jens Axboe Cc: Christoph Hellwig , Bart Van Assche Subject: [PATCH V3 3/3] block: Limit zone array allocation size Date: Wed, 26 Jun 2019 15:54:38 +0900 Message-Id: <20190626065438.19307-4-damien.lemoal@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190626065438.19307-1-damien.lemoal@wdc.com> References: <20190626065438.19307-1-damien.lemoal@wdc.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Limit the size of the struct blk_zone array used in blk_revalidate_disk_zones() to avoid memory allocation failures leading to disk revalidation failure. Further reduce the likelyhood of these failures by using kvmalloc() instead of directly allocating contiguous pages. Fixes: 515ce6061312 ("scsi: sd_zbc: Fix sd_zbc_report_zones() buffer allocation") Fixes: e76239a3748c ("block: add a report_zones method") Cc: stable@vger.kernel.org Signed-off-by: Damien Le Moal Reviewed-by: Bart Van Assche --- block/blk-zoned.c | 29 +++++++++++++---------------- include/linux/blkdev.h | 5 +++++ 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/block/blk-zoned.c b/block/blk-zoned.c index ae7e91bd0618..26f878b9b5f5 100644 --- a/block/blk-zoned.c +++ b/block/blk-zoned.c @@ -373,22 +373,20 @@ static inline unsigned long *blk_alloc_zone_bitmap(int node, * Allocate an array of struct blk_zone to get nr_zones zone information. * The allocated array may be smaller than nr_zones. */ -static struct blk_zone *blk_alloc_zones(int node, unsigned int *nr_zones) +static struct blk_zone *blk_alloc_zones(unsigned int *nr_zones) { - size_t size = *nr_zones * sizeof(struct blk_zone); - struct page *page; - int order; - - for (order = get_order(size); order >= 0; order--) { - page = alloc_pages_node(node, GFP_NOIO | __GFP_ZERO, order); - if (page) { - *nr_zones = min_t(unsigned int, *nr_zones, - (PAGE_SIZE << order) / sizeof(struct blk_zone)); - return page_address(page); - } + struct blk_zone *zones; + size_t nrz = min(*nr_zones, BLK_ZONED_REPORT_MAX_ZONES); + + zones = kvcalloc(nrz, sizeof(struct blk_zone), GFP_NOIO); + if (!zones) { + *nr_zones = 0; + return NULL; } - return NULL; + *nr_zones = nrz; + + return zones; } void blk_queue_free_zone_bitmaps(struct request_queue *q) @@ -443,7 +441,7 @@ int blk_revalidate_disk_zones(struct gendisk *disk) /* Get zone information and initialize seq_zones_bitmap */ rep_nr_zones = nr_zones; - zones = blk_alloc_zones(q->node, &rep_nr_zones); + zones = blk_alloc_zones(&rep_nr_zones); if (!zones) goto out; @@ -480,8 +478,7 @@ int blk_revalidate_disk_zones(struct gendisk *disk) blk_mq_unfreeze_queue(q); out: - free_pages((unsigned long)zones, - get_order(rep_nr_zones * sizeof(struct blk_zone))); + kvfree(zones); kfree(seq_zones_wlock); kfree(seq_zones_bitmap); diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 592669bcc536..f7faac856017 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -344,6 +344,11 @@ struct queue_limits { #ifdef CONFIG_BLK_DEV_ZONED +/* + * Maximum number of zones to report with a single report zones command. + */ +#define BLK_ZONED_REPORT_MAX_ZONES 8192U + extern unsigned int blkdev_nr_zones(struct block_device *bdev); extern int blkdev_report_zones(struct block_device *bdev, sector_t sector, struct blk_zone *zones,