From nobody Sat Nov 15 07:38:46 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593898694; cv=none; d=zohomail.com; s=zohoarc; b=G+DV1w5bGWFBCrDIPq1bmumEPekks9TULkxk/hqkrGkp2zkla40ZSc2ireENk+utewSf2fQvd8bCrQPpOUzBbafFwKYlXJw49H4oufBqVyXD70vDrNJluv4lkV4jlhuaR/4Se1EMgVCIe3ylH4bvs2w1+kn4dRlMhpy+D8WOCog= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593898694; h=Content-Type: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=FfmX4SsthOp0qVQWfh38S15QI3pmZ2xeD0V8kh7HNfQ=; b=E4s4LS+0ZMmOIxfvhCJ3cUM46m58q3yuvsoYXDlXU9hkjkblgZ4A0T3kSau9bmRC/eRB2mySPyHOdwmDdpacu63AkP3KI8a+dN8btoyuS2WV6K3gCBg+OZYh9eNqnlFqsOCkr7pbHY4MLSd8NGCcwFOS3a3XEcFDea2NyH10zWo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593898694624500.5337957814744; Sat, 4 Jul 2020 14:38:14 -0700 (PDT) Received: from localhost ([::1]:49952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrprR-0006Wj-Bj for importer@patchew.org; Sat, 04 Jul 2020 17:38:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41102) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrplF-0003DA-4G for qemu-devel@nongnu.org; Sat, 04 Jul 2020 17:31:49 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:34936 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jrplD-00045i-GR for qemu-devel@nongnu.org; Sat, 04 Jul 2020 17:31:48 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-321-rcugwG5yPRu31As_bkkGsw-1; Sat, 04 Jul 2020 17:31:43 -0400 Received: by mail-wr1-f70.google.com with SMTP id c6so17797057wru.7 for ; Sat, 04 Jul 2020 14:31:43 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id v9sm9897771wri.3.2020.07.04.14.31.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jul 2020 14:31:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593898306; 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=FfmX4SsthOp0qVQWfh38S15QI3pmZ2xeD0V8kh7HNfQ=; b=iZ0iSRURgj5jhYWbCk92qSK0FMPJ0IXFZ2kKxvWrdMh+csjXdqV2AVF0wXmbbEiUOot60X b026p5JSoOKckcg2iichzNVStAYR75nqnztf6zq6K75CAY5GX1t66rmt2JNOq4W81pnEe4 nePhev/0FYvUJ+wOkfeHtQc77pTNrUM= X-MC-Unique: rcugwG5yPRu31As_bkkGsw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FfmX4SsthOp0qVQWfh38S15QI3pmZ2xeD0V8kh7HNfQ=; b=B6NSoDPPhiNcP8IT3sqYT6VK/wswzKpmdNA0mYo7/gyKONvs9Lv7ESD95Ki71BlP07 p7srlN3W04PRwK3FaAE90GFujwTkS8YYMmb+Hd5GYtIVXN8CWG9ENJgHu09uU3qNdf9O 5VKHtmDP7hax48by957v/n+aBzaqolOjG5vd+ny5DSGLaSIaO1BNDgj7LyHZ3MjlBPoa 3V/Mtdgvs+1W5q9KUnZsa322CVxSxx/76l/scx5O6Fx9eA5B03B5iScf1MUGCKckq/0r VsGCEa/0Aqes7cTTpjqKMefGYIzYVCjtZWiNd7GxePeR8fJv5y1vwE9jHG+Eh8MEAiWV evJg== X-Gm-Message-State: AOAM530qYIqdibBx4FE4HlTDgm58ChQuUnwNf76wOfGadOm/k39GQeM6 if182NxuUpb0886Nb56zrA9Jvgp69b+urynAQEIMjF0f5rdTMDvUJ0Ma5y1aPAYJCvTLG/MYqrE jGtnpGHcqo8GrRSw= X-Received: by 2002:a5d:420e:: with SMTP id n14mr44738237wrq.164.1593898301913; Sat, 04 Jul 2020 14:31:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyoZQ4+kKdjV7wZ7Te170gV8axwINWctID0EAxSSncar08/17BXChfDuFnemnKkw698BOnE+w== X-Received: by 2002:a5d:420e:: with SMTP id n14mr44738224wrq.164.1593898301757; Sat, 04 Jul 2020 14:31:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [PATCH v3 10/16] block/nvme: Replace qemu_try_blockalign(bs) by qemu_try_memalign(pg_sz) Date: Sat, 4 Jul 2020 23:30:45 +0200 Message-Id: <20200704213051.19749-11-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200704213051.19749-1-philmd@redhat.com> References: <20200704213051.19749-1-philmd@redhat.com> MIME-Version: 1.0 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="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=207.211.31.81; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/04 08:57:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, Maxim Levitsky , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) qemu_try_blockalign() is a generic API that call back to the block driver to return its page alignment. As we call from within the very same driver, we already know to page alignment stored in our state. Remove indirections and use the value from BDRVNVMeState. This change is required to later remove the BlockDriverState argument, to make nvme_init_queue() per hardware, and not per block driver. Reviewed-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- block/nvme.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/block/nvme.c b/block/nvme.c index 9c118c000d..9566001ba6 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -174,7 +174,7 @@ static void nvme_init_queue(BlockDriverState *bs, NVMeQ= ueue *q, =20 bytes =3D ROUND_UP(nentries * entry_bytes, s->page_size); q->head =3D q->tail =3D 0; - q->queue =3D qemu_try_blockalign(bs, bytes); + q->queue =3D qemu_try_memalign(s->page_size, bytes); if (!q->queue) { error_setg(errp, "Cannot allocate queue"); return; @@ -223,7 +223,7 @@ static NVMeQueuePair *nvme_create_queue_pair(BlockDrive= rState *bs, if (!q) { return NULL; } - q->prp_list_pages =3D qemu_try_blockalign(bs, + q->prp_list_pages =3D qemu_try_memalign(s->page_size, s->page_size * NVME_QUEUE_SIZE); if (!q->prp_list_pages) { goto fail; @@ -522,7 +522,7 @@ static void nvme_identify(BlockDriverState *bs, int nam= espace, Error **errp) .cdw10 =3D cpu_to_le32(0x1), }; =20 - id =3D qemu_try_blockalign(bs, sizeof(*id)); + id =3D qemu_try_memalign(s->page_size, sizeof(*id)); if (!id) { error_setg(errp, "Cannot allocate buffer for identify response"); goto out; @@ -1141,7 +1141,7 @@ static int nvme_co_prw(BlockDriverState *bs, uint64_t= offset, uint64_t bytes, return nvme_co_prw_aligned(bs, offset, bytes, qiov, is_write, flag= s); } trace_nvme_prw_buffered(s, offset, bytes, qiov->niov, is_write); - buf =3D qemu_try_blockalign(bs, bytes); + buf =3D qemu_try_memalign(s->page_size, bytes); =20 if (!buf) { return -ENOMEM; @@ -1285,7 +1285,7 @@ static int coroutine_fn nvme_co_pdiscard(BlockDriverS= tate *bs, =20 assert(s->nr_queues > 1); =20 - buf =3D qemu_try_blockalign(bs, s->page_size); + buf =3D qemu_try_memalign(s->page_size, s->page_size); if (!buf) { return -ENOMEM; } --=20 2.21.3