From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752725AbbCLF6l (ORCPT ); Thu, 12 Mar 2015 01:58:41 -0400 Received: from ozlabs.org ([103.22.144.67]:39052 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752591AbbCLF6k (ORCPT ); Thu, 12 Mar 2015 01:58:40 -0400 Date: Thu, 12 Mar 2015 16:58:34 +1100 From: Stephen Rothwell To: Steven Rostedt , Ingo Molnar Cc: linux-kernel@vger.kernel.org Subject: [PATCH] trace: don't use __weak in header files Message-ID: <20150312165834.4482cb48@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/F3uBUcerzLbw+M8JjLioXKV"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/F3uBUcerzLbw+M8JjLioXKV Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable The commit that added a check for this to checkpatch says: "Using weak declarations can have unintended link defects. The __weak on the declaration causes non-weak definitions to become weak." In this case, when a PowerPC kernel is built with CONFIG_KPROBE_EVENT but not CONFIG_UPROBE_EVENT, it generates the following warning: WARNING: 1 bad relocations c0000000014f2190 R_PPC64_ADDR64 uprobes_fetch_type_table This is fixed by passing the fetch_table arrays to traceprobe_parse_probe_arg() which also means that they can never be NULL. Signed-off-by: Stephen Rothwell --- kernel/trace/trace_kprobe.c | 5 +++-- kernel/trace/trace_probe.c | 19 +++++++------------ kernel/trace/trace_probe.h | 10 ++-------- kernel/trace/trace_uprobe.c | 5 +++-- 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 5edb518be345..e6f9cbf4388d 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -250,7 +250,7 @@ DEFINE_FETCH_symbol(string_size) #define fetch_file_offset_string_size NULL =20 /* Fetch type information table */ -const struct fetch_type kprobes_fetch_type_table[] =3D { +static const struct fetch_type kprobes_fetch_type_table[] =3D { /* Special types */ [FETCH_TYPE_STRING] =3D __ASSIGN_FETCH_TYPE("string", string, string, sizeof(u32), 1, "__data_loc char[]"), @@ -760,7 +760,8 @@ static int create_trace_kprobe(int argc, char **argv) =20 /* Parse fetch argument */ ret =3D traceprobe_parse_probe_arg(arg, &tk->tp.size, parg, - is_return, true); + is_return, true, + kprobes_fetch_type_table); if (ret) { pr_info("Parse error at argument[%d]. (%d)\n", i, ret); goto error; diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index b983b2fd2ca1..1769a81da8a7 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -356,17 +356,14 @@ static int parse_probe_vars(char *arg, const struct f= etch_type *t, =20 /* Recursive argument parser */ static int parse_probe_arg(char *arg, const struct fetch_type *t, - struct fetch_param *f, bool is_return, bool is_kprobe) + struct fetch_param *f, bool is_return, bool is_kprobe, + const struct fetch_type *ftbl) { - const struct fetch_type *ftbl; unsigned long param; long offset; char *tmp; int ret =3D 0; =20 - ftbl =3D is_kprobe ? kprobes_fetch_type_table : uprobes_fetch_type_table; - BUG_ON(ftbl =3D=3D NULL); - switch (arg[0]) { case '$': ret =3D parse_probe_vars(arg + 1, t, f, is_return, is_kprobe); @@ -447,7 +444,7 @@ static int parse_probe_arg(char *arg, const struct fetc= h_type *t, dprm->fetch_size =3D get_fetch_size_function(t, dprm->fetch, ftbl); ret =3D parse_probe_arg(arg, t2, &dprm->orig, is_return, - is_kprobe); + is_kprobe, ftbl); if (ret) kfree(dprm); else { @@ -505,15 +502,12 @@ static int __parse_bitfield_probe_arg(const char *bf, =20 /* String length checking wrapper */ int traceprobe_parse_probe_arg(char *arg, ssize_t *size, - struct probe_arg *parg, bool is_return, bool is_kprobe) + struct probe_arg *parg, bool is_return, bool is_kprobe, + const struct fetch_type *ftbl) { - const struct fetch_type *ftbl; const char *t; int ret; =20 - ftbl =3D is_kprobe ? kprobes_fetch_type_table : uprobes_fetch_type_table; - BUG_ON(ftbl =3D=3D NULL); - if (strlen(arg) > MAX_ARGSTR_LEN) { pr_info("Argument is too long.: %s\n", arg); return -ENOSPC; @@ -535,7 +529,8 @@ int traceprobe_parse_probe_arg(char *arg, ssize_t *size, } parg->offset =3D *size; *size +=3D parg->type->size; - ret =3D parse_probe_arg(arg, parg->type, &parg->fetch, is_return, is_kpro= be); + ret =3D parse_probe_arg(arg, parg->type, &parg->fetch, is_return, + is_kprobe, ftbl); =20 if (ret >=3D 0 && t !=3D NULL) ret =3D __parse_bitfield_probe_arg(t, parg->type, &parg->fetch); diff --git a/kernel/trace/trace_probe.h b/kernel/trace/trace_probe.h index 4f815fbce16d..e30f6cce4af6 100644 --- a/kernel/trace/trace_probe.h +++ b/kernel/trace/trace_probe.h @@ -229,13 +229,6 @@ ASSIGN_FETCH_FUNC(file_offset, ftype), \ #define FETCH_TYPE_STRING 0 #define FETCH_TYPE_STRSIZE 1 =20 -/* - * Fetch type information table. - * It's declared as a weak symbol due to conditional compilation. - */ -extern __weak const struct fetch_type kprobes_fetch_type_table[]; -extern __weak const struct fetch_type uprobes_fetch_type_table[]; - #ifdef CONFIG_KPROBE_EVENT struct symbol_cache; unsigned long update_symbol_cache(struct symbol_cache *sc); @@ -333,7 +326,8 @@ find_event_file_link(struct trace_probe *tp, struct ftr= ace_event_file *file) } =20 extern int traceprobe_parse_probe_arg(char *arg, ssize_t *size, - struct probe_arg *parg, bool is_return, bool is_kprobe); + struct probe_arg *parg, bool is_return, bool is_kprobe, + const struct fetch_type *ftbl); =20 extern int traceprobe_conflict_field_name(const char *name, struct probe_arg *args, int narg); diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index 8520acc34b18..be8a7b1947d8 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -196,7 +196,7 @@ DEFINE_FETCH_file_offset(string) DEFINE_FETCH_file_offset(string_size) =20 /* Fetch type information table */ -const struct fetch_type uprobes_fetch_type_table[] =3D { +static const struct fetch_type uprobes_fetch_type_table[] =3D { /* Special types */ [FETCH_TYPE_STRING] =3D __ASSIGN_FETCH_TYPE("string", string, string, sizeof(u32), 1, "__data_loc char[]"), @@ -535,7 +535,8 @@ static int create_trace_uprobe(int argc, char **argv) =20 /* Parse fetch argument */ ret =3D traceprobe_parse_probe_arg(arg, &tu->tp.size, parg, - is_return, false); + is_return, false, + uprobes_fetch_type_table); if (ret) { pr_info("Parse error at argument[%d]. (%d)\n", i, ret); goto error; --=20 2.1.4 --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/F3uBUcerzLbw+M8JjLioXKV Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVASsOAAoJEMDTa8Ir7ZwVGykQAIHMLAuCV9A/dfA8XnbeBe4+ kXgiG9vx6M5Yfy5sWmyUJr9Yl3z9kfpWWOZnOCkZh5RiXmsdMLCJ/0m6JYAjpSCD bki0I94lz8Gfexddoa5UXAK3e/6KLIkxBzmIU75DeFGSac80bkechHiWqYyj1zw4 OuzlD1w00ntmfZs3WBK1y7ONoGGdLHb2oegjC03zQSWyOnzn4PfRloPxQdR2tIq7 bnoj7dwKNn1PZCMnoG3NKiLI2DDa7pAQQhM5fariPo+gDIu86C2JvyulYpthGrm/ 0Izs/jBOGn8z01OF4kg4KTUtJqM9Xsst5J8wjE2Oi+khvpxEVquh2ApFPWtg84Op n11hMJ2z624ugVT5URzYSJ1nWVbwcQwHjvj86EYKSn79NeVfkEndK/Q/+VJ+WRp5 bGASo3sOMEVuc/09Wr2cazLFSkUHmOJA4OgOx20ol1AbJBPOcADOT4DRJREnm8WQ Tuk9/5omr9VATEp9kUNdxw8X6E0pR9A8Ex0xSKLerv+vc14sdvsX4e6X8rH6KOyb /3W21cHDhNAXGwM5uuelz3E3SQG4F0MG7eY+RpzpIiz1lJjwRQu45G+qOzMfO28C hEFvkQpTtq8xEdrdZt0pIcaJathPlOOQ1fxfFzbAiTSSCESDzFJHMK5bkTjnie36 EcvAph/enTD+l4aQwa/y =q6xy -----END PGP SIGNATURE----- --Sig_/F3uBUcerzLbw+M8JjLioXKV--