Commit 611c9d88 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'loongarch-6.4' of... 

Merge tag 'loongarch-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson

Pull LoongArch updates from Huacai Chen:

 - Better backtraces for humanization

 - Relay BCE exceptions to userland as SIGSEGV

 - Provide kernel fpu functions

 - Optimize memory ops (memset/memcpy/memmove)

 - Optimize checksum and crc32(c) calculation

 - Add ARCH_HAS_FORTIFY_SOURCE selection

 - Add function error injection support

 - Add ftrace with direct call support

 - Add basic perf tools support

* tag 'loongarch-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson: (24 commits)
  tools/perf: Add basic support for LoongArch
  LoongArch: ftrace: Add direct call trampoline samples support
  LoongArch: ftrace: Add direct call support
  LoongArch: ftrace: Implement ftrace_find_callable_addr() to simplify code
  LoongArch: ftrace: Fix build error if DYNAMIC_FTRACE_WITH_REGS is not set
  LoongArch: ftrace: Abstract DYNAMIC_FTRACE_WITH_ARGS accesses
  LoongArch: Add support for function error injection
  LoongArch: Add ARCH_HAS_FORTIFY_SOURCE selection
  LoongArch: crypto: Add crc32 and crc32c hw acceleration
  LoongArch: Add checksum optimization for 64-bit system
  LoongArch: Optimize memory ops (memset/memcpy/memmove)
  LoongArch: Provide kernel fpu functions
  LoongArch: Relay BCE exceptions to userland as SIGSEGV with si_code=SEGV_BNDERR
  LoongArch: Tweak the BADV and CPUCFG.PRID lines in show_regs()
  LoongArch: Humanize the ESTAT line when showing registers
  LoongArch: Humanize the ECFG line when showing registers
  LoongArch: Humanize the EUEN line when showing registers
  LoongArch: Humanize the PRMD line when showing registers
  LoongArch: Humanize the CRMD line when showing registers
  LoongArch: Fix format of CSR lines during show_regs()
  ...
parents a1f749de 2fa5ebe3

arch/loongarch/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ config LOONGARCH 
	select ARCH_ENABLE_MEMORY_HOTPLUG

	select ARCH_ENABLE_MEMORY_HOTREMOVE

	select ARCH_HAS_ACPI_TABLE_UPGRADE	if ACPI

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_NMI_SAFE_THIS_CPU_OPS

	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
@@ -93,6 +94,7 @@ config LOONGARCH 
	select HAVE_DMA_CONTIGUOUS

	select HAVE_DYNAMIC_FTRACE

	select HAVE_DYNAMIC_FTRACE_WITH_ARGS

	select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS

	select HAVE_DYNAMIC_FTRACE_WITH_REGS

	select HAVE_EBPF_JIT

	select HAVE_EFFICIENT_UNALIGNED_ACCESS if !ARCH_STRICT_ALIGN
@@ -100,6 +102,7 @@ config LOONGARCH 
	select HAVE_FAST_GUP

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_ARG_ACCESS_API

	select HAVE_FUNCTION_ERROR_INJECTION

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_TRACER

	select HAVE_GENERIC_VDSO
@@ -118,6 +121,8 @@ config LOONGARCH 
	select HAVE_PERF_USER_STACK_DUMP

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_RSEQ

	select HAVE_SAMPLE_FTRACE_DIRECT

	select HAVE_SAMPLE_FTRACE_DIRECT_MULTI

	select HAVE_SETUP_PER_CPU_AREA if NUMA

	select HAVE_STACKPROTECTOR

	select HAVE_SYSCALL_TRACEPOINTS

arch/loongarch/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -115,6 +115,8 @@ endif 
libs-y += arch/loongarch/lib/

libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a



drivers-y		+= arch/loongarch/crypto/



# suspend and hibernation support

drivers-$(CONFIG_PM)	+= arch/loongarch/power/

arch/loongarch/crypto/Kconfig

0 → 100644
+14 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



menu "Accelerated Cryptographic Algorithms for CPU (loongarch)"



config CRYPTO_CRC32_LOONGARCH

	tristate "CRC32c and CRC32"

	select CRC32

	select CRYPTO_HASH

	help

	  CRC32c and CRC32 CRC algorithms



	  Architecture: LoongArch with CRC32 instructions



endmenu

arch/loongarch/crypto/Makefile

0 → 100644
+6 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

#

# Makefile for LoongArch crypto files..

#



