raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

RAS/CEC: Correct ce_add_elem()'s returned values

Browse Source 
commit 3a62583c28 upstream.

ce_add_elem() uses different return values to signal a result from
adding an element to the collector. Commit in Fixes: broke the case
where the element being added is not found in the array. Correct that.

 [ bp: Rewrite commit message, add kernel-doc comments. ]

Fixes: de0e0624d8 ("RAS/CEC: Check count_threshold unconditionally")
Signed-off-by: William Roche <william.roche@oracle.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: <stable@vger.kernel.org>
Link: https://lkml.kernel.org/r/1617722939-29670-1-git-send-email-william.roche@oracle.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
William Roche
2021-04-06 11:28:59 -04:00
committed by Greg Kroah-Hartman
parent 253acf2e98
commit 674ddb52f9
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/ras/cec.c
View File

@@ -309,11 +309,20 @@ static bool sanity_check(struct ce_array *ca)
return ret; return ret;
} }
/**
* cec_add_elem - Add an element to the CEC array.
* @pfn: page frame number to insert
*
* Return values:
* - <0: on error
* - 0: on success
* - >0: when the inserted pfn was offlined
*/
static int cec_add_elem(u64 pfn) static int cec_add_elem(u64 pfn)
{ {
struct ce_array *ca = &ce_arr; struct ce_array *ca = &ce_arr;
int count, err, ret = 0;
unsigned int to = 0; unsigned int to = 0;
int count, ret = 0;
/* /*
* We can be called very early on the identify_cpu() path where we are * We can be called very early on the identify_cpu() path where we are
@@ -330,8 +339,8 @@ static int cec_add_elem(u64 pfn)
if (ca->n == MAX_ELEMS) if (ca->n == MAX_ELEMS)
WARN_ON(!del_lru_elem_unlocked(ca)); WARN_ON(!del_lru_elem_unlocked(ca));
ret = find_elem(ca, pfn, &to); err = find_elem(ca, pfn, &to);
if (ret < 0) { if (err < 0) {
/* /*
* Shift range [to-end] to make room for one more element. * Shift range [to-end] to make room for one more element.
*/ */