From patchwork Fri May 3 17:18:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Puranjay Mohan X-Patchwork-Id: 13653153 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 E3DBB157A74; Fri, 3 May 2024 17:19:01 +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=1714756742; cv=none; b=T7q9C7XwNN6Fj5wNpXFoR8w97ik4nyi20BSiMlRMrBFQ3L7gQ2t7Shke/C4CpEupQVuj5aU9jw6mDBauXb4Kvbr4FQkG1aly6knn2eTm6zlFfEijAcR1b2R9+XMo/JQ5sAnzlGD4Nkp9xsscMWpup/i78j9Hx9DRnALFdbb/eoU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714756742; c=relaxed/simple; bh=sxFjeHo/U9d6yJ4gu/S8oCYHW6M/QMHpy5fuSlTg3o8=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=X2cQDiF8nNDVm1XYfrFSSX8RB3GKfSFxrqN/0FX0+x0wuILJCCTzdxTq+Js7ZRAQvByaHPqMBs8FStYeGixtooMvnjnNDF2buk15kifJ9TTYqzzzR5caRLWGLtSpQLvy9gnex1b3q/vGKYZZ/yeZl9Cn3LDsBWAEtyb9S1Nrm1M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hIRN+DUF; 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="hIRN+DUF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 257BCC116B1; Fri, 3 May 2024 17:19:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714756741; bh=sxFjeHo/U9d6yJ4gu/S8oCYHW6M/QMHpy5fuSlTg3o8=; h=From:To:Cc:Subject:Date:From; b=hIRN+DUFCywNEszWU9lwdZU2kY1GdPQ/vI695iOCohOzJou/FEySpToU/05dvz1P0 ZGNOaxMi/LHxI8UwG6/irrNE79FoDmsE6N81uZG/60U+ISuXKU4vUNVodtvYFA+4i0 dT1+Y3XUIr/2WwBj57H5tUUL9bgXm3QkzWI17B7W6w9mrZjvSPoXA4BnaXNZOMJiIQ NDrAUyHfKGMaCnvapDfx5CuyznN2IiuyDyL2YFAwhaVzhlCKXXh3prw7StOm4ApR6A n9LAHQYNU74Hb1IfUBy6AZlV7JSGaMh8FctgeyyunHhpfzdXJU7/TNdWUR/5yceNDd DyXx3tDu99nJQ== From: Puranjay Mohan To: Catalin Marinas , Will Deacon , Sumit Garg , Stephen Boyd , Douglas Anderson , "Peter Zijlstra (Intel)" , Thomas Gleixner , Mark Rutland , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Cc: puranjay12@gmail.com Subject: [PATCH v3 1/2] arm64/arch_timer: include Date: Fri, 3 May 2024 17:18:46 +0000 Message-Id: <20240503171847.68267-1-puranjay@kernel.org> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 arch_timer.h includes linux/smp.h since the commit: 6acc71ccac7187fc ("arm64: arch_timer: Allows a CPU-specific erratum to only affect a subset of CPUs") It was included to use DEFINE_PER_CPU(), etc. But It should have included rather than . It worked because smp.h includes percpu.h. The next commit will remove percpu.h from smp.h and it will break this usage. Explicitly include percpu.h and remove smp.h Signed-off-by: Puranjay Mohan Acked-by: Mark Rutland Reviewed-by: Stephen Boyd --- arch/arm64/include/asm/arch_timer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h index 934c658ee947..f5794d50f51d 100644 --- a/arch/arm64/include/asm/arch_timer.h +++ b/arch/arm64/include/asm/arch_timer.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include From patchwork Fri May 3 17:18:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Puranjay Mohan X-Patchwork-Id: 13653154 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 319521581F5; Fri, 3 May 2024 17:19:05 +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=1714756746; cv=none; b=p8H8/zTEUETqdKlNWOq1zFL1N21JKRhcGmxf4HELGmWEurDRoVuTEzA9vZ2fv+QNOuD+W9C8A/zXC39oMOHuPL40IrWCbKRtz/Prx/NLAqD+PsbloCYgcLIUuK39ac1m6f2Uuh3zJaOgpiAZDOJ45uK+T+bf71IstplGmBkfd5o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714756746; c=relaxed/simple; bh=SKPGGFh3wFauCRM9bosYEwSGbWHR5tDTuYSe2kSfmNQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FbyDP6sIJ7jXWQu/Rz/S6jSzCKZ8avRFoa39pEGIPQgtJk81iJeUQRcY6QHYUyRTwsoxWPz4L02mqfTJRIXHIzfPwHD4s4TT3Hd8TDn5wDOQqn2C0sa0CLlSYWU0S43D8GvrDJqEsV4JyoyFUsZlZK4m5eaMrhHR46M10d/VW80= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qI3izxXw; 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="qI3izxXw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 79A30C116B1; Fri, 3 May 2024 17:19:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714756745; bh=SKPGGFh3wFauCRM9bosYEwSGbWHR5tDTuYSe2kSfmNQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qI3izxXwFqNX4HpMhaKsfqCMLJdgy+IySCBeCY29ifhaPt902Hca20463lWJ3VH+/ Tqj338XIPGTpolG8s+ut9LJWxjNZKPNtbZ7qfwPvVyDqp9Tm9l5CC+TGRSeLs0r/QA ewaJpUaDScg/uFwSOxlI+GFyhHYZwV4o7542q9DdMg/vBiQ9SZB0CpY4vWp1IZJht2 4niqwjcIgnYWZcD6HeGFMplquUnrQfLLUXW9bFHPtKBSqQ0rYQX9UzsLwYiksBYGUI 0SPKxpx7bWmyoPsuMjCLj3VLJYC9MmZnIzb3GXAktmb+3T1ESmuPd/PmgEjakJ4E2E 8n4c87SVmbp6g== From: Puranjay Mohan To: Catalin Marinas , Will Deacon , Sumit Garg , Stephen Boyd , Douglas Anderson , "Peter Zijlstra (Intel)" , Thomas Gleixner , Mark Rutland , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Cc: puranjay12@gmail.com Subject: [PATCH v3 2/2] arm64: implement raw_smp_processor_id() using thread_info Date: Fri, 3 May 2024 17:18:47 +0000 Message-Id: <20240503171847.68267-2-puranjay@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240503171847.68267-1-puranjay@kernel.org> References: <20240503171847.68267-1-puranjay@kernel.org> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Historically, arm64 implemented raw_smp_processor_id() as a read of current_thread_info()->cpu. This changed when arm64 moved thread_info into task struct, as at the time CONFIG_THREAD_INFO_IN_TASK made core code use thread_struct::cpu for the cpu number, and due to header dependencies prevented using this in raw_smp_processor_id(). As a workaround, we moved to using a percpu variable in commit: 57c82954e77fa12c ("arm64: make cpu number a percpu variable") Since then, thread_info::cpu was reintroduced, and core code was made to use this in commits: 001430c1910df65a ("arm64: add CPU field to struct thread_info") bcf9033e5449bdca ("sched: move CPU field back into thread_info if THREAD_INFO_IN_TASK=y") Consequently it is possible to use current_thread_info()->cpu again. This decreases the number of emitted instructions like in the following example: Dump of assembler code for function bpf_get_smp_processor_id: 0xffff8000802cd608 <+0>: nop 0xffff8000802cd60c <+4>: nop 0xffff8000802cd610 <+8>: adrp x0, 0xffff800082138000 0xffff8000802cd614 <+12>: mrs x1, tpidr_el1 0xffff8000802cd618 <+16>: add x0, x0, #0x8 0xffff8000802cd61c <+20>: ldrsw x0, [x0, x1] 0xffff8000802cd620 <+24>: ret After this patch: Dump of assembler code for function bpf_get_smp_processor_id: 0xffff8000802c9130 <+0>: nop 0xffff8000802c9134 <+4>: nop 0xffff8000802c9138 <+8>: mrs x0, sp_el0 0xffff8000802c913c <+12>: ldr w0, [x0, #24] 0xffff8000802c9140 <+16>: ret A microbenchmark[1] was built to measure the performance improvement provided by this change. It calls the following function given number of times and finds the runtime overhead: static noinline int get_cpu_id(void) { return smp_processor_id(); } Run the benchmark like: modprobe smp_processor_id nr_function_calls=1000000000 +--------------------------+------------------------+ | | Number of Calls | Time taken | +--------+-----------------+------------------------+ | Before | 1000000000 | 1602888401ns | +--------+-----------------+------------------------+ | After | 1000000000 | 1206212658ns | +--------+-----------------+------------------------+ | Difference (decrease) | 396675743ns (24.74%) | +---------------------------------------------------+ Remove the percpu variable cpu_number as it is used only in set_smp_ipi_range() as a dummy variable to be passed to ipi_handler(). Use irq_stat in place of cpu_number here like arm32. [1] https://github.com/puranjaymohan/linux/commit/77d3fdd Signed-off-by: Puranjay Mohan Acked-by: Mark Rutland Reviewed-by: Stephen Boyd --- arch/arm64/include/asm/smp.h | 13 +------------ arch/arm64/kernel/smp.c | 9 ++------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/arch/arm64/include/asm/smp.h b/arch/arm64/include/asm/smp.h index efb13112b408..2510eec026f7 100644 --- a/arch/arm64/include/asm/smp.h +++ b/arch/arm64/include/asm/smp.h @@ -25,22 +25,11 @@ #ifndef __ASSEMBLY__ -#include - #include #include #include -DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number); - -/* - * We don't use this_cpu_read(cpu_number) as that has implicit writes to - * preempt_count, and associated (compiler) barriers, that we'd like to avoid - * the expense of. If we're preemptible, the value can be stale at use anyway. - * And we can't use this_cpu_ptr() either, as that winds up recursing back - * here under CONFIG_DEBUG_PREEMPT=y. - */ -#define raw_smp_processor_id() (*raw_cpu_ptr(&cpu_number)) +#define raw_smp_processor_id() (current_thread_info()->cpu) /* * Logical CPU mapping. diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 4ced34f62dab..98d4e352c3d0 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -55,9 +55,6 @@ #include -DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number); -EXPORT_PER_CPU_SYMBOL(cpu_number); - /* * as from 2.5, kernels no longer have an init_tasks structure * so we need some other way of telling a new secondary core @@ -742,8 +739,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus) */ for_each_possible_cpu(cpu) { - per_cpu(cpu_number, cpu) = cpu; - if (cpu == smp_processor_id()) continue; @@ -1021,12 +1016,12 @@ void __init set_smp_ipi_range(int ipi_base, int n) if (ipi_should_be_nmi(i)) { err = request_percpu_nmi(ipi_base + i, ipi_handler, - "IPI", &cpu_number); + "IPI", &irq_stat); WARN(err, "Could not request IPI %d as NMI, err=%d\n", i, err); } else { err = request_percpu_irq(ipi_base + i, ipi_handler, - "IPI", &cpu_number); + "IPI", &irq_stat); WARN(err, "Could not request IPI %d as IRQ, err=%d\n", i, err); }