From patchwork Mon Oct 14 10:49:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 176189 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4388859ill; Mon, 14 Oct 2019 04:35:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqwT6W8hEWMXF1VJmdtMXSd4kTUGVfpiETtRNOvzrc/GzZ1JFtFnPQ/77J/HH1wWmg01VVXC X-Received: by 2002:ac8:363c:: with SMTP id m57mr31873734qtb.290.1571052945352; Mon, 14 Oct 2019 04:35:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571052945; cv=none; d=google.com; s=arc-20160816; b=okMaL+30EWmPcJVXfnfHh+RIHW5y4wJVKz1aN51t8XqOsgpb8aNPLicuGWFnVz2w5L SAEpCa/xBiMenBsv2X9ted7FvNpV3xBRTz3qvIm3NNm9FyAmIkrf9sIXkBU5qQhmiKq9 Ju8wuH2CXMYW5ZMX2lCC/3h1BNvYflk8IDOQo9beUfx9YeBEyF2kYljgYNRvCi67Yaq7 4EoRPMkjGJcR1pDiQ6GMZ0+xuAxfeyCwsFof7iIaCFzGUOULBPFpPQSFl8MolUMAGjf3 5cx/qohqeTaufNTjFHZpJMIAt3sRjmaV45LCElaDzxRg9akXM6kfFaUMy96OvujvvU5y aT4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=crw16Ubz+md1UknF7Ek+z0EbuUyNC3Q+RBvq7bGGoJI=; b=YYFStWtx1iQ1l4EcFEuwUdyHXLfi+rbTJpsiQD0JDrjwu6cRTrMe40IlLnaAvS67Jr 1YJr23NCSVrdu/JqGWGKXZIps0ddeA4vpmpDxY+p+zFUKolwBuZgkzkovwfdKlRDiGGj 6Xq7yrhD5QiZlGIBntuKhFi2WBab0p7C3IKRrJF6yyYui/aU7LKoI34nilsWwhV7EloQ Xc3VPhqqis3AUQtkNmdwGrDu8NMy6RiIkFkOIpoAr0+XGPulYgXPGlsm6DsZy+13AOQw nZz4vNv4WkT4cgDpn0R3Qgrhka7nz+VOIxhclrS91V3Vm5qRzsi6xJXGiXqKccgAhk8W RHyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RtERnifm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 2si17573743qkj.366.2019.10.14.04.35.45 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Oct 2019 04:35:45 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RtERnifm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iJydc-00062T-H9 for patch@linaro.org; Mon, 14 Oct 2019 07:35:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46891) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iJyCD-00087r-NG for qemu-devel@nongnu.org; Mon, 14 Oct 2019 07:07:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iJyCB-0007jp-3x for qemu-devel@nongnu.org; Mon, 14 Oct 2019 07:07:24 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:34884) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iJyCA-0007iR-TN for qemu-devel@nongnu.org; Mon, 14 Oct 2019 07:07:23 -0400 Received: by mail-wr1-x443.google.com with SMTP id v8so19217345wrt.2 for ; Mon, 14 Oct 2019 04:07:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=crw16Ubz+md1UknF7Ek+z0EbuUyNC3Q+RBvq7bGGoJI=; b=RtERnifmGf+4oL7gLvdC4pomT5jrlctM+a9lrLPq6Spl9IkDmtbnTLafU6jvwHkAx4 ZWmbK5DZcarmOwOORIY6CfJmwqMT3GYaLy6zdPq40wh2UITggfRbz7b3NHKCf6aYu9bf 5zJrCy8fydA3/hilxO+qNklczdLqZR/crrGkoUtDZHTWvV5i0+GMswNsc70Nr185lgHr dc/yawqyDHDV6gO20nM9Oo4ypxQpv0h3Yt0jrEnG3sye93YAF6BNb3vivMSOQKJuhc6d uuQrVVGKO3Q0fRE2sDTMjjk0mQ2MmJvViGnQf5F7buhIryi+xDQsS63QugqyhukoZ0CK B8Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=crw16Ubz+md1UknF7Ek+z0EbuUyNC3Q+RBvq7bGGoJI=; b=qaloYDvGl9abbYzf51fVRBdkzgxwyx34IlKArDv1Ay7yeckefNeeGIhEUR988wr89x vSN3hkToKiCMZnWLej2XOpSiWAZZ5ul/3GIWptmE4B0kcqvHMw9YWyiqCKCyH6NoDpxl prC+cQV2Cs0UgxYt5xxYsR+VTKnOEUDSVQjDggT5Nulnvy9r37LeoKhAvwkA88pNfmFJ v/YRFXYXp1NHUYRk2M9B4TwLGG++2gWgmFWSFGP4VMSsI5WoGXQjukkfJWW4NRjFK6R/ Xw7P95Y6kJecXlH6qwBexRF6KMD/yOUe2RDgPEJfjGFMAz7IAUJ0iXL+bNw3XujaSj1D ionA== X-Gm-Message-State: APjAAAXb2FP+jJTwZSNbvaetAHl7ktIR4/81UC8jJtAocOXha6dp1RTV ZLubaWpGW6Nfs5r353iVDPpYLg== X-Received: by 2002:a5d:6189:: with SMTP id j9mr15899899wru.21.1571051241757; Mon, 14 Oct 2019 04:07:21 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c9sm16764103wrt.7.2019.10.14.04.07.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2019 04:07:20 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2B4041FFC3; Mon, 14 Oct 2019 11:49:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v5 36/55] plugin: add API symbols to qemu-plugins.symbols Date: Mon, 14 Oct 2019 11:49:29 +0100 Message-Id: <20191014104948.4291-37-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191014104948.4291-1-alex.bennee@linaro.org> References: <20191014104948.4291-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 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: aaron@os.amperecomputing.com, cota@braap.org, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , robert.foley@futurewei.com, peter.puhov@futurewei.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" Signed-off-by: Emilio G. Cota [AJB: moved into plugins] Signed-off-by: Alex Bennée --- v3 - moved to plugins/ - include qemu_plugin_reset v5 - re-trigger configure if symbols are updated - wrap ld checks inside if static = no --- Makefile | 7 ++++ configure | 72 ++++++++++++++++++++++++++++++++++++ plugins/.gitignore | 2 + plugins/Makefile.objs | 14 +++++++ plugins/qemu-plugins.symbols | 38 +++++++++++++++++++ 5 files changed, 133 insertions(+) create mode 100644 plugins/.gitignore create mode 100644 plugins/qemu-plugins.symbols -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/Makefile b/Makefile index 15f4745cf3..370eb9ad8d 100644 --- a/Makefile +++ b/Makefile @@ -74,6 +74,12 @@ CONFIG_ALL=y config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios $(SRC_PATH)/VERSION @echo $@ is out-of-date, running configure @./config.status + +# Force configure to re-run if the API symbols are updated +ifeq ($(CONFIG_PLUGIN),y) +config-host.mak: $(SRC_PATH)/plugins/qemu-plugins.symbols +endif + else config-host.mak: ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail)) @@ -730,6 +736,7 @@ distclean: clean rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys rm -f qemu-doc.log qemu-doc.pdf qemu-doc.pg qemu-doc.toc qemu-doc.tp rm -f qemu-doc.vr qemu-doc.txt + rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols rm -f config.log rm -f linux-headers/asm rm -f docs/version.texi diff --git a/configure b/configure index 485a9837c9..75632b1df1 100755 --- a/configure +++ b/configure @@ -30,6 +30,7 @@ TMPO="${TMPDIR1}/${TMPB}.o" TMPCXX="${TMPDIR1}/${TMPB}.cxx" TMPE="${TMPDIR1}/${TMPB}.exe" TMPMO="${TMPDIR1}/${TMPB}.mo" +TMPTXT="${TMPDIR1}/${TMPB}.txt" rm -f config.log @@ -5464,6 +5465,61 @@ if compile_prog "" "" ; then atomic64=yes fi +######################################### +# See if --dynamic-list is supported by the linker +ld_dynamic_list="no" +if test "$static" = "no" ; then + cat > $TMPTXT < $TMPC < +void foo(void); + +void foo(void) +{ + printf("foo\n"); +} + +int main(void) +{ + foo(); + return 0; +} +EOF + + if compile_prog "" "-Wl,--dynamic-list=$TMPTXT" ; then + ld_dynamic_list="yes" + fi +fi + +######################################### +# See if -exported_symbols_list is supported by the linker + +ld_exported_symbols_list="no" +if test "$static" = "no" ; then + cat > $TMPTXT <> $config_host_mak LIBS="-ldl $LIBS" + # Copy the export object list to the build dir + if test "$ld_dynamic_list" = "yes" ; then + echo "CONFIG_HAS_LD_DYNAMIC_LIST=yes" >> $config_host_mak + ld_symbols=qemu-plugins-ld.symbols + cp "$source_path/plugins/qemu-plugins.symbols" $ld_symbols + elif test "$ld_exported_symbols_list" = "yes" ; then + echo "CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST=yes" >> $config_host_mak + ld64_symbols=qemu-plugins-ld64.symbols + echo "# Automatically generated by configure - do not modify" > $ld64_symbols + grep 'qemu_' "$source_path/plugins/qemu-plugins.symbols" | sed 's/;//g' | \ + sed -E 's/^[[:space:]]*(.*)/_\1/' >> $ld64_symbols + else + error_exit \ + "If \$plugins=yes, either \$ld_dynamic_list or " \ + "\$ld_exported_symbols_list should have been set to 'yes'." + fi fi if test "$tcg_interpreter" = "yes"; then diff --git a/plugins/.gitignore b/plugins/.gitignore new file mode 100644 index 0000000000..7b8aaa1f10 --- /dev/null +++ b/plugins/.gitignore @@ -0,0 +1,2 @@ +qemu-plugins-ld.symbols +qemu-plugins-ld64.symbols diff --git a/plugins/Makefile.objs b/plugins/Makefile.objs index 95baabf3d2..6f14d91ccb 100644 --- a/plugins/Makefile.objs +++ b/plugins/Makefile.objs @@ -5,3 +5,17 @@ obj-y += loader.o obj-y += core.o obj-y += api.o + +# Abuse -libs suffix to only link with --dynamic-list/-exported_symbols_list +# when the final binary includes the plugin object. +# +# Note that simply setting LDFLAGS is not enough: we build binaries that +# never link plugin.o, and the linker might fail (at least ld64 does) +# if the symbols in the list are not in the output binary. +ifdef CONFIG_HAS_LD_DYNAMIC_LIST +api.o-libs := -Wl,--dynamic-list=$(BUILD_DIR)/qemu-plugins-ld.symbols +else +ifdef CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST +api.o-libs := -Wl,-exported_symbols_list,$(BUILD_DIR)/qemu-plugins-ld64.symbols +endif +endif diff --git a/plugins/qemu-plugins.symbols b/plugins/qemu-plugins.symbols new file mode 100644 index 0000000000..40c0d1abd2 --- /dev/null +++ b/plugins/qemu-plugins.symbols @@ -0,0 +1,38 @@ +{ + qemu_plugin_uninstall; + qemu_plugin_reset; + qemu_plugin_register_vcpu_init_cb; + qemu_plugin_register_vcpu_exit_cb; + qemu_plugin_register_vcpu_idle_cb; + qemu_plugin_register_vcpu_resume_cb; + qemu_plugin_register_vcpu_insn_exec_cb; + qemu_plugin_register_vcpu_insn_exec_inline; + qemu_plugin_register_vcpu_mem_cb; + qemu_plugin_register_vcpu_mem_haddr_cb; + qemu_plugin_register_vcpu_mem_inline; + qemu_plugin_ram_addr_from_host; + qemu_plugin_register_vcpu_tb_trans_cb; + qemu_plugin_register_vcpu_tb_exec_cb; + qemu_plugin_register_vcpu_tb_exec_inline; + qemu_plugin_register_flush_cb; + qemu_plugin_register_vcpu_syscall_cb; + qemu_plugin_register_vcpu_syscall_ret_cb; + qemu_plugin_register_atexit_cb; + qemu_plugin_tb_n_insns; + qemu_plugin_tb_get_insn; + qemu_plugin_tb_vaddr; + qemu_plugin_insn_data; + qemu_plugin_insn_size; + qemu_plugin_insn_vaddr; + qemu_plugin_insn_haddr; + qemu_plugin_mem_size_shift; + qemu_plugin_mem_is_sign_extended; + qemu_plugin_mem_is_big_endian; + qemu_plugin_mem_is_store; + qemu_plugin_get_hwaddr; + qemu_plugin_hwaddr_is_io; + qemu_plugin_hwaddr_to_raddr; + qemu_plugin_vcpu_for_each; + qemu_plugin_n_vcpus; + qemu_plugin_n_max_vcpus; +};