From patchwork Tue May 10 16:25:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1629274 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=HP5uhPvW; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KyNgc6nwcz9sG6 for ; Wed, 11 May 2022 02:25:32 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 84B17395B07F for ; Tue, 10 May 2022 16:25:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 84B17395B07F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1652199929; bh=ykd2O8auFGgwsbVnZ47WkVy4qOK4IHnTQjGMvWqVOuo=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=HP5uhPvWJlegGEW44fs3+If0rYy8QMNDI4jkuw5J7Q+0v/DIZW/sOBoj83ojxJvd2 uUlTR5+Ic8xpD3F86YR76vlHmcudqVtMc8pv2xxam1Y9LO2uJoACfQO+w3kl2/Al85 kWbBN58gEM8JbXbsET62VimY0Ehb3xfyOv15lwHg= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by sourceware.org (Postfix) with ESMTPS id 30C74395A440 for ; Tue, 10 May 2022 16:25:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 30C74395A440 Received: by mail-pj1-x1030.google.com with SMTP id cq17-20020a17090af99100b001dc0386cd8fso2582361pjb.5 for ; Tue, 10 May 2022 09:25:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ykd2O8auFGgwsbVnZ47WkVy4qOK4IHnTQjGMvWqVOuo=; b=1lDTdRt2EFKtGbD4gkEU/NURaSMs01Hzv9KRMcyYELHV5PFXkqE4ohdhgRRzGuXvBj df8A390KfhDIkz3AS0d7oMm2DtWkhrjWpUYcDRWZoezaW3psA5xdh2sTlP0TL4pwoJ3m 4eOvp82YTQ5A3cpWvnpjDeerHi6PRVE6s83QnzXTn9UVN+lSotyCH8S3effWWCYuBMXZ SL+FaWrp/DLya+VvG8DRgw+XBMgQremeZCWO/ir6zcRoiwGRjOIQjP14pLU8rpuuJTRm 3roFZkBzpBAQWlPDiC5Ks1NKw4L1Yz+d82MXYvRcUUBwRukmsu73+Tfu0WVJmjbmPTf8 OpeA== X-Gm-Message-State: AOAM5310buu+2Yk5O27vR/OThfqMsujxeHgXrnMb4HP92o0nV4WPGtPm Fyq8BCpii5Qn7HqonfNUT1BjYA3TZSM= X-Google-Smtp-Source: ABdhPJy0/4bJcCo72LcMNH7bhtUQ+1QWVjpb3K3YmwPluZFNq22t9AKcLKG81pZO0HjCmxc3/THL1w== X-Received: by 2002:a17:903:1104:b0:15f:bce:1a0c with SMTP id n4-20020a170903110400b0015f0bce1a0cmr11634041plh.149.1652199906927; Tue, 10 May 2022 09:25:06 -0700 (PDT) Received: from gnu-tgl-3.localdomain ([172.58.88.122]) by smtp.gmail.com with ESMTPSA id m1-20020a170902f64100b0015e8d4eb1c4sm2302352plg.14.2022.05.10.09.25.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 May 2022 09:25:06 -0700 (PDT) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id 44EB4C013C; Tue, 10 May 2022 09:25:05 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] x86: Skip ENDBR when emitting direct call/jmp to local function Date: Tue, 10 May 2022 09:25:05 -0700 Message-Id: <20220510162505.2721901-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3027.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Gcc-patches" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Mark a function with SYMBOL_FLAG_FUNCTION_ENDBR when inserting ENDBR at function entry. Skip the 4-byte ENDBR when emitting a direct call/jmp to a local function with ENDBR at function entry. This has been tested on Linux kernel. gcc/ PR target/102953 * config/i386/i386-features.cc (rest_of_insert_endbr_and_patchable_area): Set SYMBOL_FLAG_FUNCTION_ENDBR when inserting ENDBR. * config/i386/i386.cc (ix86_print_operand): Skip the 4-byte ENDBR when calling the local function with ENDBR at function entry. * config/i386/i386.h (SYMBOL_FLAG_FUNCTION_ENDBR): New. (SYMBOL_FLAG_FUNCTION_ENDBR_P): Likewise. gcc/testsuite/ PR target/102953 * gcc.target/i386/pr102953-1.c: New test. * gcc.target/i386/pr102953-2.c: Likewise. --- gcc/config/i386/i386-features.cc | 2 ++ gcc/config/i386/i386.cc | 11 +++++++- gcc/config/i386/i386.h | 5 ++++ gcc/testsuite/gcc.target/i386/pr102953-1.c | 25 ++++++++++++++++++ gcc/testsuite/gcc.target/i386/pr102953-2.c | 30 ++++++++++++++++++++++ 5 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.target/i386/pr102953-1.c create mode 100644 gcc/testsuite/gcc.target/i386/pr102953-2.c diff --git a/gcc/config/i386/i386-features.cc b/gcc/config/i386/i386-features.cc index 6fe41c3c24f..3ca1131ed59 100644 --- a/gcc/config/i386/i386-features.cc +++ b/gcc/config/i386/i386-features.cc @@ -1979,6 +1979,8 @@ rest_of_insert_endbr_and_patchable_area (bool need_endbr, || (TARGET_DLLIMPORT_DECL_ATTRIBUTES && DECL_DLLIMPORT_P (cfun->decl)))) { + rtx symbol = XEXP (DECL_RTL (cfun->decl), 0); + SYMBOL_REF_FLAGS (symbol) |= SYMBOL_FLAG_FUNCTION_ENDBR; if (crtl->profile && flag_fentry) { /* Queue ENDBR insertion to x86_function_profiler. diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc index 86752a6516a..ad1de239bef 100644 --- a/gcc/config/i386/i386.cc +++ b/gcc/config/i386/i386.cc @@ -13787,7 +13787,16 @@ ix86_print_operand (FILE *file, rtx x, int code) else if (flag_pic || MACHOPIC_INDIRECT) output_pic_addr_const (file, x, code); else - output_addr_const (file, x); + { + /* Skip ENDBR when emitting a direct call/jmp to a local + function with ENDBR at function entry. */ + if (code == 'P' + && GET_CODE (x) == SYMBOL_REF + && SYMBOL_REF_LOCAL_P (x) + && SYMBOL_FLAG_FUNCTION_ENDBR_P (x)) + x = gen_rtx_PLUS (Pmode, x, GEN_INT (4)); + output_addr_const (file, x); + } } } diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h index 363082ba47b..7a6317fea57 100644 --- a/gcc/config/i386/i386.h +++ b/gcc/config/i386/i386.h @@ -2792,6 +2792,11 @@ extern GTY(()) tree ms_va_list_type_node; #define SYMBOL_REF_STUBVAR_P(X) \ ((SYMBOL_REF_FLAGS (X) & SYMBOL_FLAG_STUBVAR) != 0) +/* Flag to mark a function with ENDBR at entry. */ +#define SYMBOL_FLAG_FUNCTION_ENDBR (SYMBOL_FLAG_MACH_DEP << 5) +#define SYMBOL_FLAG_FUNCTION_ENDBR_P(X) \ + ((SYMBOL_REF_FLAGS (X) & SYMBOL_FLAG_FUNCTION_ENDBR) != 0) + extern void debug_ready_dispatch (void); extern void debug_dispatch_window (int); diff --git a/gcc/testsuite/gcc.target/i386/pr102953-1.c b/gcc/testsuite/gcc.target/i386/pr102953-1.c new file mode 100644 index 00000000000..2afad391baf --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr102953-1.c @@ -0,0 +1,25 @@ +/* { dg-do compile { target { ! *-*-darwin* } } } */ +/* { dg-options "-O2 -fno-pic -fplt -fcf-protection" } */ + +extern int func (int); + +extern int i; + +__attribute__ ((noclone, noinline, noipa)) +static int +bar (int x) +{ + if (x == 0) + return x; + return bar (x - 1) + func (x); +} + +void * +foo (void) +{ + i = bar (2); + return bar; +} + +/* { dg-final { scan-assembler-times {call\t_?bar\+4\M} 2 } } */ +/* { dg-final { scan-assembler-times {call\t_?func\M} 1 } } */ diff --git a/gcc/testsuite/gcc.target/i386/pr102953-2.c b/gcc/testsuite/gcc.target/i386/pr102953-2.c new file mode 100644 index 00000000000..5b8d517f4f2 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr102953-2.c @@ -0,0 +1,30 @@ +/* { dg-do compile { target { ! *-*-darwin* } } } */ +/* { dg-options "-O2 -fno-pic -fplt -fcf-protection" } */ + +static int bar (int x); +extern int func (int); + +int +foo (int i) +{ + return bar (i); +} + +void * +bar_p (void) +{ + return bar; +} + +__attribute__ ((noclone, noinline, noipa)) +static int +bar (int x) +{ + if (x == 0) + return x; + return bar (x - 1) + func (x); +} + +/* { dg-final { scan-assembler-times {call\t_?bar\+4\M} 1 } } */ +/* { dg-final { scan-assembler-times {jmp\t_?bar\+4\M} 1 } } */ +/* { dg-final { scan-assembler-times {call\t_?func\M} 1 } } */