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.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 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=1681333886; 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=Hlfls34DHY0FZK63KeeRLDwHLonK9J9zzOmEqyv16iGfFDhxGD3OneQLZ87UNUbdOLZYmg 3meLkQcvPpKG4kJHFGBhLyffvh7INenolSMCD9XVK3mQcTuB3JFNrsiux91NUpBLj+GwaK XtyxmDWznWtE2+eK6VzJvCRQtKVtWCM= 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) From: Joe Simmons-Talbott 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 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