[PATCH] dlopen: skip debugger notification for DSO loaded from sprof (bug 30258)

[PATCH] dlopen: skip debugger notification for DSO loaded from sprof (bug 30258)

[Andreas Schwab]

Avoid inconsistent state in the debugger interface.
---
 elf/dl-load.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/elf/dl-load.c b/elf/dl-load.c
index 9a0e40c0e9..39c63ff1b3 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1483,6 +1483,10 @@ cannot enable executable stack as shared object requires");
   /* Now that the object is fully initialized add it to the object list.  */
   _dl_add_to_namespace_list (l, nsid);
 
+  /* Skip auditing and debugger notification when called from 'sprof'.  */
+  if (mode & __RTLD_SPROF)
+    return l;
+
   /* Signal that we are going to add new objects.  */
   struct r_debug *r = _dl_debug_update (nsid);
   if (r->r_state == RT_CONSISTENT)
-- 
2.40.0


-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

Re: [PATCH] dlopen: skip debugger notification for DSO loaded from sprof (bug 30258)

[Florian Weimer]

* Andreas Schwab via Libc-alpha:

> Avoid inconsistent state in the debugger interface.
> ---
>  elf/dl-load.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/elf/dl-load.c b/elf/dl-load.c
> index 9a0e40c0e9..39c63ff1b3 100644
> --- a/elf/dl-load.c
> +++ b/elf/dl-load.c
> @@ -1483,6 +1483,10 @@ cannot enable executable stack as shared object requires");
>    /* Now that the object is fully initialized add it to the object list.  */
>    _dl_add_to_namespace_list (l, nsid);
>  
> +  /* Skip auditing and debugger notification when called from 'sprof'.  */
> +  if (mode & __RTLD_SPROF)
> +    return l;
> +
>    /* Signal that we are going to add new objects.  */
>    struct r_debug *r = _dl_debug_update (nsid);
>    if (r->r_state == RT_CONSISTENT)

Can we add a test for this?  Thanks.

Re: [PATCH] dlopen: skip debugger notification for DSO loaded from sprof (bug 30258)

[Florian Weimer]

* Andreas Schwab via Libc-alpha:

>  test-srcs = \
> +  tst-sprof-basic \
>    tst-pathopt \
>    # tests-srcs

>  tests-special += \
>    $(objpfx)argv0test.out \
>    $(objpfx)tst-pathopt.out \
> +  $(objpfx)tst-sprof-basic.out \
>    $(objpfx)tst-rtld-help.out \
>    $(objpfx)tst-rtld-load-self.out \
>    $(objpfx)tst-rtld-preload.out \

Please keep those sorted lexicographically.

Rest looks okay, thanks.

Reviewed-by: Florian Weimer <fweimer@redhat.com>

Florian

[PATCH] dlopen: skip debugger notification for DSO loaded from sprof (bug 30258)

[Andreas Schwab]

Avoid inconsistent state in the debugger interface.
---
 elf/Makefile           | 11 +++++++++++
 elf/dl-load.c          |  4 ++++
 elf/tst-sprof-basic.c  | 25 +++++++++++++++++++++++++
 elf/tst-sprof-basic.sh | 41 +++++++++++++++++++++++++++++++++++++++++
 elf/tst-sprof-mod.c    | 24 ++++++++++++++++++++++++
 5 files changed, 105 insertions(+)
 create mode 100644 elf/tst-sprof-basic.c
 create mode 100755 elf/tst-sprof-basic.sh
 create mode 100644 elf/tst-sprof-mod.c

diff --git a/elf/Makefile b/elf/Makefile
index 396ec51424..4e98c9c1ea 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -509,6 +509,7 @@ tests-container += \
   # tests-container
 
 test-srcs = \
+  tst-sprof-basic \
   tst-pathopt \
   # tests-srcs
 
@@ -861,6 +862,7 @@ modules-names += \
   tst-sonamemove-linkmod1 \
   tst-sonamemove-runmod1 \
   tst-sonamemove-runmod2 \
+  tst-sprof-mod \
   tst-tls19mod1 \
   tst-tls19mod2 \
   tst-tls19mod3 \
