From: Thomas Richter Date: Wed, 5 Nov 2025 14:38:57 +0000 (+0100) Subject: s390/pai_crypto: Add common pai_del() function X-Git-Tag: v6.19-rc1~206^2~21^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42e6a0f6d2f0e9ac96d0d6045624a1fa44ab6871;p=thirdparty%2Flinux.git s390/pai_crypto: Add common pai_del() function To support one common PAI PMU device driver which handles both PMUs pai_crypto and pai_ext, use a common naming scheme for structures and variables suitable for both device drivers. Add a common usable function pai_stop() for the event on a CPU. Signed-off-by: Thomas Richter Reviewed-by: Jan Polensky Signed-off-by: Heiko Carstens --- diff --git a/arch/s390/kernel/perf_pai_crypto.c b/arch/s390/kernel/perf_pai_crypto.c index 5d4b9ffe3cb15..a014f4a1b4433 100644 --- a/arch/s390/kernel/perf_pai_crypto.c +++ b/arch/s390/kernel/perf_pai_crypto.c @@ -460,18 +460,24 @@ static void paicrypt_stop(struct perf_event *event, int flags) pai_stop(event, flags); } -static void paicrypt_del(struct perf_event *event, int flags) +static void pai_del(struct perf_event *event, int flags) { struct pai_mapptr *mp = this_cpu_ptr(pai_root.mapptr); struct pai_map *cpump = mp->mapptr; + int idx = PAI_PMU_IDX(event); - paicrypt_stop(event, PERF_EF_UPDATE); + pai_pmu[idx].pmu->stop(event, PERF_EF_UPDATE); if (--cpump->active_events == 0) { local_ctl_clear_bit(0, CR0_CRYPTOGRAPHY_COUNTER_BIT); WRITE_ONCE(get_lowcore()->ccd, 0); } } +static void paicrypt_del(struct perf_event *event, int flags) +{ + pai_del(event, flags); +} + /* Create raw data and save it in buffer. Calculate the delta for each * counter between this invocation and the last invocation. * Returns number of bytes copied.