From patchwork Sat Nov 7 17:00:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 7575951 X-Patchwork-Delegate: axboe@kernel.dk Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BF9229F36A for ; Sat, 7 Nov 2015 17:05:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0123520674 for ; Sat, 7 Nov 2015 17:05:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F79F2066C for ; Sat, 7 Nov 2015 17:05:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753820AbbKGRFR (ORCPT ); Sat, 7 Nov 2015 12:05:17 -0500 Received: from bombadil.infradead.org ([198.137.202.9]:49148 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753608AbbKGRFR (ORCPT ); Sat, 7 Nov 2015 12:05:17 -0500 Received: from [83.175.99.196] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zv6vU-0000fy-C6; Sat, 07 Nov 2015 17:05:16 +0000 From: Christoph Hellwig To: linux-nvme@lists.infradead.org Cc: linux-block@vger.kernel.org Subject: [PATCH 5/8] nvme: add segment limitations Date: Sat, 7 Nov 2015 18:00:40 +0100 Message-Id: <1446915643-21175-6-git-send-email-hch@lst.de> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446915643-21175-1-git-send-email-hch@lst.de> References: <1446915643-21175-1-git-send-email-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org See http://www.infradead.org/rpr.html Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Christoph Hellwig --- drivers/nvme/host/core.c | 11 +++++++++-- drivers/nvme/host/nvme.h | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 6737aaf..14ee152 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -982,9 +982,16 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) blk_queue_logical_block_size(ns->queue, 1 << ns->lba_shift); if (ctrl->max_hw_sectors) { blk_queue_max_hw_sectors(ns->queue, ctrl->max_hw_sectors); - blk_queue_max_segments(ns->queue, - ((ctrl->max_hw_sectors << 9) / ctrl->page_size) + 1); + + if (!ctrl->max_segments) + ctrl->max_segments = ((ctrl->max_hw_sectors << 9) / + ctrl->page_size) + 1; } + + if (ctrl->max_segments) + blk_queue_max_segments(ns->queue, ctrl->max_segments); + if (ctrl->max_segment_size) + blk_queue_max_segment_size(ns->queue, ctrl->max_segment_size); if (ctrl->stripe_size) blk_queue_chunk_sectors(ns->queue, ctrl->stripe_size >> 9); if (ctrl->vwc & NVME_CTRL_VWC_PRESENT) diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 8cf6fa5..8377a3f 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -55,6 +55,8 @@ struct nvme_ctrl { u32 ctrl_config; u32 max_hw_sectors; u32 stripe_size; + u32 max_segments; + u32 max_segment_size; u32 page_size; u16 oncs; atomic_t abort_limit;