X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftarget%2Fout_lib.c;h=a6d6b369d39fead0612fc43e584daaffdff40710;hp=8ba1fd67f5833f9fe7fba06a2fece93a99a7f8bf;hb=de8572645d287d17c409b99dabdf176822d91486;hpb=51f5621c04b363dcde7e1bb3dcdb2ebd3b2919fd

diff --git a/lustre/target/out_lib.c b/lustre/target/out_lib.c
index 8ba1fd6..a6d6b36 100644
--- a/lustre/target/out_lib.c
+++ b/lustre/target/out_lib.c
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2013, Intel Corporation.
+ * Copyright (c) 2014, Intel Corporation.
  */
 /*
  * lustre/target/out_lib.c
@@ -34,216 +34,377 @@
 #include <lu_target.h>
 #include <lustre_update.h>
 #include <obd.h>
+#include <obd_class.h>
 
-struct update_request *out_find_update(struct thandle_update *tu,
-				       struct dt_device *dt_dev)
+#define OUT_UPDATE_BUFFER_SIZE_ADD	4096
+#define OUT_UPDATE_BUFFER_SIZE_MAX	(256 * 4096)  /* 1MB update size now */
+/**
+ * resize update buffer
+ *
+ * Extend the update buffer by new_size.
+ *
+ * \param[in] ubuf	update buffer to be extended
+ * \param[in] new_size  new size of the update buffer
+ *
+ * \retval		0 if extending succeeds.
+ * \retval		negative errno if extending fails.
+ */
+static int update_buffer_resize(struct update_buffer *ubuf, size_t new_size)
 {
-	struct update_request   *update;
+	struct object_update_request *ureq;
 
-	LASSERT(tu != NULL);
-	list_for_each_entry(update, &tu->tu_remote_update_list, ur_list) {
-		if (update->ur_dt == dt_dev)
-			return update;
-	}
+	if (new_size > ubuf->ub_req_size)
+		return 0;
 
-	return NULL;
-}
-EXPORT_SYMBOL(out_find_update);
+	OBD_ALLOC_LARGE(ureq, new_size);
+	if (ureq == NULL)
+		return -ENOMEM;
 
-void out_destroy_update_req(struct update_request *update)
-{
-	if (update == NULL)
-		return;
+	memcpy(ureq, ubuf->ub_req, ubuf->ub_req_size);
 
-	LASSERT(list_empty(&update->ur_cb_items));
+	OBD_FREE_LARGE(ubuf->ub_req, ubuf->ub_req_size);
 
-	list_del(&update->ur_list);
-	if (update->ur_buf != NULL)
-		OBD_FREE_LARGE(update->ur_buf, UPDATE_BUFFER_SIZE);
+	ubuf->ub_req = ureq;
+	ubuf->ub_req_size = new_size;
 
-	OBD_FREE_PTR(update);
+	return 0;
 }
-EXPORT_SYMBOL(out_destroy_update_req);
 
