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=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,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 DF8A9C433E0 for ; Thu, 2 Jul 2020 19:08:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B95BB21883 for ; Thu, 2 Jul 2020 19:08:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="IssdcEf2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726035AbgGBTIT (ORCPT ); Thu, 2 Jul 2020 15:08:19 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:39982 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725862AbgGBTIT (ORCPT ); Thu, 2 Jul 2020 15:08:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593716897; 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: in-reply-to:in-reply-to:references:references; bh=YuSa6A609nCROWP7gC5jQIgxvOmH9Y437gf1RGlTqlE=; b=IssdcEf2wPCsU7wA89gJ2tuGA7EYD51xfPbYqZjbUAlsisx4I9c6wcysOssqsNfFo7OZeO Oc+qIzCFHEGDbCHoF/XT+bJGl1NyHPuRE2gFLZhyl8pthi7MlSeCme4wXiJ15gbIyNP0C0 JH8wYXEXOdL38ND1LzuWUz7lcv89Pl8= 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-307-o0rWxKUQPRqPEDkLcsJRvA-1; Thu, 02 Jul 2020 15:08:16 -0400 X-MC-Unique: o0rWxKUQPRqPEDkLcsJRvA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D82D51005513; Thu, 2 Jul 2020 19:08:14 +0000 (UTC) Received: from work-vm (ovpn-114-239.ams2.redhat.com [10.36.114.239]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1D49E757DF; Thu, 2 Jul 2020 19:08:07 +0000 (UTC) Date: Thu, 2 Jul 2020 20:08:04 +0100 From: "Dr. David Alan Gilbert" To: David Hildenbrand Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, qemu-s390x@nongnu.org, Richard Henderson , Paolo Bonzini , Eduardo Habkost , "Michael S . Tsirkin" Subject: Re: [PATCH v5 19/21] virtio-mem: Add trace events Message-ID: <20200702190804.GG14863@work-vm> References: <20200626072248.78761-1-david@redhat.com> <20200626072248.78761-20-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200626072248.78761-20-david@redhat.com> User-Agent: Mutt/1.14.3 (2020-06-14) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org * David Hildenbrand (david@redhat.com) wrote: > Let's add some trace events that might come in handy later. > > Cc: "Michael S. Tsirkin" > Cc: "Dr. David Alan Gilbert" > Signed-off-by: David Hildenbrand Reviewed-by: Dr. David Alan Gilbert > --- > hw/virtio/trace-events | 10 ++++++++++ > hw/virtio/virtio-mem.c | 10 +++++++++- > 2 files changed, 19 insertions(+), 1 deletion(-) > > diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events > index 6427a0047d..292fc15e29 100644 > --- a/hw/virtio/trace-events > +++ b/hw/virtio/trace-events > @@ -74,3 +74,13 @@ 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-mem.c > +virtio_mem_send_response(uint16_t type) "type=%" PRIu16 > +virtio_mem_plug_request(uint64_t addr, uint16_t nb_blocks) "addr=0x%" PRIx64 " nb_blocks=%" PRIu16 > +virtio_mem_unplug_request(uint64_t addr, uint16_t nb_blocks) "addr=0x%" PRIx64 " nb_blocks=%" PRIu16 > +virtio_mem_unplugged_all(void) "" > +virtio_mem_unplug_all_request(void) "" > +virtio_mem_resized_usable_region(uint64_t old_size, uint64_t new_size) "old_size=0x%" PRIx64 "new_size=0x%" PRIx64 > +virtio_mem_state_request(uint64_t addr, uint16_t nb_blocks) "addr=0x%" PRIx64 " nb_blocks=%" PRIu16 > +virtio_mem_state_response(uint16_t state) "state=%" PRIu16 > diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c > index 6ed5409669..fdd4dbb42c 100644 > --- a/hw/virtio/virtio-mem.c > +++ b/hw/virtio/virtio-mem.c > @@ -30,6 +30,7 @@ > #include "hw/boards.h" > #include "hw/qdev-properties.h" > #include "config-devices.h" > +#include "trace.h" > > /* > * Use QEMU_VMALLOC_ALIGN, so no THP will have to be split when unplugging > @@ -100,6 +101,7 @@ static void virtio_mem_send_response(VirtIOMEM *vmem, VirtQueueElement *elem, > VirtIODevice *vdev = VIRTIO_DEVICE(vmem); > VirtQueue *vq = vmem->vq; > > + trace_virtio_mem_send_response(le16_to_cpu(resp->type)); > iov_from_buf(elem->in_sg, elem->in_num, 0, resp, sizeof(*resp)); > > virtqueue_push(vq, elem, sizeof(*resp)); > @@ -195,6 +197,7 @@ static void virtio_mem_plug_request(VirtIOMEM *vmem, VirtQueueElement *elem, > const uint16_t nb_blocks = le16_to_cpu(req->u.plug.nb_blocks); > uint16_t type; > > + trace_virtio_mem_plug_request(gpa, nb_blocks); > type = virtio_mem_state_change_request(vmem, gpa, nb_blocks, true); > virtio_mem_send_response_simple(vmem, elem, type); > } > @@ -206,6 +209,7 @@ static void virtio_mem_unplug_request(VirtIOMEM *vmem, VirtQueueElement *elem, > const uint16_t nb_blocks = le16_to_cpu(req->u.unplug.nb_blocks); > uint16_t type; > > + trace_virtio_mem_unplug_request(gpa, nb_blocks); > type = virtio_mem_state_change_request(vmem, gpa, nb_blocks, false); > virtio_mem_send_response_simple(vmem, elem, type); > } > @@ -225,6 +229,7 @@ static void virtio_mem_resize_usable_region(VirtIOMEM *vmem, > return; > } > > + trace_virtio_mem_resized_usable_region(vmem->usable_region_size, newsize); > vmem->usable_region_size = newsize; > } > > @@ -247,7 +252,7 @@ static int virtio_mem_unplug_all(VirtIOMEM *vmem) > vmem->size = 0; > notifier_list_notify(&vmem->size_change_notifiers, &vmem->size); > } > - > + trace_virtio_mem_unplugged_all(); > virtio_mem_resize_usable_region(vmem, vmem->requested_size, true); > return 0; > } > @@ -255,6 +260,7 @@ static int virtio_mem_unplug_all(VirtIOMEM *vmem) > static void virtio_mem_unplug_all_request(VirtIOMEM *vmem, > VirtQueueElement *elem) > { > + trace_virtio_mem_unplug_all_request(); > if (virtio_mem_unplug_all(vmem)) { > virtio_mem_send_response_simple(vmem, elem, VIRTIO_MEM_RESP_BUSY); > } else { > @@ -272,6 +278,7 @@ static void virtio_mem_state_request(VirtIOMEM *vmem, VirtQueueElement *elem, > .type = cpu_to_le16(VIRTIO_MEM_RESP_ACK), > }; > > + trace_virtio_mem_state_request(gpa, nb_blocks); > if (!virtio_mem_valid_range(vmem, gpa, size)) { > virtio_mem_send_response_simple(vmem, elem, VIRTIO_MEM_RESP_ERROR); > return; > @@ -284,6 +291,7 @@ static void virtio_mem_state_request(VirtIOMEM *vmem, VirtQueueElement *elem, > } else { > resp.u.state.state = cpu_to_le16(VIRTIO_MEM_STATE_MIXED); > } > + trace_virtio_mem_state_response(le16_to_cpu(resp.u.state.state)); > virtio_mem_send_response(vmem, elem, &resp); > } > > -- > 2.26.2 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK 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=-8.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 7D8D4C433DF for ; Thu, 2 Jul 2020 19:09:08 +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 42F7E21835 for ; Thu, 2 Jul 2020 19:09:08 +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="cV5NA5UZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 42F7E21835 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]:58668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jr4a3-0002CM-J2 for qemu-devel@archiver.kernel.org; Thu, 02 Jul 2020 15:09:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jr4ZL-00019L-P7 for qemu-devel@nongnu.org; Thu, 02 Jul 2020 15:08:23 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:59565 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 1jr4ZJ-0001vE-71 for qemu-devel@nongnu.org; Thu, 02 Jul 2020 15:08:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593716899; 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: in-reply-to:in-reply-to:references:references; bh=YuSa6A609nCROWP7gC5jQIgxvOmH9Y437gf1RGlTqlE=; b=cV5NA5UZJurdJoCEtA/Vq922B8vqA0msD7ea6V22cGtGaXAvgLU3PNjXNGZKBbnszGwrXu U90O54Eh0t84sc7kYI9Qb808GOZuki3BF9TpUIAAmgiq8jUrbu+o1v4ePD72UNgWIqzGeK fV5d4gof8xZ8or9JBdpruZQ9fUyM2dA= 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-307-o0rWxKUQPRqPEDkLcsJRvA-1; Thu, 02 Jul 2020 15:08:16 -0400 X-MC-Unique: o0rWxKUQPRqPEDkLcsJRvA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D82D51005513; Thu, 2 Jul 2020 19:08:14 +0000 (UTC) Received: from work-vm (ovpn-114-239.ams2.redhat.com [10.36.114.239]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1D49E757DF; Thu, 2 Jul 2020 19:08:07 +0000 (UTC) Date: Thu, 2 Jul 2020 20:08:04 +0100 From: "Dr. David Alan Gilbert" To: David Hildenbrand Subject: Re: [PATCH v5 19/21] virtio-mem: Add trace events Message-ID: <20200702190804.GG14863@work-vm> References: <20200626072248.78761-1-david@redhat.com> <20200626072248.78761-20-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200626072248.78761-20-david@redhat.com> User-Agent: Mutt/1.14.3 (2020-06-14) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Received-SPF: pass client-ip=207.211.31.81; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/02 04:18:28 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: Eduardo Habkost , kvm@vger.kernel.org, "Michael S . Tsirkin" , qemu-devel@nongnu.org, qemu-s390x@nongnu.org, Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * David Hildenbrand (david@redhat.com) wrote: > Let's add some trace events that might come in handy later. > > Cc: "Michael S. Tsirkin" > Cc: "Dr. David Alan Gilbert" > Signed-off-by: David Hildenbrand Reviewed-by: Dr. David Alan Gilbert > --- > hw/virtio/trace-events | 10 ++++++++++ > hw/virtio/virtio-mem.c | 10 +++++++++- > 2 files changed, 19 insertions(+), 1 deletion(-) > > diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events > index 6427a0047d..292fc15e29 100644 > --- a/hw/virtio/trace-events > +++ b/hw/virtio/trace-events > @@ -74,3 +74,13 @@ 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-mem.c > +virtio_mem_send_response(uint16_t type) "type=%" PRIu16 > +virtio_mem_plug_request(uint64_t addr, uint16_t nb_blocks) "addr=0x%" PRIx64 " nb_blocks=%" PRIu16 > +virtio_mem_unplug_request(uint64_t addr, uint16_t nb_blocks) "addr=0x%" PRIx64 " nb_blocks=%" PRIu16 > +virtio_mem_unplugged_all(void) "" > +virtio_mem_unplug_all_request(void) "" > +virtio_mem_resized_usable_region(uint64_t old_size, uint64_t new_size) "old_size=0x%" PRIx64 "new_size=0x%" PRIx64 > +virtio_mem_state_request(uint64_t addr, uint16_t nb_blocks) "addr=0x%" PRIx64 " nb_blocks=%" PRIu16 > +virtio_mem_state_response(uint16_t state) "state=%" PRIu16 > diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c > index 6ed5409669..fdd4dbb42c 100644 > --- a/hw/virtio/virtio-mem.c > +++ b/hw/virtio/virtio-mem.c > @@ -30,6 +30,7 @@ > #include "hw/boards.h" > #include "hw/qdev-properties.h" > #include "config-devices.h" > +#include "trace.h" > > /* > * Use QEMU_VMALLOC_ALIGN, so no THP will have to be split when unplugging > @@ -100,6 +101,7 @@ static void virtio_mem_send_response(VirtIOMEM *vmem, VirtQueueElement *elem, > VirtIODevice *vdev = VIRTIO_DEVICE(vmem); > VirtQueue *vq = vmem->vq; > > + trace_virtio_mem_send_response(le16_to_cpu(resp->type)); > iov_from_buf(elem->in_sg, elem->in_num, 0, resp, sizeof(*resp)); > > virtqueue_push(vq, elem, sizeof(*resp)); > @@ -195,6 +197,7 @@ static void virtio_mem_plug_request(VirtIOMEM *vmem, VirtQueueElement *elem, > const uint16_t nb_blocks = le16_to_cpu(req->u.plug.nb_blocks); > uint16_t type; > > + trace_virtio_mem_plug_request(gpa, nb_blocks); > type = virtio_mem_state_change_request(vmem, gpa, nb_blocks, true); > virtio_mem_send_response_simple(vmem, elem, type); > } > @@ -206,6 +209,7 @@ static void virtio_mem_unplug_request(VirtIOMEM *vmem, VirtQueueElement *elem, > const uint16_t nb_blocks = le16_to_cpu(req->u.unplug.nb_blocks); > uint16_t type; > > + trace_virtio_mem_unplug_request(gpa, nb_blocks); > type = virtio_mem_state_change_request(vmem, gpa, nb_blocks, false); > virtio_mem_send_response_simple(vmem, elem, type); > } > @@ -225,6 +229,7 @@ static void virtio_mem_resize_usable_region(VirtIOMEM *vmem, > return; > } > > + trace_virtio_mem_resized_usable_region(vmem->usable_region_size, newsize); > vmem->usable_region_size = newsize; > } > > @@ -247,7 +252,7 @@ static int virtio_mem_unplug_all(VirtIOMEM *vmem) > vmem->size = 0; > notifier_list_notify(&vmem->size_change_notifiers, &vmem->size); > } > - > + trace_virtio_mem_unplugged_all(); > virtio_mem_resize_usable_region(vmem, vmem->requested_size, true); > return 0; > } > @@ -255,6 +260,7 @@ static int virtio_mem_unplug_all(VirtIOMEM *vmem) > static void virtio_mem_unplug_all_request(VirtIOMEM *vmem, > VirtQueueElement *elem) > { > + trace_virtio_mem_unplug_all_request(); > if (virtio_mem_unplug_all(vmem)) { > virtio_mem_send_response_simple(vmem, elem, VIRTIO_MEM_RESP_BUSY); > } else { > @@ -272,6 +278,7 @@ static void virtio_mem_state_request(VirtIOMEM *vmem, VirtQueueElement *elem, > .type = cpu_to_le16(VIRTIO_MEM_RESP_ACK), > }; > > + trace_virtio_mem_state_request(gpa, nb_blocks); > if (!virtio_mem_valid_range(vmem, gpa, size)) { > virtio_mem_send_response_simple(vmem, elem, VIRTIO_MEM_RESP_ERROR); > return; > @@ -284,6 +291,7 @@ static void virtio_mem_state_request(VirtIOMEM *vmem, VirtQueueElement *elem, > } else { > resp.u.state.state = cpu_to_le16(VIRTIO_MEM_STATE_MIXED); > } > + trace_virtio_mem_state_response(le16_to_cpu(resp.u.state.state)); > virtio_mem_send_response(vmem, elem, &resp); > } > > -- > 2.26.2 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK