From: "Martin Liška" <mliska@suse.cz>
To: Richard Biener <richard.guenther@gmail.com>,
Alexander Monakov <amonakov@ispras.ru>
Cc: Rui Ueyama <rui314@gmail.com>, GCC Patches <gcc-patches@gcc.gnu.org>
Subject: Re: [PATCH 3/3] lto-plugin: implement LDPT_GET_API_VERSION
Date: Mon, 11 Jul 2022 12:51:05 +0200 [thread overview]
Message-ID: <3bde5aa4-f3d7-63e8-8b4f-29b29f00293f@suse.cz> (raw)
In-Reply-To: <CAFiYyc1gXJKC=wiTO98+nu=pFVH1B2Joy-n2mpE7S8PdG_uQvQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1925 bytes --]
On 7/11/22 11:55, Richard Biener wrote:
> On Mon, Jul 11, 2022 at 11:16 AM Alexander Monakov <amonakov@ispras.ru> wrote:
>>
>> On Mon, 11 Jul 2022, Rui Ueyama wrote:
>>
>>>> but ignoring min_api_supported is wrong, and assuming max_api_supported > 0
>>>> is also wrong. It really should check how given [min; max] range intersects
>>>> with its own range of supported versions.
>>>
>>> Currently only one version is defined which is LAPI_V1. I don't think
>>> LAPI_UNSPECIFIED is a version number; rather, it's an unspecified
>>> value. No ordering should be defined between a defined value and an
>>> unspecified value. If LAPI_UNSPECIFIED < LAPI_V1, it should be renamed
>>> LAPI_V0.
>>
>> You still cannot rely on API guarantees of LAPI_V1 when the plugin does not
>> advertise it (thread safety of claim_file in this particular case).
>
Hi.
All right, I think we should rename LAPI_UNSPECIFIED to LAPI_V0 in order
to support minimal_api_supported == LAPI_V0.
> So with LAPI_UNSPECIFIED all the plugin gets is the linker name and version.
> Clarifying the documentation on LAPI_UNSPECIFIED might be nice, also
> what the expectation is on the linker when the plugin returns
> LAPI_UNSPECIFIED when it speficied minimal_api_supported == V1.
I've clarified that linker should return a value that is in range
[minimal_api_supported, maximal_api_supported] and added an abort
if it's not the case.
Having that, mold should respect if maximal_api_supported == LAPI_V0 is returned
by a plug-in (happens now as we miss locking for some targets).
Martin
> "minimal_api_supported == LAPI_UNSPECIFIED" does not make much
> sense if using Ruis reading of this value?
>
>> And you still should check the intersection of supported API ranges
>> and give a sane diagnostic when min_api_supported advertised by the plugin
>> exceeds LAPI_V1 (though, granted, the plugin could error out as well in this
>> case).
>>
>> Alexander
[-- Attachment #2: 0001-lto-plugin-implement-LDPT_GET_API_VERSION.patch --]
[-- Type: text/x-patch, Size: 6597 bytes --]
From 7905b58c062774deffcd3d5adfa893e17bcc0f26 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Mon, 16 May 2022 14:01:52 +0200
Subject: [PATCH] lto-plugin: implement LDPT_GET_API_VERSION
include/ChangeLog:
* plugin-api.h (enum linker_api_version): New enum.
(ld_plugin_get_api_version): New.
(enum ld_plugin_tag): Add LDPT_GET_API_VERSION.
(struct ld_plugin_tv): Add tv_get_api_version.
lto-plugin/ChangeLog:
* lto-plugin.c (negotiate_api_version): New.
(onload): Negotiate API version.
* Makefile.am: Add -DBASE_VERSION.
* Makefile.in: Regenerate.
---
include/plugin-api.h | 33 +++++++++++++++++++++++++++++
lto-plugin/Makefile.am | 2 +-
lto-plugin/Makefile.in | 2 +-
lto-plugin/lto-plugin.c | 47 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 82 insertions(+), 2 deletions(-)
diff --git a/include/plugin-api.h b/include/plugin-api.h
index 8aebe2ff267..e4ed1d139bb 100644
--- a/include/plugin-api.h
+++ b/include/plugin-api.h
@@ -483,6 +483,37 @@ enum ld_plugin_level
LDPL_FATAL
};
+/* Contract between a plug-in and a linker. */
+
+enum linker_api_version
+{
+ /* The linker/plugin do not implement any of the API levels below, the API
+ is determined solely via the transfer vector. */
+ LAPI_V0,
+
+ /* API level v1. The linker provides get_symbols_v3, add_symbols_v2,
+ the plugin will use that and not any lower versions.
+ claim_file is thread-safe on the plugin side and
+ add_symbols on the linker side. */
+ LAPI_V1
+};
+
+/* The linker's interface for API version negotiation. A plug-in calls
+ the function (with its IDENTIFIER and VERSION), plus minimal and maximal
+ version of linker_api_version is provided. Linker then returns selected
+ API version and provides its IDENTIFIER and VERSION. The returned value
+ by linker must be in range [MINIMAL_API_SUPPORTED, MAXIMAL_API_SUPPORTED].
+ Identifier pointers remain valid as long as the plugin is loaded. */
+
+typedef
+enum linker_api_version
+(*ld_plugin_get_api_version) (const char *plugin_identifier,
+ const char *plugin_version,
+ enum linker_api_version minimal_api_supported,
+ enum linker_api_version maximal_api_supported,
+ const char **linker_identifier,
+ const char **linker_version);
+
/* Values for the tv_tag field of the transfer vector. */
enum ld_plugin_tag
@@ -521,6 +552,7 @@ enum ld_plugin_tag
LDPT_REGISTER_NEW_INPUT_HOOK,
LDPT_GET_WRAP_SYMBOLS,
LDPT_ADD_SYMBOLS_V2,
+ LDPT_GET_API_VERSION,
};
/* The plugin transfer vector. */
@@ -556,6 +588,7 @@ struct ld_plugin_tv
ld_plugin_get_input_section_size tv_get_input_section_size;
ld_plugin_register_new_input tv_register_new_input;
ld_plugin_get_wrap_symbols tv_get_wrap_symbols;
+ ld_plugin_get_api_version tv_get_api_version;
} tv_u;
};
diff --git a/lto-plugin/Makefile.am b/lto-plugin/Makefile.am
index 81362eafc36..482946e4dd5 100644
--- a/lto-plugin/Makefile.am
+++ b/lto-plugin/Makefile.am
@@ -8,7 +8,7 @@ target_noncanonical := @target_noncanonical@
libexecsubdir := $(libexecdir)/gcc/$(real_target_noncanonical)/$(gcc_version)$(accel_dir_suffix)
AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS)
-AM_CFLAGS = @ac_lto_plugin_warn_cflags@ $(CET_HOST_FLAGS)
+AM_CFLAGS = @ac_lto_plugin_warn_cflags@ $(CET_HOST_FLAGS) -DBASE_VERSION='"$(gcc_version)"'
# The plug-in depends on pthreads.
AM_LDFLAGS = -pthread @ac_lto_plugin_ldflags@
AM_LIBTOOLFLAGS = --tag=disable-static
diff --git a/lto-plugin/Makefile.in b/lto-plugin/Makefile.in
index 2033dd9b7c2..9453bc7d607 100644
--- a/lto-plugin/Makefile.in
+++ b/lto-plugin/Makefile.in
@@ -343,7 +343,7 @@ AUTOMAKE_OPTIONS = no-dependencies
gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
libexecsubdir := $(libexecdir)/gcc/$(real_target_noncanonical)/$(gcc_version)$(accel_dir_suffix)
AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS)
-AM_CFLAGS = @ac_lto_plugin_warn_cflags@ $(CET_HOST_FLAGS)
+AM_CFLAGS = @ac_lto_plugin_warn_cflags@ $(CET_HOST_FLAGS) -DBASE_VERSION='"$(gcc_version)"'
# The plug-in depends on pthreads.
AM_LDFLAGS = -pthread @ac_lto_plugin_ldflags@
AM_LIBTOOLFLAGS = --tag=disable-static
diff --git a/lto-plugin/lto-plugin.c b/lto-plugin/lto-plugin.c
index 7927dca60a4..e9afd2fb76d 100644
--- a/lto-plugin/lto-plugin.c
+++ b/lto-plugin/lto-plugin.c
@@ -180,6 +180,10 @@ static ld_plugin_add_input_file add_input_file;
static ld_plugin_add_input_library add_input_library;
static ld_plugin_message message;
static ld_plugin_add_symbols add_symbols, add_symbols_v2;
+static ld_plugin_get_api_version get_api_version;
+
+/* By default, use version LAPI_V0 if there is not negotiation. */
+static enum linker_api_version api_version = LAPI_V0;
static struct plugin_file_info *claimed_files = NULL;
static unsigned int num_claimed_files = 0;
@@ -1428,6 +1432,43 @@ process_option (const char *option)
verbose = verbose || debug;
}
+/* Negotiate linker API version. */
+
+static void
+negotiate_api_version (void)
+{
+ const char *linker_identifier;
+ const char *linker_version;
+
+ enum linker_api_version supported_api = LAPI_V0;
+#if HAVE_PTHREAD_LOCKING
+ supported_api = LAPI_V1;
+#endif
+
+ api_version = get_api_version ("GCC", BASE_VERSION, LAPI_V0,
+ supported_api, &linker_identifier, &linker_version);
+ if (api_version > supported_api)
+ {
+ fprintf (stderr, "requested an unsupported API version (%d)\n", api_version);
+ abort ();
+ }
+
+ switch (api_version)
+ {
+ case LAPI_V0:
+ break;
+ case LAPI_V1:
+ check (get_symbols_v3, LDPL_FATAL,
+ "get_symbols_v3 required for API version 1");
+ check (add_symbols_v2, LDPL_FATAL,
+ "add_symbols_v2 required for API version 1");
+ break;
+ default:
+ fprintf (stderr, "unsupported API version (%d)\n", api_version);
+ abort ();
+ }
+}
+
/* Called by a linker after loading the plugin. TV is the transfer vector. */
enum ld_plugin_status
@@ -1496,12 +1537,18 @@ onload (struct ld_plugin_tv *tv)
/* We only use this to make user-friendly temp file names. */
link_output_name = p->tv_u.tv_string;
break;
+ case LDPT_GET_API_VERSION:
+ get_api_version = p->tv_u.tv_get_api_version;
+ break;
default:
break;
}
p++;
}
+ if (get_api_version)
+ negotiate_api_version ();
+
check (register_claim_file, LDPL_FATAL, "register_claim_file not found");
check (add_symbols, LDPL_FATAL, "add_symbols not found");
status = register_claim_file (claim_file_handler);
--
2.36.1
next prev parent reply other threads:[~2022-07-11 10:51 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-02 7:51 [PATCH] Support LDPT_GET_SYMBOLS_V3 Martin Liška
2022-05-04 12:20 ` [PATCH] lto-plugin: add support for feature detection Martin Liška
2022-05-04 12:32 ` Alexander Monakov
2022-05-04 12:41 ` Martin Liška
2022-05-04 13:10 ` Alexander Monakov
2022-05-04 13:31 ` Martin Liška
2022-05-04 15:06 ` Bernhard Reutner-Fischer
2022-05-05 6:15 ` Richard Biener
2022-05-05 6:31 ` Richard Biener
2022-05-05 10:52 ` Alexander Monakov
2022-05-05 12:50 ` Martin Liška
2022-05-06 14:46 ` Alexander Monakov
2022-05-09 9:05 ` Martin Liška
2022-05-15 6:57 ` Rui Ueyama
2022-05-15 7:53 ` Alexander Monakov
2022-05-15 8:07 ` Rui Ueyama
2022-05-15 8:50 ` Alexander Monakov
2022-05-15 10:01 ` Rui Ueyama
2022-05-15 10:09 ` Alexander Monakov
2022-05-15 10:32 ` Rui Ueyama
2022-05-15 11:37 ` Alexander Monakov
2022-05-15 11:52 ` Rui Ueyama
2022-05-15 12:07 ` Alexander Monakov
2022-05-16 2:41 ` Rui Ueyama
2022-05-16 6:38 ` Alexander Monakov
2022-05-16 8:37 ` Rui Ueyama
2022-05-16 9:10 ` Richard Biener
2022-05-16 9:15 ` Alexander Monakov
2022-05-16 9:25 ` Jan Hubicka
2022-05-16 9:38 ` Martin Liška
2022-05-16 9:50 ` Jan Hubicka
2022-05-16 10:22 ` Richard Biener
2022-05-16 9:58 ` Rui Ueyama
2022-05-16 10:28 ` Richard Biener
2022-05-16 10:44 ` Rui Ueyama
2022-05-16 12:04 ` Martin Liška
2022-05-16 13:07 ` Rui Ueyama
2022-05-16 13:38 ` Alexander Monakov
2022-05-16 15:16 ` Alexander Monakov
2022-05-17 6:20 ` Richard Biener
2022-05-17 13:44 ` Martin Liška
2022-06-16 6:59 ` [PATCH 1/3] lto-plugin: support LDPT_GET_SYMBOLS_V3 Martin Liška
2022-06-20 9:23 ` Richard Biener
2022-06-16 7:01 ` [PATCH 2/3] lto-plugin: make claim_file_handler thread-safe Martin Liška
2022-06-20 9:32 ` Richard Biener
2022-06-20 10:20 ` Martin Liška
2022-06-21 7:56 ` Richard Biener
2022-06-21 8:43 ` Martin Liška
2022-06-24 8:37 ` Richard Biener
2022-06-16 7:01 ` [PATCH 3/3] lto-plugin: implement LDPT_GET_API_VERSION Martin Liška
2022-06-16 8:00 ` Alexander Monakov
2022-06-16 12:25 ` Martin Liška
2022-06-20 9:35 ` Richard Biener
2022-06-20 13:01 ` Martin Liška
2022-06-30 6:43 ` Rui Ueyama
2022-06-30 8:42 ` Martin Liška
2022-07-01 6:36 ` Richard Biener
2022-07-04 14:17 ` Martin Liška
2022-07-07 2:19 ` Rui Ueyama
2022-07-08 8:42 ` Martin Liška
2022-07-08 12:41 ` Alexander Monakov
2022-07-11 7:23 ` Rui Ueyama
2022-07-11 9:16 ` Alexander Monakov
2022-07-11 9:55 ` Richard Biener
2022-07-11 10:51 ` Martin Liška [this message]
2022-07-11 12:24 ` Rui Ueyama
2022-07-11 12:38 ` Alexander Monakov
2022-07-11 12:51 ` Martin Liška
2022-07-12 1:36 ` Rui Ueyama
2022-07-11 16:35 ` Alexander Monakov
2022-07-12 6:28 ` Richard Biener
2022-07-12 7:36 ` Martin Liška
2022-07-12 11:50 ` Rui Ueyama
2022-07-12 13:21 ` Richard Biener
2022-07-12 13:31 ` Martin Liška
2022-07-13 7:44 ` Rui Ueyama
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3bde5aa4-f3d7-63e8-8b4f-29b29f00293f@suse.cz \
--to=mliska@suse.cz \
--cc=amonakov@ispras.ru \
--cc=gcc-patches@gcc.gnu.org \
--cc=richard.guenther@gmail.com \
--cc=rui314@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).