From patchwork Tue Mar 29 15:48:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1610685 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=RM3lQzMO; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=pdbg-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KSYsw08C5z9sFk for ; Wed, 30 Mar 2022 02:49:56 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4KSYsv5rv3z2yJ9 for ; Wed, 30 Mar 2022 02:49:55 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=RM3lQzMO; dkim-atps=neutral X-Original-To: pdbg@lists.ozlabs.org Delivered-To: pdbg@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::42a; helo=mail-pf1-x42a.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=RM3lQzMO; dkim-atps=neutral Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4KSYsn4bDZz2xYG for ; Wed, 30 Mar 2022 02:49:49 +1100 (AEDT) Received: by mail-pf1-x42a.google.com with SMTP id t2so16236302pfj.10 for ; Tue, 29 Mar 2022 08:49:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=znawAqR4jsCXDe/vxPPhxP/VTOVIS6fqlYlj45YgmMk=; b=RM3lQzMOSYTae0ho+AfJFAzBEBY0QAdK3SXi6oLIKzmkXCRa1lZN1RX4VXTX5YEo5m twb8rN6ylf6MU9CrBVQC2hjpKS4YQnu5JWw3BCB8denP7hPc0vrD1n/oSx0wW/GgdwLp BzqWd0EgL+p2qV8+hl+NZhT1WonUsiftzpOP67q6/I4wBzEDvHvm6O4Rh/gZrsPAj5Kg r0u8K4WCs90Ty6gw68ZdGyam57HYpBMu/+SveU3vp1W4jTH1n9pfjcRHDPqy86suSfoF ZwTNXmSg77qln0lqAPZlGONOyw3CgLvCvr+TLHMlBQjaZrOOodSFq2DNNO9QyjcXDrvg TQrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=znawAqR4jsCXDe/vxPPhxP/VTOVIS6fqlYlj45YgmMk=; b=7CxFhyFKslkOE2IrB59uSFniYtAJsrE9AhL17FuGRZ5ayA6+AVzkHA8OU7qkMGpHEf g6LhaxE7G5GgzD6jbu5FjH3aTLI2fb80JdEoaup2SWjS3RPH49Xpr91cnr1+ENKdkUi1 8kJNSIqXYHI/vLjwm2XH/tXLPR9kf1q+tVVlOGb971lLWelPatGsVQ0F/s2b2LSTabkW RXE7w2xdNiQaCUR9y3rqFHWoCX9vOuAzhoDDwr8GO9MPS6dPZhlXcCG9W3rSO2zyYxoM sl+gl5iLTjL0u16A9BvDoWQAzFpPlEl6OxxdYXc/imsFTfdUed+x00xiE7QFOx56hjLq Qe1w== X-Gm-Message-State: AOAM532D/6Fib0TO8n7y4Ti5AlchGNiOLEBqDimzZDtqB2noUSep3OKu 5F5kXPXF4iuCzXLDhfek7X38VoffLjE= X-Google-Smtp-Source: ABdhPJzlpBPBTf23zUegktpOVZK8vWFTVws7UQEm59FAGdADUTJ5hKuZ16qcCqTo/0KZbHA6Gt73yw== X-Received: by 2002:a63:806:0:b0:381:1497:c4e9 with SMTP id 6-20020a630806000000b003811497c4e9mr2517357pgi.123.1648568987315; Tue, 29 Mar 2022 08:49:47 -0700 (PDT) Received: from bobo.ibm.com (58-6-255-110.tpgi.com.au. [58.6.255.110]) by smtp.gmail.com with ESMTPSA id s35-20020a056a001c6300b004fb20b5d6c1sm14163564pfw.40.2022.03.29.08.49.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Mar 2022 08:49:47 -0700 (PDT) From: Nicholas Piggin To: pdbg@lists.ozlabs.org Date: Wed, 30 Mar 2022 01:48:56 +1000 Message-Id: <20220329154931.493851-4-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20220329154931.493851-1-npiggin@gmail.com> References: <20220329154931.493851-1-npiggin@gmail.com> MIME-Version: 1.0 Subject: [Pdbg] [PATCH v2 03/38] gdbserver: update gdb_parser_precompile.c, rename detach command X-BeenThere: pdbg@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "mailing list for https://github.com/open-power/pdbg development" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nicholas Piggin Errors-To: pdbg-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Pdbg" gdb_parser_precompile.c had not been updated since adding support for the detach command, resulting in client error messages like this: Detaching from program: /home/npiggin/images/vmlinux, process 42000 Remote doesn't know how to detach The command handler should not be named disconnect, because that is a different concept in gdb (disconnect leaves the target in the same state, detach ends the debugging session). Signed-off-by: Nicholas Piggin --- src/gdb_parser.rl | 4 ++-- src/gdb_parser_precompile.c | 2 +- src/pdbgproxy.c | 6 +++--- src/pdbgproxy.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gdb_parser.rl b/src/gdb_parser.rl index 868e31c..629a091 100644 --- a/src/gdb_parser.rl +++ b/src/gdb_parser.rl @@ -76,7 +76,7 @@ set_thread = ('H' any* @{cmd = SET_THREAD;}); - disconnect = ('D' @{cmd = DISCONNECT;} + detach = ('D' @{cmd = DETACH;} xdigit+ $hex_digit %push); # TODO: We don't actually listen to what's supported @@ -94,7 +94,7 @@ commands = (get_mem | get_gprs | get_spr | stop_reason | set_thread | q_attached | q_C | q_supported | qf_threadinfo | q_C | - v_contq | v_contc | v_conts | put_mem | disconnect ); + v_contq | v_contc | v_conts | put_mem | detach ); cmd = ((commands & ^'#'*) | ^'#'*) $crc ('#' xdigit{2} $hex_digit @end); diff --git a/src/gdb_parser_precompile.c b/src/gdb_parser_precompile.c index 505e102..f787a29 100644 --- a/src/gdb_parser_precompile.c +++ b/src/gdb_parser_precompile.c @@ -346,7 +346,7 @@ _match: break; case 11: #line 79 "src/gdb_parser.rl" - {cmd = DISCONNECT;} + {cmd = DETACH;} break; case 12: #line 83 "src/gdb_parser.rl" diff --git a/src/pdbgproxy.c b/src/pdbgproxy.c index bb7c7b3..3e27ba0 100644 --- a/src/pdbgproxy.c +++ b/src/pdbgproxy.c @@ -95,9 +95,9 @@ static void stop_reason(uint64_t *stack, void *priv) send_response(fd, TRAP); } -static void disconnect(uint64_t *stack, void *priv) +static void detach(uint64_t *stack, void *priv) { - PR_INFO("Terminating connection with client. pid %16" PRIi64 "\n", stack[0]); + PR_INFO("Detach debug session with client. pid %16" PRIi64 "\n", stack[0]); send_response(fd, OK); } @@ -416,7 +416,7 @@ command_cb callbacks[LAST_CMD + 1] = { v_conts, put_mem, interrupt, - disconnect, + detach, NULL}; int gdbserver_start(struct pdbg_target *thread, struct pdbg_target *adu, uint16_t port) diff --git a/src/pdbgproxy.h b/src/pdbgproxy.h index 1fe67f2..1910fdb 100644 --- a/src/pdbgproxy.h +++ b/src/pdbgproxy.h @@ -3,7 +3,7 @@ enum gdb_command {NONE, GET_GPRS, GET_SPR, GET_MEM, STOP_REASON, SET_THREAD, V_CONTC, V_CONTS, - PUT_MEM, INTERRUPT, DISCONNECT, LAST_CMD}; + PUT_MEM, INTERRUPT, DETACH, LAST_CMD}; typedef void (*command_cb)(uint64_t *stack, void *priv); void parser_init(command_cb *callbacks);