obj-$(CONFIG_CRYPTO_CRC32_LOONGARCH) += crc32-loongarch.o

arch/loongarch/crypto/crc32-loongarch.c

0 → 100644
+304 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * crc32.c - CRC32 and CRC32C using LoongArch crc* instructions

 *

 * Module based on mips/crypto/crc32-mips.c

 *

 * Copyright (C) 2014 Linaro Ltd <yazen.ghannam@linaro.org>

 * Copyright (C) 2018 MIPS Tech, LLC

 * Copyright (C) 2020-2023 Loongson Technology Corporation Limited

 */



#include <linux/module.h>

#include <crypto/internal/hash.h>



#include <asm/cpu-features.h>

#include <asm/unaligned.h>



#define _CRC32(crc, value, size, type)			\

do {							\

	__asm__ __volatile__(				\

		#type ".w." #size ".w" " %0, %1, %0\n\t"\

		: "+r" (crc)				\

		: "r" (value)				\

		: "memory");				\

} while (0)



#define CRC32(crc, value, size)		_CRC32(crc, value, size, crc)

#define CRC32C(crc, value, size)	_CRC32(crc, value, size, crcc)



static u32 crc32_loongarch_hw(u32 crc_, const u8 *p, unsigned int len)

{

	u32 crc = crc_;



	while (len >= sizeof(u64)) {

		u64 value = get_unaligned_le64(p);



		CRC32(crc, value, d);

		p += sizeof(u64);

		len -= sizeof(u64);

	}



	if (len & sizeof(u32)) {

		u32 value = get_unaligned_le32(p);



		CRC32(crc, value, w);

		p += sizeof(u32);

		len -= sizeof(u32);

	}



	if (len & sizeof(u16)) {

		u16 value = get_unaligned_le16(p);



		CRC32(crc, value, h);

		p += sizeof(u16);

	}



	if (len & sizeof(u8)) {

		u8 value = *p++;



		CRC32(crc, value, b);

	}



	return crc;

}



static u32 crc32c_loongarch_hw(u32 crc_, const u8 *p, unsigned int len)

{

	u32 crc = crc_;



	while (len >= sizeof(u64)) {

		u64 value = get_unaligned_le64(p);



		CRC32C(crc, value, d);

		p += sizeof(u64);

		len -= sizeof(u64);

	}



	if (len & sizeof(u32)) {

		u32 value = get_unaligned_le32(p);



		CRC32C(crc, value, w);

		p += sizeof(u32);

		len -= sizeof(u32);

	}



	if (len & sizeof(u16)) {

		u16 value = get_unaligned_le16(p);



		CRC32C(crc, value, h);

		p += sizeof(u16);

	}



	if (len & sizeof(u8)) {

		u8 value = *p++;



		CRC32C(crc, value, b);

	}



	return crc;

}



#define CHKSUM_BLOCK_SIZE	1

#define CHKSUM_DIGEST_SIZE	4



struct chksum_ctx {

	u32 key;

};



struct chksum_desc_ctx {

	u32 crc;

};



static int chksum_init(struct shash_desc *desc)

{

	struct chksum_ctx *mctx = crypto_shash_ctx(desc->tfm);

	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);



	ctx->crc = mctx->key;



	return 0;

}



/*

 * Setting the seed allows arbitrary accumulators and flexible XOR policy

 * If your algorithm starts with ~0, then XOR with ~0 before you set the seed.

 */

static int chksum_setkey(struct crypto_shash *tfm, const u8 *key, unsigned int keylen)

{

	struct chksum_ctx *mctx = crypto_shash_ctx(tfm);



	if (keylen != sizeof(mctx->key))

		return -EINVAL;



	mctx->key = get_unaligned_le32(key);



	return 0;

}



static int chksum_update(struct shash_desc *desc, const u8 *data, unsigned int length)

{

	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);



	ctx->crc = crc32_loongarch_hw(ctx->crc, data, length);

	return 0;

}



static int chksumc_update(struct shash_desc *desc, const u8 *data, unsigned int length)

{

	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);



	ctx->crc = crc32c_loongarch_hw(ctx->crc, data, length);

	return 0;

}



static int chksum_final(struct shash_desc *desc, u8 *out)

{

	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);



	put_unaligned_le32(ctx->crc, out);

	return 0;

}



static int chksumc_final(struct shash_desc *desc, u8 *out)

{

	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);



	put_unaligned_le32(~ctx->crc, out);

	return 0;

}



