From patchwork Wed Apr 12 21:11:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Simmons-Talbott X-Patchwork-Id: 67684 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 391EB3857737 for ; Wed, 12 Apr 2023 21:11:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 391EB3857737 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681333908; bh=VvLbg3OaubJ3ELvdevtKXnA/ed9a0Tz1guuSDBSLBlw=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=iRkvi1mg1Mqai8Q3NKg0ajLVEm2GAoPbqAwbP/Xf8riUdsnGC/cXrsDLR3yNKNXiz O6d44lTvaPEKwMbt4DludjiAa9jJKhfzxW1LrZnOpVJ0Se4AmK1lUcTQ+hRiiHRy2T pi20/Jb7rLIEAi6M+V8qw3y9XyrJQDGBmegj9/s8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 917D13858D39 for ; Wed, 12 Apr 2023 21:11:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 917D13858D39 Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-139-3BLjKgNVNFGdRh1vbioyLA-1; Wed, 12 Apr 2023 17:11:25 -0400 X-MC-Unique: 3BLjKgNVNFGdRh1vbioyLA-1 Received: by mail-qk1-f197.google.com with SMTP id b18-20020ae9eb12000000b007486a8b9ae9so4287517qkg.11 for ; Wed, 12 Apr 2023 14:11:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681333884; x=1683925884; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VvLbg3OaubJ3ELvdevtKXnA/ed9a0Tz1guuSDBSLBlw=; b=fEZH4iMATQVZqTcg8I+L6iftLCXmAoQgDLSjaeWbcTLVaOBui1iqPPo5xxhRynf0rS PGiHUK8xVmKafQ3HV42dvRBBsmEYRkW/IM1OV9zJIw/+LcWsOfmcrXj1TpBooKWBWaEZ OVSkW+KTcI+7JgGVklFXXNQYZ3C/r4S0shjCiBgHojXQ6pTt1/V567ggTY1Tar38zbAS krBjSsNtKXwceXtrR2u+cjazeyX6Cbcm/S/jbamlNUE3ybQWnEKNeHy6YAfobiqUgOqi a8j+2FT6kcR2XLtbJuIQ0SpbI1ek/HSfP5rvLIy+ypIFB3wjNJ2pn2C9gwsOygp9437K /W9A== X-Gm-Message-State: AAQBX9fFCnRTADh2HKodST4VRQ4lW8KXbSS0CZezB/6M0XM/Hs4xWMIG Voc1IgK5upskA+two1gecDBb/ZxUiRXkC3pwurV0wqfxtCQgESV7E3DOfY5yswPzQXwEv2YoYyK VBqD8G71p5IDtbYc4G3zOq/uTbRaCDlOnMEiiDxckwds1KyUsy+v9CWboKgGJb6K2/ZtkvroVzF CgIbUP X-Received: by 2002:a05:622a:199c:b0:3b8:2e36:9d24 with SMTP id u28-20020a05622a199c00b003b82e369d24mr24040434qtc.50.1681333884210; Wed, 12 Apr 2023 14:11:24 -0700 (PDT) X-Google-Smtp-Source: AKy350bRJLk56RSwBcMSLTHqmXQNpRWrOlgpVC1BAEri1OKLElmz5cQWquVdean0O7cyL6yTR9ix0g== X-Received: by 2002:a05:622a:199c:b0:3b8:2e36:9d24 with SMTP id u28-20020a05622a199c00b003b82e369d24mr24040411qtc.50.1681333883856; Wed, 12 Apr 2023 14:11:23 -0700 (PDT) Received: from oak.redhat.com (c-71-206-142-238.hsd1.va.comcast.net. [71.206.142.238]) by smtp.gmail.com with ESMTPSA id r82-20020a37a855000000b0074a0051fcd4sm4939068qke.88.2023.04.12.14.11.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Apr 2023 14:11:23 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Joe Simmons-Talbott Subject: [PATCH v2 1/2] x86_64: Set the syscall register right before doing the syscall. Date: Wed, 12 Apr 2023 17:11:03 -0400 Message-Id: <20230412211104.2609738-2-josimmon@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230412211104.2609738-1-josimmon@redhat.com> References: <20230411133004.2268170-1-josimmon@redhat.com> <20230412211104.2609738-1-josimmon@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Joe Simmons-Talbott via Libc-alpha From: Joe Simmons-Talbott Reply-To: Joe Simmons-Talbott Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" To make identifying syscalls easier during call tree analysis load the syscall number just before performing the syscall. --- sysdeps/unix/sysv/linux/x86_64/sysdep.h | 33 +++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep.h b/sysdeps/unix/sysv/linux/x86_64/sysdep.h index cfb51be8c5..800a56723f 100644 --- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h +++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h @@ -250,12 +250,20 @@ (long int) resultvar; \ }) +#define MSTR_HELPER(x) #x +#define MSTR(x) MSTR_HELPER(x) + #undef internal_syscall1 #define internal_syscall1(number, arg1) \ ({ \ unsigned long int resultvar; \ TYPEFY (arg1, __arg1) = ARGIFY (arg1); \ register TYPEFY (arg1, _a1) asm ("rdi") = __arg1; \ + if (__builtin_constant_p(number)) \ + asm volatile ("movl $" MSTR(number) ", %%eax\n\t" \ + : /* no outputs */ \ + : "i" (number) \ + : "eax"); \ asm volatile ( \ "syscall\n\t" \ : "=a" (resultvar) \ @@ -272,6 +280,11 @@ TYPEFY (arg1, __arg1) = ARGIFY (arg1); \ register TYPEFY (arg2, _a2) asm ("rsi") = __arg2; \ register TYPEFY (arg1, _a1) asm ("rdi") = __arg1; \ + if (__builtin_constant_p(number)) \ + asm volatile ("movl $" MSTR(number) ", %%eax\n\t" \ + : /* no outputs */ \ + : "i" (number) \ + : "eax"); \ asm volatile ( \ "syscall\n\t" \ : "=a" (resultvar) \ @@ -290,6 +303,11 @@ register TYPEFY (arg3, _a3) asm ("rdx") = __arg3; \ register TYPEFY (arg2, _a2) asm ("rsi") = __arg2; \ register TYPEFY (arg1, _a1) asm ("rdi") = __arg1; \ + if (__builtin_constant_p(number)) \ + asm volatile ("movl $" MSTR(number) ", %%eax\n\t" \ + : /* no outputs */ \ + : "i" (number) \ + : "eax"); \ asm volatile ( \ "syscall\n\t" \ : "=a" (resultvar) \ @@ -310,6 +328,11 @@ register TYPEFY (arg3, _a3) asm ("rdx") = __arg3; \ register TYPEFY (arg2, _a2) asm ("rsi") = __arg2; \ register TYPEFY (arg1, _a1) asm ("rdi") = __arg1; \ + if (__builtin_constant_p(number)) \ + asm volatile ("movl $" MSTR(number) ", %%eax\n\t" \ + : /* no outputs */ \ + : "i" (number) \ + : "eax"); \ asm volatile ( \ "syscall\n\t" \ : "=a" (resultvar) \ @@ -332,6 +355,11 @@ register TYPEFY (arg3, _a3) asm ("rdx") = __arg3; \ register TYPEFY (arg2, _a2) asm ("rsi") = __arg2; \ register TYPEFY (arg1, _a1) asm ("rdi") = __arg1; \ + if (__builtin_constant_p(number)) \ + asm volatile ("movl $" MSTR(number) ", %%eax\n\t" \ + : /* no outputs */ \ + : "i" (number) \ + : "eax"); \ asm volatile ( \ "syscall\n\t" \ : "=a" (resultvar) \ @@ -357,6 +385,11 @@ register TYPEFY (arg3, _a3) asm ("rdx") = __arg3; \ register TYPEFY (arg2, _a2) asm ("rsi") = __arg2; \ register TYPEFY (arg1, _a1) asm ("rdi") = __arg1; \ + if (__builtin_constant_p(number)) \ + asm volatile ("movl $" MSTR(number) ", %%eax\n\t" \ + : /* no outputs */ \ + : "i" (number) \ + : "eax"); \ asm volatile ( \ "syscall\n\t" \ : "=a" (resultvar) \ From patchwork Wed Apr 12 21:11:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Simmons-Talbott X-Patchwork-Id: 67685 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 684983858401 for ; Wed, 12 Apr 2023 21:12:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 684983858401 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681333950; bh=NqD66wLeGYTsXhVPcGYcidMYQx4n8yzfpDmRUGFm+r0=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=a65tOV6Eb9uuk1EuKZB1SXHx7dZyWBUW9A8xver+qxIsv1ClRNK22+6V6Wr7P52Hx J7aUuqRuiyrNwhiOaVHIJg1eFZn5zlRaGowUf4Ps/33EZSaBrDR49dkTS8u6KECrY0 13Q0LajRORFCxEZ9zbRL0GVdaYHhpX1dWk8klEw0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 6C1983858C83 for ; Wed, 12 Apr 2023 21:11:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6C1983858C83 Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-74-Qi-h35DxMDO7NQQvzR3w9A-1; Wed, 12 Apr 2023 17:11:26 -0400 X-MC-Unique: Qi-h35DxMDO7NQQvzR3w9A-1 Received: by mail-qt1-f198.google.com with SMTP id bp42-20020a05622a1baa00b003e6748b05edso16390004qtb.2 for ; Wed, 12 Apr 2023 14:11:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681333885; x=1683925885; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NqD66wLeGYTsXhVPcGYcidMYQx4n8yzfpDmRUGFm+r0=; b=WojSV74N29CfQnK9yIsus4/H0WAc3qcBDgCCv8WnjYaVdmlXmQWFrp/EZ6KmWcq+Ks R+5udH+ycqyejcx9t56iF3JkA/LvSkYH4zW44zUvEXBy56SWNNicLy7gL4Dp3gNOiPv3 lbeZac4/YZksfJ2ayV/Nw5ejvU+Xf33kcHKWpgIm2U4MNTBD5sKEhe7LhpbO8SYYdTvt MFiAwj7vCucPPf52XBni/M55xn5y6MIRiSW3S5wFtM1fbyPWYt8j8LqZC7zJr9Ywo9/O Zd3k3qnlLs4e8mY+h9rpxxwpCl38ZwPVyUTVZE2C5MeKGLh0Fa0jIYxZb5mHXwXRy1nY MnXg== X-Gm-Message-State: AAQBX9dt9bX5L7Ybn4yQ1JWpGFPpbpv9xNYctlRZXNTO0Dpff20PGOTH Ru06SRX7Fs2dY4GQl5g3Ffp3WwRLdYMxkzTaSytVT0VQvjdTc1tCy0h3Th2RZNXlI+dJXZLT2Mh DA5JB86hOXAy/PHprGdYQWrqxdrPn6xqGVApThkUznB8gzQG0pgxp8jRkijmUjAxL6193jqe6/3 n0sIau X-Received: by 2002:a05:622a:1048:b0:3e8:b3fd:4cee with SMTP id f8-20020a05622a104800b003e8b3fd4ceemr4039936qte.46.1681333885520; Wed, 12 Apr 2023 14:11:25 -0700 (PDT) X-Google-Smtp-Source: AKy350aPwgBspT1b8RdKzBJAKFRHh/y4+2CXol+RHbpGpSGPFhInyIhsliB0A8vs4KWguUcCPfFLCg== X-Received: by 2002:a05:622a:1048:b0:3e8:b3fd:4cee with SMTP id f8-20020a05622a104800b003e8b3fd4ceemr4039906qte.46.1681333885134; Wed, 12 Apr 2023 14:11:25 -0700 (PDT) Received: from oak.redhat.com (c-71-206-142-238.hsd1.va.comcast.net. [71.206.142.238]) by smtp.gmail.com with ESMTPSA id r82-20020a37a855000000b0074a0051fcd4sm4939068qke.88.2023.04.12.14.11.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Apr 2023 14:11:24 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Joe Simmons-Talbott Subject: [PATCH v2 2/2] aarch64: Set the syscall register right before doing the syscall. Date: Wed, 12 Apr 2023 17:11:04 -0400 Message-Id: <20230412211104.2609738-3-josimmon@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230412211104.2609738-1-josimmon@redhat.com> References: <20230411133004.2268170-1-josimmon@redhat.com> <20230412211104.2609738-1-josimmon@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Joe Simmons-Talbott via Libc-alpha From: Joe Simmons-Talbott Reply-To: Joe Simmons-Talbott Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" To make identifying syscalls easier during call tree analysis load the syscall number just before performing the syscall. --- sysdeps/unix/sysv/linux/aarch64/sysdep.h | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h index e94d1703ad..b91656fdff 100644 --- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h +++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h @@ -167,14 +167,28 @@ # define HAVE_CLONE3_WRAPPER 1 +# define MSTR_HELPER(x) # x +# define MSTR(x) MSTR_HELPER(x) + # undef INTERNAL_SYSCALL_RAW # define INTERNAL_SYSCALL_RAW(name, nr, args...) \ ({ long _sys_result; \ { \ LOAD_ARGS_##nr (args) \ - register long _x8 asm ("x8") = (name); \ - asm volatile ("svc 0 // syscall " # name \ - : "=r" (_x0) : "r"(_x8) ASM_ARGS_##nr : "memory"); \ + if (__builtin_constant_p(name)) \ + asm volatile ("mov x8, %1\n" \ + "svc 0 // syscall " # name \ + : "=r" (_x0) \ + : "i" (name) ASM_ARGS_##nr \ + : "x8", "memory"); \ + else \ + { \ + register long _x8 asm ("x8") = (name); \ + asm volatile ("svc 0 // syscall " # name \ + : "=r" (_x0) \ + : "r"(_x8) ASM_ARGS_##nr \ + : "memory"); \ + } \ _sys_result = _x0; \ } \ _sys_result; })