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=-5.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,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 9CDCFC47247 for ; Fri, 8 May 2020 14:03:44 +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 6DA8520736 for ; Fri, 8 May 2020 14:03:44 +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="KKv4A3YJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6DA8520736 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]:33758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jX3bL-0003g9-Gr for qemu-devel@archiver.kernel.org; Fri, 08 May 2020 10:03:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jX3aB-0002UQ-Fu for qemu-devel@nongnu.org; Fri, 08 May 2020 10:02:32 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:22318 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 1jX3a8-0000ML-5e for qemu-devel@nongnu.org; Fri, 08 May 2020 10:02:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588946545; 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=D4WUVpJaNktKm8yiSVR8Ag5EHn1iBp68/krnD+2KPcg=; b=KKv4A3YJS5OcJCWO9tbSXQqHYymP4a/KCIh7Fa1Uxo0gNKd3i11IYUwMzl3+pZIxHrI+Lm wMoaCEa4BvrxIvewTANVQphp3X5g6yshAgwHYZQR5K0MD1CBmA0ua3Mjy1NgFPMjXJroEF 6Ym9uHR5aagg11fZrAiV2fNi6VKx3c0= 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-456-uExnF8TWPnu2MwiThRQbEg-1; Fri, 08 May 2020 10:02:24 -0400 X-MC-Unique: uExnF8TWPnu2MwiThRQbEg-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 C9AAF107ACF4; Fri, 8 May 2020 14:02:22 +0000 (UTC) Received: from [10.36.114.214] (ovpn-114-214.ams2.redhat.com [10.36.114.214]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A2DE6707DE; Fri, 8 May 2020 14:02:04 +0000 (UTC) Subject: Re: [PATCH 2/5] virtio-iommu: Implement RESV_MEM probe request To: Jean-Philippe Brucker References: <20200507143201.31080-1-eric.auger@redhat.com> <20200507143201.31080-3-eric.auger@redhat.com> <20200508092605.GB1770804@myrica> From: Auger Eric Message-ID: <583efffc-8dbb-6217-a596-2ee8d56892d7@redhat.com> Date: Fri, 8 May 2020 16:02:02 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20200508092605.GB1770804@myrica> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=205.139.110.61; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/08 08:00:48 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: peter.maydell@linaro.org, mst@redhat.com, qemu-devel@nongnu.org, peterx@redhat.com, armbru@redhat.com, qemu-arm@nongnu.org, bbhushan2@marvell.com, eric.auger.pro@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Jean, On 5/8/20 11:26 AM, Jean-Philippe Brucker wrote: > On Thu, May 07, 2020 at 04:31:58PM +0200, Eric Auger wrote: >> +static ssize_t virtio_iommu_fill_resv_mem_prop(VirtIOIOMMU *s, uint32_t ep, >> + uint8_t *buf, size_t free) >> +{ >> + struct virtio_iommu_probe_resv_mem prop = {}; >> + size_t size = sizeof(prop), length = size - sizeof(prop.head), total; >> + int i; >> + >> + total = size * s->nb_reserved_regions; >> + >> + if (total > free) { >> + return -ENOSPC; >> + } >> + >> + for (i = 0; i < s->nb_reserved_regions; i++) { >> + prop.head.type = VIRTIO_IOMMU_PROBE_T_RESV_MEM; > > cpu_to_le16 > >> + prop.head.length = cpu_to_le64(length); > > same here > >> + prop.subtype = cpu_to_le64(s->reserved_regions[i].type); > > and subtype is a byte All fixed. Thanks for spotting this. > >> + prop.start = cpu_to_le64(s->reserved_regions[i].low); >> + prop.end = cpu_to_le64(s->reserved_regions[i].high); >> + >> + memcpy(buf, &prop, size); >> + >> + trace_virtio_iommu_fill_resv_property(ep, prop.subtype, >> + prop.start, prop.end); >> + buf += size; >> + } >> + return total; >> +} >> + >> +/** >> + * virtio_iommu_probe - Fill the probe request buffer with >> + * the properties the device is able to return and add a NONE >> + * property at the end. >> + */ >> +static int virtio_iommu_probe(VirtIOIOMMU *s, >> + struct virtio_iommu_req_probe *req, >> + uint8_t *buf) >> +{ >> + uint32_t ep_id = le32_to_cpu(req->endpoint); > > I think we should check that the endpoint ID is sane even if we're not > using it at the moment (it is a SHOULD in the spec, and the page size mask > patch will need the ep anyway). OK > >> + struct virtio_iommu_probe_property last = {}; >> + size_t free = VIOMMU_PROBE_SIZE - sizeof(last); > > last isn't needed, you can fill the whole probe buffer with valid > properties yep. This is a reminder from none prop. > >> + ssize_t count; >> + >> + count = virtio_iommu_fill_resv_mem_prop(s, ep_id, buf, free); >> + if (count < 0) { >> + return VIRTIO_IOMMU_S_INVAL; > > indentation? yes. Thank you for the review Eric > > Thanks, > Jean > >> + } >> + buf += count; >> + free -= count; >> + >> + /* Fill the rest with zeroes */ >> + memset(buf, 0, free); >> + >> + return VIRTIO_IOMMU_S_OK; >> +} >> + >> static int virtio_iommu_iov_to_req(struct iovec *iov, >> unsigned int iov_cnt, >> void *req, size_t req_sz) >> @@ -407,6 +464,17 @@ virtio_iommu_handle_req(detach) >> virtio_iommu_handle_req(map) >> virtio_iommu_handle_req(unmap) >> >> +static int virtio_iommu_handle_probe(VirtIOIOMMU *s, >> + struct iovec *iov, >> + unsigned int iov_cnt, >> + uint8_t *buf) >> +{ >> + struct virtio_iommu_req_probe req; >> + int ret = virtio_iommu_iov_to_req(iov, iov_cnt, &req, sizeof(req)); >> + >> + return ret ? ret : virtio_iommu_probe(s, &req, buf); >> +} >> + >> static void virtio_iommu_handle_command(VirtIODevice *vdev, VirtQueue *vq) >> { >> VirtIOIOMMU *s = VIRTIO_IOMMU(vdev); >> @@ -452,17 +520,33 @@ static void virtio_iommu_handle_command(VirtIODevice *vdev, VirtQueue *vq) >> case VIRTIO_IOMMU_T_UNMAP: >> tail.status = virtio_iommu_handle_unmap(s, iov, iov_cnt); >> break; >> + case VIRTIO_IOMMU_T_PROBE: >> + { >> + struct virtio_iommu_req_tail *ptail; >> + uint8_t *buf = g_malloc0(s->config.probe_size + sizeof(tail)); >> + >> + ptail = (struct virtio_iommu_req_tail *) >> + (buf + s->config.probe_size); >> + ptail->status = virtio_iommu_handle_probe(s, iov, iov_cnt, buf); >> + >> + sz = iov_from_buf(elem->in_sg, elem->in_num, 0, >> + buf, s->config.probe_size + sizeof(tail)); >> + g_free(buf); >> + assert(sz == s->config.probe_size + sizeof(tail)); >> + goto push; >> + } >> default: >> tail.status = VIRTIO_IOMMU_S_UNSUPP; >> } >> - qemu_mutex_unlock(&s->mutex); >> >> out: >> sz = iov_from_buf(elem->in_sg, elem->in_num, 0, >> &tail, sizeof(tail)); >> assert(sz == sizeof(tail)); >> >> - virtqueue_push(vq, elem, sizeof(tail)); >> +push: >> + qemu_mutex_unlock(&s->mutex); >> + virtqueue_push(vq, elem, sz); >> virtio_notify(vdev, vq); >> g_free(elem); >> } >> @@ -667,6 +751,7 @@ static void virtio_iommu_device_realize(DeviceState *dev, Error **errp) >> s->config.page_size_mask = TARGET_PAGE_MASK; >> s->config.input_range.end = -1UL; >> s->config.domain_range.end = 32; >> + s->config.probe_size = VIOMMU_PROBE_SIZE; >> >> virtio_add_feature(&s->features, VIRTIO_RING_F_EVENT_IDX); >> virtio_add_feature(&s->features, VIRTIO_RING_F_INDIRECT_DESC); >> @@ -676,6 +761,7 @@ static void virtio_iommu_device_realize(DeviceState *dev, Error **errp) >> virtio_add_feature(&s->features, VIRTIO_IOMMU_F_MAP_UNMAP); >> virtio_add_feature(&s->features, VIRTIO_IOMMU_F_BYPASS); >> virtio_add_feature(&s->features, VIRTIO_IOMMU_F_MMIO); >> + virtio_add_feature(&s->features, VIRTIO_IOMMU_F_PROBE); >> >> qemu_mutex_init(&s->mutex); >> >> diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events >> index e83500bee9..5550475691 100644 >> --- a/hw/virtio/trace-events >> +++ b/hw/virtio/trace-events >> @@ -73,3 +73,4 @@ virtio_iommu_get_domain(uint32_t domain_id) "Alloc domain=%d" >> virtio_iommu_put_domain(uint32_t domain_id) "Free domain=%d" >> virtio_iommu_translate_out(uint64_t virt_addr, uint64_t phys_addr, uint32_t sid) "0x%"PRIx64" -> 0x%"PRIx64 " for sid=%d" >> virtio_iommu_report_fault(uint8_t reason, uint32_t flags, uint32_t endpoint, uint64_t addr) "FAULT reason=%d flags=%d endpoint=%d address =0x%"PRIx64 >> +virtio_iommu_fill_resv_property(uint32_t devid, uint8_t subtype, uint64_t start, uint64_t end) "dev= %d, type=%d start=0x%"PRIx64" end=0x%"PRIx64 >> -- >> 2.20.1 >> >