From patchwork Tue Oct 15 10:41:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 13836153 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 00D82CFC289 for ; Tue, 15 Oct 2024 10:45:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=sdyYwjyFS7cKng3xrhrvuZYheW62euvO0qiJZmOhRNg=; b=F4w40JjJNAEbkUDs/l+2A72yoX EcFx33u3Z6j3tZgFgwpKC712zvnsY6688wO6HKOo3YBVcgg8Tpk/wa3/x3r/L1gLGNFRQTVkakEhb RJSIcYJSZkt9HqbPjRX9H6ZdAPNc1MeG+acLTOsSzKeUncDRybbqeopp5tuKnAi3bKNYHdw6IiYPN piy7ICjkvvnJy2gYAkV/tXYexlLu4Nm0kWtFxJX2Y1AzyM3ufcosjcd+AsT8wf1zlFZjEdHH0ug0O a9M+nFcjGkoVkbrtk1OVI8rtV45UySAPk797yzC65UBATj8lcViHTKgDMpNZhT1slxE2SOOij8JyZ nZw/uUqQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t0f2p-00000007tIq-2W9k; Tue, 15 Oct 2024 10:44:51 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t0f03-00000007sjF-0mDI for linux-arm-kernel@lists.infradead.org; Tue, 15 Oct 2024 10:42:00 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-6e390b164c7so30211637b3.1 for ; Tue, 15 Oct 2024 03:41:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1728988917; x=1729593717; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=sdyYwjyFS7cKng3xrhrvuZYheW62euvO0qiJZmOhRNg=; b=fZQ03FvcmKXFx3Q9jNFzRRFUF1ni3eZOPYQdcEtScIur/Oh58ke7Ko4dqhN6609Hi6 cH1ucDxh55Vl+ut9UgWcvcHZtYI5O9JbWrXgJ8iYStXHN9O0VbMulMqoAdZnDU5xBDD8 LrADqz9+dJzSlluBWff+/y2QtKa3LZ1IfcvvAFlxsqsXnXU3IdaaaZPOQz3UlPAXA6XR GO2P5Hot+vQJNoOilJfLEe5zH2fQ/5PQh4GojWinvLGRw9yaHnQ89WEVxYu+6Io1ilbD uXMOexX1tQutTuHEI6dwfZhKyJdA6irSBp3SO71/KQ/JO9vn9bXSu8J7dZ094WokIzQX F25w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728988917; x=1729593717; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sdyYwjyFS7cKng3xrhrvuZYheW62euvO0qiJZmOhRNg=; b=ofmAOshiwJ+hZId7erbS/b7XddN/IVRyUiXFtfp18QDUn0A+YocBY6w1L3KMkzs90J 4Ote3tORVrNElEnyHMS0TZUmCpy+9QUFdMkvTzhICyw6r052YJVS6QP8DKtEYWL0Mhia Scb6L3NbtfQctffIuS0oWPnwVSH9yXRNYPI5lZz1R+T8x2Xq+7dsfTqWgTbBJCD3fzvC ekBMRCmT1glvFzfs2az5gTBljzF15s/VTssui3FFG3AIim1B7rz28rqgyJ/OxmIi7A4u VPFKS3OhPR4Jtwx1u6it39Kr7HvV06aIqL0oFzcFRYdbjAZrPhfzzMwpwQrjYtS6BAij Nz8A== X-Gm-Message-State: AOJu0YyLVzOn/qTyJSZxVDOgwoUUvGMTzRL5Nuc458Offngot/irn6XI nMkp+JjoUOYtixY1OOGwOrKHiIt6IZ3gZpun6BaZz0pwhVZEvlNmOqGKDR/StwluUFLs3eNM2vd BiH3i7zDNhGld+TZFbQoSk0fB6JxlG1KxMWMixMaCixvvdGUlih+7JKJSQAJl+/g2kdDlhuJZII YwEMSW0bzFVf7lErr/EY9NlZuu/ymQkgUyo6FCFML3 X-Google-Smtp-Source: AGHT+IH+rC92o2dS6805siIyLPfs5IU3LYfFFrB+W0nlBTHPZXIyU9ukNyfRiy6dx7SJ2FOe9DBahSKj X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:7b:198d:ac11:8138]) (user=ardb job=sendgmr) by 2002:a05:690c:3190:b0:6e2:120b:be57 with SMTP id 00721157ae682-6e347b4aec8mr261627b3.5.1728988916665; Tue, 15 Oct 2024 03:41:56 -0700 (PDT) Date: Tue, 15 Oct 2024 12:41:39 +0200 In-Reply-To: <20241015104138.2875879-4-ardb+git@google.com> Mime-Version: 1.0 References: <20241015104138.2875879-4-ardb+git@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=3064; i=ardb@kernel.org; h=from:subject; bh=t1qGgmVoGyL6ETZIh2nQx2YqAZcU/0d9D3ED8tzRuT0=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIZ3P7bFhxxzJmUnPdeKnny8Plj8qv/GplpG6pL6eOMO31 pW7X67oKGVhEONgkBVTZBGY/ffdztMTpWqdZ8nCzGFlAhnCwMUpABPxa2D47y61wknXbrn3JttT usdM7J6+OZBq+HeyiWJL3T7PmKZvoQz/bHazmYb5znhboJb3XUBp8/SJHa6s+2cHrZrAzhAUqju LAQA= X-Mailer: git-send-email 2.47.0.rc1.288.g06298d1525-goog Message-ID: <20241015104138.2875879-5-ardb+git@google.com> Subject: [PATCH 1/2] arm64/lib: Handle CRC-32 alternative in C code From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, herbert@gondor.apana.org.au, will@kernel.org, catalin.marinas@arm.com, Ard Biesheuvel , Eric Biggers , Kees Cook X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241015_034159_252147_0D9A73E5 X-CRM114-Status: GOOD ( 14.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Ard Biesheuvel In preparation for adding another code path for performing CRC-32, move the alternative patching for ARM64_HAS_CRC32 into C code. The logic for deciding whether to use this new code path will be implemented in C too. Signed-off-by: Ard Biesheuvel --- arch/arm64/lib/Makefile | 2 +- arch/arm64/lib/crc32-glue.c | 34 ++++++++++++++++++++ arch/arm64/lib/crc32.S | 21 ++++-------- 3 files changed, 41 insertions(+), 16 deletions(-) diff --git a/arch/arm64/lib/Makefile b/arch/arm64/lib/Makefile index 13e6a2829116..8e882f479d98 100644 --- a/arch/arm64/lib/Makefile +++ b/arch/arm64/lib/Makefile @@ -13,7 +13,7 @@ endif lib-$(CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE) += uaccess_flushcache.o -obj-$(CONFIG_CRC32) += crc32.o +obj-$(CONFIG_CRC32) += crc32.o crc32-glue.o obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o diff --git a/arch/arm64/lib/crc32-glue.c b/arch/arm64/lib/crc32-glue.c new file mode 100644 index 000000000000..0b51761d4b75 --- /dev/null +++ b/arch/arm64/lib/crc32-glue.c @@ -0,0 +1,34 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include +#include + +#include + +asmlinkage u32 crc32_le_arm64(u32 crc, unsigned char const *p, size_t len); +asmlinkage u32 crc32c_le_arm64(u32 crc, unsigned char const *p, size_t len); +asmlinkage u32 crc32_be_arm64(u32 crc, unsigned char const *p, size_t len); + +u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len) +{ + if (!alternative_has_cap_likely(ARM64_HAS_CRC32)) + return crc32_le_base(crc, p, len); + + return crc32_le_arm64(crc, p, len); +} + +u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len) +{ + if (!alternative_has_cap_likely(ARM64_HAS_CRC32)) + return __crc32c_le_base(crc, p, len); + + return crc32c_le_arm64(crc, p, len); +} + +u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len) +{ + if (!alternative_has_cap_likely(ARM64_HAS_CRC32)) + return crc32_be_base(crc, p, len); + + return crc32_be_arm64(crc, p, len); +} diff --git a/arch/arm64/lib/crc32.S b/arch/arm64/lib/crc32.S index 8340dccff46f..5dac63da4247 100644 --- a/arch/arm64/lib/crc32.S +++ b/arch/arm64/lib/crc32.S @@ -136,25 +136,16 @@ CPU_BE( rev16 \reg, \reg ) .endm .align 5 -SYM_FUNC_START(crc32_le) -alternative_if_not ARM64_HAS_CRC32 - b crc32_le_base -alternative_else_nop_endif +SYM_FUNC_START(crc32_le_arm64) __crc32 -SYM_FUNC_END(crc32_le) +SYM_FUNC_END(crc32_le_arm64) .align 5 -SYM_FUNC_START(__crc32c_le) -alternative_if_not ARM64_HAS_CRC32 - b __crc32c_le_base -alternative_else_nop_endif +SYM_FUNC_START(crc32c_le_arm64) __crc32 c -SYM_FUNC_END(__crc32c_le) +SYM_FUNC_END(crc32c_le_arm64) .align 5 -SYM_FUNC_START(crc32_be) -alternative_if_not ARM64_HAS_CRC32 - b crc32_be_base -alternative_else_nop_endif +SYM_FUNC_START(crc32_be_arm64) __crc32 be=1 -SYM_FUNC_END(crc32_be) +SYM_FUNC_END(crc32_be_arm64)