From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:ac2:5544:0:0:0:0:0 with SMTP id l4csp1574916lfk; Fri, 26 Nov 2021 23:37:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJygIvIqLwZ6qQszLLf0NGYQ6SFdWdAHI4KQzYJO5Ng13gL4rn1MG1O2F6QGCXlhp1YZNm74 X-Received: by 2002:a5d:9492:: with SMTP id v18mr41096504ioj.158.1637998628699; Fri, 26 Nov 2021 23:37:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637998628; cv=none; d=google.com; s=arc-20160816; b=NyANFffttTwG7yy8J4Zv39Nrd9dV+7OnrZ3OMqQBRE7r0KVeuscejLgvyZodbuPv5N i6jwXp+RdPoMUb7CMoHnyxo8dOMmJFJv+kQfR9Hugx2+MzfHpcFCAnFvLjQQydL8QjyA TekWPR4eQwNvVxwAhwW1LlzCVlQoldGYDCz7LYnRbLwDIN6Sp/6ilwrFGvP3tlM25ZvD TbZgEYrDAtn7gvxqz0OxN18qUsbbcVWRmW3ocuXLe9ethjfZnb0EIOsLUtT/zMpqk8Xx mucuzr3KiUfl7GsCAe76WJM0Yi9Issa2lTpXzJC5qTZyZXwYIPPUWymSCoL4enBeEoIL KT5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=YDhGwZ7NW6jt8p5xJ6q5zE85WMbOE0yCHpx5n/sxl10=; b=p/UcEDcnMqjlP0BH9vRHNSIGuTlASAwFEnmDdkgWw88Wds47xFpWRZK/oAnelyIkM7 WTi1xhSc9cmgoRbLHg1tnUdcmD7mrcPWJ5VGqOqdbsgsvl0PSexCnVQ7AbjWIbbuC7zO +eksaow6wsC8K/OO+3rDvRUrmErRxmmShOobZ8Kh267Vc/6y8L8u1xfT9BtECkISvbei cQDqtF/KjpkGGEV0fl6kreQ/0BfHVTjpQlzKGCR1qNxhIjcpWqpkY/UsY2rvEILBs4+L 7dfto8iL/aQvSDXwLtVMcKAYo+Zwpi5+AC91euR22/c09QUZ8secJcOzHACwdG08okHk 1d8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=K9A1eMsS; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d5si18368157iow.84.2021.11.26.23.37.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Nov 2021 23:37:08 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=K9A1eMsS; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:44986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mqsGi-0006OX-4m for alex.bennee@linaro.org; Sat, 27 Nov 2021 02:37:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mqs9h-0007mm-C7 for qemu-devel@nongnu.org; Sat, 27 Nov 2021 02:29:53 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:30572) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mqs9e-0002DM-95 for qemu-devel@nongnu.org; Sat, 27 Nov 2021 02:29:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637998189; 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=YDhGwZ7NW6jt8p5xJ6q5zE85WMbOE0yCHpx5n/sxl10=; b=K9A1eMsSlJAOURVHAauTJfe88p7ayxHrBKr+h27JNc9W1QigJQX1ts0T2VPx6b2MJDVSkP 5sHsN2yauD08/8zAKeCBStozIbxUqVe9DsWupQ1lpn3wFsrXZf7ZcO28Ri9OYG+I0FYrXj Oohw4N+OOoHuYCakT61wYOqH3M7Jawg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-122-ffjbJvbKOwKmebkjBpb3Zw-1; Sat, 27 Nov 2021 02:29:46 -0500 X-MC-Unique: ffjbJvbKOwKmebkjBpb3Zw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 558368042E1; Sat, 27 Nov 2021 07:29:45 +0000 (UTC) Received: from laptop.redhat.com (unknown [10.39.192.178]) by smtp.corp.redhat.com (Postfix) with ESMTP id D2CC1608BA; Sat, 27 Nov 2021 07:29:36 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, thuth@redhat.com, qemu-arm@nongnu.org, qemu-devel@nongnu.org, jean-philippe@linaro.org, peter.maydell@linaro.org Subject: [PATCH v6 2/4] virtio-iommu: Fix endianness in get_config Date: Sat, 27 Nov 2021 08:29:08 +0100 Message-Id: <20211127072910.1261824-3-eric.auger@redhat.com> In-Reply-To: <20211127072910.1261824-1-eric.auger@redhat.com> References: <20211127072910.1261824-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=170.10.133.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.702, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, pbonzini@redhat.com Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: 0TzBYTZvKJ4H Endianess is not properly handled when populating the returned config. Use the cpu_to_le* primitives for each separate field. Also, while at it, trace the domain range start. Signed-off-by: Eric Auger Reported-by: Thomas Huth --- hw/virtio/trace-events | 2 +- hw/virtio/virtio-iommu.c | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events index 54bd7da00c8..f7ad6be5fbb 100644 --- a/hw/virtio/trace-events +++ b/hw/virtio/trace-events @@ -91,7 +91,7 @@ virtio_mmio_setting_irq(int level) "virtio_mmio setting IRQ %d" virtio_iommu_device_reset(void) "reset!" virtio_iommu_get_features(uint64_t features) "device supports features=0x%"PRIx64 virtio_iommu_device_status(uint8_t status) "driver status = %d" -virtio_iommu_get_config(uint64_t page_size_mask, uint64_t start, uint64_t end, uint32_t domain_range, uint32_t probe_size) "page_size_mask=0x%"PRIx64" start=0x%"PRIx64" end=0x%"PRIx64" domain_range=%d probe_size=0x%x" +virtio_iommu_get_config(uint64_t page_size_mask, uint64_t start, uint64_t end, uint32_t domain_start, uint32_t domain_end, uint32_t probe_size) "page_size_mask=0x%"PRIx64" input range start=0x%"PRIx64" input range end=0x%"PRIx64" domain range start=%d domain range end=%d probe_size=0x%x" virtio_iommu_attach(uint32_t domain_id, uint32_t ep_id) "domain=%d endpoint=%d" virtio_iommu_detach(uint32_t domain_id, uint32_t ep_id) "domain=%d endpoint=%d" virtio_iommu_map(uint32_t domain_id, uint64_t virt_start, uint64_t virt_end, uint64_t phys_start, uint32_t flags) "domain=%d virt_start=0x%"PRIx64" virt_end=0x%"PRIx64 " phys_start=0x%"PRIx64" flags=%d" diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index 645c0aa3997..30ee09187b8 100644 --- a/hw/virtio/virtio-iommu.c +++ b/hw/virtio/virtio-iommu.c @@ -822,14 +822,22 @@ unlock: static void virtio_iommu_get_config(VirtIODevice *vdev, uint8_t *config_data) { VirtIOIOMMU *dev = VIRTIO_IOMMU(vdev); - struct virtio_iommu_config *config = &dev->config; + struct virtio_iommu_config *dev_config = &dev->config; + struct virtio_iommu_config *out_config = (void *)config_data; - trace_virtio_iommu_get_config(config->page_size_mask, - config->input_range.start, - config->input_range.end, - config->domain_range.end, - config->probe_size); - memcpy(config_data, &dev->config, sizeof(struct virtio_iommu_config)); + out_config->page_size_mask = cpu_to_le64(dev_config->page_size_mask); + out_config->input_range.start = cpu_to_le64(dev_config->input_range.start); + out_config->input_range.end = cpu_to_le64(dev_config->input_range.end); + out_config->domain_range.start = cpu_to_le32(dev_config->domain_range.start); + out_config->domain_range.end = cpu_to_le32(dev_config->domain_range.end); + out_config->probe_size = cpu_to_le32(dev_config->probe_size); + + trace_virtio_iommu_get_config(dev_config->page_size_mask, + dev_config->input_range.start, + dev_config->input_range.end, + dev_config->domain_range.start, + dev_config->domain_range.end, + dev_config->probe_size); } static uint64_t virtio_iommu_get_features(VirtIODevice *vdev, uint64_t f, -- 2.26.3