Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1ebdd60 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6 

* 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6: (22 commits)
  Add _addr_lsb field to ia64 siginfo
  Fix migration.c compilation on s390
  HWPOISON: Remove retry loop for try_to_unmap
  HWPOISON: Turn addr_valid from bitfield into char
  HWPOISON: Disable DEBUG by default
  HWPOISON: Convert pr_debugs to pr_info
  HWPOISON: Improve comments in memory-failure.c
  x86: HWPOISON: Report correct address granuality for huge hwpoison faults
  Encode huge page size for VM_FAULT_HWPOISON errors
  Fix build error with !CONFIG_MIGRATION
  hugepage: move is_hugepage_on_freelist inside ifdef to avoid warning
  Clean up __page_set_anon_rmap
  HWPOISON, hugetlb: fix unpoison for hugepage
  HWPOISON, hugetlb: soft offlining for hugepage
  HWPOSION, hugetlb: recover from free hugepage error when !MF_COUNT_INCREASED
  hugetlb: move refcounting in hugepage allocation inside hugetlb_lock
  HWPOISON, hugetlb: add free check to dequeue_hwpoison_huge_page()
  hugetlb: hugepage migration core
  hugetlb: redefine hugepage copy functions
  hugetlb: add allocate function for hugepage migration
  ...
parents f99d0553 46e387bb

arch/ia64/include/asm/siginfo.h

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ typedef struct siginfo { 
			int _imm;		/* immediate value for "break" */

			unsigned int _flags;	/* see below */

			unsigned long _isr;	/* isr */

			short _addr_lsb;	/* lsb of faulting address */

		} _sigfault;



		/* SIGPOLL */

arch/x86/mm/fault.c

+13 −6
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/kprobes.h>		/* __kprobes, ...		*/

#include <linux/mmiotrace.h>		/* kmmio_handler, ...		*/

#include <linux/perf_event.h>		/* perf_sw_event		*/

#include <linux/hugetlb.h>		/* hstate_index_to_shift	*/



#include <asm/traps.h>			/* dotraplinkage, ...		*/

#include <asm/pgalloc.h>		/* pgd_*(), ...			*/
@@ -160,15 +161,20 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr) 


static void

force_sig_info_fault(int si_signo, int si_code, unsigned long address,

		     struct task_struct *tsk)

		     struct task_struct *tsk, int fault)

{

	unsigned lsb = 0;

	siginfo_t info;



	info.si_signo	= si_signo;

	info.si_errno	= 0;

	info.si_code	= si_code;

	info.si_addr	= (void __user *)address;

	info.si_addr_lsb = si_code == BUS_MCEERR_AR ? PAGE_SHIFT : 0;

	if (fault & VM_FAULT_HWPOISON_LARGE)

		lsb = hstate_index_to_shift(VM_FAULT_GET_HINDEX(fault)); 

	if (fault & VM_FAULT_HWPOISON)

		lsb = PAGE_SHIFT;

	info.si_addr_lsb = lsb;



	force_sig_info(si_signo, &info, tsk);

}
@@ -722,7 +728,7 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code, 
		tsk->thread.error_code	= error_code | (address >= TASK_SIZE);

		tsk->thread.trap_no	= 14;



		force_sig_info_fault(SIGSEGV, si_code, address, tsk);

		force_sig_info_fault(SIGSEGV, si_code, address, tsk, 0);



		return;

	}
@@ -807,14 +813,14 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address, 
	tsk->thread.trap_no	= 14;



#ifdef CONFIG_MEMORY_FAILURE

	if (fault & VM_FAULT_HWPOISON) {

	if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {

		printk(KERN_ERR

	"MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",

			tsk->comm, tsk->pid, address);

		code = BUS_MCEERR_AR;

	}

#endif

	force_sig_info_fault(SIGBUS, code, address, tsk);

	force_sig_info_fault(SIGBUS, code, address, tsk, fault);

}



