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=-12.0 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 1A4C0C388F7 for ; Wed, 28 Oct 2020 14:32:40 +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 44E542479A for ; Wed, 28 Oct 2020 14:32:39 +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="Cq9A0nhH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 44E542479A 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]:35508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXmVC-0007Pj-7y for qemu-devel@archiver.kernel.org; Wed, 28 Oct 2020 10:32:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXmQZ-0003Pv-AU for qemu-devel@nongnu.org; Wed, 28 Oct 2020 10:27:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:59491) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kXmQX-0007xn-Gd for qemu-devel@nongnu.org; Wed, 28 Oct 2020 10:27:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603895268; 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=KqnqHAVrBAHWhFOjtZ9qwFWqno0fOL6+iboEALamHnQ=; b=Cq9A0nhHKvBQ4tXgivUmbhaPNW9WZPgXDQ+7ajwWfGedX1mmrUB4pu32L9OEJNIOchXUBc DbFSIphX/6wceM7NvaeW0kvAOKOgiR5epTGnQqKUlbGaJvrMq/LZEKfaB6gePl5+KtV52v oHTyHbFVzpj0MM94/FKebcJx7Qcjt4s= 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-248-fIur_JijPKGBxOIvGm7Uow-1; Wed, 28 Oct 2020 10:27:44 -0400 X-MC-Unique: fIur_JijPKGBxOIvGm7Uow-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 18EC0CE649; Wed, 28 Oct 2020 14:27:43 +0000 (UTC) Received: from [10.36.112.194] (ovpn-112-194.ams2.redhat.com [10.36.112.194]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 85F8310013DB; Wed, 28 Oct 2020 14:27:37 +0000 (UTC) Subject: Re: [PATCH 17/25] block/nvme: Simplify nvme_cmd_sync() To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org References: <20201027135547.374946-1-philmd@redhat.com> <20201027135547.374946-18-philmd@redhat.com> From: Auger Eric Message-ID: <7d90342d-7d52-e371-3c45-89656e65c533@redhat.com> Date: Wed, 28 Oct 2020 15:27:36 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20201027135547.374946-18-philmd@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/28 01:51:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.921, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=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, Max Reitz , Keith Busch , Stefan Hajnoczi , Klaus Jensen Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 10/27/20 2:55 PM, Philippe Mathieu-Daudé wrote: > As all commands use the ADMIN queue, it is pointless to pass > it as argument each time. Remove the argument. > > Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Eric Auger Eric > --- > block/nvme.c | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) > > diff --git a/block/nvme.c b/block/nvme.c > index 2d3648694b0..68f0c3f7959 100644 > --- a/block/nvme.c > +++ b/block/nvme.c > @@ -487,9 +487,10 @@ static void nvme_cmd_sync_cb(void *opaque, int ret) > aio_wait_kick(); > } > > -static int nvme_cmd_sync(BlockDriverState *bs, NVMeQueuePair *q, > - NvmeCmd *cmd) > +static int nvme_cmd_sync(BlockDriverState *bs, NvmeCmd *cmd) > { > + BDRVNVMeState *s = bs->opaque; > + NVMeQueuePair *q = s->queues[INDEX_ADMIN]; > AioContext *aio_context = bdrv_get_aio_context(bs); > NVMeRequest *req; > int ret = -EINPROGRESS; > @@ -534,7 +535,7 @@ static bool nvme_identify(BlockDriverState *bs, int namespace, Error **errp) > > memset(id, 0, sizeof(*id)); > cmd.dptr.prp1 = cpu_to_le64(iova); > - if (nvme_cmd_sync(bs, s->queues[INDEX_ADMIN], &cmd)) { > + if (nvme_cmd_sync(bs, &cmd)) { > error_setg(errp, "Failed to identify controller"); > goto out; > } > @@ -557,7 +558,7 @@ static bool nvme_identify(BlockDriverState *bs, int namespace, Error **errp) > memset(id, 0, sizeof(*id)); > cmd.cdw10 = 0; > cmd.nsid = cpu_to_le32(namespace); > - if (nvme_cmd_sync(bs, s->queues[INDEX_ADMIN], &cmd)) { > + if (nvme_cmd_sync(bs, &cmd)) { > error_setg(errp, "Failed to identify namespace"); > goto out; > } > @@ -663,7 +664,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp) > .cdw10 = cpu_to_le32(((queue_size - 1) << 16) | n), > .cdw11 = cpu_to_le32(NVME_CQ_IEN | NVME_CQ_PC), > }; > - if (nvme_cmd_sync(bs, s->queues[INDEX_ADMIN], &cmd)) { > + if (nvme_cmd_sync(bs, &cmd)) { > error_setg(errp, "Failed to create CQ io queue [%u]", n); > goto out_error; > } > @@ -673,7 +674,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp) > .cdw10 = cpu_to_le32(((queue_size - 1) << 16) | n), > .cdw11 = cpu_to_le32(NVME_SQ_PC | (n << 16)), > }; > - if (nvme_cmd_sync(bs, s->queues[INDEX_ADMIN], &cmd)) { > + if (nvme_cmd_sync(bs, &cmd)) { > error_setg(errp, "Failed to create SQ io queue [%u]", n); > goto out_error; > } > @@ -889,7 +890,7 @@ static int nvme_enable_disable_write_cache(BlockDriverState *bs, bool enable, > .cdw11 = cpu_to_le32(enable ? 0x01 : 0x00), > }; > > - ret = nvme_cmd_sync(bs, s->queues[INDEX_ADMIN], &cmd); > + ret = nvme_cmd_sync(bs, &cmd); > if (ret) { > error_setg(errp, "Failed to configure NVMe write cache"); > } >