From nobody Mon Feb 9 19:30:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1626108728241809.8493933052127; Mon, 12 Jul 2021 09:52:08 -0700 (PDT) Received: from localhost ([::1]:54268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2zA7-00031d-3B for importer@patchew.org; Mon, 12 Jul 2021 12:52:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2z8Q-0000BC-UU for qemu-devel@nongnu.org; Mon, 12 Jul 2021 12:50:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:59532) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2z8O-0002IJ-7V for qemu-devel@nongnu.org; Mon, 12 Jul 2021 12:50:22 -0400 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-374-4Le6lDoPOyqrbpEvv4wu_w-1; Mon, 12 Jul 2021 12:50:16 -0400 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 EAAC919200CA; Mon, 12 Jul 2021 16:50:15 +0000 (UTC) Received: from localhost (ovpn-112-230.ams2.redhat.com [10.36.112.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id C481560916; Mon, 12 Jul 2021 16:50:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626108619; 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=+xGIERkQiJT7pnXYXCFfaq29QTay27sqA942CNOp8C0=; b=Pl/kmdWs3G+Htn9UIzgW2x5E1da5cP8XzjW8AU5SwTh/rogsEsCzkgRA2vkvkWLZKWnbde C5KrVY3ERyo/vILc9iva+BuALxXA2QBr0RXhthJlrE691dopa4jExGwrOVVxLhFvSg1QL3 NZTiO+8EE57wpEN9Tsw2KXxmPCYRjnA= X-MC-Unique: 4Le6lDoPOyqrbpEvv4wu_w-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PULL 1/6] qemu-trace-stap: changing SYSTEMTAP_TAPSET considered harmful. Date: Mon, 12 Jul 2021 17:49:56 +0100 Message-Id: <20210712165001.429113-2-stefanha@redhat.com> In-Reply-To: <20210712165001.429113-1-stefanha@redhat.com> References: <20210712165001.429113-1-stefanha@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=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=170.10.133.124; envelope-from=stefanha@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.699, 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_H4=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Eduardo Habkost , qemu-block@nongnu.org, "Dr. David Alan Gilbert" , Markus Armbruster , Gerd Hoffmann , Stefan Hajnoczi , Cleber Rosa , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1626108728959100001 Content-Type: text/plain; charset="utf-8" From: Gerd Hoffmann Setting SYSTEMTAP_TAPSET to some value other than /usr/share/systemtap/tapsets results in systemtap not finding the standard tapset library any more, which in turn breaks tracing because pid() and other standard systemtap functions are not available any more. So using SYSTEMTAP_TAPSET to point systemtap to the qemu probes will only work for the prefix=3D/usr installs because both qemu and system tapsets in the same directory then. All other prefixes are broken. Fix that by using the "-I $tapsetdir" command line switch instead. Signed-off-by: Gerd Hoffmann Reviewed-by: Stefan Hajnoczi Reviewed-by: Daniel P. Berrang=C3=A9 Message-id: 20210601132414.432430-2-kraxel@redhat.com Signed-off-by: Stefan Hajnoczi --- scripts/qemu-trace-stap | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/scripts/qemu-trace-stap b/scripts/qemu-trace-stap index 90527eb974..eb6e951ff2 100755 --- a/scripts/qemu-trace-stap +++ b/scripts/qemu-trace-stap @@ -55,11 +55,6 @@ def tapset_dir(binary): return os.path.realpath(tapset) =20 =20 -def tapset_env(tapset_dir): - tenv =3D copy.copy(os.environ) - tenv["SYSTEMTAP_TAPSET"] =3D tapset_dir - return tenv - def cmd_run(args): prefix =3D probe_prefix(args.binary) tapsets =3D tapset_dir(args.binary) @@ -81,11 +76,11 @@ def cmd_run(args): =20 # We request an 8MB buffer, since the stap default 1MB buffer # can be easily overflowed by frequently firing QEMU traces - stapargs =3D ["stap", "-s", "8"] + stapargs =3D ["stap", "-s", "8", "-I", tapsets ] if args.pid is not None: stapargs.extend(["-x", args.pid]) stapargs.extend(["-e", script]) - subprocess.call(stapargs, env=3Dtapset_env(tapsets)) + subprocess.call(stapargs) =20 =20 def cmd_list(args): @@ -101,10 +96,9 @@ def cmd_list(args): =20 if verbose: print("Listing probes with name '%s'" % script) - proc =3D subprocess.Popen(["stap", "-l", script], + proc =3D subprocess.Popen(["stap", "-I", tapsets, "-l", script], stdout=3Dsubprocess.PIPE, - universal_newlines=3DTrue, - env=3Dtapset_env(tapsets)) + universal_newlines=3DTrue) out, err =3D proc.communicate() if proc.returncode !=3D 0: print("No probes found, are the tapsets installed in %s" % tap= set_dir(args.binary)) --=20 2.31.1