From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 70953 invoked by alias); 12 Apr 2019 17:30:19 -0000 Mailing-List: contact systemtap-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: systemtap-owner@sourceware.org Received: (qmail 70892 invoked by uid 89); 12 Apr 2019 17:30:13 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-34.4 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS,USER_IN_DEF_SPF_WL autolearn=ham version=3.3.1 spammy=HPrecedence:Bulk X-HELO: smtp-fw-2101.amazon.com Received: from smtp-fw-2101.amazon.com (HELO smtp-fw-2101.amazon.com) (72.21.196.25) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 12 Apr 2019 17:30:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1555090211; x=1586626211; h=date:from:to:subject:message-id:mime-version: content-transfer-encoding; bh=PTaRboJtDsVIGNaXMyZ2O3Bpo1A3wMEkS4ntfPzy2+8=; b=sC82+itb75XKY6mdAsqgkIZ2iAueW5MhLxbPPameXW2LxPf5joB1jaDZ wXaaqZQPvt2Sr5IJPyWLBIp5oasw/qt5QoL4QFLRm0jo0dd8XM4EcC3fu 1wGxgKZTV6jZa4/gU0GRxJOyv9Jr9f1ugLoMQCDrJey3VyMDgD863gWIL 8=; Received: from iad6-co-svc-p1-lb1-vlan2.amazon.com (HELO email-inbound-relay-1a-821c648d.us-east-1.amazon.com) ([10.124.125.2]) by smtp-border-fw-out-2101.iad2.amazon.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 12 Apr 2019 17:30:09 +0000 Received: from EX13MTAUEB001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1a-821c648d.us-east-1.amazon.com (8.14.7/8.14.7) with ESMTP id x3CHU4mw064338 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=FAIL) for ; Fri, 12 Apr 2019 17:30:09 GMT Received: from EX13D05UEB003.ant.amazon.com (10.43.60.8) by EX13MTAUEB001.ant.amazon.com (10.43.60.96) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Fri, 12 Apr 2019 17:30:08 +0000 Received: from EX13MTAUEB001.ant.amazon.com (10.43.60.96) by EX13D05UEB003.ant.amazon.com (10.43.60.8) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Fri, 12 Apr 2019 17:30:08 +0000 Received: from dev-dsk-fllinden-2c-c1893d73.us-west-2.amazon.com (172.23.141.97) by mail-relay.amazon.com (10.43.60.129) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Fri, 12 Apr 2019 17:30:08 +0000 Received: by dev-dsk-fllinden-2c-c1893d73.us-west-2.amazon.com (Postfix, from userid 6262777) id 047BDD4EB1; Fri, 12 Apr 2019 17:30:08 +0000 (UTC) Date: Fri, 12 Apr 2019 17:30:00 -0000 From: Frank van der Linden To: Subject: [PATCH] arm64: use sregs for syscall probe registers Message-ID: <5cb0cb1f.ROdjA4uUKaH5hT/r%fllinden@amazon.com> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-SW-Source: 2019-q2/txt/msg00028.txt.bz2 Since syscall wrappers are now active on arm64 (4.19+), arguments need to be retrieved the right way, by checking if there is a saved set of system call registers, and using them if there are. --- tapset/arm64/registers.stp | 50 ++++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/tapset/arm64/registers.stp b/tapset/arm64/registers.stp index b2e56495d..b001b8efe 100644 --- a/tapset/arm64/registers.stp +++ b/tapset/arm64/registers.stp @@ -107,6 +107,36 @@ function u_register:long (name:string) { return _stp_register(name, 0) } +function _stp_arg_register:long (argnum:long) %{ /* pure */ + long val; + struct pt_regs *regs; + + if (STAP_ARG_argnum < 1 || STAP_ARG_argnum > 8) { + snprintf(CONTEXT->error_buffer, sizeof(CONTEXT->error_buffer), + "Cannot access arg(%lld)", + (long long)STAP_ARG_argnum); + CONTEXT->last_error = CONTEXT->error_buffer; + return; + } + + /* syscall-in-pt_regs mode, 4.19+ */ + if (CONTEXT->sregs) { + regs = CONTEXT->sregs; + } else { + regs = (CONTEXT->user_mode_p ? CONTEXT->uregs : CONTEXT->kregs); + } + + if (!regs) { + CONTEXT->last_error = "No registers available in this context"; + return; + } + + memcpy(&val, ((char *)regs) + ((STAP_ARG_argnum - 1) * sizeof (long)), + sizeof (long)); + + STAP_RETVALUE = val; +%} + /* * Return the value of function arg #argnum (1=first arg). * If truncate=1, mask off the top 32 bits. @@ -115,25 +145,7 @@ function u_register:long (name:string) { * TODO: 32-bit arm code has different calling conventions than arm64 */ function _stp_arg:long (argnum:long, sign_extend:long, truncate:long) { - val = 0 - assert(!(argnum < 1 || argnum > 8), sprintf("Cannot access arg(%d)", argnum)) - - if (argnum == 1) - val = u_register("x0") - else if (argnum == 2) - val = u_register("x1") - else if (argnum == 3) - val = u_register("x2") - else if (argnum == 4) - val = u_register("x3") - else if (argnum == 5) - val = u_register("x4") - else if (argnum == 6) - val = u_register("x5") - else if (argnum == 7) - val = u_register("x6") - else if (argnum == 8) - val = u_register("x7") + val = _stp_arg_register(argnum) if (truncate) { if (sign_extend) -- 2.16.5