-struct update_request *out_create_update_req(struct dt_device *dt)
+/**
+ * Pack the header of object_update_request
+ *
+ * Packs updates into the update_buffer header, which will either be sent to
+ * the remote MDT or stored in the local update log. The maximum update buffer
+ * size is 1MB for now.
+ *
+ * \param[in] env	execution environment
+ * \param[in] ubuf	update bufer which it will pack the update in
+ * \param[in] op	update operation
+ * \param[in] fid	object FID for this update
+ * \param[in] param_count	parameters count for this update
+ * \param[in] lens	each parameters length of this update
+ * \param[in] batchid	batchid(transaction no) of this update
+ *
+ * \retval		0 pack update succeed.
+ * \retval              negative errno pack update failed.
+ **/
+static struct object_update *
+out_update_header_pack(const struct lu_env *env, struct update_buffer *ubuf,
+		       enum update_type op, const struct lu_fid *fid,
+		       int params_count, __u16 *param_sizes, __u64 batchid)
 {
-	struct update_request *update;
-
-	OBD_ALLOC_PTR(update);
-	if (update == NULL)
-		return ERR_PTR(-ENOMEM);
+	struct object_update_request	*ureq = ubuf->ub_req;
+	size_t				ureq_size = ubuf->ub_req_size;
+	struct object_update		*obj_update;
+	struct object_update_param	*param;
+	size_t				update_size;
+	int				rc = 0;
+	unsigned int			i;
+	ENTRY;
 
-	OBD_ALLOC_LARGE(update->ur_buf, UPDATE_BUFFER_SIZE);
-	if (update->ur_buf == NULL) {
-		OBD_FREE_PTR(update);
+	/* Check update size to make sure it can fit into the buffer */
+	ureq_size = object_update_request_size(ureq);
+	update_size = offsetof(struct object_update, ou_params[0]);
+	for (i = 0; i < params_count; i++)
+		update_size += cfs_size_round(param_sizes[i] + sizeof(*param));
+
+	if (unlikely(cfs_size_round(ureq_size + update_size) >
+		     ubuf->ub_req_size)) {
+		size_t new_size = ubuf->ub_req_size;
+
+		/* enlarge object update request size */
+		while (new_size <
+		       cfs_size_round(ureq_size + update_size))
+			new_size += OUT_UPDATE_BUFFER_SIZE_ADD;
+		if (new_size >= OUT_UPDATE_BUFFER_SIZE_MAX)
+			RETURN(ERR_PTR(-E2BIG));
+
+		rc = update_buffer_resize(ubuf, new_size);
+		if (rc < 0)
+			RETURN(ERR_PTR(rc));
+
+		ureq = ubuf->ub_req;
+	}
 
-		return ERR_PTR(-ENOMEM);
+	/* fill the update into the update buffer */
+	obj_update = (struct object_update *)((char *)ureq + ureq_size);
+	obj_update->ou_fid = *fid;
+	obj_update->ou_type = op;
+	obj_update->ou_params_count = (__u16)params_count;
+	obj_update->ou_batchid = batchid;
+	param = &obj_update->ou_params[0];
+	for (i = 0; i < params_count; i++) {
+		param->oup_len = param_sizes[i];
+		param = (struct object_update_param *)((char *)param +
+			 object_update_param_size(param));
 	}
 
-	INIT_LIST_HEAD(&update->ur_list);
-	update->ur_dt = dt;
-	update->ur_buf->ub_magic = UPDATE_BUFFER_MAGIC;
-	update->ur_buf->ub_count = 0;
-	INIT_LIST_HEAD(&update->ur_cb_items);
+	CDEBUG(D_INFO, "%p "DFID" idx %u: op %d params %d:%d\n",
+	       ureq, PFID(fid), ureq->ourq_count, op, params_count,
+	       (int)update_size);
+	ureq->ourq_count++;
 
-	return update;
+	RETURN(obj_update);
 }
-EXPORT_SYMBOL(out_create_update_req);
 
 /**
- * Find or create one loc in th_dev/dev_obj_update for the update,
- * Because only one thread can access this thandle, no need
- * lock now.
- */
-struct update_request *out_find_create_update_loc(struct thandle *th,
-						  struct dt_object *dt)
+ * Packs one update into the update_buffer.
+ *
+ * \param[in] env	execution environment
+ * \param[in] ubuf	bufer where update will be packed
+ * \param[in] op	update operation (enum update_type)
+ * \param[in] fid	object FID for this update
+ * \param[in] param_count	number of parameters for this update
+ * \param[in] param_sizes	array of parameters length of this update
+ * \param[in] param_bufs	parameter buffers
+ * \param[in] batchid	transaction no of this update, plus mdt_index, which
+ *                      will be globally unique
+ *
+ * \retval		= 0 if updates packing succeeds
+ * \retval		negative errno if updates packing fails
+ **/
+int out_update_pack(const struct lu_env *env, struct update_buffer *ubuf,
+		    enum update_type op, const struct lu_fid *fid,
+		    int params_count, __u16 *param_sizes,
+		    const void **param_bufs, __u64 batchid)
 {
-	struct dt_device	*dt_dev = lu2dt_dev(dt->do_lu.lo_dev);
-	struct thandle_update	*tu = th->th_update;
-	struct update_request	*update;
+	struct object_update		*update;
+	struct object_update_param	*param;
+	unsigned int			i;
 	ENTRY;
 
-	if (tu == NULL) {
-		OBD_ALLOC_PTR(tu);
-		if (tu == NULL)
-			RETURN(ERR_PTR(-ENOMEM));
+	update = out_update_header_pack(env, ubuf, op, fid, params_count,
+					param_sizes, batchid);
+	if (IS_ERR(update))
+		RETURN(PTR_ERR(update));
 
-		INIT_LIST_HEAD(&tu->tu_remote_update_list);
-		tu->tu_sent_after_local_trans = 0;
-		th->th_update = tu;
+	param = &update->ou_params[0];
+	for (i = 0; i < params_count; i++) {
+		memcpy(&param->oup_buf[0], param_bufs[i], param_sizes[i]);
+		param = (struct object_update_param *)((char *)param +
+			 object_update_param_size(param));
 	}
 
-	update = out_find_update(tu, dt_dev);
-	if (update != NULL)
-		RETURN(update);
+	RETURN(0);
+}
+EXPORT_SYMBOL(out_update_pack);
 
-	update = out_create_update_req(dt_dev);
+/**
+ * Pack various updates into the update_buffer.
+ *
+ * The following functions pack different updates into the update_buffer
+ * So parameters of these API is basically same as its correspondent OSD/OSP
+ * API, for detail description of these parameters see osd_handler.c or
+ * osp_md_object.c.
+ *
+ * \param[in] env	execution environment
+ * \param[in] ubuf	update buffer
+ * \param[in] fid	fid of this object for the update
+ * \param[in] batchid	batch id of this update
+ *
+ * \retval		0 if insertion succeeds.
+ * \retval		negative errno if insertion fails.
+ */
+int out_create_pack(const struct lu_env *env, struct update_buffer *ubuf,
+		    const struct lu_fid *fid, struct lu_attr *attr,
+		    struct dt_allocation_hint *hint,
+		    struct dt_object_format *dof, __u64 batchid)
+{
+	struct obdo		*obdo;
+	__u16			sizes[2] = {sizeof(*obdo), 0};
+	int			buf_count = 1;
+	const struct lu_fid	*fid1 = NULL;
+	struct object_update	*update;
+	ENTRY;
+
+	if (hint != NULL && hint->dah_parent) {
+		fid1 = lu_object_fid(&hint->dah_parent->do_lu);
+		sizes[1] = sizeof(*fid1);
+		buf_count++;
+	}
+
+	update = out_update_header_pack(env, ubuf, OUT_CREATE, fid,
+					buf_count, sizes, batchid);
 	if (IS_ERR(update))
-		RETURN(update);
+		RETURN(PTR_ERR(update));
+
+	obdo = object_update_param_get(update, 0, NULL);
+	obdo->o_valid = 0;
+	obdo_from_la(obdo, attr, attr->la_valid);
+	lustre_set_wire_obdo(NULL, obdo, obdo);
+	if (fid1 != NULL) {
+		struct lu_fid *fid;
+		fid = object_update_param_get(update, 1, NULL);
+		fid_cpu_to_le(fid, fid1);
+	}
 
-	list_add_tail(&update->ur_list, &tu->tu_remote_update_list);
+	RETURN(0);
+}
+EXPORT_SYMBOL(out_create_pack);
 
-	if (!tu->tu_only_remote_trans)
-		thandle_get(th);
+int out_ref_del_pack(const struct lu_env *env, struct update_buffer *ubuf,
+		     const struct lu_fid *fid, __u64 batchid)
+{
+	return out_update_pack(env, ubuf, OUT_REF_DEL, fid, 0, NULL, NULL,
+			       batchid);
+}
+EXPORT_SYMBOL(out_ref_del_pack);
 
-	RETURN(update);
+int out_ref_add_pack(const struct lu_env *env, struct update_buffer *ubuf,
+		     const struct lu_fid *fid, __u64 batchid)
+{
+	return out_update_pack(env, ubuf, OUT_REF_ADD, fid, 0, NULL, NULL,
+			       batchid);
 }
-EXPORT_SYMBOL(out_find_create_update_loc);
+EXPORT_SYMBOL(out_ref_add_pack);
 
-int out_prep_update_req(const struct lu_env *env, struct obd_import *imp,
-			const struct update_buf *ubuf, int ubuf_len,
-			struct ptlrpc_request **reqp)
+int out_attr_set_pack(const struct lu_env *env, struct update_buffer *ubuf,
+		      const struct lu_fid *fid, const struct lu_attr *attr,
+		      __u64 batchid)
 {
-	struct ptlrpc_request  *req;
-	struct update_buf      *tmp;
-	int			rc;
+	struct object_update	*update;
+	struct obdo		*obdo;
+	__u16			size = sizeof(*obdo);
 	ENTRY;
 
-	req = ptlrpc_request_alloc(imp, &RQF_UPDATE_OBJ);
-	if (req == NULL)
-		RETURN(-ENOMEM);
-
-	req_capsule_set_size(&req->rq_pill, &RMF_UPDATE, RCL_CLIENT,
-			     UPDATE_BUFFER_SIZE);
+	update = out_update_header_pack(env, ubuf, OUT_ATTR_SET, fid, 1,
+					&size, batchid);
+	if (IS_ERR(update))
+		RETURN(PTR_ERR(update));
 
-	rc = ptlrpc_request_pack(req, LUSTRE_MDS_VERSION, UPDATE_OBJ);
-	if (rc != 0) {
-		ptlrpc_req_finished(req);
-		RETURN(rc);
-	}
+	obdo = object_update_param_get(update, 0, NULL);
+	obdo->o_valid = 0;
+	obdo_from_la(obdo, attr, attr->la_valid);
+	lustre_set_wire_obdo(NULL, obdo, obdo);
 
-	req_capsule_set_size(&req->rq_pill, &RMF_UPDATE_REPLY, RCL_SERVER,
-			     UPDATE_BUFFER_SIZE);
+	RETURN(0);
+}
+EXPORT_SYMBOL(out_attr_set_pack);
 
-	tmp = req_capsule_client_get(&req->rq_pill, &RMF_UPDATE);
-	memcpy(tmp, ubuf, ubuf_len);
-	ptlrpc_request_set_replen(req);
-	req->rq_request_portal = OUT_PORTAL;
-	req->rq_reply_portal = OSC_REPLY_PORTAL;
-	*reqp = req;
+int out_xattr_set_pack(const struct lu_env *env, struct update_buffer *ubuf,
+		       const struct lu_fid *fid, const struct lu_buf *buf,
+		       const char *name, int flag, __u64 batchid)
+{
+	__u16	sizes[3] = {strlen(name) + 1, buf->lb_len, sizeof(flag)};
+	const void *bufs[3] = {(char *)name, (char *)buf->lb_buf,
+			       (char *)&flag};
 
-	RETURN(rc);
+	return out_update_pack(env, ubuf, OUT_XATTR_SET, fid,
+			       ARRAY_SIZE(sizes), sizes, bufs, batchid);
 }
-EXPORT_SYMBOL(out_prep_update_req);
+EXPORT_SYMBOL(out_xattr_set_pack);
 
-int out_remote_sync(const struct lu_env *env, struct obd_import *imp,
-		    struct update_request *update,
-		    struct ptlrpc_request **reqp)
+int out_xattr_del_pack(const struct lu_env *env, struct update_buffer *ubuf,
+		       const struct lu_fid *fid, const char *name,
+		       __u64 batchid)
 {
-	struct ptlrpc_request	*req = NULL;
-	int			 rc;
-	ENTRY;
+	__u16	size = strlen(name) + 1;
 
-	rc = out_prep_update_req(env, imp, update->ur_buf,
-				 UPDATE_BUFFER_SIZE, &req);
-	if (rc != 0)
-		RETURN(rc);
-
-	/* Note: some dt index api might return non-zero result here, like
-	 * osd_index_ea_lookup, so we should only check rc < 0 here */
-	rc = ptlrpc_queue_wait(req);
-	if (rc < 0) {
-		ptlrpc_req_finished(req);
-		update->ur_rc = rc;
-		RETURN(rc);
-	}
+	return out_update_pack(env, ubuf, OUT_XATTR_DEL, fid, 1, &size,
+			       (const void **)&name, batchid);
+}
+EXPORT_SYMBOL(out_xattr_del_pack);
 
-	if (reqp != NULL) {
-		*reqp = req;
-	} else {
-		update->ur_rc = rc;
-		ptlrpc_req_finished(req);
-	}
 
-	RETURN(rc);
+int out_index_insert_pack(const struct lu_env *env, struct update_buffer *ubuf,
+			  const struct lu_fid *fid, const struct dt_rec *rec,
+			  const struct dt_key *key, __u64 batchid)
+{
+	struct dt_insert_rec	   *rec1 = (struct dt_insert_rec *)rec;
+	struct lu_fid		   rec_fid;
+	__u32			    type = cpu_to_le32(rec1->rec_type);
+	__u16			    sizes[3] = { strlen((char *)key) + 1,
+						sizeof(rec_fid),
+						sizeof(type) };
+	const void		   *bufs[3] = { (char *)key,
+						(char *)&rec_fid,
+						(char *)&type };
+
+	fid_cpu_to_le(&rec_fid, rec1->rec_fid);
+
+	return out_update_pack(env, ubuf, OUT_INDEX_INSERT, fid,
+			       ARRAY_SIZE(sizes), sizes, bufs, batchid);
 }
-EXPORT_SYMBOL(out_remote_sync);
+EXPORT_SYMBOL(out_index_insert_pack);
 
-int out_insert_update(const struct lu_env *env, struct update_request *update,
-		      int op, const struct lu_fid *fid, int count,
-		      int *lens, const char **bufs)
+int out_index_delete_pack(const struct lu_env *env, struct update_buffer *ubuf,
+			  const struct lu_fid *fid, const struct dt_key *key,
+			  __u64 batchid)
 {
-	struct update_buf    *ubuf = update->ur_buf;
-	struct update        *obj_update;
-	char                 *ptr;
-	int                   i;
-	int                   update_length;
-	ENTRY;
+	__u16	size = strlen((char *)key) + 1;
+	const void *buf = key;
 
-	obj_update = (struct update *)((char *)ubuf +
-		      cfs_size_round(update_buf_size(ubuf)));
+	return out_update_pack(env, ubuf, OUT_INDEX_DELETE, fid, 1, &size,
+			       &buf, batchid);
+}
+EXPORT_SYMBOL(out_index_delete_pack);
 
-	/* Check update size to make sure it can fit into the buffer */
-	update_length = cfs_size_round(offsetof(struct update,
-				       u_bufs[0]));
-	for (i = 0; i < count; i++)
-		update_length += cfs_size_round(lens[i]);
+int out_object_destroy_pack(const struct lu_env *env,
+			    struct update_buffer *ubuf,
+			    const struct lu_fid *fid, __u64 batchid)
+{
+	return out_update_pack(env, ubuf, OUT_DESTROY, fid, 0, NULL, NULL,
+			       batchid);
+}
+EXPORT_SYMBOL(out_object_destroy_pack);
 
-	if (cfs_size_round(update_buf_size(ubuf)) + update_length >
-	    UPDATE_BUFFER_SIZE || ubuf->ub_count >= UPDATE_MAX_OPS)
-		RETURN(-E2BIG);
+int out_write_pack(const struct lu_env *env, struct update_buffer *ubuf,
+		   const struct lu_fid *fid, const struct lu_buf *buf,
+		   loff_t pos, __u64 batchid)
+{
+	__u16		sizes[2] = {buf->lb_len, sizeof(pos)};
+	const void	*bufs[2] = {(char *)buf->lb_buf, (char *)&pos};
+	int		rc;
 
-	if (count > UPDATE_BUF_COUNT)
-		RETURN(-E2BIG);
+	pos = cpu_to_le64(pos);
 
-	/* fill the update into the update buffer */
-	fid_cpu_to_le(&obj_update->u_fid, fid);
-	obj_update->u_type = cpu_to_le32(op);
-	obj_update->u_batchid = update->ur_batchid;
-	for (i = 0; i < count; i++)
-		obj_update->u_lens[i] = cpu_to_le32(lens[i]);
+	rc = out_update_pack(env, ubuf, OUT_WRITE, fid, ARRAY_SIZE(sizes),
+			     sizes, bufs, batchid);
+	return rc;
+}
+EXPORT_SYMBOL(out_write_pack);
 
-	ptr = (char *)obj_update +
-			cfs_size_round(offsetof(struct update, u_bufs[0]));
-	for (i = 0; i < count; i++)
-		LOGL(bufs[i], lens[i], ptr);
+/**
+ * Pack various readonly updates into the update_buffer.
+ *
+ * The following update funcs are only used by read-only ops, lookup,
+ * getattr etc, so it does not need transaction here. Currently they
+ * are only used by OSP.
+ *
+ * \param[in] env	execution environment
+ * \param[in] fid	fid of this object for the update
+ * \param[in] ubuf	update buffer
+ *
+ * \retval		0 if packing succeeds.
+ * \retval		negative errno if packing fails.
+ */
+int out_index_lookup_pack(const struct lu_env *env, struct update_buffer *ubuf,
+			  const struct lu_fid *fid, struct dt_rec *rec,
+			  const struct dt_key *key)
+{
+	const void	*name = key;
+	__u16		size = strlen((char *)name) + 1;
+
+	return out_update_pack(env, ubuf, OUT_INDEX_LOOKUP, fid, 1, &size,
+			       &name, 0);
+}
+EXPORT_SYMBOL(out_index_lookup_pack);
 
-	ubuf->ub_count++;
+int out_attr_get_pack(const struct lu_env *env, struct update_buffer *ubuf,
+		      const struct lu_fid *fid)
+{
+	return out_update_pack(env, ubuf, OUT_ATTR_GET, fid, 0, NULL, NULL, 0);
+}
+EXPORT_SYMBOL(out_attr_get_pack);
 
-	CDEBUG(D_INFO, "%s: %p "DFID" idx %d: op %d params %d:%lu\n",
-	       update->ur_dt->dd_lu_dev.ld_obd->obd_name, ubuf, PFID(fid),
-	       ubuf->ub_count, op, count, update_buf_size(ubuf));
+int out_xattr_get_pack(const struct lu_env *env, struct update_buffer *ubuf,
+		       const struct lu_fid *fid, const char *name)
+{
+	__u16 size;
 
-	RETURN(0);
+	LASSERT(name != NULL);
+	size = strlen(name) + 1;
+	return out_update_pack(env, ubuf, OUT_XATTR_GET, fid, 1, &size,
+			       (const void **)&name, 0);
 }
-EXPORT_SYMBOL(out_insert_update);
+EXPORT_SYMBOL(out_xattr_get_pack);