From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681219819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VvLbg3OaubJ3ELvdevtKXnA/ed9a0Tz1guuSDBSLBlw=; b=Hmrq7ma3KwFxHy2w5yuKmvowWPU0wC54kr3igeTCoBocDIKm8shwVt53DSfVwqy2Xv1pOg 5e2V7tzH5uTVBMO2P4TzdqTA4XYHtY+i7ZYUPSKQqqxNpYX1VIJ3RRIIrSNsvB54mNhmPK BF+fqD+s/VJ0m6MUY010s+Hz1AgEKzI= 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) From: Joe Simmons-Talbott 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 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 List-Id: 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) \ -- 2.39.2