From: Christoph Hellwig <hch@infradead.org>
To: Rusty Russell <rusty@rustcorp.com.au>
Cc: Ingo Molnar <mingo@elte.hu>, Zachary Amsden <zach@vmware.com>,
Jeremy Fitzhardinge <jeremy@xensource.com>,
Chris Wright <chrisw@sous-sol.org>, Andrew Morton <akpm@osdl.org>,
linux-kernel@vger.kernel.org,
Arjan van de Ven <arjan@infradead.org>,
Adrian Bunk <bunk@stusta.de>,
airlied@linux.ie
Subject: Re: [patch] paravirt: isolate module ops
Date: Sat, 6 Jan 2007 19:31:52 +0000 [thread overview]
Message-ID: <20070106193152.GA26153@infradead.org> (raw)
In-Reply-To: <1168100325.20372.37.camel@localhost.localdomain>
On Sun, Jan 07, 2007 at 03:18:45AM +1100, Rusty Russell wrote:
> PS. drm_memory.h has a "drm_follow_page": this forces us to uninline
> various page tables ops. Can this use follow_page() somehow, or do we
> need an "__follow_page" export for this case?
Not if avoidable. And it seems avoidable as drm really should be using
vmalloc_to_page. Untested patch below:
Index: linux-2.6/drivers/char/drm/drm_memory.c
===================================================================
--- linux-2.6.orig/drivers/char/drm/drm_memory.c 2007-01-06 20:21:07.000000000 +0100
+++ linux-2.6/drivers/char/drm/drm_memory.c 2007-01-06 20:29:03.000000000 +0100
@@ -211,6 +211,23 @@
}
#endif /* 0 */
+static int is_agp_mapping(void *pt, unsigned long size, drm_device_t *dev)
+{
+ unsigned long addr = (unsigned long)pt;
+
+ if (addr >= VMALLOC_START && addr < VMALLOC_END) {
+ unsigned long phys;
+ drm_map_t *map;
+
+ phys = page_to_phys(vmalloc_to_page(pt)) + offset_in_page(pt);
+ map = drm_lookup_map(phys, size, dev);
+ if (map && map->type == _DRM_AGP)
+ return 1;
+ }
+
+ return 0;
+}
+
void drm_ioremapfree(void *pt, unsigned long size,
drm_device_t * dev)
{
@@ -219,21 +236,11 @@
* routines for handling mappings in the AGP space. Hopefully this can be done in
* a future revision of the interface...
*/
- if (drm_core_has_AGP(dev) && dev->agp && dev->agp->cant_use_aperture
- && ((unsigned long)pt >= VMALLOC_START
- && (unsigned long)pt < VMALLOC_END)) {
- unsigned long offset;
- drm_map_t *map;
-
- offset = drm_follow_page(pt) | ((unsigned long)pt & ~PAGE_MASK);
- map = drm_lookup_map(offset, size, dev);
- if (map && map->type == _DRM_AGP) {
- vunmap(pt);
- return;
- }
- }
-
- iounmap(pt);
+ if (drm_core_has_AGP(dev) && dev->agp && dev->agp->cant_use_aperture &&
+ is_agp_mapping(pt, size, dev))
+ vunmap(pt);
+ else
+ iounmap(pt);
}
EXPORT_SYMBOL(drm_ioremapfree);
Index: linux-2.6/drivers/char/drm/drm_memory.h
===================================================================
--- linux-2.6.orig/drivers/char/drm/drm_memory.h 2007-01-06 20:21:07.000000000 +0100
+++ linux-2.6/drivers/char/drm/drm_memory.h 2007-01-06 20:26:50.000000000 +0100
@@ -55,23 +55,6 @@
# define PAGE_AGP PAGE_KERNEL
# endif
#endif
-
-static inline unsigned long drm_follow_page(void *vaddr)
-{
- pgd_t *pgd = pgd_offset_k((unsigned long)vaddr);
- pud_t *pud = pud_offset(pgd, (unsigned long)vaddr);
- pmd_t *pmd = pmd_offset(pud, (unsigned long)vaddr);
- pte_t *ptep = pte_offset_kernel(pmd, (unsigned long)vaddr);
- return pte_pfn(*ptep) << PAGE_SHIFT;
-}
-
-#else /* __OS_HAS_AGP */
-
-static inline unsigned long drm_follow_page(void *vaddr)
-{
- return 0;
-}
-
#endif
void *drm_ioremap(unsigned long offset, unsigned long size,
next prev parent reply other threads:[~2007-01-06 19:32 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-06 0:07 [patch] paravirt: isolate module ops Ingo Molnar
2007-01-06 0:31 ` Zachary Amsden
2007-01-06 6:25 ` Rusty Russell
2007-01-06 7:08 ` Ingo Molnar
2007-01-06 7:12 ` Ingo Molnar
2007-01-06 17:42 ` Rusty Russell
2007-01-06 18:32 ` Ingo Molnar
2007-01-06 20:55 ` Zachary Amsden
2007-01-07 1:09 ` Rusty Russell
2007-01-07 14:07 ` Zachary Amsden
2007-01-06 7:14 ` Ingo Molnar
2007-01-06 9:50 ` Zachary Amsden
2007-01-06 10:52 ` Arjan van de Ven
2007-01-06 16:18 ` Rusty Russell
2007-01-06 19:31 ` Christoph Hellwig [this message]
2007-01-07 5:35 ` Rusty Russell
2007-01-07 18:39 ` Christoph Hellwig
2007-01-07 18:43 ` Ingo Molnar
2007-01-08 0:54 ` Dave Airlie
2007-01-06 1:02 ` Zachary Amsden
2007-01-06 2:07 ` Arjan van de Ven
2007-01-06 4:41 ` Zachary Amsden
2007-01-06 5:34 ` Rusty Russell
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=20070106193152.GA26153@infradead.org \
--to=hch@infradead.org \
--cc=airlied@linux.ie \
--cc=akpm@osdl.org \
--cc=arjan@infradead.org \
--cc=bunk@stusta.de \
--cc=chrisw@sous-sol.org \
--cc=jeremy@xensource.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rusty@rustcorp.com.au \
--cc=zach@vmware.com \
/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).