* along with Lustre; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
+#ifdef HAVE_KERNEL_CONFIG_H
#include <linux/config.h>
+#endif
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <linux/smp_lock.h>
-#include <linux/writeback.h>
#define DEBUG_SUBSYSTEM S_LLITE
-#include <linux/lustre_mds.h>
-#include <linux/lustre_lite.h>
+#include <lustre_lite.h>
#include "llite_internal.h"
#include <linux/lustre_compat25.h>
/* It is safe to not check anything in invalidatepage/releasepage below
because they are run with page locked and all our io is happening with
locked page too */
+#ifdef HAVE_INVALIDATEPAGE_RETURN_INT
static int ll_invalidatepage(struct page *page, unsigned long offset)
{
- if (offset)
- return 0;
+ if (offset)
+ return 0;
if (PagePrivate(page))
ll_removepage(page);
return 1;
}
+#else
+static void ll_invalidatepage(struct page *page, unsigned long offset)
+{
+ if (offset)
+ return;
+ if (PagePrivate(page))
+ ll_removepage(page);
+}
+#endif
-static int ll_releasepage(struct page *page, int gfp_mask)
+static int ll_releasepage(struct page *page, gfp_t gfp_mask)
{
if (PagePrivate(page))
ll_removepage(page);
return 1;
}
-static int ll_writepages(struct address_space *mapping,
- struct writeback_control *wbc)
+#define MAX_DIRECTIO_SIZE 2*1024*1024*1024UL
+
+static inline int ll_get_user_pages(int rw, unsigned long user_addr,
+ size_t size, struct page ***pages)
+{
+ int result = -ENOMEM;
+ unsigned long page_count;
+
+ /* set an arbitrary limit to prevent arithmetic overflow */
+ if (size > MAX_DIRECTIO_SIZE) {
+ *pages = NULL;
+ return -EFBIG;
+ }
+
+ page_count = (user_addr + size + CFS_PAGE_SIZE - 1) >> CFS_PAGE_SHIFT;
+ page_count -= user_addr >> CFS_PAGE_SHIFT;
+
+ OBD_ALLOC_GFP(*pages, page_count * sizeof(**pages), GFP_KERNEL);
+ if (*pages) {
+ down_read(¤t->mm->mmap_sem);
+ result = get_user_pages(current, current->mm, user_addr,
+ page_count, (rw == READ), 0, *pages,
+ NULL);
+ up_read(¤t->mm->mmap_sem);
+ }
+
+ return result;
+}
+
+/* ll_free_user_pages - tear down page struct array
+ * @pages: array of page struct pointers underlying target buffer */
+static void ll_free_user_pages(struct page **pages, int npages, int do_dirty)
+{
+ int i;
+
+ for (i = 0; i < npages; i++) {
+ if (do_dirty)
+ set_page_dirty_lock(pages[i]);
+ page_cache_release(pages[i]);
+ }
+
+ OBD_FREE(pages, npages * sizeof(*pages));
+}
+
+static ssize_t ll_direct_IO_26_seg(int rw, struct file *file,
+ struct address_space *mapping,
+ struct inode *inode,
+ struct lov_stripe_md *lsm,
+ unsigned long user_addr, size_t size,
+ loff_t file_offset, struct page **pages,
+ int page_count)
+{
+ struct brw_page *pga;
+ struct obdo oa;
+ int i, rc = 0;
+ size_t length;
+ ENTRY;
+
+ OBD_ALLOC(pga, sizeof(*pga) * page_count);
+ if (!pga)
+ RETURN(-ENOMEM);
+
+ for (i = 0, length = size; length > 0;
+ length -=pga[i].count, file_offset +=pga[i].count,i++) {/*i last!*/
+ pga[i].pg = pages[i];
+ pga[i].off = file_offset;
+ /* To the end of the page, or the length, whatever is less */
+ pga[i].count = min_t(int, CFS_PAGE_SIZE -(file_offset & ~CFS_PAGE_MASK),
+ length);
+ pga[i].flag = 0;
+ if (rw == READ)
+ POISON_PAGE(pages[i], 0x0d);
+ }
+
+ ll_inode_fill_obdo(inode, rw, &oa);
+
+ if (rw == WRITE)
+ lprocfs_counter_add(ll_i2sbi(inode)->ll_stats,
+ LPROC_LL_DIRECT_WRITE, size);
+ else
+ lprocfs_counter_add(ll_i2sbi(inode)->ll_stats,
+ LPROC_LL_DIRECT_READ, size);
+ rc = obd_brw_rqset(rw == WRITE ? OBD_BRW_WRITE : OBD_BRW_READ,
+ ll_i2obdexp(inode), &oa, lsm, page_count, pga, NULL);
+ if (rc == 0) {
+ rc = size;
+ if (rw == WRITE) {
+ lov_stripe_lock(lsm);
+ obd_adjust_kms(ll_i2obdexp(inode), lsm, file_offset, 0);
+ lov_stripe_unlock(lsm);
+ }
+ }
+
+ OBD_FREE(pga, sizeof(*pga) * page_count);
+ RETURN(rc);
+}
+
+static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb,
+ const struct iovec *iov, loff_t file_offset,
+ unsigned long nr_segs)
{
- struct ll_sb_info *sbi = ll_s2sbi(mapping->host->i_sb);
- int rc;
- struct timeval tstart, now;
- do_gettimeofday(&tstart);
- rc = generic_writepages(mapping, wbc);
- /* this synchronization (even being implemented via Writeback)
- * makes recovery much more sad, because iget() can get stuck
- * on I_LOCK the kernel helds over ->writepages() -bzzz */
- if (rc == 0 && wbc->sync_mode == WB_SYNC_ALL
- && sbi->ll_flags & LL_SBI_UMOUNT) {
- /* as we don't use Writeback bit to track pages
- * under I/O, filemap_fdatawait() doesn't work
- * for us. let's wait for I/O completion here */
- struct ll_inode_info *lli = ll_i2info(mapping->host);
- wait_event(lli->lli_dirty_wait,
- ll_is_inode_dirty(mapping->host) == 0);
- do_gettimeofday(&now);
- if (now.tv_sec - tstart.tv_sec > obd_timeout * 6) {
- CDEBUG(D_ERROR, "synching inode 0x%p "DLID4" took %ds\n",
- mapping->host, OLID4(&lli->lli_id),
- (int) (now.tv_sec - tstart.tv_sec));
- portals_debug_dumplog();
+ struct file *file = iocb->ki_filp;
+ ssize_t count = iov_length(iov, nr_segs), tot_bytes = 0;
+ struct ll_inode_info *lli = ll_i2info(file->f_mapping->host);
+ unsigned long seg;
+ ENTRY;
+
+ if (!lli->lli_smd || !lli->lli_smd->lsm_object_id)
+ RETURN(-EBADF);
+
+ /* FIXME: io smaller than CFS_PAGE_SIZE is broken on ia64 ??? */
+ if ((file_offset & (~CFS_PAGE_MASK)) || (count & ~CFS_PAGE_MASK))
+ RETURN(-EINVAL);
+
+ /* Check that all user buffers are aligned as well */
+ for (seg = 0; seg < nr_segs; seg++) {
+ unsigned long user_addr = (unsigned long)iov[seg].iov_base;
+ size_t size = iov[seg].iov_len;
+ if ((user_addr & ~CFS_PAGE_MASK) || (size & ~CFS_PAGE_MASK))
+ RETURN(-EINVAL);
+ }
+
+ seg = 0;
+ while ((seg < nr_segs) && (tot_bytes >= 0)) {
+ const struct iovec *vec = &iov[seg++];
+ unsigned long user_addr = (unsigned long)vec->iov_base;
+ size_t size = vec->iov_len;
+ struct page **pages;
+ int page_count;
+ ssize_t result;
+
+ page_count = ll_get_user_pages(rw, user_addr, size, &pages);
+ if (page_count < 0) {
+ ll_free_user_pages(pages, 0, 0);
+ if (tot_bytes > 0)
+ break;
+ return page_count;
}
+
+ result = ll_direct_IO_26_seg(rw, file, file->f_mapping,
+ file->f_mapping->host,
+ lli->lli_smd, user_addr, size,
+ file_offset, pages, page_count);
+ ll_free_user_pages(pages, page_count, rw == READ);
+
+ if (result <= 0) {
+ if (tot_bytes > 0)
+ break;
+ return result;
+ }
+
+ tot_bytes += result;
+ file_offset += result;
+ if (result < size)
+ break;
}
- return rc;
+ return tot_bytes;
}
struct address_space_operations ll_aops = {
.readpage = ll_readpage,
// .readpages = ll_readpages,
-// .direct_IO = ll_direct_IO_26,
+ .direct_IO = ll_direct_IO_26,
.writepage = ll_writepage_26,
- .writepages = ll_writepages,
+ .writepages = generic_writepages,
.set_page_dirty = __set_page_dirty_nobuffers,
.sync_page = NULL,
.prepare_write = ll_prepare_write,
.releasepage = ll_releasepage,
.bmap = NULL
};
+
+static int wait_on_page_locked_range(struct address_space *mapping,
+ pgoff_t start, pgoff_t end)
+{
+ pgoff_t index;
+ struct page *page;
+ int ret = 0;
+
+ if (end < start)
+ return 0;
+
+ for(index = start; index < end; index++) {
+ page = find_get_page(mapping, index);
+ if (page == NULL)
+ continue;
+
+ wait_on_page_locked(page);
+ if (PageError(page))
+ ret = -EIO;
+ cond_resched();
+ }
+
+ /* Check for outstanding write errors */
+ if (test_and_clear_bit(AS_ENOSPC, &mapping->flags))
+ ret = -ENOSPC;
+ if (test_and_clear_bit(AS_EIO, &mapping->flags))
+ ret = -EIO;
+
+ return ret;
+}
+
+int ll_sync_page_range(struct inode *inode, struct address_space *mapping,
+ loff_t pos, size_t count)
+{
+ pgoff_t start = pos >> CFS_PAGE_SHIFT;
+ pgoff_t end = (pos + count - 1) >> CFS_PAGE_SHIFT;
+ struct writeback_control wbc;
+ int ret;
+
+ wbc.sync_mode = WB_SYNC_ALL;
+ wbc.nr_to_write = mapping->nrpages * 2;
+ wbc.start = start;
+ wbc.end = end;
+ ret = generic_writepages(mapping, &wbc);
+
+ if (ret == 0)
+ ret = wait_on_page_locked_range(mapping, start, end);
+ return ret;
+}
+
git://git.whamcloud.com / fs / lustre-release.git / blobdiff