From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [PATCH 2/2] drm/i915: Disable page-faults around
	the fast pwrite/pread paths
Date: Sat, 09 Jul 2011 18:40:36 +0100
Message-ID: <e39f63$oo7me@fmsmga002.fm.intel.com>
References: <1310200731-18086-1-git-send-email-chris@chris-wilson.co.uk>
	<1310200731-18086-2-git-send-email-chris@chris-wilson.co.uk>
	<8762nb1poq.fsf@eliezer.anholt.net>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mga01.intel.com (mga01.intel.com [192.55.52.88])
	by gabe.freedesktop.org (Postfix) with ESMTP id 68BB49F0DA
	for <intel-gfx@lists.freedesktop.org>;
	Sat,  9 Jul 2011 10:40:39 -0700 (PDT)
In-Reply-To: <8762nb1poq.fsf@eliezer.anholt.net>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: Eric Anholt <eric@anholt.net>, intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Sat, 09 Jul 2011 07:41:57 -0700, Eric Anholt <eric@anholt.net> wrote:
> On Sat,  9 Jul 2011 09:38:51 +0100, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> > --- a/drivers/gpu/drm/i915/i915_gem.c
> > +++ b/drivers/gpu/drm/i915/i915_gem.c
> 
> > -		vaddr = kmap_atomic(page, KM_USER0);
> > +		vaddr = kmap_atomic(page);
> > +		/* We have to disable faulting here in case the user address
> > +		 * is really a GTT mapping and so we can not enter
> > +		 * i915_gem_fault() whilst already holding struct_mutex.
> > +		 */
> > +		pagefault_disable();
> >  		ret = __copy_from_user_inatomic(vaddr + page_offset,
> >  						user_data,
> >  						page_length);
> > -		kunmap_atomic(vaddr, KM_USER0);
> > +		pagefault_enable();
> > +		kunmap_atomic(vaddr);
> 
> does this even compile?  Looks like you dropped an arg.

That parameter was removed several months ago and although a pass was made
through the kernel to update all callsites, this one inexplicably remained.

commit t 3e4d3af501cccdc8a8cca41bdbe57d54ad7e7e73
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date:   Tue Oct 26 14:21:51 2010 -0700

    mm: stack based kmap_atomic()

-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre