From nobody Fri May 3 21:41:09 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1617966004; cv=none; d=zohomail.com; s=zohoarc; b=nZxlOw/si7eekcUMXTsvFRNcPf2PNWp3+/6RvVEs59HBN/WI5S4OJu6vWmMl58zJnnRHy49B/ziZ7xfdzf+ZpAXiK43edo6akxGajfDM+1C24jk/QWcVvil6lVX9izm3NNqZuXloGboV1abKr0EYkbxuXng74BgNswmow9UGG+M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617966004; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=rslm5yc8I1k4SNmho/Dv/Y0uCjwL7HICN2RClJ7Sjbc=; b=Y1UKjb6dliWWvWNYFMUk2vDgYc4nlCfdz0Q9NegxNUYF5Pofdu90FNOnrNNJLbAkn/BYV9J425jiLusZEbjy3rYeqNRxJwVzVOcvrr2+wQyMLUubJnVnYtrUkAbrrZoZdUOiq1cF1QicNNZrJrsh67XIR4ogXfgRFbqrzZbp1UU= ARC-Authentication-Results: i=1; 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 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 1617966003951566.1109395017168; Fri, 9 Apr 2021 04:00:03 -0700 (PDT) Received: from localhost ([::1]:55824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUorn-0003MB-Lp for importer@patchew.org; Fri, 09 Apr 2021 06:59:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUoqM-0002nv-E2 for qemu-devel@nongnu.org; Fri, 09 Apr 2021 06:58:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:33942) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUoqG-0002B2-3E for qemu-devel@nongnu.org; Fri, 09 Apr 2021 06:58:29 -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-552-XEQhgQAhPZaRXq9CIGzxDQ-1; Fri, 09 Apr 2021 06:58:20 -0400 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 3FF56100A616 for ; Fri, 9 Apr 2021 10:58:19 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-114-165.ams2.redhat.com [10.36.114.165]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D85045D9E3; Fri, 9 Apr 2021 10:58:12 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 9574618000AB; Fri, 9 Apr 2021 12:58:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617965901; 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; bh=rslm5yc8I1k4SNmho/Dv/Y0uCjwL7HICN2RClJ7Sjbc=; b=eXRarbT8cvJIAFChOllpzZVf3v0xCUBrIEd6E9hMtQTYUp+axTSVtNVqnh8wP9dVrWvC4a xIG11nBG0eOvvSxMuUaAS4X7AMzbOj8JOEwA87nSg/VzzBEpvH2boqBKxm/Xsde3gBtwFV FWC0JqEXfheOUuu16LbbLMPALppkwzU= X-MC-Unique: XEQhgQAhPZaRXq9CIGzxDQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v2] qemu-trace-stap: changing SYSTEMTAP_TAPSET considered harmful. Date: Fri, 9 Apr 2021 12:58:10 +0200 Message-Id: <20210409105810.374976-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@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=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_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: Gerd Hoffmann , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 --- 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 90527eb974f4..eb6e951ff235 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.30.2