From nobody Fri Apr 26 21:58:25 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=1605804707; cv=none; d=zohomail.com; s=zohoarc; b=ioCUMdeY3r+BzSIH0USgrJ+ZT/tt6ypl2Bv4u5t7261iVbEntatt4m3gW0xvFysGv7+Hbv72SGKYDzcP00iNfyIwx7hBeFIJ2OML4yLnS2vIytwe+3cb++NzDwgxa+NPV936vecmjOFvRgEYDyNlsMScAv/LWZzthnL/w/Xaq9E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605804707; 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=iJ2c7VHlsuEBiPWbf8iJnuabLnBFp7FEI3X8dsoTglw=; b=SdNAMYBUESzdMxvA7ogaARju6uu/JhAMv7cjob62VgvUW30ilk8eQeV9cc+6vKE4fgkvO+Sd1h9V+sN3EqGKoulMQu2ilCH6ezhQ4g9R4/y92QI8aXlzy8i2fYNWsOLABJx5xin9iPHamZBm047M7iaA4KOMDEFs0z6PvEzbXjU= 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 1605804707243794.7000583537363; Thu, 19 Nov 2020 08:51:47 -0800 (PST) Received: from localhost ([::1]:60082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfn9u-0006E3-6K for importer@patchew.org; Thu, 19 Nov 2020 11:51:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfn6V-0002jL-Of for qemu-devel@nongnu.org; Thu, 19 Nov 2020 11:48:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24854) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfn6T-00011G-P2 for qemu-devel@nongnu.org; Thu, 19 Nov 2020 11:48:15 -0500 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-419-L_9kKoudNtGyQFnaAtn0BQ-1; Thu, 19 Nov 2020 11:48:05 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4AA691019999; Thu, 19 Nov 2020 16:48:02 +0000 (UTC) Received: from localhost (ovpn-115-68.ams2.redhat.com [10.36.115.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 94B616A253; Thu, 19 Nov 2020 16:48:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605804490; 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=iJ2c7VHlsuEBiPWbf8iJnuabLnBFp7FEI3X8dsoTglw=; b=VbdTyxkgM/LzHzYNivqwgPV3UrpJH9Eg9RLMEWqoMcrQzqW4eSLrdj22alSmU9TcNBqD9X Y3KU4ztWVatcPWtZv9x9oouLzKbK6E8qSRyEiz66sQRe5GH6H3WsLbXa9n38CnKXpJnW87 l2p9C0oHImV3HJn+2cfBgIjsglWxemM= X-MC-Unique: L_9kKoudNtGyQFnaAtn0BQ-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PULL for-5.2 1/1] trace: use STAP_SDT_V2 to work around symbol visibility Date: Thu, 19 Nov 2020 16:47:58 +0000 Message-Id: <20201119164758.939980-2-stefanha@redhat.com> In-Reply-To: <20201119164758.939980-1-stefanha@redhat.com> References: <20201119164758.939980-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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=216.205.24.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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?= , qemu-block@nongnu.org, rjones@redhat.com, fche@redhat.com, kraxel@redhat.com, Stefan Hajnoczi , wcohen@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Miroslav Rezanina , ddepaula@redhat.com 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" QEMU binaries no longer launch successfully with recent SystemTap releases. This is because modular QEMU builds link the sdt semaphores into the main binary instead of into the shared objects where they are used. The symbol visibility of semaphores is 'hidden' and the dynamic linker prints an error during module loading: $ ./configure --enable-trace-backends=3Ddtrace --enable-modules ... ... Failed to open module: /builddir/build/BUILD/qemu-4.2.0/s390x-softmmu/../= block-curl.so: undefined symbol: qemu_curl_close_semaphore The long-term solution is to generate per-module dtrace .o files and link them into the module instead of the main binary. In the short term we can define STAP_SDT_V2 so dtrace(1) produces a .o file with 'default' symbol visibility instead of 'hidden'. This workaround is small and easier to merge for QEMU 5.2 and downstream backports. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=3D1898700 Cc: wcohen@redhat.com Cc: fche@redhat.com Cc: kraxel@redhat.com Cc: rjones@redhat.com Cc: ddepaula@redhat.com Signed-off-by: Stefan Hajnoczi Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Miroslav Rezanina Message-id: 20201119141457.844452-1-stefanha@redhat.com Signed-off-by: Stefan Hajnoczi --- configure | 7 +++++++ trace/meson.build | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 714e75b5d8..796cec14de 100755 --- a/configure +++ b/configure @@ -4832,6 +4832,13 @@ if have_backend "dtrace"; then trace_backend_stap=3D"no" if has 'stap' ; then trace_backend_stap=3D"yes" + + # Workaround to avoid dtrace(1) producing a file with 'hidden' symbol + # visibility. Define STAP_SDT_V2 to produce 'default' symbol visibility + # instead. QEMU --enable-modules depends on this because the SystemTap + # semaphores are linked into the main binary and not the module's shar= ed + # object. + QEMU_CFLAGS=3D"$QEMU_CFLAGS -DSTAP_SDT_V2" fi fi =20 diff --git a/trace/meson.build b/trace/meson.build index d5fc45c628..843ea14495 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -38,13 +38,13 @@ foreach dir : [ '.' ] + trace_events_subdirs trace_dtrace_h =3D custom_target(fmt.format('trace-dtrace', 'h'), output: fmt.format('trace-dtrace', 'h'), input: trace_dtrace, - command: [ 'dtrace', '-o', '@OUTPUT@', = '-h', '-s', '@INPUT@' ]) + command: [ 'dtrace', '-DSTAP_SDT_V2', '= -o', '@OUTPUT@', '-h', '-s', '@INPUT@' ]) trace_ss.add(trace_dtrace_h) if host_machine.system() !=3D 'darwin' trace_dtrace_o =3D custom_target(fmt.format('trace-dtrace', 'o'), output: fmt.format('trace-dtrace', 'o= '), input: trace_dtrace, - command: [ 'dtrace', '-o', '@OUTPUT@'= , '-G', '-s', '@INPUT@' ]) + command: [ 'dtrace', '-DSTAP_SDT_V2',= '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ]) trace_ss.add(trace_dtrace_o) endif =20 --=20 2.28.0