From patchwork Mon Feb 26 09:49:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Qi X-Patchwork-Id: 206542 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1975046dyb; Mon, 26 Feb 2024 02:11:06 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWAA+w3zNxFAIHB/z4nfRAm1YoLXutyxE62u+W+7sTF/xmnGpmLLmRDU0U7PikO/V3ip1yT5UBVMhQLtVJKjNbAoWfB3g== X-Google-Smtp-Source: AGHT+IGPHnbSrvIb9hf9h/6Xqa4iefD9V9z5uPfSA5GbOLD9YcXvSiaMdyE1QtP7QY+1+n0/rOfa X-Received: by 2002:a17:906:b34e:b0:a43:3fb:6c6f with SMTP id cd14-20020a170906b34e00b00a4303fb6c6fmr3040712ejb.67.1708942266360; Mon, 26 Feb 2024 02:11:06 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708942266; cv=pass; d=google.com; s=arc-20160816; b=ASzFgjaocmi/gOfajl+GNzeOa99hptrFx4ablbzsWY2lirQ1NDZJn9bAUezJO861rj GyIQZwBIdul+rxXQzek0BVgrxOze6IqE63Ksoe1IyD5mHCG7v0R+2ErvIRe4uuIY1U8k 5kuAk0JIAyyDj1+a7CovM1sJhepvrSTSBkLI4DrMJFjESPP3p3ZAo6yeMpUL/gNym8LU zsbd5NSdl2M/BhiVKJ4d21EwXJ+hfL5nvL+8cvvX8HyRvSNTxKInehPxqRWekvqWKnX8 hndlnMByz6wTK8+5haVaKDn3AnWkYm28Ji642qL5nYtWpxfup2aMGU1EonG9iii2R+DB s7og== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=4Xvb2DA8xzihP7Mzi/v0EMpx+00b5U5crlo4mSn4zeU=; fh=712wfo9D1fvjXSxgEVZLXnF3FHdrW20EA9nY3XWIS/k=; b=cmK7WLhVsWBsw0a5GCemBlEqJk2fz/fQ3BcN1c7SNx/IAMyf9swDwABr2eJZuDG83C x3BogYNgclupm5jZMQTlOGjy7ALqSkZzBcDX4xrn9LwjpIiiDAG6WkY/aB9DQbB6vJ35 hfew17o6+zPZBcUV5o3n1nHyOrempK06condVQiqCOl5QfIo0MXXB0OL2xe5nD6EgDJ6 kYf9JDK3wiXCdeCsZAnVd1qRe3ee0mdGA824XwyQM35z/G0BB/HjxSBJMvtSb/EWhnlK ded7esplo+1wv7pjLFeYWMMwN0WKUV5xuGfQlqEeB5rAO9BewQfzO8OtutVpWbUNGYzj U/7g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=kS80TS6+; arc=pass (i=1 spf=pass spfdomain=bytedance.com dkim=pass dkdomain=bytedance.com dmarc=pass fromdomain=bytedance.com); spf=pass (google.com: domain of linux-kernel+bounces-81095-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-81095-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id ji10-20020a170907980a00b00a3e3fab918csi1964345ejc.428.2024.02.26.02.11.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 02:11:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-81095-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=kS80TS6+; arc=pass (i=1 spf=pass spfdomain=bytedance.com dkim=pass dkdomain=bytedance.com dmarc=pass fromdomain=bytedance.com); spf=pass (google.com: domain of linux-kernel+bounces-81095-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-81095-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id CA42C1F27DB0 for ; Mon, 26 Feb 2024 10:11:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 75C1463403; Mon, 26 Feb 2024 09:49:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="kS80TS6+" Received: from mail-oo1-f68.google.com (mail-oo1-f68.google.com [209.85.161.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 414B662A19 for ; Mon, 26 Feb 2024 09:49:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.68 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708940989; cv=none; b=qeta0ZslyqZOLQu1ys3nazaNwhwxONbtu3nvT4F4tdjNR8oJzljsSf0/uG1w32S9f0Tk48liOsiAjnUHWXYh3K+Qsjzo6IfyIYgfjsdofRRIUSV/kMcsdv8XxhFVzI1uViRrfLT7rdQeojnVTuDf+7kAbJ68deTx//lp0sk/zEQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708940989; c=relaxed/simple; bh=abhzLrMcAo73itQJFRf9PngJ2NfPzbHIHmMJXMFZsec=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WwQ0naeSgPRiPdVur1Tn5IKpRfdUwx78nu4lbG71F9t/GEn5L2vj521Syf7WZxIje5N60uYijyK6YG+NgR3AFvx+t9PRfww5T86xx672+D5PDkVOq0mwQMhFm9lWzmCHijTRStfoCDowFEvB+sXr9dCId33QN0+IRSN77AcvFXI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=kS80TS6+; arc=none smtp.client-ip=209.85.161.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Received: by mail-oo1-f68.google.com with SMTP id 006d021491bc7-595aa5b1fe0so1983893eaf.2 for ; Mon, 26 Feb 2024 01:49:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1708940987; x=1709545787; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4Xvb2DA8xzihP7Mzi/v0EMpx+00b5U5crlo4mSn4zeU=; b=kS80TS6+bvhX77tP2NzsgvN1vrcEaGL/j9EoXMVM75liO5j/u5XYeNecqv8/A+MDip RvcXJbrHzxexzcrRWDoe+KYkUa58Svgw40P6NRNt/dh98vSuf/g0JOpEsqSva/DH2HJw a/u6xC6OpwKz/rTmVafuBNSisY6VKGjGDmKhVNKwi9HH6XR+eK9tSEuT/CUDK57zP8dp QcMJnEzWEYrDMjvyA4tyVgJ+R2XGgo8n8a2KKxBwWS8TMrESf6nrEXUbAnZskodmr/vk 3Ib3e1HuJiqGRrSTgLX5Oi5npiADY0VcvTp8c2CdQjTDSv6R4RCY63+qZa1B7aXP9jwy T/1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708940987; x=1709545787; 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=4Xvb2DA8xzihP7Mzi/v0EMpx+00b5U5crlo4mSn4zeU=; b=iiKzUZR+mCzjM5UnjKmJmb4yQLZjZyF8kZGGUhutTSpBBiuCyzSkMTufdfrMxTsD/d k0LcIMk8P3vbkd8tX4ZirCdDtU56Yzanes9maxTpGPkO71+FnyjEBDWHGaQzNA8Humsq IZa945LT3p6f+iJoACBpClc8O5s/BzRn9nND3arQvlX/bmqwiF/Ut/YlsY4pj9hG1Byy EIkofAHz/92KZQYtfifMQz0SvaVqlEwfwxitJp6Y0x7j5EmPXdeCmdEoAT7Q4td9IiDD yQQQVWLjZJydRzFLpeqRoIVGZ+FJbV0Z6AxZVVPYG0kcpLZRd3xlAYhON3Bg3qZunFEE edSw== X-Forwarded-Encrypted: i=1; AJvYcCXlj0i7697del9wtd9yteKGltTEn44PP/ziK/vLd0b9SzAIgIq/JbMikciA1yO/3Bm/5IbXo3/xIjE6Q+E0R0H+Dg72WUCLeIsop6n3 X-Gm-Message-State: AOJu0Yw6KjXAJT7wvjyoDImMBjDp0ZBuF1KBsn9ktv6ktc+5eGLTxXoF aI0El/GRXy/OD2eSDEufqGssRs1LNAaZIf8Sg7rv1jYNtFdNmxGSBWSdP9i3twc= X-Received: by 2002:a05:6358:7627:b0:17b:304f:b2b with SMTP id r39-20020a056358762700b0017b304f0b2bmr7270243rwg.26.1708940987303; Mon, 26 Feb 2024 01:49:47 -0800 (PST) Received: from C02CV19DML87.bytedance.net ([203.208.189.12]) by smtp.gmail.com with ESMTPSA id x19-20020a17090ab01300b002990d91d31dsm5934779pjq.15.2024.02.26.01.49.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 01:49:46 -0800 (PST) From: Rui Qi To: bp@alien8.de, mingo@redhat.com, tglx@linutronix.de, hpa@zytor.com, jpoimboe@redhat.com, peterz@infradead.org, mbenes@suse.cz, gregkh@linuxfoundation.org, stable@vger.kernel.org, alexandre.chartre@oracle.com Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Rui Qi Subject: [PATCH 2/3] objtool: Add support for intra-function calls Date: Mon, 26 Feb 2024 17:49:24 +0800 Message-Id: <20240226094925.95835-3-qirui.001@bytedance.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240226094925.95835-1-qirui.001@bytedance.com> References: <20240226094925.95835-1-qirui.001@bytedance.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791955845412759252 X-GMAIL-MSGID: 1791955845412759252 From: Alexandre Chartre commit 8aa8eb2a8f5b3305a95f39957dd2b715fa668e21 upstream. Change objtool to support intra-function calls. On x86, an intra-function call is represented in objtool as a push onto the stack (of the return address), and a jump to the destination address. That way the stack information is correctly updated and the call flow is still accurate. Signed-off-by: Alexandre Chartre Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Miroslav Benes Acked-by: Josh Poimboeuf Link: https://lkml.kernel.org/r/20200414103618.12657-4-alexandre.chartre@oracle.com Signed-off-by: Rui Qi --- include/linux/frame.h | 11 ++++ .../Documentation/stack-validation.txt | 8 +++ tools/objtool/arch/x86/decode.c | 6 ++ tools/objtool/check.c | 62 +++++++++++++++++-- 4 files changed, 83 insertions(+), 4 deletions(-) diff --git a/include/linux/frame.h b/include/linux/frame.h index 02d3ca2d9598..303cda600e56 100644 --- a/include/linux/frame.h +++ b/include/linux/frame.h @@ -15,9 +15,20 @@ static void __used __section(.discard.func_stack_frame_non_standard) \ *__func_stack_frame_non_standard_##func = func +/* + * This macro indicates that the following intra-function call is valid. + * Any non-annotated intra-function call will cause objtool to issue a warning. + */ +#define ANNOTATE_INTRA_FUNCTION_CALL \ + 999: \ + .pushsection .discard.intra_function_calls; \ + .long 999b; \ + .popsection; + #else /* !CONFIG_STACK_VALIDATION */ #define STACK_FRAME_NON_STANDARD(func) +#define ANNOTATE_INTRA_FUNCTION_CALL #endif /* CONFIG_STACK_VALIDATION */ diff --git a/tools/objtool/Documentation/stack-validation.txt b/tools/objtool/Documentation/stack-validation.txt index de094670050b..ee26bb382b70 100644 --- a/tools/objtool/Documentation/stack-validation.txt +++ b/tools/objtool/Documentation/stack-validation.txt @@ -290,6 +290,14 @@ they mean, and suggestions for how to fix them. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70646 +11. file.o: warning: unannotated intra-function call + + This warning means that a direct call is done to a destination which + is not at the beginning of a function. If this is a legit call, you + can remove this warning by putting the ANNOTATE_INTRA_FUNCTION_CALL + directive right before the call. + + If the error doesn't seem to make sense, it could be a bug in objtool. Feel free to ask the objtool maintainer for help. diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decode.c index a62e032863a8..c3ff62c085c8 100644 --- a/tools/objtool/arch/x86/decode.c +++ b/tools/objtool/arch/x86/decode.c @@ -437,6 +437,12 @@ int arch_decode_instruction(struct elf *elf, struct section *sec, case 0xe8: *type = INSN_CALL; + /* + * For the impact on the stack, a CALL behaves like + * a PUSH of an immediate value (the return address). + */ + op->src.type = OP_SRC_CONST; + op->dest.type = OP_DEST_PUSH; break; case 0xfc: diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 71a24fd46dbd..0fa414869f45 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -645,6 +645,7 @@ static int add_jump_destinations(struct objtool_file *file) return 0; } + /* * Find the destination instructions for all calls. */ @@ -666,10 +667,7 @@ static int add_call_destinations(struct objtool_file *file) dest_off); if (!insn->call_dest && !insn->ignore) { - WARN_FUNC("unsupported intra-function call", - insn->sec, insn->offset); - if (retpoline) - WARN("If this is a retpoline, please patch it in with alternatives and annotate it with ANNOTATE_NOSPEC_ALTERNATIVE."); + WARN_FUNC("unannotated intra-function call", insn->sec, insn->offset); return -1; } @@ -1291,6 +1289,58 @@ static int read_retpoline_hints(struct objtool_file *file) return 0; } + +static int read_intra_function_calls(struct objtool_file *file) +{ + struct instruction *insn; + struct section *sec; + struct rela *rela; + + sec = find_section_by_name(file->elf, ".rela.discard.intra_function_calls"); + if (!sec) + return 0; + + list_for_each_entry(rela, &sec->rela_list, list) { + unsigned long dest_off; + + if (rela->sym->type != STT_SECTION) { + WARN("unexpected relocation symbol type in %s", + sec->name); + return -1; + } + + insn = find_insn(file, rela->sym->sec, rela->addend); + if (!insn) { + WARN("bad .discard.intra_function_call entry"); + return -1; + } + + if (insn->type != INSN_CALL) { + WARN_FUNC("intra_function_call not a direct call", + insn->sec, insn->offset); + return -1; + } + + /* + * Treat intra-function CALLs as JMPs, but with a stack_op. + * See add_call_destinations(), which strips stack_ops from + * normal CALLs. + */ + insn->type = INSN_JUMP_UNCONDITIONAL; + + dest_off = insn->offset + insn->len + insn->immediate; + insn->jump_dest = find_insn(file, insn->sec, dest_off); + if (!insn->jump_dest) { + WARN_FUNC("can't find call dest at %s+0x%lx", + insn->sec, insn->offset, + insn->sec->name, dest_off); + return -1; + } + } + + return 0; +} + static void mark_rodata(struct objtool_file *file) { struct section *sec; @@ -1346,6 +1396,10 @@ static int decode_sections(struct objtool_file *file) if (ret) return ret; + ret = read_intra_function_calls(file); + if (ret) + return ret; + ret = add_call_destinations(file); if (ret) return ret; From patchwork Mon Feb 26 09:49:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Qi X-Patchwork-Id: 206543 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1979870dyb; Mon, 26 Feb 2024 02:22:49 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUruns5mz+vc6fGZNUOdQDA8/Pp5gVzcqgFHJ0hjE/uu4MFKm+w/DYFNd9DzmomJc3KUZshXGNe6TwqdqiFYk9zI5kSmg== X-Google-Smtp-Source: AGHT+IH3mKFBaYk0Qm9oY3QAvhg8WhmhRwb6hmvHWQxvgjW34bWZSPzylkWG13Sr9jCCJmEhdvq2 X-Received: by 2002:a05:6358:4428:b0:17a:def8:5687 with SMTP id z40-20020a056358442800b0017adef85687mr4924371rwc.27.1708942968983; Mon, 26 Feb 2024 02:22:48 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708942968; cv=pass; d=google.com; s=arc-20160816; b=NK+Amy2C4WRz0LVaNfxrCbMxz9tcRyosDEi9GeBQ4uxkMyJttIsx96EF3gS8ZExk2M 0iEPa71fSqMMl9fRdh4fBFjPcliXjt23tJN7CcID9jYNlgtRFfS/qlF945oLz5YP66u0 1KFkvc8exL+hUh5WSD4YLQ/SJOhZjHUySRQHR9CCvXXKH2p03ZPJZ5wn5kZchxrynkRC fH8e6vGECIihxScoyjSuqiMOPIE0n+kvnhCs+OgJ31AZdDhfq9p76/zTsb+JAUb+G0CK 744yeQFbX/2/P+yQW8ryXDWpR1N8ongYxraU9j4HiyTXW2BavuN/7Ytnz05dCLRRM4LL hkWA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=BoOMBp9MzLd3f62Ny862YOxP5jt6oFE+bwUjv1x9+1Q=; fh=nrYJ/xtn8+3pj0uBchL7pcMB7vEcBLqYmRBUnxi+53k=; b=DgW7PU+LDRtc9YsFzUWWI4km3VMsBzte20qENlX47SCWzS4v9XbOjBN4wbgB8/CLMA 8V45h0mhevw0lI0BBwInNT1QoM9ybgQdozMMwzFm0lnW20mR1goraUpxjg6BGAzrBXVl WfElHRfzsnhBlhHJNvVL8Rp3t840JWOwDRwg7FZWiQeFy/INxMgNRuCPmccmNwNTMwT+ isa0XqeVc//viPNewpHBu1OteuAiVAgFtpaxlZ0qICfdfXoQeJk4qkyorExv2VpISbnX oWzZJ2P6Xjp/3BI9eCI5Pk4mgkqn/EBaWaZHu5qX2WOT9kB4VTEsDDqdwImzzW5SxFri SnmA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b="XL/J4snT"; arc=pass (i=1 spf=pass spfdomain=bytedance.com dkim=pass dkdomain=bytedance.com dmarc=pass fromdomain=bytedance.com); spf=pass (google.com: domain of linux-kernel+bounces-81096-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-81096-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id o25-20020a656159000000b005d8b8ca425esi3470541pgv.308.2024.02.26.02.22.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 02:22:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-81096-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b="XL/J4snT"; arc=pass (i=1 spf=pass spfdomain=bytedance.com dkim=pass dkdomain=bytedance.com dmarc=pass fromdomain=bytedance.com); spf=pass (google.com: domain of linux-kernel+bounces-81096-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-81096-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id E982228B019 for ; Mon, 26 Feb 2024 10:11:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B5CC263518; Mon, 26 Feb 2024 09:49:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="XL/J4snT" Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9130563405 for ; Mon, 26 Feb 2024 09:49:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708940995; cv=none; b=mBkH/tvGddRlo/5CBlkjL1eUONrfRypERb9uODJNQ5n5yKCqDlFI8a0tXcxhwhQcN8/o51c5244/NLKhaUys6LDvNxfYlORrRvVnK0k2Bj9zJLXzMI/Fbw6zMxdW1hXRNU3RT04QCAjk3Q5neUDBcrA5aToUr0e9j2v/qIIZk9E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708940995; c=relaxed/simple; bh=M/UuqL9yNB3YF1HtldRq/T2nYA0slbNy46LBdPsUNaQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TUH6zXeLIlZQZyJ3lPWZ7/7FE+eRq7AUR2Xr08JfDt+/BnmpjfpYsj4Y+rcMNbqW1z4ceu9aCdlMRsMCjD4IYMFOCZC+URrphFoHX/2uBhEscsYRhajHkBn4Oe2aOX/1CzKsuuOtXI1z+CFkPxFmpfngMyW3194F3l3imD0KzNU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=XL/J4snT; arc=none smtp.client-ip=209.85.215.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-5bdbe2de25fso2542536a12.3 for ; Mon, 26 Feb 2024 01:49:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1708940993; x=1709545793; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BoOMBp9MzLd3f62Ny862YOxP5jt6oFE+bwUjv1x9+1Q=; b=XL/J4snT3B/RN17t+c08z5978ntp2Z62yUxUAjk4+UC260iIs22/n0n3Bc69G81MZ5 FZKqVdAIn1n1OuHGMxDyAratZ/QyhQG0+eiA+gbZoWeneV+Q6Fgchmebvw+3+CWL/G/R e68ks+B2f0t8SVtwjOSDPlsLcmzYdG80twE4uwlm336w2HRe+KCG2icDkTMBi8pDeFiK 1D9fn4a2fl6U7b9IM6AyP+ZCt9Z+2mYEC1VjZwIVxuaZ4Y1M5roEh01/2FOHfetdSnCF gT3Ni96X2spWDycAlWi9C4K8HJ+VsFnb29Q16Y1y6bmKMAeKm3hYYQhAF/c8tt3QMIUx PFnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708940993; x=1709545793; 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=BoOMBp9MzLd3f62Ny862YOxP5jt6oFE+bwUjv1x9+1Q=; b=pIKsULHU1UD1WJUGbW1YCWemJKKTtTyKT+nuQGWq4dGEjCXV2fNoYD0MmzCgaFF1Q0 di7CGiSkYlcnZcEeN9s2rcD98vyWcVG05ELYJmbs7SeTVM9CNj4VfzYHE0QR/pJXo0Z7 z7Ulw7cfx8nofUC6hp0gzDF4FZUkQP/tzmNUP/CuHva4BSgpqnNB24NCZT2onwQY3wNs 4Y4RGJ0orDmUdysxqfx2ewX27bIaTO7TkEKDbU/sanvsoNCB/8ocySpTT5ef8jN+ueQ/ jM/e9Ec7uOUAtlCgh0SkngNNlj8PVWBEWA5dedsq2KBRgAtGPZZOE3MUEuEwh7wJmkLZ 9Y8g== X-Forwarded-Encrypted: i=1; AJvYcCXZYagqj1K1B0S/HJJ6Py1gvhpUZc0Cjcn//3WMg1BLy65djDA3/ugC4p+hPIUXeiSd8qpzQFd6zAIvaj8x3ePc5l2+/MuQDNOXYadt X-Gm-Message-State: AOJu0YwkyQfEnawehuFKOlro2hEVwGjMiD2VaHBFzwsfnfQEhY6OPUs8 1TgL5OkVsNNzXqD3VCwIHhafeMJzZ+mvOkgIcZLvx3s6y+0Tuq6bKfOS7bkh9Ok= X-Received: by 2002:a05:6a21:2d0b:b0:1a0:e59d:1dc4 with SMTP id tw11-20020a056a212d0b00b001a0e59d1dc4mr11855842pzb.11.1708940993010; Mon, 26 Feb 2024 01:49:53 -0800 (PST) Received: from C02CV19DML87.bytedance.net ([203.208.189.12]) by smtp.gmail.com with ESMTPSA id x19-20020a17090ab01300b002990d91d31dsm5934779pjq.15.2024.02.26.01.49.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 01:49:52 -0800 (PST) From: Rui Qi To: bp@alien8.de, mingo@redhat.com, tglx@linutronix.de, hpa@zytor.com, jpoimboe@redhat.com, peterz@infradead.org, mbenes@suse.cz, gregkh@linuxfoundation.org, stable@vger.kernel.org, alexandre.chartre@oracle.com Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Rui Qi Subject: [PATCH 3/3] x86/speculation: Support intra-function call validation Date: Mon, 26 Feb 2024 17:49:25 +0800 Message-Id: <20240226094925.95835-4-qirui.001@bytedance.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240226094925.95835-1-qirui.001@bytedance.com> References: <20240226094925.95835-1-qirui.001@bytedance.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791956582689447319 X-GMAIL-MSGID: 1791956582689447319 commit 8afd1c7da2b0 ("x86/speculation: Change FILL_RETURN_BUFFER to work with objtool") does not support intra-function call stack validation, which causes kernel live patching to fail. This commit adds support for this, and after testing, the kernel live patching feature is restored to normal. Fixes: 8afd1c7da2b0 ("x86/speculation: Change FILL_RETURN_BUFFER to work with objtool") Signed-off-by: Rui Qi --- arch/x86/include/asm/nospec-branch.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h index c8819358a332..a88135c358c0 100644 --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -13,6 +13,8 @@ #include #include +#include +#include /* * This should be used immediately before a retpoline alternative. It tells * objtool where the retpolines are so that it can make sense of the control @@ -51,14 +53,18 @@ #define __FILL_RETURN_BUFFER(reg, nr, sp) \ mov $(nr/2), reg; \ 771: \ + ANNOTATE_INTRA_FUNCTION_CALL; \ call 772f; \ 773: /* speculation trap */ \ + UNWIND_HINT_EMPTY; \ pause; \ lfence; \ jmp 773b; \ 772: \ + ANNOTATE_INTRA_FUNCTION_CALL; \ call 774f; \ 775: /* speculation trap */ \ + UNWIND_HINT_EMPTY; \ pause; \ lfence; \ jmp 775b; \ @@ -152,6 +158,7 @@ .endm .macro ISSUE_UNBALANCED_RET_GUARD + ANNOTATE_INTRA_FUNCTION_CALL; call .Lunbalanced_ret_guard_\@ int3 .Lunbalanced_ret_guard_\@: