lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RAS/CEC: Check count_threshold unconditionally

Browse Source 
The count_threshold should be checked unconditionally, after insertion
too, so that a count_threshold value of 1 can cause an immediate
offlining. I.e., offline the page on the *first* error encountered.

Add comments to make it clear what cec_add_elem() does, while at it.

Reported-by: WANG Chao <chao.wang@ucloud.cn>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-edac@vger.kernel.org
Link: https://lkml.kernel.org/r/20190418034115.75954-3-chao.wang@ucloud.cn
This commit is contained in:
Borislav Petkov 2019-04-20 14:06:37 +02:00
parent 6d8e294bf5
commit de0e0624d8
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/ras/cec.c
View File

@ -294,6 +294,7 @@ int cec_add_elem(u64 pfn)
ca->ces_entered++; ca->ces_entered++;
/* Array full, free the LRU slot. */
if (ca->n == MAX_ELEMS) if (ca->n == MAX_ELEMS)
WARN_ON(!del_lru_elem_unlocked(ca)); WARN_ON(!del_lru_elem_unlocked(ca));
@ -306,24 +307,17 @@ int cec_add_elem(u64 pfn)
(void *)&ca->array[to], (void *)&ca->array[to],
(ca->n - to) * sizeof(u64)); (ca->n - to) * sizeof(u64));
ca->array[to] = (pfn << PAGE_SHIFT) | ca->array[to] = pfn << PAGE_SHIFT;
(DECAY_MASK << COUNT_BITS) | 1;
ca->n++; ca->n++;
ret = 0;
goto decay;
} }
count = COUNT(ca->array[to]); /* Add/refresh element generation and increment count */
ca->array[to] |= DECAY_MASK << COUNT_BITS;
if (count < count_threshold) {
ca->array[to] |= (DECAY_MASK << COUNT_BITS);
ca->array[to]++; ca->array[to]++;
ret = 0; /* Check action threshold and soft-offline, if reached. */
} else { count = COUNT(ca->array[to]);
if (count >= count_threshold) {
u64 pfn = ca->array[to] >> PAGE_SHIFT; u64 pfn = ca->array[to] >> PAGE_SHIFT;
if (!pfn_valid(pfn)) { if (!pfn_valid(pfn)) {
@ -338,15 +332,14 @@ int cec_add_elem(u64 pfn)
del_elem(ca, to); del_elem(ca, to);
/* /*
* Return a >0 value to denote that we've reached the offlining * Return a >0 value to callers, to denote that we've reached
* threshold. * the offlining threshold.
*/ */
ret = 1; ret = 1;
goto unlock; goto unlock;
} }
decay:
ca->decay_count++; ca->decay_count++;
if (ca->decay_count >= CLEAN_ELEMS) if (ca->decay_count >= CLEAN_ELEMS)