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=-11.3 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 78E72C2D0A3 for ; Thu, 29 Oct 2020 09:03:48 +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 7C936206D9 for ; Thu, 29 Oct 2020 09:03:47 +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="B65Vllsc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7C936206D9 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]:36246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kY3qU-0006O1-Em for qemu-devel@archiver.kernel.org; Thu, 29 Oct 2020 05:03:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kY3pc-0005w1-SJ for qemu-devel@nongnu.org; Thu, 29 Oct 2020 05:02:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:25165) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kY3pY-0003Ec-BE for qemu-devel@nongnu.org; Thu, 29 Oct 2020 05:02:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603962163; 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=GFus9oQMXcvHdQSpaIGMeoySc+snnVGcuQlXR74wFtU=; b=B65Vllsc3YDZIzyeJ+V5phbO9Iou0cJ8zVGKoPEzZoRFxqCQZZBoJs5kcmFcha91M/1MaH 5Fw1ra0rU0WCajl3D5ZtgLpMq4iJ33gD6ThwjDhc+CpN2pazrtu+iyD/4tVvWPNepqrF/Y m1aVcNcdUwWOb8F8z8AuNP2HjnRIiUM= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-66-XXDXWWR1PrCvipb-NVh20g-1; Thu, 29 Oct 2020 05:02:41 -0400 X-MC-Unique: XXDXWWR1PrCvipb-NVh20g-1 Received: by mail-ej1-f69.google.com with SMTP id d12so898562ejr.19 for ; Thu, 29 Oct 2020 02:02:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=JXFGrglNJ2UoAWx0G+kVBlq5vYcFX8BvVksSuxSw7uw=; b=n866A1szSHgNgkb3WcnLI+8aqCTiUMRaWQeh2LMjur0jPKURgejs0PJZikQlF7aqk5 HKpIl+VlUajg4itW3Uk4kysSB2iO0cvMn/VSQbeV9vpxtAhqt5d6HxDR+KJ4ZeQp0Lnq 2owol8J5cubyBa3J24Qzt8m1UKKwlGveZljWr7djkQoUdKzKsqaLPJaGsGDrv9hcrYg2 ITzGs6j/xyZk4jK2wGqOrU2mPYnOUFVMWmHY81ExPGQLqAxIR53mNSKYT+aXoC1KeRjT AotBOK2/Eh0VW1/cV2w7DaEe03KiVMGk9cJbTeHF3BTLgRVutoq4SOlp4XBLQ2OwK9rt ofiw== X-Gm-Message-State: AOAM533u3BdDZYGEFoSkPY0OveiS7lILi4ZO3FkLWBpM/GNd6a1whkcR y6dJyqxEBy79cTku1O+Ep4k9cr4lcx6keibZPqGxzAZSfYhaVkEZmNMVld0/gmWTyL2rl4AdB5M s88zmv9CJAkvUlvQ= X-Received: by 2002:a05:6402:2292:: with SMTP id cw18mr3005636edb.112.1603962160195; Thu, 29 Oct 2020 02:02:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCo3YUTjeNIjS4Ml9Qd0A3UXZug1DTqCqZwnL8BZ13VSFXUarPpZG2ZLcVXUCNRcqieXSTtA== X-Received: by 2002:a05:6402:2292:: with SMTP id cw18mr3005609edb.112.1603962159893; Thu, 29 Oct 2020 02:02:39 -0700 (PDT) Received: from [192.168.1.36] (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id 11sm1104680ejy.19.2020.10.29.02.02.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 29 Oct 2020 02:02:39 -0700 (PDT) Subject: Re: [PATCH 13/25] block/nvme: Introduce Completion Queue definitions From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= To: Stefan Hajnoczi References: <20201027135547.374946-1-philmd@redhat.com> <20201027135547.374946-14-philmd@redhat.com> <20201028151633.GH231368@stefanha-x1.localdomain> Message-ID: <43f09633-dfc6-289a-f138-32e32afd69de@redhat.com> Date: Thu, 29 Oct 2020 10:02:37 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.3.1 MIME-Version: 1.0 In-Reply-To: Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=WINDOWS-1252 Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/29 01:47:28 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=unavailable 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, Eric Auger , qemu-devel@nongnu.org, Max Reitz , Keith Busch , Klaus Jensen Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 10/28/20 7:24 PM, Philippe Mathieu-Daudé wrote: > On 10/28/20 4:16 PM, Stefan Hajnoczi wrote: >> On Tue, Oct 27, 2020 at 02:55:35PM +0100, Philippe Mathieu-Daudé wrote: >>> Rename Submission Queue flags with 'Sq' and introduce >>> Completion Queue flag definitions. >>> >>> Signed-off-by: Philippe Mathieu-Daudé >>> --- >>> include/block/nvme.h | 17 +++++++++++------ >>> 1 file changed, 11 insertions(+), 6 deletions(-) >>> >>> diff --git a/include/block/nvme.h b/include/block/nvme.h >>> index 65e68a82c89..079f884a2d3 100644 >>> --- a/include/block/nvme.h >>> +++ b/include/block/nvme.h >>> @@ -491,6 +491,11 @@ typedef struct QEMU_PACKED NvmeCreateCq { >>> #define NVME_CQ_FLAGS_PC(cq_flags) (cq_flags & 0x1) >>> #define NVME_CQ_FLAGS_IEN(cq_flags) ((cq_flags >> 1) & 0x1) >>> >>> +enum NvmeFlagsCq { >>> + NVME_CQ_PC = 1, >>> + NVME_CQ_IEN = 2, >>> +}; >>> + >>> typedef struct QEMU_PACKED NvmeCreateSq { >>> uint8_t opcode; >>> uint8_t flags; >>> @@ -508,12 +513,12 @@ typedef struct QEMU_PACKED NvmeCreateSq { >>> #define NVME_SQ_FLAGS_PC(sq_flags) (sq_flags & 0x1) >>> #define NVME_SQ_FLAGS_QPRIO(sq_flags) ((sq_flags >> 1) & 0x3) >>> >>> -enum NvmeQueueFlags { >>> - NVME_Q_PC = 1, >>> - NVME_Q_PRIO_URGENT = 0, >>> - NVME_Q_PRIO_HIGH = 1, >>> - NVME_Q_PRIO_NORMAL = 2, >>> - NVME_Q_PRIO_LOW = 3, >>> +enum NvmeFlagsSq { >>> + NVME_SQ_PC = 1, >>> + NVME_SQ_PRIO_URGENT = 0, >>> + NVME_SQ_PRIO_HIGH = 1, >>> + NVME_SQ_PRIO_NORMAL = 2, >>> + NVME_SQ_PRIO_LOW = 3, >>> }; >> >> There is also: >> >> #define NVME_SQ_FLAGS_PC(sq_flags) (sq_flags & 0x1) >> #define NVME_SQ_FLAGS_QPRIO(sq_flags) ((sq_flags >> 1) & 0x3) >> >> These macros should use the new constants. SQ_PC is bit#0, NVME_SQ_PC is "bit SQ_PC set (PC enabled)", SQ_PRIO are bits #1-2 (shift by 1, mask 2 bits), NVME_SQ_PRIO_xxx is the enum of these 2 bits. The NVME_SQ_FLAGS_X() macros extract the flags. So the macros can not use the new constants. >> >> I didn't check if there are additional magic numbers in hw/block/nvme.c >> that should be converted. > > FYI we discussed with Klaus and might convert "block/nvme.h" to > use the registerfields API during the 6.0 dev cycle.