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 4F8DA282EB for ; Tue, 2 Dec 2025 18:00:21 +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=1764698421; cv=none; b=SXoMdd8ojcNxwQ33vYmScc40LuUl2h/E1tQBhKZYm3V3pBMoeBqClsRGyeARTnfqOX1w8TpI40vd//lPesbYlTy9znKHubsW2SpP2QmLY25xiXsVa5GGJFygGlC8Gu/Hnj+2h/hwpYL0aKo8zFUFY8HynA/cjO8EzwpS9Bhx0F4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764698421; c=relaxed/simple; bh=ZtLVWr71rZ8+Axvan4UkZ0TC33klJh6vS0JVfx99pFA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Srbgb/HsuLPJT21ZbmFFSBlqn10NJ1D5mEfTA8Q60zbGXvZ+37dTEglvxOCheIsyLMMRDI1Yxmp9OIP9tg6O++FXbdquMY0eNTfLF/VBrKwmRPIfpxQ3AGZ1xVIsKhXGEdVUIcMus6K1t/4hy1DCRTYP1oMGCAWiMzq4Cs3GQMQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aWJ2NVPJ; 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="aWJ2NVPJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7EAF2C4CEF1; Tue, 2 Dec 2025 18:00:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764698420; bh=ZtLVWr71rZ8+Axvan4UkZ0TC33klJh6vS0JVfx99pFA=; h=From:To:Cc:Subject:Date:From; b=aWJ2NVPJh8Ia0G/qtM27ne4QgqjCERYLj3ouIGibWreoCBMnSn9brKXwM2EFDmF3v Ir6E1SJL9cqWvu/reVL4FAy0tlBy4yzGz6p05ABSUQjhSoq3eDPmxdDy27SPDwcJ5n FgzPeGVHajkL23BYgam+le7wzljKQuJSG8UB1JYr8hutli7GND3RRERjnB64GWYYXn FRW6+OVEXA98cXNYxGXs1ra+ezH4rMSbY6l+lLqQldwtTqwxiQID+JGzzw5OLOzRks ekNZDWzwGpNLnpwzyJriThTPj/GukS8DoIBSwBkLKfBDG6VJQaIUi0oCOFOIqy5qqd RR/X6I0tCwvvg== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Ingo Molnar Subject: [PATCH v2 0/4] objtool: Improve code generation for annotation macros Date: Tue, 2 Dec 2025 09:59:35 -0800 Message-ID: X-Mailer: git-send-email 2.51.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit For tip/objtool/urgent (fixing a "regression" in code generation). Changes since v1 (https://lore.kernel.org/cover.1764137163.git.jpoimboe@kernel.org): - rebase on Linus's tree (bug.h conflicts) As much as possible, undo the code generation damage introduced by ANNOTATE_DATA_SPECIAL: - Remove its usage in favor of SHF_MERGE + sh_entsize, where possible - Print the annotation on a single line: 912: .pushsection ".discard.annotate_data", "M", @progbits, 8; .long 912b - .; .long 1; .popsection - Remove the trailing newline/tab; let the invoking code decide on the appropriate separator for the given context Josh Poimboeuf (4): x86/alternative: Remove ANNOTATE_DATA_SPECIAL usage x86/asm: Remove ANNOTATE_DATA_SPECIAL usage objtool: Consolidate annotation macros objtool: Remove newlines and tabs from annotation macros arch/um/include/asm/Kbuild | 1 - arch/um/include/shared/common-offsets.h | 3 ++ arch/x86/include/asm/alternative.h | 9 +++--- arch/x86/include/asm/asm.h | 25 ++++++++------- arch/x86/include/asm/bug.h | 2 +- arch/x86/include/asm/cpufeature.h | 2 +- arch/x86/include/asm/irq_stack.h | 2 +- arch/x86/include/asm/jump_label.h | 2 +- arch/x86/include/asm/nospec-branch.h | 4 +-- arch/x86/include/asm/paravirt_types.h | 2 +- arch/x86/include/asm/smap.h | 8 ++--- arch/x86/include/asm/static_call.h | 2 +- arch/x86/kernel/alternative.c | 4 +-- arch/x86/kernel/asm-offsets.c | 3 ++ arch/x86/kernel/rethook.c | 2 +- arch/x86/kernel/static_call.c | 4 +-- arch/x86/lib/error-inject.c | 2 +- arch/x86/um/shared/sysdep/kernel-offsets.h | 2 ++ include/linux/annotate.h | 36 +++++++++------------- include/linux/objtool.h | 2 +- kernel/bounds.c | 1 + scripts/mod/devicetable-offsets.c | 1 + 22 files changed, 62 insertions(+), 57 deletions(-) -- 2.51.1