From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE073C43331 for ; Tue, 31 Mar 2020 09:23:50 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 78644208E0 for ; Tue, 31 Mar 2020 09:23:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hjFYDwpX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 78644208E0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJD7d-0001Gu-Ig for qemu-devel@archiver.kernel.org; Tue, 31 Mar 2020 05:23:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36776) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJD73-0000iN-W0 for qemu-devel@nongnu.org; Tue, 31 Mar 2020 05:23:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJD72-0003ip-NG for qemu-devel@nongnu.org; Tue, 31 Mar 2020 05:23:13 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:23677 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jJD72-0003i2-JO for qemu-devel@nongnu.org; Tue, 31 Mar 2020 05:23:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585646591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x3eGzpse8rETKxH/68ThWsj3qdaQ5P2CD03wXWnGQwg=; b=hjFYDwpXnVMsl5PaBuhxy7zDQk2KejNmB8qxxKAf/z4STmMqTyrg+IREli+o1WhIU8wrQW dY3tkmlSgj33SGA5+MphPFm2WAmq+Vf0p6lON/L+jiwgnP1fae5N62/bPzXv0oh23BE3R6 qfH4FwbdRHDYbwjycmzVkmu/nDR0d+c= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-264-x3ngkyeZPIiEpps90Ay2rA-1; Tue, 31 Mar 2020 05:23:08 -0400 X-MC-Unique: x3ngkyeZPIiEpps90Ay2rA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A742B1937FC0; Tue, 31 Mar 2020 09:23:06 +0000 (UTC) Received: from maximlenovopc.usersys.redhat.com (unknown [10.35.206.223]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1792560BE0; Tue, 31 Mar 2020 09:23:03 +0000 (UTC) Message-ID: <56c10b9fa23d725e6e0182c1aeb6c12917bf2882.camel@redhat.com> Subject: Re: [PATCH v6 29/42] nvme: refactor request bounds checking From: Maxim Levitsky To: Klaus Birkelund Jensen Date: Tue, 31 Mar 2020 12:23:02 +0300 In-Reply-To: <20200331054456.wl4jayuropl7tku2@apples.localdomain> References: <20200316142928.153431-1-its@irrelevant.dk> <20200316142928.153431-30-its@irrelevant.dk> <27ff4b99b076e90ee7536a9c9063f10201a66096.camel@redhat.com> <20200331054456.wl4jayuropl7tku2@apples.localdomain> Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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 , qemu-block@nongnu.org, qemu-devel@nongnu.org, Max Reitz , Keith Busch , Javier Gonzalez Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 2020-03-31 at 07:44 +0200, Klaus Birkelund Jensen wrote: > On Mar 25 12:56, Maxim Levitsky wrote: > > On Mon, 2020-03-16 at 07:29 -0700, Klaus Jensen wrote: > > > From: Klaus Jensen > > > > > > Signed-off-by: Klaus Jensen > > > --- > > > hw/block/nvme.c | 28 ++++++++++++++++++++++------ > > > 1 file changed, 22 insertions(+), 6 deletions(-) > > > > > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > > > index eecfad694bf8..ba520c76bae5 100644 > > > --- a/hw/block/nvme.c > > > +++ b/hw/block/nvme.c > > > @@ -562,13 +577,14 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, > > > uint64_t data_offset = slba << data_shift; > > > int is_write = rw->opcode == NVME_CMD_WRITE ? 1 : 0; > > > enum BlockAcctType acct = is_write ? BLOCK_ACCT_WRITE : BLOCK_ACCT_READ; > > > + uint16_t status; > > > > > > trace_nvme_dev_rw(is_write ? "write" : "read", nlb, data_size, slba); > > > > > > - if (unlikely((slba + nlb) > ns->id_ns.nsze)) { > > > + status = nvme_check_bounds(n, ns, slba, nlb, req); > > > + if (status) { > > > block_acct_invalid(blk_get_stats(n->conf.blk), acct); > > > - trace_nvme_dev_err_invalid_lba_range(slba, nlb, ns->id_ns.nsze); > > > - return NVME_LBA_RANGE | NVME_DNR; > > > + return status; > > > } > > > > > > if (nvme_map(n, cmd, &req->qsg, &req->iov, data_size, req)) { > > > > Looks good as well, once we get support for discard, it will > > use this as well, but for now indeed only write zeros and read/write > > need bounds checking on the IO path. > > > > I have that patch in the submission queue and the check is factored out > there ;) Perfect! > > > Reviewed-by: Maxim Levitsky > > > > Best regards, Maxim Levitsky