From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A28BE3932D5; Wed, 13 May 2026 03:34:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778643271; cv=none; b=FwT5ks55Vme62htdNoRe66L8b0GRHJCMhSk+rOWMOgW0UFB5cHqX7JmbbfsovqAVW22zzk3pXzBjwj+klXccnwr0ahI7O6yejSDn+ybnaEDtyNj8I2Cj+ZJwSnf3hmCdG4hqFOL8YMKyFEVBdNYHqbOVVOnmzWo+c1ZvXv+MTJI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778643271; c=relaxed/simple; bh=/D2z4LhluhXqyHCGUz6p/RDiGmFitxBUbjhr8ydpie0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Lr6vxtncxvj9Hz45c62jZgJP/PGqdQ2S5Hp5P1ztGfFXD4aBY8VpdOE0poQUg6vtSXEQWedaw0RMHMC3BxOs++ptf7kHMn/+HQFqe8ROFkhXEA8JVZXUJoAuhGwpxuFu7TCl7ramjhw4WJVuBm/slskD2EVtcQnJqKcQzoWgHso= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hIIHfT85; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hIIHfT85" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B65BC2BCF7; Wed, 13 May 2026 03:34:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778643271; bh=/D2z4LhluhXqyHCGUz6p/RDiGmFitxBUbjhr8ydpie0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hIIHfT854Lr7qsvx6I7cr5tcMFSOYnHYPsUmlBOOQ12eZ0G9T3SFghvuElI0QqTAV 2SLst2YyVIO1f/ZvenQYzJYqR/oV8LI5/GEj7n/hGWaNL6KxmxWXwSHw24BJsHHoz6 e2OgjzlFPNrAXLwegFCvo6KF2cyu61LwIX8Bm4kooPJGmoqItKTAdEUrh4Olr0dA4K zOUmYG+BHOMK3fJejkQed26rSkT16Kc94617C4QN3JjjjI7wd97LhqZFTbFIDtbb7+ i9PXHoqiMYP2/mIjzf87KMuc5dG8JRc9WUbRdqozAxsJGZKdOOuGVGb91juojVNqX6 5dREqsC8NOPAg== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, live-patching@vger.kernel.org, Peter Zijlstra , Joe Lawrence , Song Liu , Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org, Mark Rutland , Miroslav Benes , Petr Mladek Subject: [PATCH v3 02/21] arm64: Annotate intra-function calls Date: Tue, 12 May 2026 20:33:36 -0700 Message-ID: <16bdb04ed6653809514d9f060702248b8e587f05.1778642120.git.jpoimboe@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In preparation for enabling objtool on arm64, annotate intra-function calls. Acked-by: Song Liu Signed-off-by: Josh Poimboeuf --- arch/arm64/kernel/entry.S | 2 ++ arch/arm64/kernel/proton-pack.c | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index e0db14e9c843a..d4cbdfb23d733 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -705,6 +706,7 @@ alternative_else_nop_endif * entry onto the return stack and using a RET instruction to * enter the full-fat kernel vectors. */ + ANNOTATE_INTRA_FUNCTION_CALL bl 2f b . 2: diff --git a/arch/arm64/kernel/proton-pack.c b/arch/arm64/kernel/proton-pack.c index b3801f532b10b..b63887a1b8234 100644 --- a/arch/arm64/kernel/proton-pack.c +++ b/arch/arm64/kernel/proton-pack.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -245,11 +246,12 @@ static noinstr void qcom_link_stack_sanitisation(void) { u64 tmp; - asm volatile("mov %0, x30 \n" - ".rept 16 \n" - "bl . + 4 \n" - ".endr \n" - "mov x30, %0 \n" + asm volatile("mov %0, x30 \n" + ".rept 16 \n" + ANNOTATE_INTRA_FUNCTION_CALL " \n" + "bl . + 4 \n" + ".endr \n" + "mov x30, %0 \n" : "=&r" (tmp)); } -- 2.53.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1A51E3AA1BD; Wed, 13 May 2026 03:34:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778643290; cv=none; b=KV5FirGoBImcymrlTYtUfdlcRISzUeZ3SdScCJEFuv3UXRArEriZL471DLEfKXmyLJO5QkVykwUlwZrhc2iafTf0C8HbVvhydBSSJ+yohn81+nEeVZYqgXlWQcEYIlvng9FcjUirq4V63NF3fib5HeSuJgyIf/hzHvAvlSmEoAw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778643290; c=relaxed/simple; bh=/D2z4LhluhXqyHCGUz6p/RDiGmFitxBUbjhr8ydpie0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B9P/8oL6tUr18bN01wNZCGJxM9sCSriNUfsxrGxA4TyU9IUEtPMRlwADsU3Y6I9C/Mmxu8+8mMteURagFoeNjIvpIP5eJ2wU+YIj/8PqrVWEo0/i0Q1pTWkskBzL1gcjfPz1TlhuvMrTAkm3NbF42xr5dRZvvooV6SHcnBxF33c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=n4wFO7Ny; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="n4wFO7Ny" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 213AAC4AF16; Wed, 13 May 2026 03:34:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778643285; bh=/D2z4LhluhXqyHCGUz6p/RDiGmFitxBUbjhr8ydpie0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n4wFO7NyEYV/0+gNSdpO5s6iBrXisy37EVMZ7XBcBafOcltAlXO8aNqvC66gwtukA BpAC8LbYsQ83PGTqi+BVIzjsHKleUaDINXj+X40ksQjhqfhKihbK2EMAUEE1CN7Z2O 2VxRe0WmYAIYRhBeOkV23VTmSMiKwFnkptoN0E9+gsURWFFm9BWuOlNsGxdlIJOdKL HKe/rTqC3sN/Kk/T09iqfq1Tx2kMx/M5PlnfC1rVP6e99977xU8Czo5Dn+iBzn6dXB 5WOSu4exmVjZxnfcBgO/MXRSObGNVub56XoGBSugxwKrYmMp/FMo46gA/gWv1UVicG 7v9P0wAMQPUnw== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, live-patching@vger.kernel.org, Peter Zijlstra , Joe Lawrence , Song Liu , Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org, Mark Rutland , Miroslav Benes , Petr Mladek Subject: [PATCH v3 02/21] arm64: Annotate intra-function calls Date: Tue, 12 May 2026 20:33:58 -0700 Message-ID: <16bdb04ed6653809514d9f060702248b8e587f05.1778642120.git.jpoimboe@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID: <20260513033358.flWYgJMtVIxDJUGwhP53789a-LNZRaqtRwrwn1_fG5o@z> In preparation for enabling objtool on arm64, annotate intra-function calls. Acked-by: Song Liu Signed-off-by: Josh Poimboeuf --- arch/arm64/kernel/entry.S | 2 ++ arch/arm64/kernel/proton-pack.c | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index e0db14e9c843a..d4cbdfb23d733 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -705,6 +706,7 @@ alternative_else_nop_endif * entry onto the return stack and using a RET instruction to * enter the full-fat kernel vectors. */ + ANNOTATE_INTRA_FUNCTION_CALL bl 2f b . 2: diff --git a/arch/arm64/kernel/proton-pack.c b/arch/arm64/kernel/proton-pack.c index b3801f532b10b..b63887a1b8234 100644 --- a/arch/arm64/kernel/proton-pack.c +++ b/arch/arm64/kernel/proton-pack.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -245,11 +246,12 @@ static noinstr void qcom_link_stack_sanitisation(void) { u64 tmp; - asm volatile("mov %0, x30 \n" - ".rept 16 \n" - "bl . + 4 \n" - ".endr \n" - "mov x30, %0 \n" + asm volatile("mov %0, x30 \n" + ".rept 16 \n" + ANNOTATE_INTRA_FUNCTION_CALL " \n" + "bl . + 4 \n" + ".endr \n" + "mov x30, %0 \n" : "=&r" (tmp)); } -- 2.53.0