From patchwork Tue Apr 11 13:30: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: 1767642 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=WIkWbBm7; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PwmvW1rHPz1yXv for ; Tue, 11 Apr 2023 23:31:19 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 39011385828D for ; Tue, 11 Apr 2023 13:31:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 39011385828D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681219877; 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=WIkWbBm7b5DpQc7RSeQoVqQFFBMGw2V0YuRpVZNXrLRqMKa0TquVdK3AWo5ccLTKN fE2gnvwhvOz1uhX0aqceuv9aVecHKICXcs87388F0bF95XsBV1InukLEgypFiG67K0 Uspoh3kMgn5GPz9ShWRH7nRGiSt0wIgjnXQonR3Y= 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 03D553858426 for ; Tue, 11 Apr 2023 13:30:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 03D553858426 Received: from mail-yw1-f198.google.com (mail-yw1-f198.google.com [209.85.128.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-628-6EYeZgi1NqeS25oNY33Lwg-1; Tue, 11 Apr 2023 09:30:18 -0400 X-MC-Unique: 6EYeZgi1NqeS25oNY33Lwg-1 Received: by mail-yw1-f198.google.com with SMTP id 00721157ae682-54ee397553eso84928527b3.19 for ; Tue, 11 Apr 2023 06:30:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681219817; x=1683811817; 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=dOp7DVW/crKyXojg9DoixuphDI37TKvrc86NJYVSKEkqkDoNb8FNFSiMmzNfK2RCij Mgu4KcuEeeM4vhFeWn8A9r8Ha1/hVKVty8YgxHh1pYHw9/Tz1lqHqSTNYypgYMFdgeLB Pvtbbpw2JXobwEGFjsqq4dGr3CtmJUEliQiEjl4q7qe7Ku9AUGk2cAeI7CDev1cr0zDK Ncbyp9YkOJ7O3NsAf/Cvz11Ks3OcV/FHR35K0CQ0J/XssYLBU4mOe8C7ALa4tkvBTXkI ZRGtYo3ikJZIXkfB5t/70nSAoJQW9pCuqRSA91PYby/ow6qOpTJa4uwGEqYn19AwuZPo UhgQ== X-Gm-Message-State: AAQBX9f8MAowy0uQ9+6gs4O+OGil2sFSY/GVqazlREsTuLsM/m+2sy9i m0lUnlVb8zeHaRp94rrIqGlUxfqwqZMf30rq84/a3ZSDenj1ZMUzyVXDZ3J9XmOFii7+kiAvXNw hZdkumTj2CR1cDqTuCDoFHZE5PDjHi85n2mvNJ/+REG/yBVopxdfp5T0h+/Xm0CVl6m//Bb/i2T 8nRK63 X-Received: by 2002:a0d:d9cd:0:b0:541:bc8f:9c5f with SMTP id b196-20020a0dd9cd000000b00541bc8f9c5fmr7880946ywe.38.1681219817253; Tue, 11 Apr 2023 06:30:17 -0700 (PDT) X-Google-Smtp-Source: AKy350Y43szaq+EXC5opjCu0FS5jyYMSrLeBWML/9dVRZ5vqPPatFqWmOty/qg5LgmQDRurnUTqR2Q== X-Received: by 2002:a0d:d9cd:0:b0:541:bc8f:9c5f with SMTP id b196-20020a0dd9cd000000b00541bc8f9c5fmr7880925ywe.38.1681219816934; Tue, 11 Apr 2023 06:30:16 -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 n124-20020a0dcb82000000b00545a0818493sm3486425ywd.35.2023.04.11.06.30.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 06:30:16 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Joe Simmons-Talbott Subject: [PATCH 1/2] x86_64: Set the syscall register right before doing the syscall. Date: Tue, 11 Apr 2023 09:30:03 -0400 Message-Id: <20230411133004.2268170-2-josimmon@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230411133004.2268170-1-josimmon@redhat.com> References: <20230411133004.2268170-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+incoming=patchwork.ozlabs.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 Tue Apr 11 13:30: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: 1767641 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=s5ENAycb; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pwmtq3fB3z1yXv for ; Tue, 11 Apr 2023 23:30:43 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 799553858D39 for ; Tue, 11 Apr 2023 13:30:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 799553858D39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681219841; bh=Imwb2HozwUNexQIxdU7WIVtUekmiCRuIhSMH9QQlkAE=; 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=s5ENAycb8Erb/uh+7Pa8PJDaeTuz6LsjDpnmPtyvE1OeGNtvwqss2C/oFz49kCbVN uWOCur5VNSqeFbZC5lkuCeZSv+BUeEQoSw/CPRq+X+3rX2QLcjq+952poNvnVsqSvm me1//HthwTC5yuci5WJ4HYe0dP8l/vF9qcUhmuk0= 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 74EF33857835 for ; Tue, 11 Apr 2023 13:30:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 74EF33857835 Received: from mail-yb1-f198.google.com (mail-yb1-f198.google.com [209.85.219.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-620-jemzAMzwPYKk7Uj3OryCXg-1; Tue, 11 Apr 2023 09:30:20 -0400 X-MC-Unique: jemzAMzwPYKk7Uj3OryCXg-1 Received: by mail-yb1-f198.google.com with SMTP id b124-20020a253482000000b00b8f1b9d74ecso2731007yba.18 for ; Tue, 11 Apr 2023 06:30:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681219818; x=1683811818; 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=Imwb2HozwUNexQIxdU7WIVtUekmiCRuIhSMH9QQlkAE=; b=2oozyZrseng2b6Mf6HGOQT2FR2kdAWpRkotiLR0OHnR3FA8/cMbyd+u52X6KZcIzzF 1KcaQiX8fEax+Lqwxn+oewr6ffUWIuMJbZoA46RdeNcXrltQae5r3QDBjaROhKpST50F yAuARyvhy2zitDHc5Ttu1qbSLIExIpFYlYo2pTgxCEi+BtFLJgKEE7hl/qDg2N0uToXd tTSMB3XnOCmL5qIM4MtZyJoGcH3JHiCiiJBoP43gbeaqWzIWii0NiGhMUAfY397Uwei6 p9gDm5aKt2ZAxBlh6XzBUImupOBI5TOc2YmUef9CFqv7jwpid8Q0X/UnpC1mlIhXo/mD lLPQ== X-Gm-Message-State: AAQBX9doNWN+D7s5iom7k5x51Vwb03GiSyYn6+gBOlzhMqARNSREXklL FFmO7RvurIGkX4h4Z704DUWh7l9ITS22ChW5SdIY8RXHvYq8awtvhR6ljkG+Cpg6YcbVQieTiQH /QatjIsn4ImSEGHSQ5dhxjvxQRHuNEPvQi9yx5yOgQfvK7B8NfllmdMhmSNGafT1HliBjFpEL6m S26TOR X-Received: by 2002:a25:15c5:0:b0:a30:3ccd:e16e with SMTP id 188-20020a2515c5000000b00a303ccde16emr1619065ybv.2.1681219818629; Tue, 11 Apr 2023 06:30:18 -0700 (PDT) X-Google-Smtp-Source: AKy350ZEiTbml4im5ElNlR25lCwpD5Rdcs6kEhmjoYBYL/cJhluvD6ZpqHDiTl3rLDsyP9BQMtDuFA== X-Received: by 2002:a25:15c5:0:b0:a30:3ccd:e16e with SMTP id 188-20020a2515c5000000b00a303ccde16emr1619050ybv.2.1681219818322; Tue, 11 Apr 2023 06:30:18 -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 n124-20020a0dcb82000000b00545a0818493sm3486425ywd.35.2023.04.11.06.30.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 06:30:17 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Joe Simmons-Talbott Subject: [PATCH 2/2] aarch64: Set the syscall register right before doing the syscall. Date: Tue, 11 Apr 2023 09:30:04 -0400 Message-Id: <20230411133004.2268170-3-josimmon@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230411133004.2268170-1-josimmon@redhat.com> References: <20230411133004.2268170-1-josimmon@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.1 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+incoming=patchwork.ozlabs.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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h index e94d1703ad..42a70feac2 100644 --- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h +++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h @@ -167,12 +167,18 @@ # 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); \ + if (__builtin_constant_p(name)) \ + asm volatile ("mov x8, " MSTR(name) ";" \ + : /* no output */ : "i" (name) : "x8"); \ asm volatile ("svc 0 // syscall " # name \ : "=r" (_x0) : "r"(_x8) ASM_ARGS_##nr : "memory"); \ _sys_result = _x0; \