Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 20:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

s390/cpum_sf: Ignore lsctl() return code in sf_disable()

Browse Source 
sf_disable() returns the condition code of instruction lsctl (load
sampling controls). However the parameter to lsctl() in
sf_disable() is a sample control block containing
all zeroes. This invocation of lsctl() does not fail and returns
always zero even when there is no authorization for sampling
on the machine. In short, sampling can be always turned off.
Ignore the return code of sf_disable() and change the function
return to void.

Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
Acked-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
This commit is contained in:
Thomas Richter 2024-08-08 10:58:56 +02:00 committed by Vasily Gorbik
parent 073ef6b204
commit 742a755716
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/s390/kernel/perf_cpum_sf.c
View File

@ -170,12 +170,12 @@ static inline unsigned long *get_next_sdbt(unsigned long *s)
/*
* sf_disable() - Switch off sampling facility
*/
static int sf_disable(void)
static void sf_disable(void)
{
struct hws_lsctl_request_block sreq;
memset(&sreq, 0, sizeof(sreq));
return lsctl(&sreq);
lsctl(&sreq);
}
/*
@ -620,13 +620,12 @@ static void setup_pmc_cpu(void *flags)
if (err)
break;
cpuhw->flags |= PMU_F_RESERVED;
err = sf_disable();
sf_disable();
break;
case PMC_RELEASE:
cpuhw->flags &= ~PMU_F_RESERVED;
err = sf_disable();
if (!err)
deallocate_buffers(cpuhw);
sf_disable();
deallocate_buffers(cpuhw);
break;
}
if (err) {