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 A93A125A2C4; Mon, 9 Jun 2025 13:44: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=1749476671; cv=none; b=gEdimkQk7Jzn/REEfxtvT6YoF5lVZ105c3eWqwydAj1ZS97/C0HZicx/tZwjUQ5+w+yV13RQ1Qx7ROgHhochC0LTNjH8hI+PJd54+Qp4AiNZ9rK8uC+ZXa5jPG6Egg2mdLfLvpWlcHn8WnQ+uSfSNz/aUAspAuDdYV0/Wfg6sXI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749476671; c=relaxed/simple; bh=qrZpZsMrsU1gfoQb0W7EnINpdzrBuhVDdB9nntc+yHM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KdS7wGZJBuK7UV1BLe8hs4cKHUXGcuu6ZDUAfFFTYVBj9HSi/GJoQdORMXSk3gImjKdWBID3CwaY/aNhKMohlk9KdzEH83yBZzARdI/autEzGmo5lCGSXtBKFdWWeTrpq65h2hwcrZMjb/9JOiW6HCDR2wuH7DH/SW7weKrc4aA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SKvTtkTN; 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="SKvTtkTN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95BC6C4CEEB; Mon, 9 Jun 2025 13:44:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1749476671; bh=qrZpZsMrsU1gfoQb0W7EnINpdzrBuhVDdB9nntc+yHM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SKvTtkTN8narjfvtFO18FLl6NPZW3qDtjhjOl9SlTVgXR7MkuAAM4eHp7XQOkUzYY XE/vFQznH0t7eUC8/v8zP8hdPMvE8xFisItCUXEbAvjwDW0oDyB2lFe0o9WqULKf4o 1e6kV7fOJHQHhhkV7CNJBcUY3GKAwov7qJeAGDiN8mu3i73f/EX3HwDtZtNxk4dke3 nDMPCO+mXVTI1jfbbaaycclzxpaDhZpZPzgnS7mDyzc8l3IIO6zOIG7VA7TYReIOgV r39XwUPLdoldsA97QUyrxNW5jtTy9FfadP+ANyHMv+gNXATnEknhFAku6j9GvzCceZ mDzlhcwJrNKgg== From: Sasha Levin To: patches@lists.linux.dev, stable@vger.kernel.org Cc: Sami Tolvanen , Masahiro Yamada , linux-kbuild@vger.kernel.org, kernel test robot , Johannes Berg , Sasha Levin Subject: [PATCH AUTOSEL 6.15 15/35] um: Add cmpxchg8b_emu and checksum functions to asm-prototypes.h Date: Mon, 9 Jun 2025 09:43:31 -0400 Message-Id: <20250609134355.1341953-15-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250609134355.1341953-1-sashal@kernel.org> References: <20250609134355.1341953-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.15.1 Content-Transfer-Encoding: 8bit From: Sami Tolvanen [ Upstream commit 674d03f6bd6b0f8327f1a4920ff5893557facfbd ] With CONFIG_GENDWARFKSYMS, um builds fail due to missing prototypes in asm/asm-prototypes.h. Add declarations for cmpxchg8b_emu and the exported checksum functions, including csum_partial_copy_generic as it's also exported. Cc: Masahiro Yamada Cc: linux-kbuild@vger.kernel.org Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202503251216.lE4t9Ikj-lkp@intel.com/ Signed-off-by: Sami Tolvanen Link: https://patch.msgid.link/20250326190500.847236-2-samitolvanen@google.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- **YES** This commit should be backported to stable kernel trees based on the following analysis: ## Analysis ### Purpose and Context This commit fixes a build failure in the User Mode Linux (UM) architecture when `CONFIG_GENDWARFKSYMS` is enabled. The `CONFIG_GENDWARFKSYMS` feature is a new kernel build system enhancement for generating DWARF-based symbol versioning, which requires proper prototypes in `asm-prototypes.h` files to generate correct CRCs for exported symbols. ### Code Changes Analysis **File 1: `arch/um/include/asm/asm-prototypes.h`** - **Before**: Only included the generic asm-prototypes.h - **After**: Added includes for `` and conditional declaration of `cmpxchg8b_emu()` for `CONFIG_UML_X86` **File 2: `arch/x86/um/asm/checksum.h`** - **Before**: Only declared `csum_partial()` function - **After**: Added declaration for `csum_partial_copy_generic()` with a comment explaining it's for export type visibility ### Why This Should Be Backported 1. **Fixes Important Build Failures**: This directly addresses build failures when `CONFIG_GENDWARFKSYMS` is enabled for UM architecture, as confirmed by the kernel test robot report. 2. **Minimal Risk Changes**: - Only adds function declarations, no implementation changes - Changes are confined to UM architecture headers - No behavioral changes to existing code paths 3. **Follows Established Patterns**: Similar commits in the reference history (Similar Commit #1 and #5) that add missing prototypes to `asm-prototypes.h` files were marked as "YES" for backporting. This follows the exact same pattern. 4. **Critical Infrastructure Fix**: The `asm-prototypes.h` infrastructure is essential for proper symbol versioning. Missing prototypes can cause genksyms to segfault during build, making this a critical build system fix. 5. **Architecture-Specific Scope**: Changes are limited to UM architecture, reducing risk of regressions in other subsystems. 6. **Self-Contained**: The fix includes both the missing `cmpxchg8b_emu` prototype (conditional on `CONFIG_UML_X86`) and the checksum function declarations, making it complete. ### Comparison to Reference Commits - **Similar to Commit #1**: Adds missing prototypes for genksyms CRC generation (Status: YES) - **Similar to Commit #5**: Fixes missing prototypes causing build issues with symbol versioning (Status: YES) - **Unlike Commits #2, #3, #4**: This is not just a comment update or cleanup, but fixes actual build failures The fix addresses a concrete build failure affecting users who enable `CONFIG_GENDWARFKSYMS` with UM, making it an important bugfix that meets stable tree criteria for backporting. arch/um/include/asm/asm-prototypes.h | 5 +++++ arch/x86/um/asm/checksum.h | 3 +++ 2 files changed, 8 insertions(+) diff --git a/arch/um/include/asm/asm-prototypes.h b/arch/um/include/asm/asm-prototypes.h index 5898a26daa0dd..408b31d591279 100644 --- a/arch/um/include/asm/asm-prototypes.h +++ b/arch/um/include/asm/asm-prototypes.h @@ -1 +1,6 @@ #include +#include + +#ifdef CONFIG_UML_X86 +extern void cmpxchg8b_emu(void); +#endif diff --git a/arch/x86/um/asm/checksum.h b/arch/x86/um/asm/checksum.h index b07824500363f..ddc144657efad 100644 --- a/arch/x86/um/asm/checksum.h +++ b/arch/x86/um/asm/checksum.h @@ -20,6 +20,9 @@ */ extern __wsum csum_partial(const void *buff, int len, __wsum sum); +/* Do not call this directly. Declared for export type visibility. */ +extern __visible __wsum csum_partial_copy_generic(const void *src, void *dst, int len); + /** * csum_fold - Fold and invert a 32bit checksum. * sum: 32bit unfolded sum -- 2.39.5