linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Miaohe Lin <linmiaohe@huawei.com>,
	Mike Kravetz <mike.kravetz@oracle.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH 4.4 03/31] mm/hugetlb: fix potential missing huge page size info
Date: Fri, 22 Jan 2021 15:08:17 +0100	[thread overview]
Message-ID: <20210122135732.010605999@linuxfoundation.org> (raw)
In-Reply-To: <20210122135731.873346566@linuxfoundation.org>

From: Miaohe Lin <linmiaohe@huawei.com>

commit 0eb98f1588c2cc7a79816d84ab18a55d254f481c upstream.

The huge page size is encoded for VM_FAULT_HWPOISON errors only.  So if
we return VM_FAULT_HWPOISON, huge page size would just be ignored.

Link: https://lkml.kernel.org/r/20210107123449.38481-1-linmiaohe@huawei.com
Fixes: aa50d3a7aa81 ("Encode huge page size for VM_FAULT_HWPOISON errors")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 mm/hugetlb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -3659,7 +3659,7 @@ retry:
 		 * So we need to block hugepage fault by PG_hwpoison bit check.
 		 */
 		if (unlikely(PageHWPoison(page))) {
-			ret = VM_FAULT_HWPOISON |
+			ret = VM_FAULT_HWPOISON_LARGE |
 				VM_FAULT_SET_HINDEX(hstate_index(h));
 			goto backout_unlocked;
 		}



  parent reply	other threads:[~2021-01-22 20:19 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-22 14:08 [PATCH 4.4 00/31] 4.4.253-rc1 review Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 01/31] ASoC: dapm: remove widget from dirty list on free Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 02/31] MIPS: Fix malformed NT_FILE and NT_SIGINFO in 32bit coredumps Greg Kroah-Hartman
2021-01-22 14:08 ` Greg Kroah-Hartman [this message]
2021-01-22 14:08 ` [PATCH 4.4 04/31] ext4: fix bug for rename with RENAME_WHITEOUT Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 05/31] ARC: build: add boot_targets to PHONY Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 06/31] ethernet: ucc_geth: fix definition and size of ucc_geth_tx_global_pram Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 07/31] arch/arc: add copy_user_page() to <asm/page.h> to fix build error on ARC Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 08/31] misdn: dsp: select CONFIG_BITREVERSE Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 09/31] net: ethernet: fs_enet: Add missing MODULE_LICENSE Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 10/31] ACPI: scan: add stub acpi_create_platform_device() for !CONFIG_ACPI Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 11/31] ARM: picoxcell: fix missing interrupt-parent properties Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 12/31] Input: uinput - avoid FF flush when destroying device Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 13/31] dump_common_audit_data(): fix racy accesses to ->d_name Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 14/31] NFS: nfs_igrab_and_active must first reference the superblock Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 15/31] ext4: fix superblock checksum failure when setting password salt Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 16/31] RDMA/usnic: Fix memleak in find_free_vf_and_create_qp_grp Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 17/31] mm, slub: consider rest of partial list if acquire_slab() fails Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 18/31] net: sunrpc: interpret the return value of kstrtou32 correctly Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 19/31] usb: ohci: Make distrust_firmware param default to false Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 20/31] compiler.h: Raise minimum version of GCC to 5.1 for arm64 Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 21/31] iio: buffer: Fix demux update Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 22/31] nfsd4: readdirplus shouldnt return parent of export Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 23/31] net: cdc_ncm: correct overhead in delayed_ndp_size Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 24/31] netxen_nic: fix MSI/MSI-x interrupts Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 25/31] rndis_host: set proper input size for OID_GEN_PHYSICAL_MEDIUM request Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 26/31] net: dcb: Validate netlink message in DCB handler Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 27/31] net: dcb: Accept RTM_GETDCB messages carrying set-like DCB commands Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 28/31] net: sit: unregister_netdevice on newlinks error path Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 29/31] rxrpc: Fix handling of an unsupported token type in rxrpc_read() Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 30/31] net: avoid 32 x truesize under-estimation for tiny skbs Greg Kroah-Hartman
2021-01-22 14:08 ` [PATCH 4.4 31/31] spi: cadence: cache reference clock rate during probe Greg Kroah-Hartman
2021-01-23  0:25 ` [PATCH 4.4 00/31] 4.4.253-rc1 review Shuah Khan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210122135732.010605999@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=akpm@linux-foundation.org \
    --cc=linmiaohe@huawei.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mike.kravetz@oracle.com \
    --cc=stable@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).