Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3449344pxk; Mon, 5 Oct 2020 09:55:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+zsHV54uiuhfI+ZCh+hNDCIdgUumLLm45v8BDDgvUcPbNwH8eTMCMhAvHJUulfznxGzOn X-Received: by 2002:a17:906:4e06:: with SMTP id z6mr692342eju.370.1601916911124; Mon, 05 Oct 2020 09:55:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601916911; cv=none; d=google.com; s=arc-20160816; b=KNoLYdPiycFgM8Vq/0qFMGUhO6zV17fE+eEgD56B22AWELuiYaf9Wuu+Z2GpfL6rjf dQsCGmNU+1bopNwpQBQIAEEjoIHDkVSn6EiYEnShHh+i/AzZv3EbWOsxbCKvfk/ip3nY 6BTsgQUJ7D7E6zA7myUbLmfkU+TwQ+vx9okw042wZFSTja8Gvu2UYqcUKUUwSutEAaRY 79CbN1e/6IyMORCk3cbg6mTQLQx2fObS+PHoBNjTVdPdohWbiTE3SKiLLEXgQR9/4w/e mp8g5LEF3R4VZmifQr5DWdw8ONFXRQ7YBk2rx2MYDperCtfau15L9c/l8g17nN/kcxYL qu6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qdlqTvZ2PSQZeb9RiMVwtisOtbZfPeJw0f22a09Xl50=; b=v8yw2+Dctkr3TSOHPEbHZAgS9VUjwLU0fDA+rBijLZ2T/YQ99z7tQXBh3LGlK+JkDm B2vnNkZiVqF1antqjyEnh/K3DX0aNIcsTcsqiE64iHcdf5x/gp8mvZFXTqwrPdF4FAf8 u3HCZn3qx+SVKxlXjF3JAcmqFgvOy3z27Gje4EMQj7CCCf768V8+nNNTLiELzDd4AZEP kb2D23Hvo1MjZA7UxZhhK5lGj7y984XxHodeIbLQNg92AR3SKW8e+G/b2P2Ct9Rpb3Vx ziBc2YY3kWwRowcw5EACtkMRpjt1ZnTBqLZhCrd2b6Lf7e+a37HoZH9PGPdG5f8QlrJT V6TQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cK1k9IBp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ba12si386312edb.470.2020.10.05.09.54.47; Mon, 05 Oct 2020 09:55:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cK1k9IBp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727846AbgJEPbL (ORCPT + 99 others); Mon, 5 Oct 2020 11:31:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:57694 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727819AbgJEPa7 (ORCPT ); Mon, 5 Oct 2020 11:30:59 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9B153208C7; Mon, 5 Oct 2020 15:30:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601911858; bh=V536KcdNvxVyDh188gN62lpom3k/ICSNV9mzVKKowMM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cK1k9IBpKG3VuVwbdoRtWBGBG1oX5GUM4v/oetJ2OxfsWluf8nbKn14IEcPM7VWgi C+shBvOk0R83HPvDq7rMRrVH+AU4+y++IPzTUsigJnndTrj7kl9JAXwhoUIOM7IBPJ 1tdglbuZMDgic13Nt4sqFM/UhKAdkR6t2eeX7MHY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Keith Busch , Sagi Grimberg , Christoph Hellwig , Jens Axboe , Revanth Rajashekar Subject: [PATCH 5.4 52/57] nvme: consolidate chunk_sectors settings Date: Mon, 5 Oct 2020 17:27:04 +0200 Message-Id: <20201005142112.302461357@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201005142109.796046410@linuxfoundation.org> References: <20201005142109.796046410@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Keith Busch commit 38adf94e166e3cb4eb89683458ca578051e8218d upstream. Move the quirked chunk_sectors setting to the same location as noiob so one place registers this setting. And since the noiob value is only used locally, remove the member from struct nvme_ns. Signed-off-by: Keith Busch Reviewed-by: Sagi Grimberg Signed-off-by: Christoph Hellwig Signed-off-by: Jens Axboe Signed-off-by: Revanth Rajashekar Signed-off-by: Greg Kroah-Hartman --- drivers/nvme/host/core.c | 22 ++++++++++------------ drivers/nvme/host/nvme.h | 1 - 2 files changed, 10 insertions(+), 13 deletions(-) --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1680,12 +1680,6 @@ static void nvme_init_integrity(struct g } #endif /* CONFIG_BLK_DEV_INTEGRITY */ -static void nvme_set_chunk_size(struct nvme_ns *ns) -{ - u32 chunk_size = nvme_lba_to_sect(ns, ns->noiob); - blk_queue_chunk_sectors(ns->queue, rounddown_pow_of_two(chunk_size)); -} - static void nvme_config_discard(struct gendisk *disk, struct nvme_ns *ns) { struct nvme_ctrl *ctrl = ns->ctrl; @@ -1840,6 +1834,7 @@ static void nvme_update_disk_info(struct static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id) { struct nvme_ns *ns = disk->private_data; + u32 iob; /* * If identify namespace failed, use default 512 byte block size so @@ -1848,7 +1843,13 @@ static void __nvme_revalidate_disk(struc ns->lba_shift = id->lbaf[id->flbas & NVME_NS_FLBAS_LBA_MASK].ds; if (ns->lba_shift == 0) ns->lba_shift = 9; - ns->noiob = le16_to_cpu(id->noiob); + + if ((ns->ctrl->quirks & NVME_QUIRK_STRIPE_SIZE) && + is_power_of_2(ns->ctrl->max_hw_sectors)) + iob = ns->ctrl->max_hw_sectors; + else + iob = nvme_lba_to_sect(ns, le16_to_cpu(id->noiob)); + ns->ms = le16_to_cpu(id->lbaf[id->flbas & NVME_NS_FLBAS_LBA_MASK].ms); ns->ext = ns->ms && (id->flbas & NVME_NS_FLBAS_META_EXT); /* the PI implementation requires metadata equal t10 pi tuple size */ @@ -1857,8 +1858,8 @@ static void __nvme_revalidate_disk(struc else ns->pi_type = 0; - if (ns->noiob) - nvme_set_chunk_size(ns); + if (iob) + blk_queue_chunk_sectors(ns->queue, rounddown_pow_of_two(iob)); nvme_update_disk_info(disk, ns, id); #ifdef CONFIG_NVME_MULTIPATH if (ns->head->disk) { @@ -2209,9 +2210,6 @@ static void nvme_set_queue_limits(struct blk_queue_max_hw_sectors(q, ctrl->max_hw_sectors); blk_queue_max_segments(q, min_t(u32, max_segments, USHRT_MAX)); } - if ((ctrl->quirks & NVME_QUIRK_STRIPE_SIZE) && - is_power_of_2(ctrl->max_hw_sectors)) - blk_queue_chunk_sectors(q, ctrl->max_hw_sectors); blk_queue_virt_boundary(q, ctrl->page_size - 1); if (ctrl->vwc & NVME_CTRL_VWC_PRESENT) vwc = true; --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -384,7 +384,6 @@ struct nvme_ns { #define NVME_NS_REMOVING 0 #define NVME_NS_DEAD 1 #define NVME_NS_ANA_PENDING 2 - u16 noiob; struct nvme_fault_inject fault_inject;