From nobody Sun May 19 07:11:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yadro.com ARC-Seal: i=1; a=rsa-sha256; t=1594887562; cv=none; d=zohomail.com; s=zohoarc; b=Ve4rf60zUXhMwmh73S0/z54E2ZVcHBejN3EVGJv7RDa+llC6HT/dZQNCCdpOHrTYSE4sGJv61rRY/rQJEO2orIX0CB+owNkOfPkfDSqkEHbMlM4yCRmz5RYfJP1Zf+yx9buEEIb/rYAf4X1ojut5Uata01PFnivP1c8fLpGnjwA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594887562; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TDPHTa0M6IxXouQfCGBucpIN2gJFWgp5gLCx7k3Q1II=; b=cb8m6tozRM4zzp3CoeMCo3owk79NYUWhlgMmk/whlRv6LIIR1c6TIUF+0ZFXgxJUcYBh3YkL0cFD895+BePNkL58V7143A0RSbh0f1hqamOJDZXh5NQ2WfoiguGXcDmjCvbGp6JGKKLsDTt137q4gL8kGFrYdar5KmYb2Hr+USA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594887562881793.0173925413781; Thu, 16 Jul 2020 01:19:22 -0700 (PDT) Received: from localhost ([::1]:33812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvz6v-0000PP-Ay for importer@patchew.org; Thu, 16 Jul 2020 04:19:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvz66-0007bi-Vy for qemu-devel@nongnu.org; Thu, 16 Jul 2020 04:18:31 -0400 Received: from mta-02.yadro.com ([89.207.88.252]:43072 helo=mta-01.yadro.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvz65-0008QR-9q for qemu-devel@nongnu.org; Thu, 16 Jul 2020 04:18:30 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 05A424C902; Thu, 16 Jul 2020 08:18:28 +0000 (UTC) Received: from mta-01.yadro.com ([127.0.0.1]) by localhost (mta-01.yadro.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IV_gzIq2UEke; Thu, 16 Jul 2020 11:18:26 +0300 (MSK) Received: from T-EXCH-02.corp.yadro.com (t-exch-02.corp.yadro.com [172.17.10.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mta-01.yadro.com (Postfix) with ESMTPS id D2D8E4C83C; Thu, 16 Jul 2020 11:18:26 +0300 (MSK) Received: from localhost (172.17.204.212) by T-EXCH-02.corp.yadro.com (172.17.10.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Thu, 16 Jul 2020 11:18:26 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yadro.com; h= content-type:content-type:content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=mta-01; t= 1594887506; x=1596701907; bh=nkNZsz7/JkOV/cy6qwKLx+4fdJUxZ+Y0cXW zs1V9bwQ=; b=sITrZXmmHrSZ6k9Pho5SzkUQQBNp5bsodqwuv7qSmXGtsJp6T16 LpnXK2VrrBytWv00WSwKwMFdHoMqZMuto7ToBE/buPrXmPc0RFsyuVlpbNh/+lQn kRurUB10rCNox2GOb2Lg9A6zx+uskKuq0UitHnXCCHbuU2ZzQVbro9tc= X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH 1/4] scripts/tracetool: Fix dtrace generation for macOS Date: Thu, 16 Jul 2020 11:17:51 +0300 Message-ID: <20200716081754.22422-2-r.bolshakov@yadro.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200716081754.22422-1-r.bolshakov@yadro.com> References: <20200716081754.22422-1-r.bolshakov@yadro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.17.204.212] X-ClientProxiedBy: T-EXCH-01.corp.yadro.com (172.17.10.101) To T-EXCH-02.corp.yadro.com (172.17.10.102) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=89.207.88.252; envelope-from=r.bolshakov@yadro.com; helo=mta-01.yadro.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/16 04:18:26 X-ACL-Warn: Detected OS = Linux 3.11 and newer 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Stefan Hajnoczi , Cameron Esfahani Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @yadro.com) Content-Type: text/plain; charset="utf-8" dtrace USDT is fully supported since OS X 10.6. There are a few peculiarities compared to other dtrace flavors. 1. It doesn't accept empty files. 2. It doesn't recognize bool type but accepts ANSI C _Bool. Cc: Cameron Esfahani Signed-off-by: Roman Bolshakov Reviewed-by: Daniel P. Berrang=C3=A9 --- scripts/tracetool/format/d.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/tracetool/format/d.py b/scripts/tracetool/format/d.py index 0afb5f3f47..be4a2aa254 100644 --- a/scripts/tracetool/format/d.py +++ b/scripts/tracetool/format/d.py @@ -13,6 +13,7 @@ __email__ =3D "stefanha@redhat.com" =20 =20 from tracetool import out +from sys import platform =20 =20 # Reserved keywords from @@ -34,7 +35,8 @@ def generate(events, backend, group): =20 # SystemTap's dtrace(1) warns about empty "provider qemu {}" but is ha= ppy # with an empty file. Avoid the warning. - if not events: + # But dtrace on macOS can't deal with empty files. + if not events and platform !=3D "darwin": return =20 out('/* This file is autogenerated by tracetool, do not edit. */' @@ -44,6 +46,11 @@ def generate(events, backend, group): for e in events: args =3D [] for type_, name in e.args: + if platform =3D=3D "darwin": + if type_ =3D=3D 'bool': + type_ =3D '_Bool' + if type_ =3D=3D 'bool *': + type_ =3D '_Bool *' if name in RESERVED_WORDS: name +=3D '_' args.append(type_ + ' ' + name) --=20 2.26.1 From nobody Sun May 19 07:11:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yadro.com ARC-Seal: i=1; a=rsa-sha256; t=1594887564; cv=none; d=zohomail.com; s=zohoarc; b=O/mG8gFdXCEw/dguFJcrzleadO66ctxJHYdPiXw582vOKsjE05xGyDggEjCIZQ6YIwWS4F2nKYX4uHkiOSkC4PqSWPI13Q2gkC5afuQNmhp50ch7vdT6i6zGxiQVwqGp9wnyyQFLDr3VGZxijEgZZ8umCMxrDgH8diz3fIJ0TDY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594887564; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=65sDviXJTke5PdI9wtgJ9AmGLw6lm2WPGohQ38Q93pw=; b=Dp41t1xAKLpl0HaEgTzM3Lx6P9uL9XAeBS4uK9Tp7EH4T2V2gnbLs2kAe/Wq+YquwWrLP/MfvjI7cmCuM+DfsxgbECTxEdQkmz0/uoFQK03hkn4yZ7L1P0vjT6F3x6VklFRTV16rAXPMKm0Ol33E6O4RLeGuCmcxzXr4tuCNuUk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594887564436365.2012099550956; Thu, 16 Jul 2020 01:19:24 -0700 (PDT) Received: from localhost ([::1]:33934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvz6x-0000SQ-5j for importer@patchew.org; Thu, 16 Jul 2020 04:19:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvz68-0007dC-HS for qemu-devel@nongnu.org; Thu, 16 Jul 2020 04:18:32 -0400 Received: from mta-02.yadro.com ([89.207.88.252]:43084 helo=mta-01.yadro.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvz66-0008Qb-QH for qemu-devel@nongnu.org; Thu, 16 Jul 2020 04:18:32 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 7D0494C901; Thu, 16 Jul 2020 08:18:29 +0000 (UTC) Received: from mta-01.yadro.com ([127.0.0.1]) by localhost (mta-01.yadro.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q3jVZFvW6gSf; Thu, 16 Jul 2020 11:18:28 +0300 (MSK) Received: from T-EXCH-02.corp.yadro.com (t-exch-02.corp.yadro.com [172.17.10.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mta-01.yadro.com (Postfix) with ESMTPS id 5AF934C83C; Thu, 16 Jul 2020 11:18:28 +0300 (MSK) Received: from localhost (172.17.204.212) by T-EXCH-02.corp.yadro.com (172.17.10.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Thu, 16 Jul 2020 11:18:28 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yadro.com; h= content-type:content-type:content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=mta-01; t= 1594887508; x=1596701909; bh=KBPu3pnnuJoJXNVzOcGqGbq+3EzDIyehum+ B7GOYl4g=; b=cb2pZYOQbWpptGXGxaV8R12ImnXqINma1rPQBuys1X4VmcI25Ph uGButqscketsipek498C+HU2QvyolQCgj6tIweDpjd9AmdRwdKUt2ZJTRN3MPq13 rcnxer36aVvi9U0ycRtguXhHIGkqpV5WeQHjKPU5KOadYoy9F7iI3Nik= X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH 2/4] scripts/tracetool: Use void pointer for vcpu Date: Thu, 16 Jul 2020 11:17:52 +0300 Message-ID: <20200716081754.22422-3-r.bolshakov@yadro.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200716081754.22422-1-r.bolshakov@yadro.com> References: <20200716081754.22422-1-r.bolshakov@yadro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.17.204.212] X-ClientProxiedBy: T-EXCH-01.corp.yadro.com (172.17.10.101) To T-EXCH-02.corp.yadro.com (172.17.10.102) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=89.207.88.252; envelope-from=r.bolshakov@yadro.com; helo=mta-01.yadro.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/16 04:18:26 X-ACL-Warn: Detected OS = Linux 3.11 and newer 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Stefan Hajnoczi , Cameron Esfahani Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @yadro.com) Content-Type: text/plain; charset="utf-8" dtrace on macOS complains that CPUState * is used for a few probes: dtrace: failed to compile script trace-dtrace-root.dtrace: line 130: synt= ax error near "CPUState" A comment in scripts/tracetool/__init__.py mentions that: We only want to allow standard C types or fixed sized integer types. We don't want QEMU specific types as we can't assume trace backends can resolve all the typedefs Fixes: 3d211d9f4dbee ("trace: Add 'vcpu' event property to trace guest vCPU= ") Cc: Cameron Esfahani Signed-off-by: Roman Bolshakov Reviewed-by: Daniel P. Berrang=C3=A9 --- scripts/tracetool/vcpu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/tracetool/vcpu.py b/scripts/tracetool/vcpu.py index b54e4f4e7a..868b4cb04c 100644 --- a/scripts/tracetool/vcpu.py +++ b/scripts/tracetool/vcpu.py @@ -24,7 +24,7 @@ def transform_event(event): assert "tcg-trans" not in event.properties assert "tcg-exec" not in event.properties =20 - event.args =3D Arguments([("CPUState *", "__cpu"), event.args]) + event.args =3D Arguments([("void *", "__cpu"), event.args]) if "tcg" in event.properties: fmt =3D "\"cpu=3D%p \"" event.fmt =3D [fmt + event.fmt[0], --=20 2.26.1 From nobody Sun May 19 07:11:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yadro.com ARC-Seal: i=1; a=rsa-sha256; t=1594887648; cv=none; d=zohomail.com; s=zohoarc; b=kMVtJwz7H6fDtwz6zP3bwFYKQeGs/dZPZx9MXTetAme9bVNCSfUZTn1T/ynRCeo5TaOH5++kX1d2SRnPWP3g3vrTYRXcZEKZlE2zRs8ZJSGKFrEVlK46KbiWY+UmeCBtrtRGalmn8YimxO3SfRdw9zx3bGsrkuviKByuGLuXqeI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594887648; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=K634s0IV9O28JmatiLxvflUTbDpMchAE3kl5wKIJ//c=; b=VfFB+hyt5S442iWZOsTJQfuTNzyMjs3iSRiu1y9I4d4wxAzt3G6LSwKQVwrulgyd2pV5Vmg8RIODO+G6CZXxpb0n8u+Obbj3PS6q+VMywU5R1Aef3ZRG1SgfiLalaZ/i7Sry2cQgK1tktGfdc4nJBYTlGsskXh4JCvHLq+wq7+g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594887648856204.13536706751995; Thu, 16 Jul 2020 01:20:48 -0700 (PDT) Received: from localhost ([::1]:39246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvz8J-0002jw-N3 for importer@patchew.org; Thu, 16 Jul 2020 04:20:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvz6A-0007hJ-GO for qemu-devel@nongnu.org; Thu, 16 Jul 2020 04:18:34 -0400 Received: from mta-02.yadro.com ([89.207.88.252]:43094 helo=mta-01.yadro.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvz68-0008Qj-II for qemu-devel@nongnu.org; Thu, 16 Jul 2020 04:18:34 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 3AF804C902; Thu, 16 Jul 2020 08:18:31 +0000 (UTC) Received: from mta-01.yadro.com ([127.0.0.1]) by localhost (mta-01.yadro.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sV9xFw0sIT2g; Thu, 16 Jul 2020 11:18:29 +0300 (MSK) Received: from T-EXCH-02.corp.yadro.com (t-exch-02.corp.yadro.com [172.17.10.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mta-01.yadro.com (Postfix) with ESMTPS id B7F324C83C; Thu, 16 Jul 2020 11:18:29 +0300 (MSK) Received: from localhost (172.17.204.212) by T-EXCH-02.corp.yadro.com (172.17.10.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Thu, 16 Jul 2020 11:18:29 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yadro.com; h= content-type:content-type:content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=mta-01; t= 1594887509; x=1596701910; bh=ZWdQaxpJ7cyhetjiwBvj58UmJ/1Ud70+cJ8 wULIywVM=; b=HSA2pmY4+MBD2JkQBeF32sk9Lm929GvDzKmA2t/QVB3Wrs3h0GX 3WZNhSi2uaSSPu1FaKxKfTmFYAE5AecN6hb+LWJtM12WWtvzxkTiE/da60V2dJkl h7+FxRG7OXvi1DZLncpB7/vLH293aPWlihN8Vf2p7DaqrzT4LmGuHDS0= X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH 3/4] build: Don't make object files for dtrace on macOS Date: Thu, 16 Jul 2020 11:17:53 +0300 Message-ID: <20200716081754.22422-4-r.bolshakov@yadro.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200716081754.22422-1-r.bolshakov@yadro.com> References: <20200716081754.22422-1-r.bolshakov@yadro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.17.204.212] X-ClientProxiedBy: T-EXCH-01.corp.yadro.com (172.17.10.101) To T-EXCH-02.corp.yadro.com (172.17.10.102) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=89.207.88.252; envelope-from=r.bolshakov@yadro.com; helo=mta-01.yadro.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/16 04:18:26 X-ACL-Warn: Detected OS = Linux 3.11 and newer 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Cameron Esfahani Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @yadro.com) Content-Type: text/plain; charset="utf-8" dtrace on macOS uses unresolved symbols with a special prefix to define probes [1], only headers should be generated for USDT (dtrace(1)). But it doesn't support backwards compatible no-op -G flag [2] and implicit build rules fail. 1. https://markmail.org/message/6grq2ygr5nwdwsnb 2. https://markmail.org/message/5xrxt2w5m42nojkz Cc: Cameron Esfahani Signed-off-by: Roman Bolshakov Reviewed-by: Daniel P. Berrang=C3=A9 --- Makefile.objs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.objs b/Makefile.objs index d22b3b45d7..982f15ba30 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -211,5 +211,7 @@ trace-events-files =3D $(SRC_PATH)/trace-events $(trace= -events-subdirs:%=3D$(SRC_PAT trace-obj-y =3D trace-root.o trace-obj-y +=3D $(trace-events-subdirs:%=3D%/trace.o) trace-obj-$(CONFIG_TRACE_UST) +=3D trace-ust-all.o +ifneq ($(CONFIG_DARWIN),y) trace-obj-$(CONFIG_TRACE_DTRACE) +=3D trace-dtrace-root.o trace-obj-$(CONFIG_TRACE_DTRACE) +=3D $(trace-events-subdirs:%=3D%/trace-d= trace.o) +endif --=20 2.26.1 From nobody Sun May 19 07:11:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yadro.com ARC-Seal: i=1; a=rsa-sha256; t=1594887646; cv=none; d=zohomail.com; s=zohoarc; b=F2rUmtlIay6oSmJBGr5u8oQE8SY8C3qz6HX7XrrDkAP8KQDdX2AgqR2BJOqJ5dD1LS7gROL0cL47PY8DQshLKI6LtvjcvLxB+Hvt/aAoTcIkyQLBEQSIf+F0qg6sPKxK1P94C/m+VpFh1j5bAbefeRGbgnOIm1hPYUA1oU82/qI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594887646; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=P8d0KGzjcwWBoK/G0jbPXiGr0ftKaWJ1u490P6YzznA=; b=YXlgTcJVIgU24j/lmPM0kHrvpAF1UcwIchF55BWUoGeY3rXZ8uTO6QUDnvBB6/c1rehp3mi8G373Pw9qfgh2YGfa+H3JmmHS+N4tgzBC+okg19L6yRkHkIBUgpcCkuu5zzDeV7dWWiMcsEzuL4OQzbYC01nL5KFMStt4ET+sEc0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594887646250719.3322165486074; Thu, 16 Jul 2020 01:20:46 -0700 (PDT) Received: from localhost ([::1]:39090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvz8H-0002ez-1q for importer@patchew.org; Thu, 16 Jul 2020 04:20:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51246) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvz6D-0007no-AA for qemu-devel@nongnu.org; Thu, 16 Jul 2020 04:18:37 -0400 Received: from mta-02.yadro.com ([89.207.88.252]:43114 helo=mta-01.yadro.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvz6B-0008R3-22 for qemu-devel@nongnu.org; Thu, 16 Jul 2020 04:18:36 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 1BEC44C90A; Thu, 16 Jul 2020 08:18:33 +0000 (UTC) Received: from mta-01.yadro.com ([127.0.0.1]) by localhost (mta-01.yadro.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EWxpkDAFqnvN; Thu, 16 Jul 2020 11:18:31 +0300 (MSK) Received: from T-EXCH-02.corp.yadro.com (t-exch-02.corp.yadro.com [172.17.10.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mta-01.yadro.com (Postfix) with ESMTPS id 0099C4C905; Thu, 16 Jul 2020 11:18:30 +0300 (MSK) Received: from localhost (172.17.204.212) by T-EXCH-02.corp.yadro.com (172.17.10.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Thu, 16 Jul 2020 11:18:30 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yadro.com; h= content-transfer-encoding:content-type:content-type:mime-version :references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=mta-01; t= 1594887511; x=1596701912; bh=a/hw31nyqTa1gAAqwWlH/JwEKLobmydqIiw vsM6UCNo=; b=GojVBUcYoFOr+BibDf9RGhqXtXod0PH8XJcgmtL2IJLeK+oji81 eSKu+KNyxotlrZe5bg6GgAxxzo6LjnWLkeknJsixYSqiUmbO6MWD0sBXvS+92wUK HSjy+stFc1TABAJQ6WecJ/Rs47Y2jGldt4hjCAh8d0I5yd5QK15U2dYg= X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH 4/4] net/colo: Match is-enabled probe to tracepoint Date: Thu, 16 Jul 2020 11:17:54 +0300 Message-ID: <20200716081754.22422-5-r.bolshakov@yadro.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200716081754.22422-1-r.bolshakov@yadro.com> References: <20200716081754.22422-1-r.bolshakov@yadro.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.17.204.212] X-ClientProxiedBy: T-EXCH-01.corp.yadro.com (172.17.10.101) To T-EXCH-02.corp.yadro.com (172.17.10.102) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=89.207.88.252; envelope-from=r.bolshakov@yadro.com; helo=mta-01.yadro.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/16 04:18:26 X-ACL-Warn: Detected OS = Linux 3.11 and newer 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no 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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Li Zhijian , Jason Wang , Cameron Esfahani , Zhang Chen , Roman Bolshakov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @yadro.com) Build of QEMU with dtrace fails on macOS: LINK x86_64-softmmu/qemu-system-x86_64 error: probe colo_compare_miscompare doesn't exist error: Could not register probes ld: error creating dtrace DOF section for architecture x86_64 The reason of the error is explained by Adam Leventhal [1]: Note that is-enabled probes don't have the stability magic so I'm not sure how things would work if only is-enabled probes were used. net/colo code uses is-enabled probes to determine if other probes should be used but colo_compare_miscompare itself is not used explicitly. Linker doesn't include the symbol and build fails. The issue can be resolved if is-enabled probe matches the actual trace point that is used inside the test. 1. http://markmail.org/message/6grq2ygr5nwdwsnb Fixes: f4b618360e ("colo-compare: add TCP, UDP, ICMP packet comparison") Cc: Philippe Mathieu-Daud=C3=A9 Cc: Cameron Esfahani Signed-off-by: Roman Bolshakov --- net/colo-compare.c | 12 +++++++----- net/filter-rewriter.c | 8 ++++++-- net/trace-events | 2 -- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 398b7546ff..9525ed703b 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -327,7 +327,7 @@ static int colo_compare_packet_payload(Packet *ppkt, uint16_t len) =20 { - if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) { + if (trace_event_get_state_backends(TRACE_COLO_COMPARE_IP_INFO)) { char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20= ]; =20 strcpy(pri_ip_src, inet_ntoa(ppkt->ip->ip_src)); @@ -492,7 +492,7 @@ sec: g_queue_push_head(&conn->primary_list, ppkt); g_queue_push_head(&conn->secondary_list, spkt); =20 - if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE))= { + if (trace_event_get_state_backends(TRACE_COLO_COMPARE_TCP_INFO)) { qemu_hexdump((char *)ppkt->data, stderr, "colo-compare ppkt", ppkt->size); qemu_hexdump((char *)spkt->data, stderr, @@ -533,7 +533,8 @@ static int colo_packet_compare_udp(Packet *spkt, Packet= *ppkt) ppkt->size - offset)) { trace_colo_compare_udp_miscompare("primary pkt size", ppkt->size); trace_colo_compare_udp_miscompare("Secondary pkt size", spkt->size= ); - if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE))= { + if (trace_event_get_state_backends( + TRACE_COLO_COMPARE_UDP_MISCOMPARE)) { qemu_hexdump((char *)ppkt->data, stderr, "colo-compare pri pkt= ", ppkt->size); qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt= ", @@ -576,7 +577,8 @@ static int colo_packet_compare_icmp(Packet *spkt, Packe= t *ppkt) ppkt->size); trace_colo_compare_icmp_miscompare("Secondary pkt size", spkt->size); - if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE))= { + if (trace_event_get_state_backends( + TRACE_COLO_COMPARE_ICMP_MISCOMPARE)) { qemu_hexdump((char *)ppkt->data, stderr, "colo-compare pri pkt= ", ppkt->size); qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt= ", @@ -597,7 +599,7 @@ static int colo_packet_compare_other(Packet *spkt, Pack= et *ppkt) uint16_t offset =3D ppkt->vnet_hdr_len; =20 trace_colo_compare_main("compare other"); - if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) { + if (trace_event_get_state_backends(TRACE_COLO_COMPARE_IP_INFO)) { char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20= ]; =20 strcpy(pri_ip_src, inet_ntoa(ppkt->ip->ip_src)); diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c index 1aaad101b6..ff04165cc4 100644 --- a/net/filter-rewriter.c +++ b/net/filter-rewriter.c @@ -76,7 +76,9 @@ static int handle_primary_tcp_pkt(RewriterState *rf, struct tcp_hdr *tcp_pkt; =20 tcp_pkt =3D (struct tcp_hdr *)pkt->transport_header; - if (trace_event_get_state_backends(TRACE_COLO_FILTER_REWRITER_DEBUG)) { + if (trace_event_get_state_backends(TRACE_COLO_FILTER_REWRITER_PKT_INFO= ) || + trace_event_get_state_backends( + TRACE_COLO_FILTER_REWRITER_CONN_OFFSET)) { trace_colo_filter_rewriter_pkt_info(__func__, inet_ntoa(pkt->ip->ip_src), inet_ntoa(pkt->ip->ip_dst), ntohl(tcp_pkt->th_seq), ntohl(tcp_pkt->th_ack), @@ -180,7 +182,9 @@ static int handle_secondary_tcp_pkt(RewriterState *rf, =20 tcp_pkt =3D (struct tcp_hdr *)pkt->transport_header; =20 - if (trace_event_get_state_backends(TRACE_COLO_FILTER_REWRITER_DEBUG)) { + if (trace_event_get_state_backends(TRACE_COLO_FILTER_REWRITER_PKT_INFO= ) || + trace_event_get_state_backends( + TRACE_COLO_FILTER_REWRITER_CONN_OFFSET)) { trace_colo_filter_rewriter_pkt_info(__func__, inet_ntoa(pkt->ip->ip_src), inet_ntoa(pkt->ip->ip_dst), ntohl(tcp_pkt->th_seq), ntohl(tcp_pkt->th_ack), diff --git a/net/trace-events b/net/trace-events index fa49c71533..bfaff7891d 100644 --- a/net/trace-events +++ b/net/trace-events @@ -17,10 +17,8 @@ colo_compare_udp_miscompare(const char *sta, int size) "= : %s =3D %d" colo_compare_icmp_miscompare(const char *sta, int size) ": %s =3D %d" colo_compare_ip_info(int psize, const char *sta, const char *stb, int ssiz= e, const char *stc, const char *std) "ppkt size =3D %d, ip_src =3D %s, ip_d= st =3D %s, spkt size =3D %d, ip_src =3D %s, ip_dst =3D %s" colo_old_packet_check_found(int64_t old_time) "%" PRId64 -colo_compare_miscompare(void) "" colo_compare_tcp_info(const char *pkt, uint32_t seq, uint32_t ack, int hdl= en, int pdlen, int offset, int flags) "%s: seq/ack=3D %u/%u hdlen=3D %d pdl= en=3D %d offset=3D %d flags=3D%d" =20 # filter-rewriter.c -colo_filter_rewriter_debug(void) "" colo_filter_rewriter_pkt_info(const char *func, const char *src, const cha= r *dst, uint32_t seq, uint32_t ack, uint32_t flag) "%s: src/dst: %s/%s p: s= eq/ack=3D%u/%u flags=3D0x%x" colo_filter_rewriter_conn_offset(uint32_t offset) ": offset=3D%u" --=20 2.26.1