From nobody Mon Feb 9 13:02:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1586931541; cv=none; d=zohomail.com; s=zohoarc; b=R+zPeDp7Rrn7xm0HN/GuyVHi+8Q2TchwkBG7ZEu0XNpVDqp+ZZttpbTw+cxzYCqLrTfqo6Dbj2j1o9C5k2boCDSdD2xB4gQYXeMtmG0bxU8ac73lzjv+U10iIOpynGObA0KKcSIJrQs8GT2TFJ2Q7tLrkuuo02XfY8235zPkINk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586931541; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jtDAwGYXdnZs4KDPX2xBHQExfglc88QrCnWZFdZTbac=; b=dVkMDHSydPgJv80q1JqKCN4TU3PaF2U/pazkj8cCbqrX1I5XwvE2SO4ENe6jFBV3esI1V9DeEWYmSuCEd7IfUQsVvvCw65GKUeQpHOsjUYnW1e9zCzobaxgjdmbO1qLOAHaET5ZMf/+xRulWH73IlOWnEN4ykYGwzpkqsMPZUAA= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1586931541417173.91609406487237; Tue, 14 Apr 2020 23:19:01 -0700 (PDT) Received: from localhost ([::1]:43990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jObNs-0006K9-IQ for importer@patchew.org; Wed, 15 Apr 2020 02:18:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35572) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOaz1-0002rq-74 for qemu-devel@nongnu.org; Wed, 15 Apr 2020 01:53:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOayz-0002rL-WF for qemu-devel@nongnu.org; Wed, 15 Apr 2020 01:53:11 -0400 Received: from charlie.dont.surf ([128.199.63.193]:47586) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jOayw-0002bG-Gq; Wed, 15 Apr 2020 01:53:06 -0400 Received: from apples.local (80-167-98-190-cable.dk.customer.tdc.net [80.167.98.190]) by charlie.dont.surf (Postfix) with ESMTPSA id A2633BFDC7; Wed, 15 Apr 2020 05:52:31 +0000 (UTC) From: Klaus Jensen To: qemu-block@nongnu.org Subject: [PATCH v7 37/48] nvme: add nvme_check_rw helper Date: Wed, 15 Apr 2020 07:51:29 +0200 Message-Id: <20200415055140.466900-38-its@irrelevant.dk> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200415055140.466900-1-its@irrelevant.dk> References: <20200415055140.466900-1-its@irrelevant.dk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 128.199.63.193 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: Kevin Wolf , Beata Michalska , Klaus Jensen , qemu-devel@nongnu.org, Max Reitz , Klaus Jensen , Keith Busch , Javier Gonzalez , Maxim Levitsky Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Klaus Jensen Signed-off-by: Klaus Jensen --- hw/block/nvme.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index c123be10fd0d..ffc49985321b 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -651,6 +651,25 @@ static inline uint16_t nvme_check_bounds(NvmeCtrl *n, = uint64_t slba, return NVME_SUCCESS; } =20 +static uint16_t nvme_check_rw(NvmeCtrl *n, NvmeRequest *req) +{ + NvmeNamespace *ns =3D req->ns; + size_t len =3D req->nlb << nvme_ns_lbads(ns); + uint16_t status; + + status =3D nvme_check_mdts(n, len, req); + if (status) { + return status; + } + + status =3D nvme_check_bounds(n, req->slba, req->nlb, req); + if (status) { + return status; + } + + return NVME_SUCCESS; +} + static void nvme_rw_cb(NvmeRequest *req, void *opaque) { NvmeSQueue *sq =3D req->sq; @@ -810,12 +829,7 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeRequest *req) trace_nvme_dev_rw(nvme_req_is_write(req) ? "write" : "read", req->nlb, req->nlb << nvme_ns_lbads(req->ns), req->slba); =20 - status =3D nvme_check_mdts(n, len, req); - if (status) { - goto invalid; - } - - status =3D nvme_check_bounds(n, req->slba, req->nlb, req); + status =3D nvme_check_rw(n, req); if (status) { goto invalid; } --=20 2.26.0