Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux (d192f538) · Commits · EulixOS / Software / Kernel

arch/arm64/kernel/fpsimd.c

+25 −8

Original line number	Diff line number	Diff line
		@@ -847,6 +847,8 @@ void sve_sync_from_fpsimd_zeropad(struct task_struct *task)
		int vec_set_vector_length(struct task_struct *task, enum vec_type type,
		unsigned long vl, unsigned long flags)
		{
		bool free_sme = false;

		if (flags & ~(unsigned long)(PR_SVE_VL_INHERIT \|
		PR_SVE_SET_VL_ONEXEC))
		return -EINVAL;
		@@ -897,21 +899,36 @@ int vec_set_vector_length(struct task_struct *task, enum vec_type type,
		task->thread.fp_type = FP_STATE_FPSIMD;
		}

		if (system_supports_sme() && type == ARM64_VEC_SME) {
		if (system_supports_sme()) {
		if (type == ARM64_VEC_SME \|\|
		!(task->thread.svcr & (SVCR_SM_MASK \| SVCR_ZA_MASK))) {
		/*
		* We are changing the SME VL or weren't using
		* SME anyway, discard the state and force a
		* reallocation.
		*/
		task->thread.svcr &= ~(SVCR_SM_MASK \|
		SVCR_ZA_MASK);
		clear_thread_flag(TIF_SME);
		free_sme = true;
		}
		}

		if (task == current)
		put_cpu_fpsimd_context();

		/*
		* Force reallocation of task SVE and SME state to the correct
		* size on next use:
		* Free the changed states if they are not in use, SME will be
		* reallocated to the correct size on next use and we just
		* allocate SVE now in case it is needed for use in streaming
		* mode.
		*/
		if (system_supports_sve()) {
		sve_free(task);
		if (system_supports_sme() && type == ARM64_VEC_SME)
		sve_alloc(task, true);
		}

		if (free_sme)
		sme_free(task);

		task_set_vl(task, type, vl);

+4 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,10 @@
		*
		*/

		int __kernel_clock_gettime(clockid_t clock, struct __kernel_timespec *ts);
		int __kernel_gettimeofday(struct __kernel_old_timeval tv, struct timezone tz);
		int __kernel_clock_getres(clockid_t clock_id, struct __kernel_timespec *res);

		int __kernel_clock_gettime(clockid_t clock,
		struct __kernel_timespec *ts)
		{

+3 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@
		#include <linux/bug.h>
		#include <linux/mm.h>
		#include <linux/mmzone.h>
		#include <linux/kfence.h>

		static void trans_alloc(struct trans_pgd_info info)
		{
		@@ -41,7 +42,8 @@ static void _copy_pte(pte_t dst_ptep, pte_t src_ptep, unsigned long addr)
		* the temporary mappings we use during restore.
		*/
		set_pte(dst_ptep, pte_mkwrite(pte));
		} else if (debug_pagealloc_enabled() && !pte_none(pte)) {
		} else if ((debug_pagealloc_enabled() \|\|
		is_kfence_address((void *)addr)) && !pte_none(pte)) {
		/*
		* debug_pagealloc will removed the PTE_VALID bit if
		* the page isn't in use by the resume kernel. It may have

+6 −6