From patchwork Wed Mar 10 09:53:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Klaus Jensen X-Patchwork-Id: 1450432 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=irrelevant.dk header.i=@irrelevant.dk header.a=rsa-sha256 header.s=fm2 header.b=PqwBmHJf; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm2 header.b=NVxLGrQO; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DwSlC4l5rz9sR4 for ; Wed, 10 Mar 2021 21:20:39 +1100 (AEDT) Received: from localhost ([::1]:59262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJvxF-0006vQ-HZ for incoming@patchwork.ozlabs.org; Wed, 10 Mar 2021 05:20:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJvXc-0007du-VE; Wed, 10 Mar 2021 04:54:10 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:52135) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJvXZ-0005BV-HV; Wed, 10 Mar 2021 04:54:08 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id A42FC5C015E; Wed, 10 Mar 2021 04:54:04 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 10 Mar 2021 04:54:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=iiQ3j5MVSR5dy QoDIgkU+ZqGjuZ/Ry0mGvlFqMZammw=; b=PqwBmHJf679Rov7xq8CDj2aSyfTgK N6Ge5mn+HdV8xFm/1kB/fS+YBd6SP9CdfuR3mGoXAIlmfCUZha+OZhZAkdBcx8xh 9juSlvZey2Linm/tcOg44WhpN3hlK+lGnRa2E49hCj1YE/iu9hKgtAHhvnKyY4TV 1gyo0Q3ZsW8o2E/Y//hzaYCdkJ61fQA/FVKsS9TrrNSvjCKTFeMwM59W67C/n5ey L54dXIO2oPSUslvwAqSdMpIwjgiVFKQYb8FBDHutdANGLCpnqK0pNz0R2TVadJ7e Ln/GOP8cpeSMoLOPM1cCnHM1spmP2UAcS4Km39UKzPp7DpR67qIGhRdFA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=iiQ3j5MVSR5dyQoDIgkU+ZqGjuZ/Ry0mGvlFqMZammw=; b=NVxLGrQO Ux7SFp/NHHXCi9EjEoJnpzOySbhr5dJPHyFm/QbAeXZhjDtxUVrncgnCMM+X//CH ybLPb0YkFh9haYefE51suVjdNCQWUqxXPpHidaX3pbhuLgaixCSK2xNCO4yK38WY lWoCthpw7b/i5QU7vvOcVU4bObftLwtuRLLxQ8B4ZwS3cUkyEVq2v7M+WvygLdYd HlSx/HYcKNn1Hmxq4gwSLkU+ZrEXB6YVlO54XIUqN0p4k3MUpuF9HA3HTvlhxQv/ 3ZvHvHsh5p3wzWw/wcW0FiBs1c47R4WWH+71zCDDt10cv6goq4u3lu3o9+WVdcUB yP3L9afCw+CvMQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddukedgtdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefmlhgruhhs ucflvghnshgvnhcuoehithhssehirhhrvghlvghvrghnthdrughkqeenucggtffrrghtth gvrhhnpeeuleetgeeiuefhgfekfefgveejiefgteekiedtgfdtieefhfdthfefueffvefg keenucfkphepkedtrdduieejrdelkedrudeltdenucevlhhushhtvghrufhiiigvpeejne curfgrrhgrmhepmhgrihhlfhhrohhmpehithhssehirhhrvghlvghvrghnthdrughk X-ME-Proxy: Received: from apples.local (80-167-98-190-cable.dk.customer.tdc.net [80.167.98.190]) by mail.messagingengine.com (Postfix) with ESMTPA id 4204F24005A; Wed, 10 Mar 2021 04:54:03 -0500 (EST) From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH v5 09/13] hw/block/nvme: parameterize nvme_ns_nlbas Date: Wed, 10 Mar 2021 10:53:43 +0100 Message-Id: <20210310095347.682395-10-its@irrelevant.dk> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210310095347.682395-1-its@irrelevant.dk> References: <20210310095347.682395-1-its@irrelevant.dk> MIME-Version: 1.0 Received-SPF: pass client-ip=66.111.4.29; envelope-from=its@irrelevant.dk; helo=out5-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Klaus Jensen , Gollu Appalanaidu , Max Reitz , Keith Busch , Stefan Hajnoczi , Klaus Jensen Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Klaus Jensen Provide a more flexible nlbas helper. Signed-off-by: Klaus Jensen Reviewed-by: Minwoo Im --- hw/block/nvme-ns.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/hw/block/nvme-ns.h b/hw/block/nvme-ns.h index 07e16880801d..34f9474a1cd1 100644 --- a/hw/block/nvme-ns.h +++ b/hw/block/nvme-ns.h @@ -136,12 +136,18 @@ static inline bool nvme_ns_ext(NvmeNamespace *ns) } /* calculate the number of LBAs that the namespace can accomodate */ +static inline uint64_t __nvme_nlbas(size_t size, uint8_t lbads, uint16_t ms) +{ + if (ms) { + return size / ((1 << lbads) + ms); + } + + return size >> lbads; +} + static inline uint64_t nvme_ns_nlbas(NvmeNamespace *ns) { - if (nvme_msize(ns)) { - return ns->size / (nvme_lsize(ns) + nvme_msize(ns)); - } - return ns->size >> nvme_ns_lbads(ns); + return __nvme_nlbas(ns->size, nvme_ns_lbads(ns), nvme_msize(ns)); } typedef struct NvmeCtrl NvmeCtrl;