From patchwork Thu Feb 9 19:20:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Avihai Horon X-Patchwork-Id: 13134987 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 31986C61DA4 for ; Thu, 9 Feb 2023 19:22:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQCUT-0004KX-0C; Thu, 09 Feb 2023 14:21:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pQCUS-0004KC-7T for qemu-devel@nongnu.org; Thu, 09 Feb 2023 14:21:52 -0500 Received: from mail-bn8nam11on20601.outbound.protection.outlook.com ([2a01:111:f400:7eae::601] helo=NAM11-BN8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pQCUQ-0005as-CZ for qemu-devel@nongnu.org; Thu, 09 Feb 2023 14:21:51 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lb9eWTbH4ayKeyXsP86F/yZKK0UrzGlem8zSiBIh5DIvZov4oS3/gJnb7om/c8/rB5ukvnLu37iOUayZG8llAxObBPgbHPp6Xpb31bZ1k9QFW3aONmf88W2GIahSTiX0e+kRMSC3oButt3J+rkK2wqscAYvGC4RT9DOoNFc/0YemnD6AQA6pmY+IJlB4+UOFItnFIWZEvtuGiGjzR+YjR4oa36juXtjneUyKuN368pXW2O1y7UuGID1z2Zi+ZNNcIUH7p2BMRNexXiaszQcPPCoMNLaGtIy/5Ku0AbxVa+cSpEZpbtadKuOd/Fplq2zXVJO4bWdmsTA1nQzhTRCntw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=rlru3fdePzpRWsEsUE37cCfxN2jirajYW39osNlJ+js=; b=Rreb4rS+Ec9Lui8yIlnMTIODYCqIDcHO1+H2LXWTO5zWbiAScPud/zFeoATeTFqp6CYSNpKYmN0r00Ox/ABWqXfV+CFTcs49apor5w+xaUIdD7J6VFCTly1YyTni5x7FaKGannTlGCPzyzd+0EONVB6zg/zcLOW1R8GqNXwI1ZX7lzfkFywp5qZeiHwFj3k+3zKBEAweMxf/DejN/EoX0usPUm+U1/yFivaXtQK6LQtcXZJHYk+ND78ReDNw2jHryU2Rt5g3NfhMYnQ9VaJHcyiUMZ9d5CW4GNFJG+sWkR2ChkHYnS3PugOGmf3UJSzNiHUmaPvZDjuYr+iXEJOsng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=nongnu.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rlru3fdePzpRWsEsUE37cCfxN2jirajYW39osNlJ+js=; b=cFtDZg89pp+5vQWfd0KRNQEkvpuy2Mkf218EheN1xBYkWfg4cE9US6G7x9aCs1mvXbFhXedS7xDWvFeYRboPqo+l+xaCkU9xPPI+IS+Q2fWKzfIQRYYdkyXxqhFHH8+6xOiivOWeQQZ4ay9kx9Q5B5l3k5xnPw9EUGUlA6DsfD6l37CRdBqzOKvL4473YZvsgko7NCMWj6ySj8JMO2YBCYz3p9etZIZALWbCwpTSKLb1dBfmoDW4YxCNohQVd+XcMmZBEQTMZm3I5V1Y4VkoemzZv/Wo4fvTpwMq1469akutpPUTu3jVaJ5hzEXFBjirDHV4nDGD8T8UkwGD0rfG2A== Received: from DM6PR02CA0051.namprd02.prod.outlook.com (2603:10b6:5:177::28) by DM4PR12MB5770.namprd12.prod.outlook.com (2603:10b6:8:61::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.19; Thu, 9 Feb 2023 19:21:47 +0000 Received: from DS1PEPF0000E634.namprd02.prod.outlook.com (2603:10b6:5:177:cafe::9d) by DM6PR02CA0051.outlook.office365.com (2603:10b6:5:177::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.18 via Frontend Transport; Thu, 9 Feb 2023 19:21:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by DS1PEPF0000E634.mail.protection.outlook.com (10.167.17.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.16 via Frontend Transport; Thu, 9 Feb 2023 19:21:47 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Thu, 9 Feb 2023 11:21:34 -0800 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Thu, 9 Feb 2023 11:21:34 -0800 Received: from vdi.nvidia.com (10.127.8.9) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.986.36 via Frontend Transport; Thu, 9 Feb 2023 11:21:30 -0800 From: Avihai Horon To: CC: Alex Williamson , Juan Quintela , "Dr. David Alan Gilbert" , "Michael S. Tsirkin" , Cornelia Huck , Paolo Bonzini , Vladimir Sementsov-Ogievskiy , =?utf-8?q?C=C3=A9?= =?utf-8?q?dric_Le_Goater?= , Yishai Hadas , Jason Gunthorpe , Maor Gottlieb , Avihai Horon , Kirti Wankhede , Tarun Gupta , Joao Martins Subject: [PATCH v10 11/12] vfio: Alphabetize migration section of VFIO trace-events file Date: Thu, 9 Feb 2023 21:20:42 +0200 Message-ID: <20230209192043.14885-12-avihaih@nvidia.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20230209192043.14885-1-avihaih@nvidia.com> References: <20230209192043.14885-1-avihaih@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0000E634:EE_|DM4PR12MB5770:EE_ X-MS-Office365-Filtering-Correlation-Id: 39ff66d0-28d7-4967-3a92-08db0ad2e35a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Mrh9QG0Ma6NHwEObRR4YGjDJZWY1XtKYFNU68fQXUcwo8Mb8xbanZzIYV9ciZsZLeKzXzMZs2dcMKFhltybJw7xBNqokQTCfebrAQSkNCyJaFeyTUAoPTjG1OyqiuDC32oudcLCn/OKLabOOZvhYCyBRFSIz8NrdhdlBrM5BWIKSqDTmIZ6XCD2YRBdNxAjW6eDMJ/hHU/swSqPkx7HVCH2CBtyFAj+eMjMdFyMW8Ua9x1UlNnyNA8kujiBsBer6WFZvba7b7lrseZuzsYk4N2Bm0fEa4Of2kqeVNhi5S/WQpvsEyBTHMcKU0kU1p+oT7suW/+WmshqQZx0Vp/cJMvKsskzTNuo9I/FdA1Zg3sqfJHAmR/drBMz79akNdJQzjEnkp0/oNKWfqC4saj4/Wpzxi240qAVg+t6Ty6PFGJl1HeEGPDYjc0eC0viN61xUlxzKMR0eEt4VUhxp6Ivd9i5c9sJpHvKYn4byXXrfqjybGgXhmdxQib5+PMxXWskPA6Ha/y0QiCF0Dc/bsNXAzHK1lRmlxlTN/9rO9qmbJXdJTT9xZSPGy/lhKYQa0KR7ZWydbfe75j3bcKLGgK/9Miefccvj4+KpB36Wch6ECqYfZ7BMhX26smrfi4AWW7pn5W6YXdmtAyiLGsVp+WH9KJYTI1WRnjGgvxzdabn4kzMmU+RenQ4hnPzD765RW/YJSdcFAGjjQ+0INBjx4MUyaQ== X-Forefront-Antispam-Report: CIP:216.228.118.233; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge2.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(136003)(39860400002)(346002)(396003)(376002)(451199018)(36840700001)(40470700004)(46966006)(36756003)(40480700001)(82310400005)(83380400001)(356005)(7636003)(36860700001)(82740400003)(40460700003)(186003)(1076003)(26005)(6666004)(54906003)(2906002)(478600001)(7696005)(316002)(7416002)(41300700001)(5660300002)(8936002)(66574015)(47076005)(86362001)(2616005)(426003)(336012)(70586007)(70206006)(6916009)(4326008)(8676002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2023 19:21:47.5245 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 39ff66d0-28d7-4967-3a92-08db0ad2e35a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.233]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0000E634.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5770 Received-SPF: softfail client-ip=2a01:111:f400:7eae::601; envelope-from=avihaih@nvidia.com; helo=NAM11-BN8-obe.outbound.protection.outlook.com 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, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sort the migration section of VFIO trace events file alphabetically and move two misplaced traces to common.c section. Signed-off-by: Avihai Horon Reviewed-by: Cédric Le Goater Reviewed-by: Juan Quintela --- hw/vfio/trace-events | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events index e5dc46c873..536dfbdcb2 100644 --- a/hw/vfio/trace-events +++ b/hw/vfio/trace-events @@ -119,6 +119,8 @@ vfio_region_sparse_mmap_header(const char *name, int index, int nr_areas) "Devic vfio_region_sparse_mmap_entry(int i, unsigned long start, unsigned long end) "sparse entry %d [0x%lx - 0x%lx]" vfio_get_dev_region(const char *name, int index, uint32_t type, uint32_t subtype) "%s index %d, %08x/%0x8" vfio_dma_unmap_overflow_workaround(void) "" +vfio_get_dirty_bitmap(int fd, uint64_t iova, uint64_t size, uint64_t bitmap_size, uint64_t start) "container fd=%d, iova=0x%"PRIx64" size= 0x%"PRIx64" bitmap_size=0x%"PRIx64" start=0x%"PRIx64 +vfio_iommu_map_dirty_notify(uint64_t iova_start, uint64_t iova_end) "iommu dirty @ 0x%"PRIx64" - 0x%"PRIx64 # platform.c vfio_platform_base_device_init(char *name, int groupid) "%s belongs to group #%d" @@ -148,19 +150,17 @@ vfio_display_edid_update(uint32_t prefx, uint32_t prefy) "%ux%u" vfio_display_edid_write_error(void) "" # migration.c +vfio_load_cleanup(const char *name) " (%s)" +vfio_load_device_config_state(const char *name) " (%s)" +vfio_load_state(const char *name, uint64_t data) " (%s) data 0x%"PRIx64 +vfio_load_state_device_data(const char *name, uint64_t data_size, int ret) " (%s) size 0x%"PRIx64" ret %d" vfio_migration_probe(const char *name) " (%s)" vfio_migration_set_state(const char *name, const char *state) " (%s) state %s" -vfio_vmstate_change(const char *name, int running, const char *reason, const char *dev_state) " (%s) running %d reason %s device state %s" vfio_migration_state_notifier(const char *name, const char *state) " (%s) state %s" -vfio_save_setup(const char *name, uint64_t data_buffer_size) " (%s) data buffer size 0x%"PRIx64 +vfio_save_block(const char *name, int data_size) " (%s) data_size %d" vfio_save_cleanup(const char *name) " (%s)" +vfio_save_complete_precopy(const char *name, int ret) " (%s) ret %d" vfio_save_device_config_state(const char *name) " (%s)" +vfio_save_setup(const char *name, uint64_t data_buffer_size) " (%s) data buffer size 0x%"PRIx64 vfio_state_pending_exact(const char *name, uint64_t precopy, uint64_t postcopy, uint64_t compatible, uint64_t stopcopy_size) " (%s) precopy 0x%"PRIx64" postcopy 0x%"PRIx64" compatible 0x%"PRIx64" stopcopy size 0x%"PRIx64 -vfio_save_complete_precopy(const char *name, int ret) " (%s) ret %d" -vfio_load_device_config_state(const char *name) " (%s)" -vfio_load_state(const char *name, uint64_t data) " (%s) data 0x%"PRIx64 -vfio_load_state_device_data(const char *name, uint64_t data_size, int ret) " (%s) size 0x%"PRIx64" ret %d" -vfio_load_cleanup(const char *name) " (%s)" -vfio_get_dirty_bitmap(int fd, uint64_t iova, uint64_t size, uint64_t bitmap_size, uint64_t start) "container fd=%d, iova=0x%"PRIx64" size= 0x%"PRIx64" bitmap_size=0x%"PRIx64" start=0x%"PRIx64 -vfio_iommu_map_dirty_notify(uint64_t iova_start, uint64_t iova_end) "iommu dirty @ 0x%"PRIx64" - 0x%"PRIx64 -vfio_save_block(const char *name, int data_size) " (%s) data_size %d" +vfio_vmstate_change(const char *name, int running, const char *reason, const char *dev_state) " (%s) running %d reason %s device state %s"