#include <time.h>
#include <sys/types.h>
#include <sys/queue.h>
+#include <fcntl.h>
#include <sysio.h>
#include <fs.h>
#include "llite_lib.h"
+static int llu_lock_to_stripe_offset(struct inode *inode, struct ldlm_lock *lock)
+{
+ struct llu_inode_info *lli = llu_i2info(inode);
+ struct lov_stripe_md *lsm = lli->lli_smd;
+ struct obd_export *exp = llu_i2obdexp(inode);
+ struct {
+ char name[16];
+ struct ldlm_lock *lock;
+ struct lov_stripe_md *lsm;
+ } key = { .name = "lock_to_stripe", .lock = lock, .lsm = lsm };
+ __u32 stripe, vallen = sizeof(stripe);
+ int rc;
+ ENTRY;
+
+ if (lsm->lsm_stripe_count == 1)
+ RETURN(0);
+
+ /* get our offset in the lov */
+ rc = obd_get_info(exp, sizeof(key), &key, &vallen, &stripe);
+ if (rc != 0) {
+ CERROR("obd_get_info: rc = %d\n", rc);
+ LBUG();
+ }
+ LASSERT(stripe < lsm->lsm_stripe_count);
+ RETURN(stripe);
+}
+
static int llu_extent_lock_callback(struct ldlm_lock *lock,
struct ldlm_lock_desc *new, void *data,
int flag)
CERROR("ldlm_cli_cancel failed: %d\n", rc);
break;
case LDLM_CB_CANCELING: {
- struct inode *inode = llu_inode_from_lock(lock);
+ struct inode *inode;
struct llu_inode_info *lli;
+ struct lov_stripe_md *lsm;
+ __u32 stripe;
+ __u64 kms;
+ /* This lock wasn't granted, don't try to evict pages */
+ if (lock->l_req_mode != lock->l_granted_mode)
+ RETURN(0);
+
+ inode = llu_inode_from_lock(lock);
if (!inode)
RETURN(0);
lli= llu_i2info(inode);
- if (!lli) {
- I_RELE(inode);
- RETURN(0);
- }
- if (!lli->lli_smd) {
- I_RELE(inode);
- RETURN(0);
- }
-
-/*
- ll_pgcache_remove_extent(inode, lli->lli_smd, lock);
- iput(inode);
-*/
+ if (!lli)
+ goto iput;
+ if (!lli->lli_smd)
+ goto iput;
+ lsm = lli->lli_smd;
+
+ stripe = llu_lock_to_stripe_offset(inode, lock);
+ kms = ldlm_extent_shift_kms(lock,
+ lsm->lsm_oinfo[stripe].loi_kms);
+ if (lsm->lsm_oinfo[stripe].loi_kms != kms)
+ LDLM_DEBUG(lock, "updating kms from "LPU64" to "LPU64,
+ lsm->lsm_oinfo[stripe].loi_kms, kms);
+ lsm->lsm_oinfo[stripe].loi_kms = kms;
+iput:
I_RELE(inode);
break;
}
RETURN(0);
}
+static int llu_glimpse_callback(struct ldlm_lock *lock, void *reqp)
+{
+ struct ptlrpc_request *req = reqp;
+ struct inode *inode = llu_inode_from_lock(lock);
+ struct llu_inode_info *lli;
+ struct ost_lvb *lvb;
+ int rc, size = sizeof(*lvb), stripe = 0;
+ ENTRY;
+
+ if (inode == NULL)
+ GOTO(out, rc = -ELDLM_NO_LOCK_DATA);
+ lli = llu_i2info(inode);
+ if (lli == NULL)
+ GOTO(iput, rc = -ELDLM_NO_LOCK_DATA);
+ if (lli->lli_smd == NULL)
+ GOTO(iput, rc = -ELDLM_NO_LOCK_DATA);
+
+ /* First, find out which stripe index this lock corresponds to. */
+ if (lli->lli_smd->lsm_stripe_count > 1)
+ stripe = llu_lock_to_stripe_offset(inode, lock);
+
+ rc = lustre_pack_reply(req, 1, &size, NULL);
+ if (rc) {
+ CERROR("lustre_pack_reply: %d\n", rc);
+ GOTO(iput, rc);
+ }
+
+ lvb = lustre_msg_buf(req->rq_repmsg, 0, sizeof(*lvb));
+ lvb->lvb_size = lli->lli_smd->lsm_oinfo[stripe].loi_kms;
+
+ LDLM_DEBUG(lock, "i_size: %llu -> stripe number %u -> kms "LPU64,
+ lli->lli_st_size, stripe, lvb->lvb_size);
+ iput:
+ I_RELE(inode);
+ out:
+ /* These errors are normal races, so we don't want to fill the console
+ * with messages by calling ptlrpc_error() */
+ if (rc == -ELDLM_NO_LOCK_DATA)
+ lustre_pack_reply(req, 0, NULL, NULL);
+
+ req->rq_status = rc;
+ return rc;
+}
+
+__u64 lov_merge_size(struct lov_stripe_md *lsm, int kms);
+__u64 lov_merge_mtime(struct lov_stripe_md *lsm, __u64 current_time);
+
+/* NB: lov_merge_size will prefer locally cached writes if they extend the
+ * file (because it prefers KMS over RSS when larger) */
+int llu_glimpse_size(struct inode *inode, struct ost_lvb *lvb)
+{
+ struct llu_inode_info *lli = llu_i2info(inode);
+ struct llu_sb_info *sbi = llu_i2sbi(inode);
+ ldlm_policy_data_t policy = { .l_extent = { 0, OBD_OBJECT_EOF } };
+ struct lustre_handle lockh;
+ int rc, flags = LDLM_FL_HAS_INTENT;
+ ENTRY;
+
+ CDEBUG(D_DLMTRACE, "Glimpsing inode %lu\n", lli->lli_st_ino);
+
+ rc = obd_enqueue(sbi->ll_osc_exp, lli->lli_smd, LDLM_EXTENT, &policy,
+ LCK_PR, &flags, llu_extent_lock_callback,
+ ldlm_completion_ast, llu_glimpse_callback, inode,
+ sizeof(*lvb), lustre_swab_ost_lvb, &lockh);
+ if (rc > 0)
+ RETURN(-EIO);
+
+ lvb->lvb_size = lov_merge_size(lli->lli_smd, 0);
+ //inode->i_mtime = lov_merge_mtime(lli->lli_smd, inode->i_mtime);
+
+ CDEBUG(D_DLMTRACE, "glimpse: size: "LPU64"\n", lvb->lvb_size);
+
+ obd_cancel(sbi->ll_osc_exp, lli->lli_smd, LCK_PR, &lockh);
+
+ RETURN(rc);
+}
+
+int llu_extent_lock(struct ll_file_data *fd, struct inode *inode,
+ struct lov_stripe_md *lsm, int mode,
+ ldlm_policy_data_t *policy, struct lustre_handle *lockh,
+ int ast_flags)
+{
+ struct llu_sb_info *sbi = llu_i2sbi(inode);
+ struct llu_inode_info *lli = llu_i2info(inode);
+ int rc;
+ ENTRY;
+
+ LASSERT(lockh->cookie == 0);
+
+ /* XXX phil: can we do this? won't it screw the file size up? */
+ if ((fd && (fd->fd_flags & LL_FILE_IGNORE_LOCK)) ||
+ (sbi->ll_flags & LL_SBI_NOLCK))
+ RETURN(0);
+
+ CDEBUG(D_DLMTRACE, "Locking inode %lu, start "LPU64" end "LPU64"\n",
+ lli->lli_st_ino, policy->l_extent.start, policy->l_extent.end);
+
+ rc = obd_enqueue(sbi->ll_osc_exp, lsm, LDLM_EXTENT, policy, mode,
+ &ast_flags, llu_extent_lock_callback,
+ ldlm_completion_ast, llu_glimpse_callback, inode,
+ sizeof(struct ost_lvb), lustre_swab_ost_lvb, lockh);
+ if (rc > 0)
+ rc = -EIO;
+
+ if (policy->l_extent.start == 0 &&
+ policy->l_extent.end == OBD_OBJECT_EOF)
+ lli->lli_st_size = lov_merge_size(lsm, 1);
+
+ //inode->i_mtime = lov_merge_mtime(lsm, inode->i_mtime);
+
+ RETURN(rc);
+}
+
+#if 0
int llu_extent_lock_no_validate(struct ll_file_data *fd,
struct inode *inode,
struct lov_stripe_md *lsm,
*/
int llu_extent_lock(struct ll_file_data *fd, struct inode *inode,
struct lov_stripe_md *lsm, int mode,
- struct ldlm_extent *extent, struct lustre_handle *lockh)
+ struct ldlm_extent *extent, struct lustre_handle *lockh,
+ int nonblock)
{
struct llu_inode_info *lli = llu_i2info(inode);
struct obd_export *exp = llu_i2obdexp(inode);
struct ldlm_extent size_lock;
struct lustre_handle match_lockh = {0};
int flags, rc, matched;
+ int astflags = nonblock ? LDLM_FL_BLOCK_NOWAIT : 0;
ENTRY;
- rc = llu_extent_lock_no_validate(fd, inode, lsm, mode, extent, lockh, 0);
+ rc = llu_extent_lock_no_validate(fd, inode, lsm, mode, extent,
+ lockh, astflags);
if (rc != ELDLM_OK)
RETURN(rc);
size_lock.end = OBD_OBJECT_EOF;
/* XXX I bet we should be checking the lock ignore flags.. */
+ /* FIXME use LDLM_FL_TEST_LOCK instead */
flags = LDLM_FL_CBPENDING | LDLM_FL_BLOCK_GRANTED;
matched = obd_match(exp, lsm, LDLM_EXTENT, &size_lock,
sizeof(size_lock), LCK_PR, &flags, inode,
&match_lockh);
- /* hey, alright, we hold a size lock that covers the size we
+ /* hey, alright, we hold a size lock that covers the size we
* just found, its not going to change for a while.. */
if (matched == 1) {
set_bit(LLI_F_HAVE_OST_SIZE_LOCK, &lli->lli_flags);
obd_cancel(exp, lsm, LCK_PR, &match_lockh);
- }
+ }
RETURN(0);
}
+#endif
int llu_extent_unlock(struct ll_file_data *fd, struct inode *inode,
struct lov_stripe_md *lsm, int mode,
struct llu_sb_info *sbi = llu_i2sbi(inode);
int rc;
ENTRY;
-#if 0
+
/* XXX phil: can we do this? won't it screw the file size up? */
if ((fd && (fd->fd_flags & LL_FILE_IGNORE_LOCK)) ||
(sbi->ll_flags & LL_SBI_NOLCK))
RETURN(0);
-#endif
+
rc = obd_cancel(sbi->ll_osc_exp, lsm, mode, lockh);
RETURN(rc);
RETURN(ERR_PTR(rc));
}
+void lov_increase_kms(struct obd_export *exp, struct lov_stripe_md *lsm,
+ obd_off size);
+
struct llu_sysio_callback_args*
llu_file_write(struct inode *inode, const struct iovec *iovec,
size_t iovlen, loff_t pos)
struct ll_file_data *fd = lli->lli_file_data;
struct lustre_handle lockh = {0};
struct lov_stripe_md *lsm = lli->lli_smd;
+ struct obd_export *exp = NULL;
+ ldlm_policy_data_t policy;
struct llu_sysio_callback_args *lsca;
struct llu_sysio_cookie *cookie;
- struct ldlm_extent extent;
+ int astflag = (lli->lli_open_flags & O_NONBLOCK) ?
+ LDLM_FL_BLOCK_NOWAIT : 0;
ldlm_error_t err;
int iovidx;
ENTRY;
LASSERT(iovlen <= MAX_IOVEC);
+ exp = llu_i2obdexp(inode);
+ if (exp == NULL)
+ RETURN(ERR_PTR(-EINVAL));
+
OBD_ALLOC(lsca, sizeof(*lsca));
if (!lsca)
RETURN(ERR_PTR(-ENOMEM));
if (count == 0)
continue;
- /* FIXME libsysio haven't handle O_APPEND */
- extent.start = pos;
- extent.end = pos + count - 1;
+ if (pos + count > lli->lli_maxbytes)
+ GOTO(err_out, err = -ERANGE);
-#ifdef LIBLUSTRE_HANDLE_UNALIGNED_PAGE
- if ((pos & ~PAGE_CACHE_MASK) == 0 &&
- (count & ~PAGE_CACHE_MASK) == 0)
- err = llu_extent_lock_no_validate(fd, inode, lsm,
- LCK_PW, &extent, &lockh, 0);
- else
- err = llu_extent_lock(fd, inode, lsm, LCK_PW,
- &extent, &lockh);
-#else
- /* server will handle partial write, so we don't
- * care for file size here */
- err = llu_extent_lock_no_validate(fd, inode, lsm, LCK_PW,
- &extent, &lockh, 0);
-#endif
+ /* FIXME libsysio haven't handle O_APPEND?? */
+ policy.l_extent.start = pos;
+ policy.l_extent.end = pos + count - 1;
+
+ err = llu_extent_lock(fd, inode, lsm, LCK_PW, &policy,
+ &lockh, astflag);
if (err != ELDLM_OK)
GOTO(err_out, err = -ENOLCK);
/* save cookie */
lsca->cookies[lsca->ncookies++] = cookie;
pos += count;
- /* file size grow. XXX should be done here? */
- if (pos > lli->lli_st_size) {
+ lov_increase_kms(exp, lsm, pos);
+ /* file size grow */
+ if (pos > lli->lli_st_size)
lli->lli_st_size = pos;
- set_bit(LLI_F_PREFER_EXTENDED_SIZE,
- &lli->lli_flags);
- }
} else {
llu_extent_unlock(fd, inode, lsm, LCK_PW, &lockh);
GOTO(err_out, err = PTR_ERR(cookie));
struct llu_sysio_callback_args*
llu_file_read(struct inode *inode, const struct iovec *iovec,
- size_t iovlen, loff_t pos)
+ size_t iovlen, loff_t pos)
{
struct llu_inode_info *lli = llu_i2info(inode);
struct ll_file_data *fd = lli->lli_file_data;
struct lov_stripe_md *lsm = lli->lli_smd;
struct lustre_handle lockh = { 0 };
- struct ldlm_extent extent;
+ ldlm_policy_data_t policy;
struct llu_sysio_callback_args *lsca;
struct llu_sysio_cookie *cookie;
+ int astflag = (lli->lli_open_flags & O_NONBLOCK) ?
+ LDLM_FL_BLOCK_NOWAIT : 0;
+ __u64 kms;
int iovidx;
ldlm_error_t err;
if (count == 0)
continue;
- extent.start = pos;
- extent.end = pos + count - 1;
+ policy.l_extent.start = pos;
+ policy.l_extent.end = pos + count - 1;
- err = llu_extent_lock(fd, inode, lsm, LCK_PR, &extent, &lockh);
+ err = llu_extent_lock(fd, inode, lsm, LCK_PR, &policy,
+ &lockh, astflag);
if (err != ELDLM_OK)
GOTO(err_out, err = -ENOLCK);
- CDEBUG(D_INFO, "Reading inode %lu, "LPSZ" bytes, offset %Ld\n",
- lli->lli_st_ino, count, pos);
+ kms = lov_merge_size(lsm, 1);
+ if (policy.l_extent.end > kms) {
+ /* A glimpse is necessary to determine whether we
+ * return a short read or some zeroes at the end of
+ * the buffer */
+ struct ost_lvb lvb;
+ if (llu_glimpse_size(inode, &lvb)) {
+ llu_extent_unlock(fd, inode, lsm, LCK_PR, &lockh);
+ GOTO(err_out, err = -ENOLCK);
+ }
+ lli->lli_st_size = lvb.lvb_size;
+ } else {
+ lli->lli_st_size = kms;
+ }
+
+ CDEBUG(D_INFO, "Reading inode %lu, "LPSZ" bytes, offset %Ld, "
+ "i_size "LPU64"\n", lli->lli_st_ino, count, pos,
+ lli->lli_st_size);
if (pos >= lli->lli_st_size) {
llu_extent_unlock(fd, inode, lsm, LCK_PR, &lockh);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff