Aaron Merey [Wed, 22 Nov 2017 20:38:40 +0000 (15:38 -0500)]
Fix stapbpf compile error on older kernels.
* configure.ac: Check for the necessary declarations in linux/bpf.h instead of
simply checking that linux/bpf.h exists. This avoids a compile error if
linux/bpf.h exists but does not contain these declarations (as is the case
with some older kernels). Replaced HAVE_LINUX_BPF_H with HAVE_BPF_DECLS.
* Makefile.am, stapbpf/Makefile.am, main.cxx: Replaced HAVE_LINUX_BPF_H with
HAVE_BPF_DECLS.
* rest: changes caused by autoconf, automake and autoheader.
David Smith [Mon, 20 Nov 2017 21:36:03 +0000 (15:36 -0600)]
Actually run the stap command in the docker container.
* httpd/backends.cxx (docker_backend::generate_module): Actually run the
stap command in the docker container.
* httpd/docker/fedora_install_package.py: Renamed from
fedora_install_packages.py. When installing a kernel, automatically
install the kernel-devel package. Install each package's debuginfo.
* httpd/docker/Makefile.am: Handle fedora_install_package.py rename.
* httpd/docker/fedora.json: Ditto.
* httpd/docker/Makefile.in: Regenerated.
Frank Ch. Eigler [Thu, 16 Nov 2017 22:18:57 +0000 (17:18 -0500)]
stap -L: produce yum/dnf disagnostics if kernel-devel missing
stap listing modes previously suppressed the rpm-finder's suggestions,
if not even kernel-devel was installed, leading to an opaque error
message about .../build/.config not being found. Reenable warnings in
this case, for if kernel-devel was sought and missing, stap as a whole
will shut down soon anyway.
David Smith [Thu, 16 Nov 2017 20:18:39 +0000 (14:18 -0600)]
Update the docker container builder for the web server.
* httpd/docker/fedora_install_packages.py: New file.
* httpd/docker/fedora.json: Change from stages to a scheme where we've got
a docker 'header' and 'footer' items. Each package to be installed runs
the 'install' item.
* httpd/docker/stap_build_docker_container.py: Handle changes to the
distro JSON file.
* httpd/backends.cxx (docker_backend::docker_backend): Fix the docker
build script path.
(docker_backend::generate_module): Update the docker build script
arguments.
* httpd/api.cxx (build_info::module_build): Pass the UUID down to the
backends.
* httpd/backends.h (backend_base): Add a 'uuid' parameter to the
generate_module() function declaration.
* httpd/docker/Makefile.am: Installs the fedora install package script.
* httpd/docker/Makefile.in: Regenerated.
David Smith [Mon, 13 Nov 2017 22:34:36 +0000 (16:34 -0600)]
The web server now writes the client request data to a JSON file.
* httpd/api.h ("client_request_data"): Made 'struct client_request_data'
into a class. Added a get_json_object() function declaration.
* httpd/api.cxx: Change the type on all 'client_request_data' variables.
(response build_collection_rh::POST): Lowercase the distro name to make
things easier when searching for a distro.
(client_request_data::get_json_object): New function.
* httpd/backends.h: Change the type on all 'client_request_data'
variables.
* httpd/backends.cxx: Change the type on all 'client_request_data'
variables.
(docker_backend::docker_backend): Lowercase the distro name to make
things easier when searching for a distro.
(docker_backend::generate_module): Grab a JSON representation of the
client_request_data and write it to a file.
David Smith [Fri, 10 Nov 2017 19:46:53 +0000 (13:46 -0600)]
Fix a couple of subtle bugs in the web server POST parameter handling.
* httpd/server.cxx (get_key_values): Expect a 'post_params_t' instead of
a 'struct request' pointer.
(connection_info::postdataiterator): Be sure to only use 'size' bytes of
'data', otherwise you can get junk values.
(server::access_handler): Pass get_key_values a 'post_params_t' instead
of a 'struct request' pointer.
* httpd/server.h: Define and use the 'post_params_t' type.
David Smith [Wed, 8 Nov 2017 22:12:09 +0000 (16:12 -0600)]
Save the package information on the web server side.
* httpd/api.cxx (build_collection_rh::POST): Package up the file
information (name, package name, build id) from the client.
(build_info::parse_cmd_args): Fix the argument handling. We need to
add an argument 0 to make getopt_long() happy. Grab the right perpass
verbosity level as our level.
* httpd/api.h: Add the 'file_info' structure.
David Smith [Wed, 8 Nov 2017 16:41:52 +0000 (10:41 -0600)]
Rework the web client package information to be valid JSON.
* client-http.cxx (http_client::post): Rework the package information to
be valid JSON. Turn the package information inside out so that instead
of one array of multiple fields, we'll have multiplie single-dimension
arrays.
David Smith [Mon, 6 Nov 2017 15:50:50 +0000 (09:50 -0600)]
Move the web server unzip logic to its proper place.
* httpd/api.cxx (build_collection_rh::POST): Move the unzip logic to
build_info::module_build().
(build_info::module_build): Do the unzip here, so that we don't slow
down the thread handling http requests.
David Smith [Fri, 3 Nov 2017 20:06:13 +0000 (15:06 -0500)]
The web server now tries to build a docker container.
* httpd/backends.cxx (local_backend::generate_module): No longer fail if
the stdout/stderr files already exist.
(docker_backend::docker_backend): Clear out the docker path if we
couldn't find the docker executable. Fix choping off the json file
extension.
(docker_backend::generate_module): Run the script that builds the
docker container.
* httpd/api.cxx (parse_cmd_args): New function.
(module_build): Call parse_cmd_args(). Always create the stdout/stderr
files, so the client will always have something to grab.
* httpd/api.h (client_request_data): Add 'verbose' field.
* httpd/Makefile.am: Add ../cmdline.cxx to the list of files to be compiled.
* httpd/Makefile.in: Regenerated.
David Smith [Mon, 30 Oct 2017 20:39:11 +0000 (15:39 -0500)]
Match non-executable shared libraries in glob patterns.
Shared libraries in Debian do not have executable permissions. This
patch makes glob patterns work for those. Debian policy 8.1:
"Shared libraries should not be installed executable, since the dynamic
linker does not require this and trying to execute a shared library
usually results in a core dump."
David Smith [Mon, 30 Oct 2017 20:25:21 +0000 (15:25 -0500)]
Add a small improvement to testsuite/semok/twenty.stp
* testsuite/semok/twenty.stp: Instead of piping stap's output to "wc",
instead send it to /dev/null. This uses less memory on the system and
avoids masking the return value of stap (by getting the return value of
"wc").
David Smith [Mon, 30 Oct 2017 18:05:18 +0000 (13:05 -0500)]
Improve the way the web client/server sends files.
* client-http.cxx (http_client): Rename the 'script_files' variable to
'files'.
(http_client::post): No longer assume the first file is a script.
(add_file): Renamed from 'add_script_file'. Just add the file.
(http_client_backend::include_file_or_directory): Rewrite to be like the
nss client.
(http_client_backend::package_request): If we've seen some files the
need to be transferred, package them up into a zip file.
(add_tapsets): Deleted function.
(http_client_backend::add_tmpdir_file): Just remember we added a file.
* client-http.h (client_backend): Remove the 'request_files' variable and
add the 'files_seen' variable.
* httpd/api.cxx (POST): Unzip the client zip file if present.
David Smith [Mon, 30 Oct 2017 17:57:07 +0000 (12:57 -0500)]
Improve the way a script is read from standard input.
* main.cxx (passes_0_4): Instead of passing 'cin' to parse(), pass it the
session 'stdin_script' variable.
* csclient.cxx (create_request): Instead of copying the script from
standard input, copy it from the session 'stdin_script' variable.
* session.h (s): Add the 'stdin_script' variable.
* session.cxx (systemtap_session): Copy the 'stdin_script' variable in the
copy constructor.
* testsuite/systemtap.server/server.exp: Add 2 tests for getting a script
from standard input.
David Smith [Wed, 25 Oct 2017 13:26:19 +0000 (08:26 -0500)]
Add a minor update to systemtap.stress/tapset_functions.exp.
* testsuite/systemtap.stress/tapset_functions.exp: Change the name of the
"testscript" test to "tapset_functions testscript" test so its name
sticks out a bit more on failure.
David Smith [Fri, 20 Oct 2017 19:52:06 +0000 (14:52 -0500)]
The web server now gives a better error message on an unsupported request.
* httpd/backends.cxx: Provide a new "default" backend, which just returns
a reasonable error message (that this server cannot support the request).
* httpd/api.cxx (module_build): Improved error message.
Frank Ch. Eigler [Fri, 20 Oct 2017 14:01:58 +0000 (10:01 -0400)]
rhbz1504009: let dtrace -G -o /dev/null run, as in autoconf
commit c245153ca193c471a8c broke the ability of dtrace to be tested in
autoconf "-G -o /dev/null" usage, because its output file name was too
simple a function of the input name, and normal users can't write to
/dev/null.dtrace-temp.c . Now we back down to mkstemp, like before,
upon a failure of the simple concatenated name.
David Smith [Thu, 19 Oct 2017 18:24:06 +0000 (13:24 -0500)]
Improve web service startup a bit.
* client-http.cxx (http_client::download): If verbose is >= 4, set the
VERBOSE curl option so that all packets are dumped.
(http_client_backend::find_and_connect_to_server): Instead of trying to
GET the /builds directory (which isn't implemented), grab the base
server directory.
* httpd/server.cxx (server::server): Add a base directory request
handler.
* httpd/server.h: Move 'class server' constructor into server.cxx.
David Smith [Thu, 19 Oct 2017 18:19:04 +0000 (13:19 -0500)]
Add string trim utility functions.
* util.cxx (ltrim): New function.
(rtrim): Ditto.
(trim): Ditto.
(get_distro_info): Trim 'name' and 'version' items.
* util.h: Add trim function declarations.
* tapset-mark.cxx (mark_builder::build): Use new trim functions.
* tapsets.cxx (dwarf_builder::build): Ditto.
David Smith [Mon, 16 Oct 2017 20:30:52 +0000 (15:30 -0500)]
Fix PR22278 by fixing server breakage caused by commit 586c8666a.
* csclient.cxx (create_request): Let the backend add the argument in
include_file_or_directory().
* testsuite/systemtap.server/server.exp: Add 3 simple tests: a filename, a
"-L", and a "-I tapset -e SCRIPT".
* testsuite/lib/systemtap.exp (stap_run_batch): If the "filename" argument
is empty, assume this stap command line doesn't need a file.
BPF translation internals involve data structures that do not track
the staptree level entities they are based on. So when an error
occurs, there's no quick way to mapping it back to the token, for an
ideal error message. translate_bpf_pass() now tries to track a
last-token* as it goes translating all the probe bodies to bpf, so
that a semantic_error can be synthesized if needed.
This is still far from ideal; a single exception causes giving up
trying all the remaining probes; and all begin/end probes are
translated into single larger bpf programs, so it's harder to narrow
down the cause. Baby steps.
Frank Ch. Eigler [Fri, 13 Oct 2017 23:00:37 +0000 (19:00 -0400)]
bpf translator: catch runtime_errors
Some simple test cases can run up against bpf-translate limitations.
Those that are signalled with a runtime_error exception need to be
caught at least in translate_bpf_pass() and a message improvised, so
that there is something more to go on than an anonymous pass-4
failure.
David Smith [Fri, 13 Oct 2017 20:52:44 +0000 (15:52 -0500)]
Make small improvements to the systemtap server testsuite.
* testsuite/systemtap.server/server.exp: When restarting the avahi daemon,
try to fix a restart failure.
* testsuite/systemtap.server/client.exp (list_servers): Add debug output.
* testsuite/lib/systemtap.exp (shutdown_server): Try to ensure that the
systemtap server is really gone before returning.
David Smith [Wed, 11 Oct 2017 15:53:19 +0000 (10:53 -0500)]
Update the server_locale.exp test case to avoid spurious failures.
* testsuite/systemtap.server/server_locale.exp: Handle the case where the
French langpack isn't installed on the system. Do a French sniff test
before trying to use the French locale.
* client-nss.h (client_backend): Removed 'server_tmpdir' declaration that
shadowed the declaration in the base class. This caused the code in
csclient.cxx to get the wrong value for 'server_tmpdir'.
Aaron Merey [Fri, 6 Oct 2017 23:34:24 +0000 (19:34 -0400)]
stapbpf: fix global variable initialization bug.
* bpf-translate.cxx: The translator now adds assignment statements to
the beginning of the "stap_begin" bpf program in order to initialize
global variables with any user-supplied default values. Currently there
is no support for string literals, the translator will still ignore them.
(struct init_block): manages the resources associated with these
assignments.
* tapsets.cxx(sort_for_bpf), tapset-been.cxx (sort_for_bpf): immediately
returns if the probe group pointer is NULL.
* bpf_tests: added new tests and fixed a syntax error in globals1.stp and
globals2.stp.
David Smith [Fri, 6 Oct 2017 15:32:53 +0000 (10:32 -0500)]
Add a PR20516 workaround by using kallsyms_lookup_name to find udelay_simple.
* runtime/linux/common_session_state.h (stp_session_init): Use
kallsyms_lookup_name() to find udelay_simple() if it exists but isn't
exported.
* runtime/linux/runtime.h: Ditto.
* buildrun.cxx (compile_pass): Add an new autoconf test for
udelay_simple().
* runtime/linux/autoconf-udelay_simple.c: New file.
Aaron Merey [Thu, 5 Oct 2017 16:35:44 +0000 (12:35 -0400)]
stapbpf: fix temporary registers appearing in translator output and null ptr deref.
* bpf-opt.cxx (reg_alloc): When replacing temp registers with hard registers in
bpf instructions, allow for a maximum of 10 dereferences of vector "partition",
up from 2.
(post_alloc_cleanup): Avoid removing redundant instructions if they
are their block's only instruction since removing them will cause a null pointer
deref in bpf-translate.cxx (output_probe).
David Smith [Thu, 5 Oct 2017 17:31:26 +0000 (12:31 -0500)]
Add the server version number to the http protocol.
* httpd/api.cxx (result_info::generate_response): Send the server version
number to the client.
(build_info::generate_response): Ditto.
* client-http.cxx (unpack_response): Get the server version number.
Sandipan Das [Thu, 5 Oct 2017 09:09:41 +0000 (14:39 +0530)]
powerpc: Change SDT argument constraint
With the 'o' memory constraint, any memory operand which
has an offsettable address is allowed. However, for some
architectures such as powerpc, this allows operands like
the ones shown below in the readelf output from Fedora 26
to be generated.
The second and third argument shown above are both having
operands which are pointers to static data anchors. Since
these static anchors are not included in the symbol table,
they cannot be resolved from the binary itself. So, such
arguments cannot be read via their corresponding markers.
Using the 'Z' memory constraint instead solves this issue
as it will only allow a memory operand that is an indexed
or indirect from a register.
So, for powerpc, we set STAP_SDT_ARG_CONSTRAINT to 'nZr'
but keep it as 'nor' for all other architectures.
Signed-off-by: Sandipan Das <sandipan@linux.vnet.ibm.com>
David Smith [Wed, 4 Oct 2017 20:48:19 +0000 (15:48 -0500)]
Add more http client updates and rearrange some code.
* client-nss.cxx: Moved MOK_PUBLIC_CERT_NAME to cscommon.h.
(nss_client_backend:nss_client_backend): Moved here from client-nss.h.
(process_response): Moved to csclient.cxx.
* client-nss.h (nss_client_backend): Moved class constructor to
client-nss.cxx.
* client-http.h (http_client_backend): Moved class constructor to
client-http.cxx.
* client-http.cxx (http_client_backend::http_client_backend): Moved here
from header file and initialize 'server_tmpdir'.
(http_client_backend::unpack_response): Move processing from
process_response() to here and delete process_response().
* csclient.cxx (process_response): Moved from client-nss.cxx.
* csclient.h: Move 'process_response' from the backend to the main
code. Add 'server_tmpdir' and 'server_version' to the backend.
* cscommon.h: Move MOK_PUBLIC_CERT_NAME and MOK_PUBLIC_CERT_FILE
definitions here.
* stap-serverd.cxx: Remove MOK_PUBLIC_CERT_NAME and MOK_PUBLIC_CERT_FILE
definitions.
* util.cxx: Add another write_to_file() template instantiation.
David Smith [Mon, 2 Oct 2017 21:29:08 +0000 (16:29 -0500)]
Add more http client updates.
* client-http.cxx (http_client::download): Turn off following HTML
redirects, so we can handle things ourselves.
(http_client::get_response_code): New function.
(http_client_backend::find_and_connect_to_server): Don't try to look up
details for the "kernel" module. Reverse return value logic - only
return success if everything worked.
(http_client_backend::process_response): Rework logic to keep looping
until we get a 303 response code. The next GET should be our result
info. Make the "files" array optional, since not all stap requests
return a module.
David Smith [Wed, 27 Sep 2017 21:43:33 +0000 (16:43 -0500)]
Fix PR22158 by fixing the shutdown sequence of events.
* runtime/stp_utrace.c (utrace_exit): Free everything.
(utrace_cleanup): No longer cancel pending task_work requests.
(utrace_cancel_all_task_work): New function.
(untrace_shutdown): Cancel all pending task_work requests, wait on all
running items to finish, then free everything.
* runtime/linux/task_finder2.c (__stp_tf_cancel_all_task_work): Renamed
from __stp_tf_cancel_task_work.
(__stp_tf_free_all_task_work) New function.
(stap_stop_task_finder): Just cancel all pending task_work requests
before waiting for them to finish. After they have all finished, free
everything.
David Smith [Thu, 21 Sep 2017 20:41:21 +0000 (15:41 -0500)]
Add some http client updates.
* client-http.cxx (http_client::post): Reindent a bit and add FIXME
comment.
(http_client::add_script_file): Don't assume a placeholder for the
script file.
(http_client_backend::process_response): Instead of calling
json_object_to_json_string(), call json_object_get_string(). The former
returns a quoted string (and turns '/' into '\/'). The latter returns a
"raw" string, which is what we want.
* runtime/linux/task_finder.c (__stp_call_mmap_callbacks_for_task):
Instead of a 'struct path' pointer, store the 'struct path' structure
itself in vma_cache_t.
* runtime/linux/task_finder2.c: Ditto.