static noinline void
@@ -824,7 +830,8 @@ mm_fault_error(struct pt_regs *regs, unsigned long error_code, 
	if (fault & VM_FAULT_OOM) {

		out_of_memory(regs, error_code, address);

	} else {

		if (fault & (VM_FAULT_SIGBUS|VM_FAULT_HWPOISON))

		if (fault & (VM_FAULT_SIGBUS|VM_FAULT_HWPOISON|

			     VM_FAULT_HWPOISON_LARGE))

			do_sigbus(regs, error_code, address, fault);

		else

			BUG();

fs/hugetlbfs/inode.c

+15 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/statfs.h>

#include <linux/security.h>

#include <linux/magic.h>

#include <linux/migrate.h>



#include <asm/uaccess.h>
@@ -573,6 +574,19 @@ static int hugetlbfs_set_page_dirty(struct page *page) 
	return 0;

}



static int hugetlbfs_migrate_page(struct address_space *mapping,

				struct page *newpage, struct page *page)

{

	int rc;



	rc = migrate_huge_page_move_mapping(mapping, newpage, page);

	if (rc)

		return rc;

	migrate_page_copy(newpage, page);



	return 0;

}



static int hugetlbfs_statfs(struct dentry *dentry, struct kstatfs *buf)

{

	struct hugetlbfs_sb_info *sbinfo = HUGETLBFS_SB(dentry->d_sb);
@@ -659,6 +673,7 @@ static const struct address_space_operations hugetlbfs_aops = { 
	.write_begin	= hugetlbfs_write_begin,

	.write_end	= hugetlbfs_write_end,

	.set_page_dirty	= hugetlbfs_set_page_dirty,

	.migratepage    = hugetlbfs_migrate_page,

};

fs/signalfd.c

+10 −0
Original line number Diff line number Diff line
@@ -98,6 +98,16 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo, 
		err |= __put_user((long) kinfo->si_addr, &uinfo->ssi_addr);

#ifdef __ARCH_SI_TRAPNO

		err |= __put_user(kinfo->si_trapno, &uinfo->ssi_trapno);

#endif

#ifdef BUS_MCEERR_AO

		/* 

		 * Other callers might not initialize the si_lsb field,

		 * so check explicitly for the right codes here.

		 */

		if (kinfo->si_code == BUS_MCEERR_AR ||

		    kinfo->si_code == BUS_MCEERR_AO)

			err |= __put_user((short) kinfo->si_addr_lsb,

					  &uinfo->ssi_addr_lsb);

#endif

		break;

	case __SI_CHLD:

include/linux/hugetlb.h

+15 −2
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ int hugetlb_reserve_pages(struct inode *inode, long from, long to, 
						struct vm_area_struct *vma,

						int acctflags);

void hugetlb_unreserve_pages(struct inode *inode, long offset, long freed);

void __isolate_hwpoisoned_huge_page(struct page *page);

int dequeue_hwpoisoned_huge_page(struct page *page);

void copy_huge_page(struct page *dst, struct page *src);



extern unsigned long hugepages_treat_as_movable;

extern const unsigned long hugetlb_zero, hugetlb_infinity;
@@ -101,7 +102,10 @@ static inline void hugetlb_report_meminfo(struct seq_file *m) 
#define hugetlb_free_pgd_range(tlb, addr, end, floor, ceiling) ({BUG(); 0; })

#define hugetlb_fault(mm, vma, addr, flags)	({ BUG(); 0; })

#define huge_pte_offset(mm, address)	0

#define __isolate_hwpoisoned_huge_page(page)	0

#define dequeue_hwpoisoned_huge_page(page)	0

static inline void copy_huge_page(struct page *dst, struct page *src)

{

}



#define hugetlb_change_protection(vma, address, end, newprot)
@@ -228,6 +232,8 @@ struct huge_bootmem_page { 
	struct hstate *hstate;

};



struct page *alloc_huge_page_node(struct hstate *h, int nid);



/* arch callback */

int __init alloc_bootmem_huge_page(struct hstate *h);
@@ -301,8 +307,14 @@ static inline struct hstate *page_hstate(struct page *page) 
	return size_to_hstate(PAGE_SIZE << compound_order(page));

}



static inline unsigned hstate_index_to_shift(unsigned index)

{

	return hstates[index].order + PAGE_SHIFT;

}



#else

struct hstate {};

#define alloc_huge_page_node(h, nid) NULL

#define alloc_bootmem_huge_page(h) NULL

#define hstate_file(f) NULL

#define hstate_vma(v) NULL
@@ -317,6 +329,7 @@ static inline unsigned int pages_per_huge_page(struct hstate *h) 
{

	return 1;

}

#define hstate_index_to_shift(index) 0

#endif



#endif /* _LINUX_HUGETLB_H */