From: npiggin@suse.de
To: akpm@linux-foundation.org
Cc: rolandd@cisco.com, mshefty@ichips.intel.com,
hal.rosenstock@gmail.com, general@lists.openfabrics.org,
linux-kernel@vger.kernel.org
Subject: [patch 11/18] ib: nopage
Date: Wed, 05 Dec 2007 18:15:58 +1100 [thread overview]
Message-ID: <20071205071627.900265000@nick.local0.net> (raw)
In-Reply-To: 20071205071547.701344000@nick.local0.net
[-- Attachment #1: ib-nopage.patch --]
[-- Type: text/plain, Size: 2915 bytes --]
Convert IB from nopage to fault.
Signed-off-by: Nick Piggin <npiggin@suse.de>
Cc: rolandd@cisco.com
Cc: mshefty@ichips.intel.com
Cc: hal.rosenstock@gmail.com
Cc: general@lists.openfabrics.org
Cc: linux-kernel@vger.kernel.org
---
drivers/infiniband/hw/ipath/ipath_debug.h | 4 +--
drivers/infiniband/hw/ipath/ipath_file_ops.c | 29 +++++++++------------------
2 files changed, 12 insertions(+), 21 deletions(-)
Index: linux-2.6/drivers/infiniband/hw/ipath/ipath_file_ops.c
===================================================================
--- linux-2.6.orig/drivers/infiniband/hw/ipath/ipath_file_ops.c
+++ linux-2.6/drivers/infiniband/hw/ipath/ipath_file_ops.c
@@ -1120,33 +1120,24 @@ bail:
}
/*
- * ipath_file_vma_nopage - handle a VMA page fault.
+ * ipath_file_vma_fault - handle a VMA page fault.
*/
-static struct page *ipath_file_vma_nopage(struct vm_area_struct *vma,
- unsigned long address, int *type)
+static int ipath_file_vma_fault(struct vm_area_struct *vma,
+ struct vm_fault *vmf)
{
- unsigned long offset = address - vma->vm_start;
- struct page *page = NOPAGE_SIGBUS;
- void *pageptr;
+ struct page *page;
- /*
- * Convert the vmalloc address into a struct page.
- */
- pageptr = (void *)(offset + (vma->vm_pgoff << PAGE_SHIFT));
- page = vmalloc_to_page(pageptr);
+ page = vmalloc_to_page((void *)(vmf->pgoff << PAGE_SHIFT));
if (!page)
- goto out;
-
- /* Increment the reference count. */
+ return VM_FAULT_SIGBUS;
get_page(page);
- if (type)
- *type = VM_FAULT_MINOR;
-out:
- return page;
+ vmf->page = page;
+
+ return 0;
}
static struct vm_operations_struct ipath_file_vm_ops = {
- .nopage = ipath_file_vma_nopage,
+ .fault = ipath_file_vma_fault,
};
static int mmap_kvaddr(struct vm_area_struct *vma, u64 pgaddr,
Index: linux-2.6/drivers/infiniband/hw/ipath/ipath_debug.h
===================================================================
--- linux-2.6.orig/drivers/infiniband/hw/ipath/ipath_debug.h
+++ linux-2.6/drivers/infiniband/hw/ipath/ipath_debug.h
@@ -55,7 +55,7 @@
#define __IPATH_PKTDBG 0x80 /* print packet data */
/* print process startup (init)/exit messages */
#define __IPATH_PROCDBG 0x100
-/* print mmap/nopage stuff, not using VDBG any more */
+/* print mmap/fault stuff, not using VDBG any more */
#define __IPATH_MMDBG 0x200
#define __IPATH_ERRPKTDBG 0x400
#define __IPATH_USER_SEND 0x1000 /* use user mode send */
@@ -81,7 +81,7 @@
#define __IPATH_VERBDBG 0x0 /* very verbose debug */
#define __IPATH_PKTDBG 0x0 /* print packet data */
#define __IPATH_PROCDBG 0x0 /* process startup (init)/exit messages */
-/* print mmap/nopage stuff, not using VDBG any more */
+/* print mmap/fault stuff, not using VDBG any more */
#define __IPATH_MMDBG 0x0
#define __IPATH_EPKTDBG 0x0 /* print ethernet packet data */
#define __IPATH_IPATHDBG 0x0 /* Ethernet (IPATH) table dump on */
--
next prev parent reply other threads:[~2007-12-05 8:00 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-05 7:15 [patch 00/18] remove nopage npiggin
2007-12-05 7:15 ` [patch 01/18] ia64: ia32 nopage npiggin
2007-12-05 7:15 ` [patch 02/18] relay: nopage npiggin
2007-12-05 7:15 ` [patch 03/18] drm: nopage npiggin
2007-12-05 9:05 ` Dave Airlie
2007-12-05 9:17 ` Nick Piggin
2007-12-05 7:15 ` [patch 04/18] uio: nopage npiggin
2007-12-05 10:04 ` Hans-Jürgen Koch
2007-12-05 10:10 ` Nick Piggin
2007-12-05 10:25 ` Hans-Jürgen Koch
2007-12-05 10:37 ` Nick Piggin
2007-12-05 7:15 ` [patch 05/18] kvm: nopage npiggin
2007-12-05 10:40 ` Avi Kivity
2007-12-05 7:15 ` [patch 06/18] ieee1394: nopage npiggin
2007-12-05 13:09 ` Stefan Richter
2007-12-05 13:15 ` Stefan Richter
2007-12-05 23:52 ` Nick Piggin
2007-12-05 23:51 ` Nick Piggin
2007-12-15 13:04 ` Stefan Richter
2007-12-15 13:01 ` Stefan Richter
2007-12-05 7:15 ` [patch 07/18] v4l: nopage npiggin
2007-12-08 0:31 ` Andrew Morton
2007-12-08 9:15 ` Ingo Molnar
2007-12-08 10:15 ` Andrew Morton
2007-12-09 17:10 ` Randy Dunlap
2007-12-10 5:06 ` [patch] x64/page.h: convert some macros to inlines Randy Dunlap
2007-12-10 8:34 ` Ingo Molnar
2007-12-05 7:15 ` [patch 08/18] fb: defio nopage npiggin
2007-12-05 7:15 ` [patch 09/18] agp: alpha nopage npiggin
2007-12-05 7:15 ` [patch 10/18] sg: nopage npiggin
2008-02-08 3:45 ` Douglas Gilbert
2007-12-05 7:15 ` npiggin [this message]
2007-12-05 7:15 ` [patch 12/18] usb: mon nopage npiggin
2007-12-05 16:39 ` Pete Zaitcev
2007-12-05 23:54 ` Nick Piggin
2007-12-05 7:16 ` [patch 13/18] alsa: nopage npiggin
2007-12-13 15:35 ` Takashi Iwai
2007-12-05 7:16 ` [patch 14/18] oss: via nopage npiggin
2007-12-05 7:16 ` [patch 15/18] alsa: usx2y nopage npiggin
2007-12-13 15:35 ` Takashi Iwai
2007-12-05 7:16 ` [patch 16/18] mm: special mapping nopage npiggin
2007-12-05 7:16 ` [patch 17/18] mm: remove nopage npiggin
2007-12-05 22:47 ` Andrew Morton
2007-12-05 23:23 ` Nick Piggin
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=20071205071627.900265000@nick.local0.net \
--to=npiggin@suse.de \
--cc=akpm@linux-foundation.org \
--cc=general@lists.openfabrics.org \
--cc=hal.rosenstock@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mshefty@ichips.intel.com \
--cc=rolandd@cisco.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).