linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Hugh Dickins <hughd@google.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Chris Wilson <chris@chris-wilson.co.uk>,
	Keith Packard <keithp@keithp.com>,
	Dave Airlie <airlied@redhat.com>,
	linux-kernel@vger.kernel.org, linux-mm@kvack.org
Subject: [PATCH 7/14] drm/i915: adjust to new truncate_range
Date: Mon, 30 May 2011 17:45:10 -0700 (PDT)	[thread overview]
Message-ID: <alpine.LSU.2.00.1105301743500.5482@sister.anvils> (raw)
In-Reply-To: <alpine.LSU.2.00.1105301726180.5482@sister.anvils>

The interface to ->truncate_range is changing very slightly:
once "tmpfs: take control of its truncate_range" has been applied,
this can be applied.  For now it's only a slight inefficiency while
this remains unapplied, but soon it will become essential.

Signed-off-by: Hugh Dickins <hughd@google.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Keith Packard <keithp@keithp.com>
Cc: Dave Airlie <airlied@redhat.com>
---
 drivers/gpu/drm/i915/i915_gem.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- linux.orig/drivers/gpu/drm/i915/i915_gem.c	2011-05-30 14:26:13.121737248 -0700
+++ linux/drivers/gpu/drm/i915/i915_gem.c	2011-05-30 14:26:20.861775625 -0700
@@ -1693,13 +1693,13 @@ i915_gem_object_truncate(struct drm_i915
 	/* Our goal here is to return as much of the memory as
 	 * is possible back to the system as we are called from OOM.
 	 * To do this we must instruct the shmfs to drop all of its
-	 * backing pages, *now*. Here we mirror the actions taken
-	 * when by shmem_delete_inode() to release the backing store.
+	 * backing pages, *now*.
 	 */
 	inode = obj->base.filp->f_path.dentry->d_inode;
-	truncate_inode_pages(inode->i_mapping, 0);
 	if (inode->i_op->truncate_range)
 		inode->i_op->truncate_range(inode, 0, (loff_t)-1);
+	else
+		truncate_inode_pages(inode->i_mapping, 0);
 
 	obj->madv = __I915_MADV_PURGED;
 }

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

  parent reply	other threads:[~2011-05-31  0:45 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-31  0:33 [PATCH 0/14] mm: tmpfs and trunc changes, affecting drm Hugh Dickins
2011-05-31  0:35 ` [PATCH 1/14] mm: invalidate_mapping_pages flush cleancache Hugh Dickins
2011-05-31 15:49   ` Dan Magenheimer
2011-05-31 17:05     ` Hugh Dickins
2011-05-31 21:08       ` Chris Mason
2011-05-31 22:01         ` Hugh Dickins
2011-05-31  0:36 ` [PATCH 2/14] mm: move vmtruncate_range to truncate.c Hugh Dickins
2011-06-01  0:36   ` Christoph Hellwig
2011-05-31  0:39 ` [PATCH 3/14] tmpfs: take control of its truncate_range Hugh Dickins
2011-06-01  0:39   ` Christoph Hellwig
2011-06-01 16:58     ` Hugh Dickins
2011-06-03  5:16       ` Christoph Hellwig
2011-06-06  5:37         ` Hugh Dickins
2011-05-31  0:40 ` [PATCH 4/14] tmpfs: add shmem_read_mapping_page_gfp Hugh Dickins
2011-06-01  0:42   ` Christoph Hellwig
2011-06-01 17:02     ` Hugh Dickins
2011-05-31  0:42 ` [PATCH 5/14] drm/ttm: use shmem_read_mapping_page Hugh Dickins
2011-05-31  0:43 ` [PATCH 6/14] drm/i915: " Hugh Dickins
2011-05-31  0:45 ` Hugh Dickins [this message]
2011-06-01  0:43   ` [PATCH 7/14] drm/i915: adjust to new truncate_range Christoph Hellwig
2011-06-01 17:04     ` Hugh Dickins
2011-05-31  0:46 ` [PATCH 8/14] drm/i915: more struct_mutex locking Hugh Dickins
2011-05-31  0:48 ` [PATCH 9/14] mm: cleanup descriptions of filler arg Hugh Dickins
2011-05-31  0:49 ` [PATCH 10/14] mm: truncate functions are in truncate.c Hugh Dickins
2011-05-31  0:51 ` [PATCH 11/14] mm: tidy vmtruncate_range and related functions Hugh Dickins
2011-05-31  0:52 ` [PATCH 12/14] mm: consistent truncate and invalidate loops Hugh Dickins
2011-05-31  0:54 ` [PATCH 13/14] mm: pincer in truncate_inode_pages_range Hugh Dickins
2011-05-31  0:55 ` [PATCH 14/14] tmpfs: no need to use i_lock Hugh Dickins
2011-05-31 16:08   ` Tim Chen

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=alpine.LSU.2.00.1105301743500.5482@sister.anvils \
    --to=hughd@google.com \
    --cc=airlied@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=chris@chris-wilson.co.uk \
    --cc=keithp@keithp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.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