static int __chksum_finup(u32 crc, const u8 *data, unsigned int len, u8 *out)

{

	put_unaligned_le32(crc32_loongarch_hw(crc, data, len), out);

	return 0;

}



static int __chksumc_finup(u32 crc, const u8 *data, unsigned int len, u8 *out)

{

	put_unaligned_le32(~crc32c_loongarch_hw(crc, data, len), out);

	return 0;

}



static int chksum_finup(struct shash_desc *desc, const u8 *data, unsigned int len, u8 *out)

{

	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);



	return __chksum_finup(ctx->crc, data, len, out);

}



static int chksumc_finup(struct shash_desc *desc, const u8 *data, unsigned int len, u8 *out)

{

	struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);



	return __chksumc_finup(ctx->crc, data, len, out);

}



static int chksum_digest(struct shash_desc *desc, const u8 *data, unsigned int length, u8 *out)

{

	struct chksum_ctx *mctx = crypto_shash_ctx(desc->tfm);



	return __chksum_finup(mctx->key, data, length, out);

}



static int chksumc_digest(struct shash_desc *desc, const u8 *data, unsigned int length, u8 *out)

{

	struct chksum_ctx *mctx = crypto_shash_ctx(desc->tfm);



	return __chksumc_finup(mctx->key, data, length, out);

}



static int chksum_cra_init(struct crypto_tfm *tfm)

{

	struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);



	mctx->key = 0;

	return 0;

}



static int chksumc_cra_init(struct crypto_tfm *tfm)

{

	struct chksum_ctx *mctx = crypto_tfm_ctx(tfm);



	mctx->key = ~0;

	return 0;

}



static struct shash_alg crc32_alg = {

	.digestsize		=	CHKSUM_DIGEST_SIZE,

	.setkey			=	chksum_setkey,

	.init			=	chksum_init,

	.update			=	chksum_update,

	.final			=	chksum_final,

	.finup			=	chksum_finup,

	.digest			=	chksum_digest,

	.descsize		=	sizeof(struct chksum_desc_ctx),

	.base			=	{

		.cra_name		=	"crc32",

		.cra_driver_name	=	"crc32-loongarch",

		.cra_priority		=	300,

		.cra_flags		=	CRYPTO_ALG_OPTIONAL_KEY,

		.cra_blocksize		=	CHKSUM_BLOCK_SIZE,

		.cra_alignmask		=	0,

		.cra_ctxsize		=	sizeof(struct chksum_ctx),

		.cra_module		=	THIS_MODULE,

		.cra_init		=	chksum_cra_init,

	}

};



static struct shash_alg crc32c_alg = {

	.digestsize		=	CHKSUM_DIGEST_SIZE,

	.setkey			=	chksum_setkey,

	.init			=	chksum_init,

	.update			=	chksumc_update,

	.final			=	chksumc_final,

	.finup			=	chksumc_finup,

	.digest			=	chksumc_digest,

	.descsize		=	sizeof(struct chksum_desc_ctx),

	.base			=	{

		.cra_name		=	"crc32c",

		.cra_driver_name	=	"crc32c-loongarch",

		.cra_priority		=	300,

		.cra_flags		=	CRYPTO_ALG_OPTIONAL_KEY,

		.cra_blocksize		=	CHKSUM_BLOCK_SIZE,

		.cra_alignmask		=	0,

		.cra_ctxsize		=	sizeof(struct chksum_ctx),

		.cra_module		=	THIS_MODULE,

		.cra_init		=	chksumc_cra_init,

	}

};



static int __init crc32_mod_init(void)

{

	int err;



	if (!cpu_has(CPU_FEATURE_CRC32))

		return 0;



	err = crypto_register_shash(&crc32_alg);

	if (err)

		return err;



	err = crypto_register_shash(&crc32c_alg);

	if (err)

		return err;



	return 0;

}



static void __exit crc32_mod_exit(void)

{

	if (!cpu_has(CPU_FEATURE_CRC32))

		return;



	crypto_unregister_shash(&crc32_alg);

	crypto_unregister_shash(&crc32c_alg);

}



module_init(crc32_mod_init);

module_exit(crc32_mod_exit);



MODULE_AUTHOR("Min Zhou <zhoumin@loongson.cn>");

MODULE_AUTHOR("Huacai Chen <chenhuacai@loongson.cn>");

MODULE_DESCRIPTION("CRC32 and CRC32C using LoongArch crc* instructions");

MODULE_LICENSE("GPL v2");