Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1317134/?format=api
{ "id": 1317134, "url": "http://patchwork.ozlabs.org/api/patches/1317134/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20200625184838.28172-6-philmd@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20200625184838.28172-6-philmd@redhat.com>", "list_archive_url": null, "date": "2020-06-25T18:48:26", "name": "[05/17] block/nvme: Replace qemu_try_blockalign0 by qemu_try_blockalign/memset", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "f49ea397b627653ee27bf1ab566acea6edfc0939", "submitter": { "id": 74995, "url": "http://patchwork.ozlabs.org/api/people/74995/?format=api", "name": "Philippe Mathieu-Daudé", "email": "philmd@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20200625184838.28172-6-philmd@redhat.com/mbox/", "series": [ { "id": 185846, "url": "http://patchwork.ozlabs.org/api/series/185846/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=185846", "date": "2020-06-25T18:48:21", "name": "block/nvme: Various cleanups required to use multiple queues", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/185846/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1317134/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1317134/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=<UNKNOWN>)", "ozlabs.org;\n dmarc=fail (p=none dis=none) header.from=redhat.com", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=baxh4CP2;\n\tdkim-atps=neutral" ], "Received": [ "from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 49t8J74x9vz9sRf\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 26 Jun 2020 04:51:51 +1000 (AEST)", "from localhost ([::1]:46338 helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1joWyT-0003JR-BT\n\tfor incoming@patchwork.ozlabs.org; Thu, 25 Jun 2020 14:51:49 -0400", "from eggs.gnu.org ([2001:470:142:3::10]:40152)\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <philmd@redhat.com>) id 1joWvt-00081f-TF\n for qemu-devel@nongnu.org; Thu, 25 Jun 2020 14:49:09 -0400", "from us-smtp-1.mimecast.com ([205.139.110.61]:45118\n helo=us-smtp-delivery-1.mimecast.com)\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256)\n (Exim 4.90_1) (envelope-from <philmd@redhat.com>) id 1joWvr-0000xh-KI\n for qemu-devel@nongnu.org; Thu, 25 Jun 2020 14:49:09 -0400", "from mail-wm1-f72.google.com (mail-wm1-f72.google.com\n [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id\n us-mta-506-54AGoQVyO_mYYq6HDTjO8g-1; Thu, 25 Jun 2020 14:49:05 -0400", "by mail-wm1-f72.google.com with SMTP id v6so5725498wmg.1\n for <qemu-devel@nongnu.org>; Thu, 25 Jun 2020 11:49:05 -0700 (PDT)", "from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net.\n [83.51.162.1])\n by smtp.gmail.com with ESMTPSA id k185sm10423085wmk.47.2020.06.25.11.49.02\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 25 Jun 2020 11:49:03 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1593110946;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=D25/qK3jouvb6CaMBWXVBrYPJJAal8XQQt3oaNzllJ4=;\n b=baxh4CP2HMXHBtjjhAilTauf3Bx4Id22YBhM+IMh5C8M7x8+4xXmsqvkE4zRdgP1i/pmA4\n fnruajdm3SLzr9Sc4ES22TDs9Z3DlwvkKbOmx5HDNCEWszRyFvH5EQe6b49C9WqpnR4/mx\n V392xxbwpHq6Knd/lop6wNyztF+8WKQ=", "X-MC-Unique": "54AGoQVyO_mYYq6HDTjO8g-1", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n :references:mime-version:content-transfer-encoding;\n bh=D25/qK3jouvb6CaMBWXVBrYPJJAal8XQQt3oaNzllJ4=;\n b=VSmun/5CU2BsARU7KW0EN/+mK5ubqSR2ltGbZZO5OliOAGwmQz09J7gtt+UDXBWA2b\n hYBpGQDg4In6/D6cqmad8f4ucnwzb8oiSdvN3SXShf1NG5pVOX85sX2aVUKEhBf+YHu1\n DqvWF1Vix9+evDP7KAmMRJ4FKQEgityfLqd5uRi2GDkMGnThxJGU7HpLfyg+gRFabNVb\n 6RMwpCe0V2C7OYVumfYjtYRZbWKnPMDmMpjU+Mf0OvDIIVBjQjAJTKsR8ixM5AIlxtpO\n HnetuNdX2Tg7KHxUdEZ/Jb5/CwUDD8kADVXpVlZh7e2Qj6vv/w+EDteN4pr2/xXsvru2\n kClw==", "X-Gm-Message-State": "AOAM531S4qLS6xezYb1rh2hVmsyOohlNkWa7xgHVE1l2tMCxd3utoT1r\n Xcu9Oobc/Wbs4LgjPBcWjOWeyoClbi9TRtxn63I3kTopPwjuTJ8vNBpsygTreWzyaFTKttaf7uB\n 1UV+5k5zAJIA6xyI=", "X-Received": [ "by 2002:adf:ed02:: with SMTP id a2mr21006371wro.110.1593110944037;\n Thu, 25 Jun 2020 11:49:04 -0700 (PDT)", "by 2002:adf:ed02:: with SMTP id a2mr21006362wro.110.1593110943859;\n Thu, 25 Jun 2020 11:49:03 -0700 (PDT)" ], "X-Google-Smtp-Source": "\n ABdhPJwWhDJ6tss58s/bIUrcVvTbA3/T8YxyahSOQxXh9LEF89jgu5T9YuMy4CKKr/sUQwSeV1DHkA==", "From": "=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@redhat.com>", "To": "qemu-devel@nongnu.org,\n\tStefan Hajnoczi <stefanha@redhat.com>", "Subject": "[PATCH 05/17] block/nvme: Replace qemu_try_blockalign0 by\n qemu_try_blockalign/memset", "Date": "Thu, 25 Jun 2020 20:48:26 +0200", "Message-Id": "<20200625184838.28172-6-philmd@redhat.com>", "X-Mailer": "git-send-email 2.21.3", "In-Reply-To": "<20200625184838.28172-1-philmd@redhat.com>", "References": "<20200625184838.28172-1-philmd@redhat.com>", "MIME-Version": "1.0", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Type": "text/plain; charset=UTF-8;\n\ttext/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "8bit", "Received-SPF": "pass client-ip=205.139.110.61; envelope-from=philmd@redhat.com;\n helo=us-smtp-delivery-1.mimecast.com", "X-detected-operating-system": "by eggs.gnu.org: First seen = 2020/06/25 00:45:15", "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,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01,\n 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": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "Fam Zheng <fam@euphon.net>, Kevin Wolf <kwolf@redhat.com>,\n qemu-block@nongnu.org, Max Reitz <mreitz@redhat.com>,\n Maxim Levitsky <mlevitsk@redhat.com>,\n =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@redhat.com>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "In the next commit we'll get ride of qemu_try_blockalign().\nTo ease review, first replace qemu_try_blockalign0() by explicit\ncalls to qemu_try_blockalign() and memset().\n\nSigned-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>\n---\n block/nvme.c | 17 ++++++++++-------\n 1 file changed, 10 insertions(+), 7 deletions(-)", "diff": "diff --git a/block/nvme.c b/block/nvme.c\nindex ffda804a8e..bdddcd975d 100644\n--- a/block/nvme.c\n+++ b/block/nvme.c\n@@ -158,12 +158,12 @@ static void nvme_init_queue(BlockDriverState *bs, NVMeQueue *q,\n \n bytes = ROUND_UP(nentries * entry_bytes, s->page_size);\n q->head = q->tail = 0;\n- q->queue = qemu_try_blockalign0(bs, bytes);\n-\n+ q->queue = qemu_try_blockalign(bs, bytes);\n if (!q->queue) {\n error_setg(errp, \"Cannot allocate queue\");\n return;\n }\n+ memset(q->queue, 0, bytes);\n r = qemu_vfio_dma_map(s->vfio, q->queue, bytes, false, &q->iova);\n if (r) {\n error_setg(errp, \"Cannot map queue\");\n@@ -204,11 +204,12 @@ static NVMeQueuePair *nvme_create_queue_pair(BlockDriverState *bs,\n if (!q) {\n return NULL;\n }\n- q->prp_list_pages = qemu_try_blockalign0(bs,\n+ q->prp_list_pages = qemu_try_blockalign(bs,\n s->page_size * NVME_QUEUE_SIZE);\n if (!q->prp_list_pages) {\n goto fail;\n }\n+ memset(q->prp_list_pages, 0, s->page_size * NVME_QUEUE_SIZE);\n qemu_mutex_init(&q->lock);\n q->index = idx;\n qemu_co_queue_init(&q->free_req_queue);\n@@ -450,7 +451,7 @@ static void nvme_identify(BlockDriverState *bs, int namespace, Error **errp)\n };\n \n idsz_max = MAX_CONST(sizeof(NvmeIdCtrl), sizeof(NvmeIdNs));\n- resp = qemu_try_blockalign0(bs, idsz_max);\n+ resp = qemu_try_blockalign(bs, idsz_max);\n if (!resp) {\n error_setg(errp, \"Cannot allocate buffer for identify response\");\n goto out;\n@@ -462,6 +463,8 @@ static void nvme_identify(BlockDriverState *bs, int namespace, Error **errp)\n error_setg(errp, \"Cannot map buffer for DMA\");\n goto out;\n }\n+\n+ memset(resp, 0, sizeof(NvmeIdCtrl));\n cmd.prp1 = cpu_to_le64(iova);\n \n if (nvme_cmd_sync(bs, s->queues[QUEUE_INDEX_ADMIN], &cmd)) {\n@@ -484,7 +487,7 @@ static void nvme_identify(BlockDriverState *bs, int namespace, Error **errp)\n s->supports_write_zeroes = !!(oncs & NVME_ONCS_WRITE_ZEROS);\n s->supports_discard = !!(oncs & NVME_ONCS_DSM);\n \n- memset(resp, 0, 4096);\n+ memset(resp, 0, sizeof(NvmeIdNs));\n \n cmd.cdw10 = 0;\n cmd.nsid = cpu_to_le32(namespace);\n@@ -1202,11 +1205,11 @@ static int coroutine_fn nvme_co_pdiscard(BlockDriverState *bs,\n \n assert(s->nr_queues > 1);\n \n- buf = qemu_try_blockalign0(bs, s->page_size);\n+ buf = qemu_try_blockalign(bs, s->page_size);\n if (!buf) {\n return -ENOMEM;\n }\n-\n+ memset(buf, 0, s->page_size);\n buf->nlb = cpu_to_le32(bytes >> s->blkshift);\n buf->slba = cpu_to_le64(offset >> s->blkshift);\n buf->cattr = 0;\n", "prefixes": [ "05/17" ] }