X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftarget%2Ftgt_handler.c;h=027b05d5e299f17284bb3d116294697fc0e43b42;hb=f843facff59226d3788d855d1d6948523ab8d944;hp=a28ab03a65399e578c4dacb1deafbb7ae5eb6922;hpb=ccf3674c9ca3ed8918c49163007708d1ae5db6f5;p=fs%2Flustre-release.git

diff --git a/lustre/target/tgt_handler.c b/lustre/target/tgt_handler.c
index a28ab03..027b05d 100644
--- a/lustre/target/tgt_handler.c
+++ b/lustre/target/tgt_handler.c
@@ -63,7 +63,7 @@ EXPORT_SYMBOL(tgt_name);
  *  - create lu_object, corresponding to the fid in mdt_body, and save it in
  *  @tsi;
  *
- *  - if HABEO_CORPUS flag is set for this request type check whether object
+ *  - if HAS_BODY flag is set for this request type check whether object
  *  actually exists on storage (lu_object_exists()).
  *
  */
@@ -100,7 +100,7 @@ static int tgt_mdt_body_unpack(struct tgt_session_info *tsi, __u32 flags)
 			     &tsi->tsi_tgt->lut_bottom->dd_lu_dev,
 			     &body->mbo_fid1, NULL);
 	if (!IS_ERR(obj)) {
-		if ((flags & HABEO_CORPUS) && !lu_object_exists(obj)) {
+		if ((flags & HAS_BODY) && !lu_object_exists(obj)) {
 			lu_object_put(tsi->tsi_env, obj);
 			rc = -ENOENT;
 		} else {
@@ -277,9 +277,8 @@ static int tgt_ost_body_unpack(struct tgt_session_info *tsi, __u32 flags)
 	}
 
 	if (!(body->oa.o_valid & OBD_MD_FLID)) {
-		if (flags & HABEO_CORPUS) {
-			CERROR("%s: OBD_MD_FLID flag is not set in ost_body "
-			       "but OID/FID is mandatory with HABEO_CORPUS\n",
+		if (flags & HAS_BODY) {
+			CERROR("%s: OBD_MD_FLID flag is not set in ost_body but OID/FID is mandatory with HAS_BODY\n",
 			       tgt_name(tsi->tsi_tgt));
 			RETURN(-EPROTO);
 		} else {
@@ -317,7 +316,7 @@ static int tgt_request_preprocess(struct tgt_session_info *tsi,
 	LASSERT(h->th_opc == lustre_msg_get_opc(req->rq_reqmsg));
 	LASSERT(current->journal_info == NULL);
 
-	LASSERT(ergo(flags & (HABEO_CORPUS | HABEO_REFERO),
+	LASSERT(ergo(flags & (HAS_BODY | HAS_REPLY),
 		     h->th_fmt != NULL));
 	if (h->th_fmt != NULL) {
 		req_capsule_set(pill, h->th_fmt);
@@ -333,10 +332,10 @@ static int tgt_request_preprocess(struct tgt_session_info *tsi,
 		}
 	}
 
-	if (flags & MUTABOR && tgt_conn_flags(tsi) & OBD_CONNECT_RDONLY)
+	if (flags & IS_MUTABLE && tgt_conn_flags(tsi) & OBD_CONNECT_RDONLY)
 		RETURN(-EROFS);
 
-	if (flags & HABEO_CLAVIS) {
+	if (flags & HAS_KEY) {
 		struct ldlm_request *dlm_req;
 
 		LASSERT(h->th_fmt != NULL);
@@ -418,7 +417,7 @@ static int tgt_handle_request0(struct tgt_session_info *tsi,
 
 	rc = tgt_request_preprocess(tsi, h, req);
 	/* pack reply if reply format is fixed */
-	if (rc == 0 && h->th_flags & HABEO_REFERO) {
+	if (rc == 0 && h->th_flags & HAS_REPLY) {
 		/* Pack reply */
 		if (req_capsule_has_field(tsi->tsi_pill, &RMF_MDT_MD,
 					  RCL_SERVER))
@@ -799,7 +798,8 @@ int tgt_request_handle(struct ptlrpc_request *req)
 	LASSERTF(h->th_opc == opc, "opcode mismatch %d != %d\n",
 		 h->th_opc, opc);
 
-	if (CFS_FAIL_CHECK_ORSET(request_fail_id, CFS_FAIL_ONCE))
+	if ((cfs_fail_val == 0 || cfs_fail_val == opc) &&
+	     CFS_FAIL_CHECK_ORSET(request_fail_id, CFS_FAIL_ONCE))
 		GOTO(out, rc = 0);
 
 	rc = lustre_msg_check_version(msg, h->th_version);
@@ -997,6 +997,13 @@ int tgt_connect(struct tgt_session_info *tsi)
 	tsi->tsi_exp->exp_connect_data.ocd_brw_size = reply->ocd_brw_size;
 	spin_unlock(&tsi->tsi_exp->exp_lock);
 
+	if (strcmp(tsi->tsi_exp->exp_obd->obd_type->typ_name,
+		   LUSTRE_MDT_NAME) == 0) {
+		rc = req_check_sepol(tsi->tsi_pill);
+		if (rc)
+			GOTO(out, rc);
+	}
+
 	RETURN(0);
 out:
 	obd_disconnect(class_export_get(tsi->tsi_exp));
@@ -1010,6 +1017,8 @@ int tgt_disconnect(struct tgt_session_info *tsi)
 
 	ENTRY;
 
+	OBD_FAIL_TIMEOUT(OBD_FAIL_OST_DISCONNECT_DELAY, cfs_fail_val);
+
 	rc = target_handle_disconnect(tgt_ses_req(tsi));
 	if (rc)
 		RETURN(err_serious(rc));
@@ -1027,7 +1036,16 @@ int tgt_obd_ping(struct tgt_session_info *tsi)
 
 	ENTRY;
 
-	rc = target_handle_ping(tgt_ses_req(tsi));
+	/* The target-specific part of OBD_PING request handling.
+	 * It controls Filter Modification Data (FMD) expiration each time
+	 * PING is received.
+	 *
+	 * Valid only for replayable targets, e.g. MDT and OFD
+	 */
+	if (tsi->tsi_exp->exp_obd->obd_replayable)
+		tgt_fmd_expire(tsi->tsi_exp);
+
+	rc = req_capsule_server_pack(tsi->tsi_pill);
 	if (rc)
 		RETURN(err_serious(rc));
 
@@ -1372,10 +1390,10 @@ int tgt_cp_callback(struct tgt_session_info *tsi)
 
 /* generic LDLM target handler */
 struct tgt_handler tgt_dlm_handlers[] = {
-TGT_DLM_HDL    (HABEO_CLAVIS,	LDLM_ENQUEUE,		tgt_enqueue),
-TGT_DLM_HDL    (HABEO_CLAVIS,	LDLM_CONVERT,		tgt_convert),
-TGT_DLM_HDL_VAR(0,		LDLM_BL_CALLBACK,	tgt_bl_callback),
-TGT_DLM_HDL_VAR(0,		LDLM_CP_CALLBACK,	tgt_cp_callback)
+TGT_DLM_HDL(HAS_KEY, LDLM_ENQUEUE, tgt_enqueue),
+TGT_DLM_HDL(HAS_KEY, LDLM_CONVERT, tgt_convert),
+TGT_DLM_HDL_VAR(0, LDLM_BL_CALLBACK, tgt_bl_callback),
+TGT_DLM_HDL_VAR(0, LDLM_CP_CALLBACK, tgt_cp_callback)
 };
 EXPORT_SYMBOL(tgt_dlm_handlers);
 
@@ -1537,8 +1555,8 @@ static int tgt_handle_lfsck_query(struct tgt_session_info *tsi)
 }
 
 struct tgt_handler tgt_lfsck_handlers[] = {
-TGT_LFSCK_HDL(HABEO_REFERO,	LFSCK_NOTIFY,	tgt_handle_lfsck_notify),
-TGT_LFSCK_HDL(HABEO_REFERO,	LFSCK_QUERY,	tgt_handle_lfsck_query),
+TGT_LFSCK_HDL(HAS_REPLY,	LFSCK_NOTIFY,	tgt_handle_lfsck_notify),
+TGT_LFSCK_HDL(HAS_REPLY,	LFSCK_QUERY,	tgt_handle_lfsck_query),
 };
 EXPORT_SYMBOL(tgt_lfsck_handlers);
 
@@ -1720,16 +1738,16 @@ static int tgt_checksum_niobuf(struct lu_target *tgt,
 				 int opc, enum cksum_types cksum_type,
 				 __u32 *cksum)
 {
-	struct cfs_crypto_hash_desc	*hdesc;
+	struct ahash_request	       *req;
 	unsigned int			bufsize;
 	int				i, err;
 	unsigned char			cfs_alg = cksum_obd2cfs(cksum_type);
 
-	hdesc = cfs_crypto_hash_init(cfs_alg, NULL, 0);
-	if (IS_ERR(hdesc)) {
+	req = cfs_crypto_hash_init(cfs_alg, NULL, 0);
+	if (IS_ERR(req)) {
 		CERROR("%s: unable to initialize checksum hash %s\n",
 		       tgt_name(tgt), cfs_crypto_hash_name(cfs_alg));
-		return PTR_ERR(hdesc);
+		return PTR_ERR(req);
 	}
 
 	CDEBUG(D_INFO, "Checksum for algo %s\n", cfs_crypto_hash_name(cfs_alg));
@@ -1755,7 +1773,7 @@ static int tgt_checksum_niobuf(struct lu_target *tgt,
 				 * display in dump_all_bulk_pages() */
 				np->index = i;
 
-				cfs_crypto_hash_update_page(hdesc, np, off,
+				cfs_crypto_hash_update_page(req, np, off,
 							    len);
 				continue;
 			} else {
@@ -1763,7 +1781,7 @@ static int tgt_checksum_niobuf(struct lu_target *tgt,
 				       tgt_name(tgt));
 			}
 		}
-		cfs_crypto_hash_update_page(hdesc, local_nb[i].lnb_page,
+		cfs_crypto_hash_update_page(req, local_nb[i].lnb_page,
 				  local_nb[i].lnb_page_offset & ~PAGE_MASK,
 				  local_nb[i].lnb_len);
 
@@ -1788,7 +1806,7 @@ static int tgt_checksum_niobuf(struct lu_target *tgt,
 				 * display in dump_all_bulk_pages() */
 				np->index = i;
 
-				cfs_crypto_hash_update_page(hdesc, np, off,
+				cfs_crypto_hash_update_page(req, np, off,
 							    len);
 				continue;
 			} else {
@@ -1799,7 +1817,7 @@ static int tgt_checksum_niobuf(struct lu_target *tgt,
 	}
 
 	bufsize = sizeof(*cksum);
-	err = cfs_crypto_hash_final(hdesc, (unsigned char *)cksum, &bufsize);
+	err = cfs_crypto_hash_final(req, (unsigned char *)cksum, &bufsize);
 
 	return 0;
 }
@@ -1860,7 +1878,7 @@ static void dump_all_bulk_pages(struct obdo *oa, int count,
 		kunmap(local_nb[i].lnb_page);
 	}
 
-	rc = ll_vfs_fsync_range(filp, 0, LLONG_MAX, 1);
+	rc = vfs_fsync_range(filp, 0, LLONG_MAX, 1);
 	if (rc)
 		CERROR("%s: sync returns %d\n", dbgcksum_file_name, rc);
 	filp_close(filp, NULL);
@@ -1951,7 +1969,7 @@ static int tgt_checksum_niobuf_t10pi(struct lu_target *tgt,
 	enum cksum_types t10_cksum_type = tgt->lut_dt_conf.ddp_t10_cksum_type;
 	unsigned char cfs_alg = cksum_obd2cfs(OBD_CKSUM_T10_TOP);
 	const char *obd_name = tgt->lut_obd->obd_name;
-	struct cfs_crypto_hash_desc *hdesc;
+	struct ahash_request *req;
 	unsigned int bufsize;
 	unsigned char *buffer;
 	struct page *__page;
@@ -1967,11 +1985,11 @@ static int tgt_checksum_niobuf_t10pi(struct lu_target *tgt,
 	if (__page == NULL)
 		return -ENOMEM;
 
-	hdesc = cfs_crypto_hash_init(cfs_alg, NULL, 0);
-	if (IS_ERR(hdesc)) {
+	req = cfs_crypto_hash_init(cfs_alg, NULL, 0);
+	if (IS_ERR(req)) {
 		CERROR("%s: unable to initialize checksum hash %s\n",
 		       tgt_name(tgt), cfs_crypto_hash_name(cfs_alg));
-		return PTR_ERR(hdesc);
+		return PTR_ERR(req);
 	}
 
 	buffer = kmap(__page);
@@ -1999,7 +2017,7 @@ static int tgt_checksum_niobuf_t10pi(struct lu_target *tgt,
 				 * display in dump_all_bulk_pages() */
 				np->index = i;
 
-				cfs_crypto_hash_update_page(hdesc, np, off,
+				cfs_crypto_hash_update_page(req, np, off,
 							    len);
 				continue;
 			} else {
@@ -2034,8 +2052,18 @@ static int tgt_checksum_niobuf_t10pi(struct lu_target *tgt,
 		}
 
 		LASSERT(used <= MAX_GUARD_NUMBER);
-		/* If disk support T10PI checksum, copy guards to local_nb */
-		if (t10_cksum_type && opc == OST_WRITE) {
+		/*
+		 * If disk support T10PI checksum, copy guards to local_nb.
+		 * If the write is partial page, do not use the guards for bio
+		 * submission since the data might not be full-sector. The bio
+		 * guards will be generated later based on the full sectors. If
+		 * the sector size is 512B rather than 4 KB, or the page size
+		 * is larger than 4KB, this might drop some useful guards for
+		 * partial page write, but it will only add minimal extra time
+		 * of checksum calculation.
+		 */
+		if (t10_cksum_type && opc == OST_WRITE &&
+		    local_nb[i].lnb_len == PAGE_SIZE) {
 			local_nb[i].lnb_guard_rpc = 1;
 			memcpy(local_nb[i].lnb_guards,
 			       guard_start + used_number,
@@ -2044,7 +2072,7 @@ static int tgt_checksum_niobuf_t10pi(struct lu_target *tgt,
 
 		used_number += used;
 		if (used_number == guard_number) {
-			cfs_crypto_hash_update_page(hdesc, __page, 0,
+			cfs_crypto_hash_update_page(req, __page, 0,
 				used_number * sizeof(*guard_start));
 			used_number = 0;
 		}
@@ -2070,7 +2098,7 @@ static int tgt_checksum_niobuf_t10pi(struct lu_target *tgt,
 				 * display in dump_all_bulk_pages() */
 				np->index = i;
 
-				cfs_crypto_hash_update_page(hdesc, np, off,
+				cfs_crypto_hash_update_page(req, np, off,
 							    len);
 				continue;
 			} else {
@@ -2084,11 +2112,11 @@ static int tgt_checksum_niobuf_t10pi(struct lu_target *tgt,
 		GOTO(out, rc);
 
 	if (used_number != 0)
-		cfs_crypto_hash_update_page(hdesc, __page, 0,
+		cfs_crypto_hash_update_page(req, __page, 0,
 			used_number * sizeof(*guard_start));
 
 	bufsize = sizeof(cksum);
-	rc = cfs_crypto_hash_final(hdesc, (unsigned char *)&cksum, &bufsize);
+	rc = cfs_crypto_hash_final(req, (unsigned char *)&cksum, &bufsize);
 
 	if (rc == 0)
 		*check_sum = cksum;
@@ -2360,7 +2388,7 @@ out_lock:
 EXPORT_SYMBOL(tgt_brw_read);
 
 static int tgt_shortio2pages(struct niobuf_local *local, int npages,
-			     unsigned char *buf, int size)
+			     unsigned char *buf, unsigned int size)
 {
 	int	i, off, len;
 	char	*ptr;
@@ -2558,7 +2586,7 @@ int tgt_brw_write(struct tgt_session_info *tsi)
 	if (rc < 0)
 		GOTO(out_lock, rc);
 	if (body->oa.o_flags & OBD_FL_SHORT_IO) {
-		int short_io_size;
+		unsigned int short_io_size;
 		unsigned char *short_io_buf;
 
 		short_io_size = req_capsule_get_size(&req->rq_pill,