Commit b2a679e3 authored by Shuai Xue's avatar Shuai Xue Committed by Tong Tiangen
Browse files

mm: memory-failure: move return value documentation to function declaration 

maillist inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9GCZS
CVE: NA

Reference: https://lore.kernel.org/lkml/20240204080144.7977-3-xueshuai@linux.alibaba.com/



--------------------------------

Part of return value comments for memory_failure() were originally
documented at the call site. Move those comments to the function
declaration to improve code readability and to provide developers with
immediate access to function usage and return information.

Signed-off-by: default avatarShuai Xue <xueshuai@linux.alibaba.com>

conflicts:
  arch/x86/kernel/cpu/mce/core.c

Signed-off-by: default avatarTong Tiangen <tongtiangen@huawei.com>
parent e0c12d38

arch/x86/kernel/cpu/mce/core.c

+0 −7
Original line number Diff line number Diff line
@@ -1353,13 +1353,6 @@ static void kill_me_maybe(struct callback_head *cb) 
		return;

	}



	/*

	 * -EHWPOISON from memory_failure() means that it already sent SIGBUS

	 * to the current process with the proper error info,

	 * -EOPNOTSUPP means hwpoison_filter() filtered the error event,

	 *

	 * In both cases, no further processing is required.

	 */

	if (ret == -EHWPOISON || ret == -EOPNOTSUPP)

		return;

mm/memory-failure.c

+6 −3
Original line number Diff line number Diff line
@@ -2171,9 +2171,12 @@ static int memory_failure_dev_pagemap(unsigned long pfn, int flags, 
 * Must run in process context (e.g. a work queue) with interrupts

 * enabled and no spinlocks held.

 *

 * Return: 0 for successfully handled the memory error,

 *         -EOPNOTSUPP for hwpoison_filter() filtered the error event,

 *         < 0(except -EOPNOTSUPP) on failure.

 * Return values:

 *   0             - success

 *   -EOPNOTSUPP   - hwpoison_filter() filtered the error event.

 *   -EHWPOISON    - sent SIGBUS to the current process with the proper

 *                   error info by kill_accessing_process().

 *   other negative values - failure

 */

int memory_failure(unsigned long pfn, int flags)

{