#define DEBUG_SUBSYSTEM S_LLITE
-
#include <obd.h>
#include <linux/pagevec.h>
#include <linux/memcontrol.h>
+
#include "llite_internal.h"
#include "vvp_internal.h"
#include <libcfs/linux/linux-misc.h>
ast_flags |= CEF_NONBLOCK;
if (io->ci_lock_no_expand)
ast_flags |= CEF_LOCK_NO_EXPAND;
+ if (vio->vui_fd) {
+ /* Group lock held means no lockless any more */
+ if (vio->vui_fd->fd_flags & LL_FILE_GROUP_LOCKED)
+ io->ci_ignore_lockless = 1;
+
+ if (ll_file_nolock(vio->vui_fd->fd_file) ||
+ (vio->vui_fd->fd_flags & LL_FILE_LOCKLESS_IO &&
+ !io->ci_ignore_lockless))
+ ast_flags |= CEF_NEVER;
+ }
result = vvp_mmap_locks(env, vio, io);
if (result == 0)
const struct cl_io_slice *ios)
{
struct cl_io *io = ios->cis_io;
- __u64 new_size;
+ __u64 lock_start = 0;
+ __u64 lock_end = OBD_OBJECT_EOF;
__u32 enqflags = 0;
if (cl_io_is_trunc(io)) {
- new_size = io->u.ci_setattr.sa_attr.lvb_size;
- if (new_size == 0)
+ if (io->u.ci_setattr.sa_attr.lvb_size == 0)
enqflags = CEF_DISCARD_DATA;
+ } else if (cl_io_is_fallocate(io)) {
+ lock_start = io->u.ci_setattr.sa_falloc_offset;
+ lock_end = lock_start + io->u.ci_setattr.sa_attr.lvb_size;
} else {
unsigned int valid = io->u.ci_setattr.sa_avalid;
io->u.ci_setattr.sa_attr.lvb_atime >=
io->u.ci_setattr.sa_attr.lvb_ctime))
return 0;
-
- new_size = 0;
}
return vvp_io_one_lock(env, io, enqflags, CLM_WRITE,
- new_size, OBD_OBJECT_EOF);
+ lock_start, lock_end);
}
static int vvp_do_vmtruncate(struct inode *inode, size_t size)
trunc_sem_down_write(&lli->lli_trunc_sem);
inode_lock(inode);
inode_dio_wait(inode);
+ } else if (cl_io_is_fallocate(io)) {
+ inode_lock(inode);
+ inode_dio_wait(inode);
} else {
inode_lock(inode);
}
/* Truncate in memory pages - they must be clean pages
* because osc has already notified to destroy osc_extents. */
vvp_do_vmtruncate(inode, io->u.ci_setattr.sa_attr.lvb_size);
- inode_dio_write_done(inode);
inode_unlock(inode);
trunc_sem_up_write(&lli->lli_trunc_sem);
+ } else if (cl_io_is_fallocate(io)) {
+ inode_unlock(inode);
} else {
inode_unlock(inode);
}
static int vvp_io_read_start(const struct lu_env *env,
const struct cl_io_slice *ios)
{
- struct vvp_io *vio = cl2vvp_io(env, ios);
- struct cl_io *io = ios->cis_io;
- struct cl_object *obj = io->ci_obj;
- struct inode *inode = vvp_object_inode(obj);
- struct ll_inode_info *lli = ll_i2info(inode);
- struct file *file = vio->vui_fd->fd_file;
- loff_t pos = io->u.ci_rd.rd.crw_pos;
- long cnt = io->u.ci_rd.rd.crw_count;
- long tot = vio->vui_tot_count;
- int exceed = 0;
- int result;
+ struct vvp_io *vio = cl2vvp_io(env, ios);
+ struct cl_io *io = ios->cis_io;
+ struct cl_object *obj = io->ci_obj;
+ struct inode *inode = vvp_object_inode(obj);
+ struct ll_inode_info *lli = ll_i2info(inode);
+ struct file *file = vio->vui_fd->fd_file;
+ loff_t pos = io->u.ci_rd.rd.crw_pos;
+ size_t cnt = io->u.ci_rd.rd.crw_count;
+ size_t tot = vio->vui_tot_count;
+ int exceed = 0;
+ int result;
ENTRY;
CLOBINVRNT(env, obj, vvp_object_invariant(obj));
/* initialize read-ahead window once per syscall */
if (!vio->vui_ra_valid) {
vio->vui_ra_valid = true;
- vio->vui_ra_start = cl_index(obj, pos);
- vio->vui_ra_count = cl_index(obj, tot + PAGE_SIZE - 1);
+ vio->vui_ra_start_idx = cl_index(obj, pos);
+ vio->vui_ra_pages = cl_index(obj, tot + PAGE_SIZE - 1);
/* If both start and end are unaligned, we read one more page
* than the index math suggests. */
- if (pos % PAGE_SIZE != 0 && (pos + tot) % PAGE_SIZE != 0)
- vio->vui_ra_count++;
+ if ((pos & ~PAGE_MASK) != 0 && ((pos + tot) & ~PAGE_MASK) != 0)
+ vio->vui_ra_pages++;
- CDEBUG(D_READA, "tot %ld, ra_start %lu, ra_count %lu\n", tot,
- vio->vui_ra_start, vio->vui_ra_count);
+ CDEBUG(D_READA, "tot %zu, ra_start %lu, ra_count %lu\n",
+ tot, vio->vui_ra_start_idx, vio->vui_ra_pages);
}
/* BUG: 5972 */
/*
* Kernels 4.2 - 4.5 pass memcg argument to account_page_dirtied()
- * Kernel v5.2-5678-gac1c3e4 no longer exports account_page_dirtied
+ * Kernel v5.2-5678-gac1c3e4 no longer exports account_page_dirtied
*/
static inline void ll_account_page_dirtied(struct page *page,
struct address_space *mapping)
account_page_dirtied(page, mapping, memcg);
mem_cgroup_end_page_stat(memcg);
-#elif defined HAVE_ACCOUNT_PAGE_DIRTIED
- account_page_dirtied(page, mapping, memcg);
+#elif defined(HAVE_ACCOUNT_PAGE_DIRTIED_EXPORT)
+ account_page_dirtied(page, mapping);
#else
- typedef unsigned int (dirtied_t)(struct page *pg,
- struct address_space *as);
- const char *symbol = "account_page_dirtied";
- static dirtied_t *dirtied = NULL;
-
- if (!dirtied)
- dirtied = (dirtied_t *)symbol_get(symbol);
-
- if (dirtied)
- dirtied(page, mapping);
+ vvp_account_page_dirtied(page, mapping);
#endif
}
static inline void ll_page_tag_dirty(struct page *page,
struct address_space *mapping)
{
-#ifdef HAVE___XA_SET_MARK
+#ifndef HAVE_RADIX_TREE_TAG_SET
__xa_set_mark(&mapping->i_pages, page_index(page), PAGECACHE_TAG_DIRTY);
#else
radix_tree_tag_set(&mapping->page_tree, page_index(page),
ClearPageReclaim(pvec->pages[i]);
LASSERTF(page->mapping,
- "mapping must be set. page %p, page->private (cl_page) %p",
+ "mapping must be set. page %p, page->private (cl_page) %p\n",
page, (void *) page->private);
/* Rest of code derived from __set_page_dirty_nobuffers */
- xa_lock_irqsave(&mapping->i_pages, flags);
+ ll_xa_lock_irqsave(&mapping->i_pages, flags);
/* Notes on differences with __set_page_dirty_nobuffers:
* 1. We don't need to call page_mapping because we know this is a page
dirtied++;
unlock_page_memcg(page);
}
- xa_unlock_irqrestore(&mapping->i_pages, flags);
+ ll_xa_unlock_irqrestore(&mapping->i_pages, flags);
CDEBUG(D_VFSTRACE, "mapping %p, count %d, dirtied %d\n", mapping,
count, dirtied);
size_t cnt = io->u.ci_wr.wr.crw_count;
bool lock_inode = !IS_NOSEC(inode);
size_t nob = io->ci_nob;
+ struct iov_iter iter;
size_t written = 0;
ENTRY;
* trucates, etc. is handled in the higher layers of lustre.
*/
lock_inode = !IS_NOSEC(inode);
+ iter = *vio->vui_iter;
if (unlikely(lock_inode))
inode_lock(inode);
inode_unlock(inode);
written = result;
- if (result > 0 || result == -EIOCBQUEUED)
+ if (result > 0)
#ifdef HAVE_GENERIC_WRITE_SYNC_2ARGS
result = generic_write_sync(vio->vui_iocb, result);
#else
if (result > 0) {
result = vvp_io_write_commit(env, io);
+ /* Simulate short commit */
+ if (CFS_FAULT_CHECK(OBD_FAIL_LLITE_SHORT_COMMIT)) {
+ vio->u.write.vui_written >>= 1;
+ if (vio->u.write.vui_written > 0)
+ io->ci_need_restart = 1;
+ }
if (vio->u.write.vui_written > 0) {
result = vio->u.write.vui_written;
CDEBUG(D_VFSTRACE, "%s: write nob %zd, result: %zd\n",
file_dentry(file)->d_name.name,
io->ci_nob, result);
io->ci_nob += result;
+ } else {
+ io->ci_continue = 0;
}
}
if (vio->vui_iocb->ki_pos != (pos + io->ci_nob - nob)) {
file_dentry(file)->d_name.name,
vio->vui_iocb->ki_pos, pos + io->ci_nob - nob,
written, io->ci_nob - nob, result);
- /* rewind ki_pos to where it has successfully committed */
+ /*
+ * Rewind ki_pos and vui_iter to where it has
+ * successfully committed.
+ */
vio->vui_iocb->ki_pos = pos + io->ci_nob - nob;
+ iov_iter_advance(&iter, io->ci_nob - nob);
+ vio->vui_iter->iov = iter.iov;
+ vio->vui_iter->nr_segs = iter.nr_segs;
+ vio->vui_iter->iov_offset = iter.iov_offset;
+ vio->vui_iter->count = iter.count;
}
- if (result > 0) {
+ if (result > 0 || result == -EIOCBQUEUED) {
ll_file_set_flag(ll_i2info(inode), LLIF_DATA_MODIFIED);
if (result < cnt)
io->ci_continue = 0;
- result = 0;
+ if (result > 0)
+ result = 0;
}
RETURN(result);
if (fio->ft_mkwrite) {
wait_on_page_writeback(vmpage);
if (!PageDirty(vmpage)) {
- struct cl_page_list *plist = &io->ci_queue.c2_qin;
+ struct cl_page_list *plist = &vio->u.fault.ft_queue;
struct vvp_page *vpg = cl_object_page_slice(obj, page);
int to = PAGE_SIZE;
/* size fixup */
if (last_index == vvp_index(vpg))
- to = size & ~PAGE_MASK;
+ to = ((size - 1) & ~PAGE_MASK) + 1;
/* Do not set Dirty bit here so that in case IO is
* started before the page is really made dirty, we
* still have chance to detect it. */
result = cl_io_commit_async(env, io, plist, 0, to,
mkwrite_commit_callback);
+ /* Have overquota flag, trying sync write to check
+ * whether indeed out of quota */
+ if (result == -EDQUOT) {
+ cl_page_get(page);
+ result = vvp_io_commit_sync(env, io,
+ plist, 0, to);
+ if (result >= 0) {
+ io->ci_noquota = 1;
+ cl_page_own(env, io, page);
+ cl_page_list_add(plist, page);
+ lu_ref_add(&page->cp_reference,
+ "cl_io", io);
+ result = cl_io_commit_async(env, io,
+ plist, 0, to,
+ mkwrite_commit_callback);
+ io->ci_noquota = 0;
+ } else {
+ cl_page_put(env, page);
+ }
+ }
+
LASSERT(cl_page_is_owned(page, io));
cl_page_list_fini(env, plist);
if (result == -EDQUOT)
result = -ENOSPC;
GOTO(out, result);
- } else
+ } else {
cl_page_disown(env, io, page);
+ }
}
}
struct vvp_io *vio = cl2vvp_io(env, ios);
if (unlikely(vio->vui_fd->fd_flags & LL_FILE_GROUP_LOCKED)) {
- ra->cra_end = CL_PAGE_EOF;
+ ra->cra_end_idx = CL_PAGE_EOF;
result = +1; /* no need to call down */
}
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff