From nobody Sun Feb 8 12:57:53 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44363C7EE2E for ; Fri, 9 Jun 2023 11:19:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238603AbjFILTI (ORCPT ); Fri, 9 Jun 2023 07:19:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229808AbjFILTE (ORCPT ); Fri, 9 Jun 2023 07:19:04 -0400 Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAD73C1 for ; Fri, 9 Jun 2023 04:19:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1686309542; x=1717845542; h=from:date:subject:mime-version:content-transfer-encoding: message-id:to:cc; bh=7XMigKyzIzkGYn81G4evNo2KHPOOkw2Qm++AiRLE9eM=; b=bgBKpe26ymYsevpWU8ZM/ybAdNsG47TSnm5L3ZpCqsyreDNiwZxVOhbf YJG/3BzBKBhGydzVuHmrQAVmG8fkIZEaX5QT4EitqUeN4slbbR1vQMQCh YEDZZCps0PQ5bW02phKFY9On+3QppH8V+euHiqguQBldqjmunLY9n578O 5Zwgq47FgBc8i2fFF2ZXrHjbyndlWLpUECEkFlcVddjV0StXz/Fz/UKMl LTbntvNkNhfq2KpYuPOWo0E8XM09wP66rhVgn7sBigoZzeMLY2vS4Ls1a gV7MZiPlKD/5/JRr1i1zqp3FLfjCk8TKDH5U0N37gi3vEjYdm3ORH+43a w==; From: Vincent Whitchurch Date: Fri, 9 Jun 2023 13:18:54 +0200 Subject: [PATCH] x86: Fix build of UML with KASAN MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20230609-uml-kasan-v1-1-5fac8d409d4f@axis.com> X-B4-Tracking: v=1; b=H4sIAJ0Kg2QC/x2N0QrCMAxFf2Xk2UBNnWz+iviQtZkLm600KMLYv 9vt8VzO5axgUlQMbs0KRb5qmlOF86mBMHF6CmqsDOTIu6vr8fNacGbjhOR7ivESfNd2UP2BTXA onMK0P8acaZ/fRUb9HYn7Y9v+0FOpHXIAAAA= To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , , "H. Peter Anvin" , Frederic Weisbecker , "Rafael J. Wysocki" , Peter Zijlstra CC: Richard Weinberger , Anton Ivanov , Johannes Berg , , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , , , , Vincent Whitchurch X-Mailer: b4 0.12.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Building UML with KASAN fails since commit 69d4c0d32186 ("entry, kasan, x86: Disallow overriding mem*() functions") with the following errors: $ tools/testing/kunit/kunit.py run --kconfig_add CONFIG_KASAN=3Dy ... ld: mm/kasan/shadow.o: in function `memset': shadow.c:(.text+0x40): multiple definition of `memset'; arch/x86/lib/memset_64.o:(.noinstr.text+0x0): first defined here ld: mm/kasan/shadow.o: in function `memmove': shadow.c:(.text+0x90): multiple definition of `memmove'; arch/x86/lib/memmove_64.o:(.noinstr.text+0x0): first defined here ld: mm/kasan/shadow.o: in function `memcpy': shadow.c:(.text+0x110): multiple definition of `memcpy'; arch/x86/lib/memcpy_64.o:(.noinstr.text+0x0): first defined here If I'm reading that commit right, the !GENERIC_ENTRY case is still supposed to be allowed to override the mem*() functions, so use weak aliases in that case. Fixes: 69d4c0d32186 ("entry, kasan, x86: Disallow overriding mem*() functio= ns") Signed-off-by: Vincent Whitchurch Tested-by: David Gow --- arch/x86/lib/memcpy_64.S | 4 ++++ arch/x86/lib/memmove_64.S | 4 ++++ arch/x86/lib/memset_64.S | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S index 8f95fb267caa7..5dc265b36ef0b 100644 --- a/arch/x86/lib/memcpy_64.S +++ b/arch/x86/lib/memcpy_64.S @@ -40,7 +40,11 @@ SYM_TYPED_FUNC_START(__memcpy) SYM_FUNC_END(__memcpy) EXPORT_SYMBOL(__memcpy) =20 +#ifdef CONFIG_GENERIC_ENTRY SYM_FUNC_ALIAS(memcpy, __memcpy) +#else +SYM_FUNC_ALIAS_WEAK(memcpy, __memcpy) +#endif EXPORT_SYMBOL(memcpy) =20 SYM_FUNC_START_LOCAL(memcpy_orig) diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S index 02661861e5dd9..3b1a02357fb29 100644 --- a/arch/x86/lib/memmove_64.S +++ b/arch/x86/lib/memmove_64.S @@ -215,5 +215,9 @@ SYM_FUNC_START(__memmove) SYM_FUNC_END(__memmove) EXPORT_SYMBOL(__memmove) =20 +#ifdef CONFIG_GENERIC_ENTRY SYM_FUNC_ALIAS(memmove, __memmove) +#else +SYM_FUNC_ALIAS_WEAK(memmove, __memmove) +#endif EXPORT_SYMBOL(memmove) diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S index 7c59a704c4584..fe27538a355db 100644 --- a/arch/x86/lib/memset_64.S +++ b/arch/x86/lib/memset_64.S @@ -40,7 +40,11 @@ SYM_FUNC_START(__memset) SYM_FUNC_END(__memset) EXPORT_SYMBOL(__memset) =20 +#ifdef CONFIG_GENERIC_ENTRY SYM_FUNC_ALIAS(memset, __memset) +#else +SYM_FUNC_ALIAS_WEAK(memset, __memset) +#endif EXPORT_SYMBOL(memset) =20 SYM_FUNC_START_LOCAL(memset_orig) --- base-commit: 9561de3a55bed6bdd44a12820ba81ec416e705a7 change-id: 20230609-uml-kasan-2392dd4c3858 Best regards, --=20 Vincent Whitchurch