From nobody Thu May 9 12:16:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=yadro.com ARC-Seal: i=1; a=rsa-sha256; t=1650057213; cv=none; d=zohomail.com; s=zohoarc; b=jjjsA+p3j6hKIDY24XTzm8rSwfqAHMnnbL04xj5cyMhmXafAPlUxMI1cR7g5Gi3gBW8wTMdv4yX5PP8hhICnmbdW3aRAFqzFeR4y2mMstDEdMPFCDmgz8uTvswrRgVU5lPnBHSUPPmXVGyxy5cx5GkiIgsISOMV6c9WRSV4hCns= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1650057213; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=pdONXorr8QKCI9l+E/xYDclajBLoUDJfqsf8s/sI7Lo=; b=O9urRKsh6XUgzStgj2GyjPUBZMMIjEZkri6NJnp1OfPKNTwCg0zQukwtdHqc4Upwl7oPbFwBNe5WncGQuoqNu6pkGM4tvKs+iiGGgHowPZhLaM2fxSWgMgaGmiAKwCkqfsGk6NDA1O3/WLGce7OL9cCJx0nx8nZpXNGj7rfnY6c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1650057213686554.230542597031; Fri, 15 Apr 2022 14:13:33 -0700 (PDT) Received: from localhost ([::1]:36066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nfTG0-0003m9-80 for importer@patchew.org; Fri, 15 Apr 2022 17:13:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nfRbQ-0000AC-S3; Fri, 15 Apr 2022 15:27:33 -0400 Received: from mta-02.yadro.com ([89.207.88.252]:32864 helo=mta-01.yadro.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nfRbO-0007mj-PM; Fri, 15 Apr 2022 15:27:32 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id C974E45974; Fri, 15 Apr 2022 19:27:26 +0000 (UTC) Received: from mta-01.yadro.com ([127.0.0.1]) by localhost (mta-01.yadro.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dhtzuTYMF0_o; Fri, 15 Apr 2022 22:27:25 +0300 (MSK) Received: from T-EXCH-04.corp.yadro.com (t-exch-04.corp.yadro.com [172.17.100.104]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mta-01.yadro.com (Postfix) with ESMTPS id 473904596E; Fri, 15 Apr 2022 22:27:24 +0300 (MSK) Received: from localhost.localdomain (10.178.113.54) by T-EXCH-04.corp.yadro.com (172.17.100.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Fri, 15 Apr 2022 22:27:22 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yadro.com; h= content-disposition:content-type:content-type:mime-version :message-id:subject:subject:from:from:date:date:received :received:received; s=mta-01; t=1650050845; x=1651865246; bh=jhV cgHOGLI3pCnUfrwtZbUAiebPSWXtzOhl5L7TDvKg=; b=S9YW3ARHKQya3t6ozbA lGdusNjIOmx8cqHiDHsJANqEJlIfqFxOhC7vAV2BQCL5yXzsOqVBc8SN3Ip5qBGY l2GjyopY7flnX+Wbq1xBSyZYnNfG2JIg2xIMcMh4TQldHwPVBS86PS/kcMT5E5TV keyvcp3suH/Q+/GZ5ORGYc7U= X-Virus-Scanned: amavisd-new at yadro.com Date: Fri, 15 Apr 2022 22:27:21 +0300 From: Dmitry Tikhov To: Subject: [PATCH] hw/nvme: fix control flow statement Message-ID: <20220415192721.tkbokbl65rrwkbew@localhost.localdomain> MIME-Version: 1.0 Content-Disposition: inline X-Originating-IP: [10.178.113.54] X-ClientProxiedBy: T-EXCH-01.corp.yadro.com (172.17.10.101) To T-EXCH-04.corp.yadro.com (172.17.100.104) 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; Received-SPF: pass client-ip=89.207.88.252; envelope-from=d.tihov@yadro.com; helo=mta-01.yadro.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Fri, 15 Apr 2022 17:12:18 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kbusch@kernel.org, its@irrelevant.dk, ddtikhov@gmail.com, qemu-block@nongnu.org, linux@yadro.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @yadro.com) X-ZM-MESSAGEID: 1650057216031100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Since there is no else after nvme_dsm_cb invocation, metadata associated with non-zero block range is currently zeroed. Also this behaviour leads to segfault since we schedule iocb->bh two times. First when entering nvme_dsm_cb with iocb->idx =3D=3D iocb->nr and second on call stack unwindi= ng by calling blk_aio_pwrite_zeroes and subsequent nvme_dsm_cb callback because of missing else statement. Signed-off-by: Dmitry Tikhov --- hw/nvme/ctrl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index 03760ddeae..7ebd2aa326 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -2372,11 +2372,12 @@ static void nvme_dsm_md_cb(void *opaque, int ret) } =20 nvme_dsm_cb(iocb, 0); + } else { + iocb->aiocb =3D blk_aio_pwrite_zeroes(ns->blkconf.blk, nvme_moff(n= s, slba), + nvme_m2b(ns, nlb), BDRV_REQ_MA= Y_UNMAP, + nvme_dsm_cb, iocb); } =20 - iocb->aiocb =3D blk_aio_pwrite_zeroes(ns->blkconf.blk, nvme_moff(ns, s= lba), - nvme_m2b(ns, nlb), BDRV_REQ_MAY_UN= MAP, - nvme_dsm_cb, iocb); return; =20 done: --=20 2.35.1