From patchwork Thu Dec 7 17:08:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 24781 Received: (qmail 99204 invoked by alias); 7 Dec 2017 17:08:53 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 99157 invoked by uid 89); 7 Dec 2017 17:08:53 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-wr0-f196.google.com Received: from mail-wr0-f196.google.com (HELO mail-wr0-f196.google.com) (209.85.128.196) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 07 Dec 2017 17:08:51 +0000 Received: by mail-wr0-f196.google.com with SMTP id y21so8256208wrc.1 for ; Thu, 07 Dec 2017 09:08:50 -0800 (PST) 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:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=W+UXqrn+ynmnsrvuBOv4mJ5ple3mxuadG3YuS9yk288=; b=Dz6jVdUK5ARh7bK37J3yCNo0pb7dNrLsuS6HJczuT8GiY08LBGQhWp05YQ4AECtDaB 9awxh9dp79UYIszBVhnG/tdTcqvrcjF7oSG7+V9tTjfVT4zniisRq3+BTNCaNraJnr4v 2emmQDQH7DwJRwLulfcKUxubrmXADhh6qmRZBC64Rqvc3QkeL3tmYLmqcpoLBshqA030 MEepnZcHZPMkDIqxHAEz4P8R5BS84byH3RiqljnJNcQRrOVP6PHUpknQ+WzC0mkWdXVA JeT2h1ctcm9Jc2f0Go30q1dgdOxEAYlX0+ZfzQ9QLbf9XToFJKOfbvK7s9cw2ltcedOM VeHA== X-Gm-Message-State: AJaThX6BTR5f2eMkUTEIBSmh6sN6ua1ckPFrQoaq6zqLCe982AEDoDvd 5PNmA9OckDMUkzJYJ+mEGgo6oQ== X-Google-Smtp-Source: AGs4zMYMnwMZW5XOBEAqll0/NsVC8rdAwj0UjPkjsbt2G3B5TJtSkOjSHDVtB1oeu+dF5/9Fy12Hgg== X-Received: by 10.223.178.232 with SMTP id g95mr24594160wrd.53.1512666528819; Thu, 07 Dec 2017 09:08:48 -0800 (PST) Received: from E107787-LIN (static.42.136.251.148.clients.your-server.de. [148.251.136.42]) by smtp.gmail.com with ESMTPSA id j132sm1066479wmd.2.2017.12.07.09.08.46 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 07 Dec 2017 09:08:47 -0800 (PST) From: Yao Qi To: Pedro Alves Cc: gdb-patches@sourceware.org Subject: Re: [PATCH] Initialize target description early in IPA References: <1512640910-26090-1-git-send-email-yao.qi@linaro.org> <04d3d5e3-6c99-d442-055d-b465ad2b7431@redhat.com> Date: Thu, 07 Dec 2017 17:08:42 +0000 In-Reply-To: <04d3d5e3-6c99-d442-055d-b465ad2b7431@redhat.com> (Pedro Alves's message of "Thu, 7 Dec 2017 11:30:09 +0000") Message-ID: <86bmjapisl.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-IsSubscribed: yes Pedro Alves writes: > Thanks for the fix. This is OK. A couple minor nits below. These comments are addressed. Patch below is pushed in. diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 171bc53..c84dcac 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,14 @@ +2017-12-07 Yao Qi + + * linux-aarch64-ipa.c (initialize_low_tracepoint): Call + aarch64_linux_read_description. + * linux-amd64-ipa.c (idx2mask): New array. + (get_ipa_tdesc): Move idx2mask out. + (initialize_low_tracepoint): Initialize target descriptions. + * linux-i386-ipa.c (idx2mask): New array. + (get_ipa_tdesc): Move idx2mask out. + (initialize_low_tracepoint): Initialize target descriptions. + 2017-12-05 Simon Marchi * tdesc.c (struct tdesc_type): Change return type. diff --git a/gdb/gdbserver/linux-aarch64-ipa.c b/gdb/gdbserver/linux-aarch64-ipa.c index b240100..c39b7ec 100644 --- a/gdb/gdbserver/linux-aarch64-ipa.c +++ b/gdb/gdbserver/linux-aarch64-ipa.c @@ -204,4 +204,5 @@ alloc_jump_pad_buffer (size_t size) void initialize_low_tracepoint (void) { + aarch64_linux_read_description (); } diff --git a/gdb/gdbserver/linux-amd64-ipa.c b/gdb/gdbserver/linux-amd64-ipa.c index 85d0d45..81070df 100644 --- a/gdb/gdbserver/linux-amd64-ipa.c +++ b/gdb/gdbserver/linux-amd64-ipa.c @@ -169,6 +169,19 @@ supply_static_tracepoint_registers (struct regcache *regcache, #endif /* HAVE_UST */ +#if !defined __ILP32__ +/* Map the tdesc index to xcr0 mask. */ +static uint64_t idx2mask[X86_TDESC_LAST] = { + X86_XSTATE_X87_MASK, + X86_XSTATE_SSE_MASK, + X86_XSTATE_AVX_MASK, + X86_XSTATE_MPX_MASK, + X86_XSTATE_AVX_MPX_MASK, + X86_XSTATE_AVX_AVX512_MASK, + X86_XSTATE_AVX_MPX_AVX512_PKU_MASK, +}; +#endif + /* Return target_desc to use for IPA, given the tdesc index passed by gdbserver. */ @@ -194,17 +207,6 @@ get_ipa_tdesc (int idx) break; } #else - /* Map the tdesc index to xcr0 mask. */ - uint64_t idx2mask[X86_TDESC_LAST] = { - X86_XSTATE_X87_MASK, - X86_XSTATE_SSE_MASK, - X86_XSTATE_AVX_MASK, - X86_XSTATE_MPX_MASK, - X86_XSTATE_AVX_MPX_MASK, - X86_XSTATE_AVX_AVX512_MASK, - X86_XSTATE_AVX_MPX_AVX512_PKU_MASK, - }; - return amd64_linux_read_description (idx2mask[idx], false); #endif @@ -276,4 +278,12 @@ alloc_jump_pad_buffer (size_t size) void initialize_low_tracepoint (void) { +#if defined __ILP32__ + amd64_linux_read_description (X86_XSTATE_SSE_MASK, true); + amd64_linux_read_description (X86_XSTATE_AVX_MASK, true); + amd64_linux_read_description (X86_XSTATE_AVX_AVX512_MASK, true); +#else + for (auto i = 0; i < X86_TDESC_LAST; i++) + amd64_linux_read_description (idx2mask[i], false); +#endif } diff --git a/gdb/gdbserver/linux-i386-ipa.c b/gdb/gdbserver/linux-i386-ipa.c index 785a63e..a1a35db 100644 --- a/gdb/gdbserver/linux-i386-ipa.c +++ b/gdb/gdbserver/linux-i386-ipa.c @@ -245,6 +245,17 @@ initialize_fast_tracepoint_trampoline_buffer (void) } } +/* Map the tdesc index to xcr0 mask. */ +static uint64_t idx2mask[X86_TDESC_LAST] = { + X86_XSTATE_X87_MASK, + X86_XSTATE_SSE_MASK, + X86_XSTATE_AVX_MASK, + X86_XSTATE_MPX_MASK, + X86_XSTATE_AVX_MPX_MASK, + X86_XSTATE_AVX_AVX512_MASK, + X86_XSTATE_AVX_MPX_AVX512_PKU_MASK, +}; + /* Return target_desc to use for IPA, given the tdesc index passed by gdbserver. */ @@ -256,18 +267,6 @@ get_ipa_tdesc (int idx) internal_error (__FILE__, __LINE__, "unknown ipa tdesc index: %d", idx); } - - /* Map the tdesc index to xcr0 mask. */ - uint64_t idx2mask[X86_TDESC_LAST] = { - X86_XSTATE_X87_MASK, - X86_XSTATE_SSE_MASK, - X86_XSTATE_AVX_MASK, - X86_XSTATE_MPX_MASK, - X86_XSTATE_AVX_MPX_MASK, - X86_XSTATE_AVX_AVX512_MASK, - X86_XSTATE_AVX_MPX_AVX512_PKU_MASK, - }; - return i386_linux_read_description (idx2mask[idx]); } @@ -290,4 +289,6 @@ void initialize_low_tracepoint (void) { initialize_fast_tracepoint_trampoline_buffer (); + for (auto i = 0; i < X86_TDESC_LAST; i++) + i386_linux_read_description (idx2mask[i]); } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 87547cb..7becd10 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-12-07 Yao Qi + + * gdb.trace/ftrace.exp (run_trace_experiment): Set breakpoint on + malloc and catch syscall. + 2017-12-07 Phil Muldoon * gdb.python/py-breakpoint.exp (test_bkpt_explicit_loc): Add new diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/ftrace.exp index b862680..3aa8883 100644 --- a/gdb/testsuite/gdb.trace/ftrace.exp +++ b/gdb/testsuite/gdb.trace/ftrace.exp @@ -63,9 +63,36 @@ proc run_trace_experiment {} { gdb_test_no_output "tstart" "start trace experiment" - gdb_test "continue" \ - ".*Breakpoint \[0-9\]+, end .*" \ - "advance through tracing" + # Fast tracepoint can be set in signal handler, so gdb_collect in + # IPA shouldn't call any non-async-signal-safe functions. It is + # impractical to list all non-async-signal-safe functions, and set + # breakpoints on them, so choose malloc only in this test. + gdb_test "b -q malloc" + + # Performance-wise, gdb_collect in IPA shouldn't call any syscall + # in order to keep fast tracepoint fast enough. + global gdb_prompt + set test "catch syscall" + gdb_test_multiple $test $test { + -re "The feature \'catch syscall\' is not supported.*\r\n$gdb_prompt $" { + } + -re ".*$gdb_prompt $" { + pass $test + } + } + + global decimal + set test "advance through tracing" + gdb_test_multiple "continue" $test { + -re "Thread 2 .* hit Catchpoint $decimal \\(call to syscall .*\\).*\r\n$gdb_prompt $" { + # IPA starts a helper thread, which calls accept. Ignore it. + send_gdb "continue\n" + exp_continue + } + -re "Breakpoint $decimal, end .*$gdb_prompt $" { + pass $test + } + } gdb_test "tstatus" ".*Trace .*" "check on trace status"