@@ -1113,6 +1115,7 @@ ifeq ($(run-built-tests),yes)
 tests-special += \
   $(objpfx)argv0test.out \
   $(objpfx)tst-pathopt.out \
+  $(objpfx)tst-sprof-basic.out \
   $(objpfx)tst-rtld-help.out \
   $(objpfx)tst-rtld-load-self.out \
   $(objpfx)tst-rtld-preload.out \
@@ -2986,3 +2989,11 @@ tst-audit-tlsdesc-dlopen-ENV = LD_AUDIT=$(objpfx)tst-auditmod-tlsdesc.so
 $(objpfx)tst-dlmopen-twice.out: \
   $(objpfx)tst-dlmopen-twice-mod1.so \
   $(objpfx)tst-dlmopen-twice-mod2.so
+
+LDFLAGS-tst-sprof-mod.so = -Wl,-soname,tst-sprof-mod.so
+$(objpfx)tst-sprof-basic: $(objpfx)tst-sprof-mod.so
+$(objpfx)tst-sprof-basic.out: tst-sprof-basic.sh $(objpfx)tst-sprof-basic
+	$(SHELL) $< $(common-objpfx) '$(test-wrapper-env)' \
+		 '$(run-program-env)' > $@; \
+	$(evaluate-test)
+generated += tst-sprof-mod.so.profile
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 9a0e40c0e9..39c63ff1b3 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1483,6 +1483,10 @@ cannot enable executable stack as shared object requires");
   /* Now that the object is fully initialized add it to the object list.  */
   _dl_add_to_namespace_list (l, nsid);
 
+  /* Skip auditing and debugger notification when called from 'sprof'.  */
+  if (mode & __RTLD_SPROF)
+    return l;
+
   /* Signal that we are going to add new objects.  */
   struct r_debug *r = _dl_debug_update (nsid);
   if (r->r_state == RT_CONSISTENT)
diff --git a/elf/tst-sprof-basic.c b/elf/tst-sprof-basic.c
new file mode 100644
index 0000000000..5e4083305a
--- /dev/null
+++ b/elf/tst-sprof-basic.c
@@ -0,0 +1,25 @@
+/* Copyright (C) 2023 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+void hello (void);
+
+int
+main (void)
+{
+  hello ();
+  return 0;
+}
diff --git a/elf/tst-sprof-basic.sh b/elf/tst-sprof-basic.sh
new file mode 100755
index 0000000000..901db61708
--- /dev/null
+++ b/elf/tst-sprof-basic.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+# Test basic functionality of sprof
+# Copyright (C) 2023 Free Software Foundation, Inc.
+# This file is part of the GNU C Library.
+
+# The GNU C Library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# The GNU C Library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with the GNU C Library; if not, see
+# <https://www.gnu.org/licenses/>.
+
+set -e
+
+common_objpfx=$1
+test_wrapper_env=$2
+run_program_env=$3
+
+sprof_mod=tst-sprof-mod.so
+
+${test_wrapper_env} \
+${run_program_env} \
+LD_PROFILE=$sprof_mod \
+LD_PROFILE_OUTPUT=${common_objpfx}elf \
+LD_LIBRARY_PATH=${common_objpfx}.:${common_objpfx}elf \
+  ${common_objpfx}elf/ld.so ${common_objpfx}elf/tst-sprof-basic
+
+${test_wrapper_env} \
+${run_program_env} \
+LD_LIBRARY_PATH=${common_objpfx}.:${common_objpfx}elf \
+  ${common_objpfx}elf/ld.so ${common_objpfx}elf/sprof -p $sprof_mod \
+  ${common_objpfx}elf/${sprof_mod}.profile
+
+exit $?
diff --git a/elf/tst-sprof-mod.c b/elf/tst-sprof-mod.c
new file mode 100644
index 0000000000..8b3f5e8e07
--- /dev/null
+++ b/elf/tst-sprof-mod.c
@@ -0,0 +1,24 @@
+/* Copyright (C) 2023 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include <stdio.h>
+
+void
+hello (void)
+{
+  printf ("Hello World\n");
+}
-- 
2.40.1


-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."