From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: Re: [RFC 1/3] mm, Make __get_user_pages return -EHWPOISON for HWPOISON page optionally Date: Wed, 22 Dec 2010 16:54:06 -0800 Message-ID: <20101222165406.6e3f8fb0.akpm@linux-foundation.org> References: <1292986317-2805-1-git-send-email-ying.huang@intel.com> <1292986317-2805-2-git-send-email-ying.huang@intel.com> <20101222150735.c266c149.akpm@linux-foundation.org> <1293064800.8743.128.camel@yhuang-dev> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: Avi Kivity , Marcelo Tosatti , "linux-kernel@vger.kernel.org" , "kvm@vger.kernel.org" , Andi Kleen , "Luck, Tony" , Dean Nelson To: Huang Ying Return-path: In-Reply-To: <1293064800.8743.128.camel@yhuang-dev> Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org On Thu, 23 Dec 2010 08:39:59 +0800 Huang Ying wrote: > > > --- a/mm/memory.c > > > +++ b/mm/memory.c > > > @@ -1449,9 +1449,16 @@ int __get_user_pages(struct task_struct > > > if (ret & VM_FAULT_ERROR) { > > > if (ret & VM_FAULT_OOM) > > > return i ? i : -ENOMEM; > > > - if (ret & > > > - (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE| > > > - VM_FAULT_SIGBUS)) > > > + if (ret & (VM_FAULT_HWPOISON | > > > + VM_FAULT_HWPOISON_LARGE)) { > > > + if (i) > > > + return i; > > > + else if (gup_flags & FOLL_HWPOISON) > > > + return -EHWPOISON; > > > + else > > > + return -EFAULT; > > > + } > > > + if (ret & VM_FAULT_SIGBUS) > > > > hm, that function is getting a bit unweildy. > > Yes. Do you think the following code is better? > > return i ? i : (gup_flags & FOLL_HWPOISON) ? -EHWPOISON : -EFAULT; nope ;) The function just needs to be ripped up and redone somehow. That's not an appropriate activity in the context of this patch though.