#define DEBUG_SUBSYSTEM S_CLASS
#include <linux/user_namespace.h>
-#ifdef HAVE_UIDGID_HEADER
-# include <linux/uidgid.h>
-#endif
+#include <linux/delay.h>
+#include <linux/uidgid.h>
+#include <libcfs/linux/linux-mem.h>
#include <obd.h>
#include <obd_class.h>
#include <obd_cksum.h>
* - 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()).
*
*/
&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 {
}
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 {
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);
- if (req_capsule_has_field(pill, &RMF_MDT_BODY, RCL_CLIENT)) {
+ if (req_capsule_has_field(pill, &RMF_MDT_BODY, RCL_CLIENT) &&
+ req_capsule_field_present(pill, &RMF_MDT_BODY,
+ RCL_CLIENT)) {
rc = tgt_mdt_body_unpack(tsi, flags);
if (rc < 0)
RETURN(rc);
} else if (req_capsule_has_field(pill, &RMF_OST_BODY,
+ RCL_CLIENT) &&
+ req_capsule_field_present(pill, &RMF_OST_BODY,
RCL_CLIENT)) {
rc = tgt_ost_body_unpack(tsi, flags);
if (rc < 0)
}
}
- 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);
OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_MULTI_NET)))
RETURN(0);
+ /* drop OUT_UPDATE rpc */
+ if (unlikely(lustre_msg_get_opc(req->rq_reqmsg) == OUT_UPDATE &&
+ OBD_FAIL_CHECK(OBD_FAIL_OUT_UPDATE_DROP)))
+ RETURN(0);
+
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))
req_capsule_set_size(tsi->tsi_pill, &RMF_SHORT_IO,
RCL_SERVER,
- (body->oa.o_flags & OBD_FL_SHORT_IO) ?
+ (body->oa.o_valid & OBD_MD_FLFLAGS &&
+ body->oa.o_flags & OBD_FL_SHORT_IO) ?
remote_nb[0].rnb_len : 0);
}
rc = h->th_act(tsi);
if (!is_serious(rc) &&
!req->rq_no_reply && req->rq_reply_state == NULL) {
- DEBUG_REQ(D_ERROR, req, "%s \"handler\" %s did not "
- "pack reply and returned 0 error\n",
+ DEBUG_REQ(D_ERROR, req,
+ "%s: %s handler did not pack reply but returned no error",
tgt_name(tsi->tsi_tgt), h->th_name);
LBUG();
}
case MDS_HSM_PROGRESS:
case MDS_HSM_STATE_SET:
case MDS_HSM_REQUEST:
+ case OST_FALLOCATE:
*process = target_queue_recovery_request(req, obd);
RETURN(0);
/* sanity check: if the xid matches, the request must be marked as a
* resent or replayed */
- if (req_can_reconstruct(req, NULL)) {
+ if (req_can_reconstruct(req, NULL) == 1) {
if (!(lustre_msg_get_flags(req->rq_reqmsg) &
(MSG_RESENT | MSG_REPLAY))) {
- DEBUG_REQ(D_WARNING, req, "rq_xid %llu matches "
- "saved xid, expected REPLAY or RESENT flag "
- "(%x)", req->rq_xid,
+ DEBUG_REQ(D_WARNING, req,
+ "rq_xid=%llu matches saved XID, expected REPLAY or RESENT flag (%x)",
+ req->rq_xid,
lustre_msg_get_flags(req->rq_reqmsg));
req->rq_status = -ENOTCONN;
RETURN(-ENOTCONN);
tgt = class_exp2tgt(req->rq_export);
if (unlikely(tgt == NULL)) {
- DEBUG_REQ(D_ERROR, req, "%s: No target for connected export\n",
+ DEBUG_REQ(D_ERROR, req, "%s: no target for connected export",
class_exp2obd(req->rq_export)->obd_name);
RETURN(ERR_PTR(-EINVAL));
}
/* opcode was not found in slice */
if (unlikely(s->tos_hs == NULL)) {
- CERROR("%s: no handlers for opcode 0x%x\n", tgt_name(tgt),
- opc);
+ static bool printed;
+
+ /* don't spew error messages for unhandled RPCs */
+ if (!printed) {
+ CERROR("%s: no handler for opcode 0x%x from %s\n",
+ tgt_name(tgt), opc, libcfs_id2str(req->rq_peer));
+ printed = true;
+ }
RETURN(ERR_PTR(-ENOTSUPP));
}
static int process_req_last_xid(struct ptlrpc_request *req)
{
__u64 last_xid;
+ int rc = 0;
+ struct obd_export *exp = req->rq_export;
+ struct tg_export_data *ted = &exp->exp_target_data;
+ bool need_lock = tgt_is_multimodrpcs_client(exp);
ENTRY;
+ if (need_lock)
+ mutex_lock(&ted->ted_lcd_lock);
/* check request's xid is consistent with export's last_xid */
last_xid = lustre_msg_get_last_xid(req->rq_reqmsg);
- if (last_xid > req->rq_export->exp_last_xid)
- req->rq_export->exp_last_xid = last_xid;
-
- if (req->rq_xid == 0 ||
- (req->rq_xid <= req->rq_export->exp_last_xid)) {
- DEBUG_REQ(D_ERROR, req, "Unexpected xid %llx vs. "
- "last_xid %llx\n", req->rq_xid,
- req->rq_export->exp_last_xid);
+ if (last_xid > exp->exp_last_xid)
+ exp->exp_last_xid = last_xid;
+
+ if (req->rq_xid == 0 || req->rq_xid <= exp->exp_last_xid) {
/* Some request is allowed to be sent during replay,
* such as OUT update requests, FLD requests, so it
* is possible that replay requests has smaller XID
* - The former RPC got chance to be processed;
*/
if (!(lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY))
- RETURN(-EPROTO);
+ rc = -EPROTO;
+
+ DEBUG_REQ(D_WARNING, req,
+ "unexpected xid=%llx != exp_last_xid=%llx, rc = %d",
+ req->rq_xid, exp->exp_last_xid, rc);
+ if (rc)
+ GOTO(out, rc);
}
/* The "last_xid" is the minimum xid among unreplied requests,
* replay request will have the larger xid than "exp_last_xid"
*/
if (req->rq_export->exp_conn_cnt >
- lustre_msg_get_conn_cnt(req->rq_reqmsg))
- RETURN(-ESTALE);
+ lustre_msg_get_conn_cnt(req->rq_reqmsg)) {
+ CDEBUG(D_RPCTRACE,
+ "Dropping request %llu from an old epoch %u/%u\n",
+ req->rq_xid,
+ lustre_msg_get_conn_cnt(req->rq_reqmsg),
+ req->rq_export->exp_conn_cnt);
+ req->rq_no_reply = 1;
+ GOTO(out, rc = -ESTALE);
+ }
/* try to release in-memory reply data */
- if (tgt_is_multimodrpcs_client(req->rq_export)) {
- tgt_handle_received_xid(req->rq_export,
- lustre_msg_get_last_xid(req->rq_reqmsg));
- if (!(lustre_msg_get_flags(req->rq_reqmsg) &
- (MSG_RESENT | MSG_REPLAY)))
- tgt_handle_tag(req->rq_export,
- lustre_msg_get_tag(req->rq_reqmsg));
+ if (tgt_is_multimodrpcs_client(exp)) {
+ tgt_handle_received_xid(exp, last_xid);
+ rc = tgt_handle_tag(req);
}
- RETURN(0);
+
+out:
+ if (need_lock)
+ mutex_unlock(&ted->ted_lcd_lock);
+
+ RETURN(rc);
}
int tgt_request_handle(struct ptlrpc_request *req)
if (cfs_fail_val == 0 &&
lustre_msg_get_opc(msg) != OBD_PING &&
lustre_msg_get_flags(msg) & MSG_REQ_REPLAY_DONE) {
- struct l_wait_info lwi = { 0 };
-
cfs_fail_val = 1;
cfs_race_state = 0;
- l_wait_event(cfs_race_waitq, (cfs_race_state == 1),
- &lwi);
+ wait_event_idle(cfs_race_waitq, (cfs_race_state == 1));
}
}
- /* Refill the context, to make sure all thread keys are allocated */
- lu_env_refill(req->rq_svc_thread->t_env);
-
req_capsule_init(&req->rq_pill, req, RCL_SERVER);
tsi->tsi_pill = &req->rq_pill;
tsi->tsi_env = req->rq_svc_thread->t_env;
tsi->tsi_jobid = NULL;
if (tgt == NULL) {
- DEBUG_REQ(D_ERROR, req, "%s: No target for connected export\n",
+ DEBUG_REQ(D_ERROR, req, "%s: No target for connected export",
class_exp2obd(req->rq_export)->obd_name);
req->rq_status = -EINVAL;
rc = ptlrpc_error(req);
/* reset the exp_last_xid on each connection. */
req->rq_export->exp_last_xid = 0;
} else if (obd->obd_recovery_data.trd_processing_task !=
- current_pid()) {
+ current->pid) {
rc = process_req_last_xid(req);
if (rc) {
req->rq_status = rc;
rc = lustre_msg_check_version(msg, h->th_version);
if (unlikely(rc)) {
- DEBUG_REQ(D_ERROR, req, "%s: drop mal-formed request, version"
- " %08x, expecting %08x\n", tgt_name(tgt),
- lustre_msg_get_version(msg), h->th_version);
+ DEBUG_REQ(D_ERROR, req,
+ "%s: drop malformed request version=%08x expect=%08x",
+ tgt_name(tgt), lustre_msg_get_version(msg),
+ h->th_version);
req->rq_status = -EINVAL;
rc = ptlrpc_error(req);
GOTO(out, rc);
int tgt_connect_check_sptlrpc(struct ptlrpc_request *req, struct obd_export *exp)
{
- struct lu_target *tgt = class_exp2tgt(exp);
- struct sptlrpc_flavor flvr;
- int rc = 0;
+ struct lu_target *tgt = class_exp2tgt(exp);
+ struct sptlrpc_flavor flvr;
+ int rc = 0;
LASSERT(tgt);
LASSERT(tgt->lut_obd);
exp->exp_sp_peer = req->rq_sp_from;
exp->exp_flvr = flvr;
- /* when on mgs, if no restriction is set, or if client
- * is loopback, allow any flavor */
+ /* when on mgs, if no restriction is set, or if the client
+ * NID is on the local node, allow any flavor
+ */
if ((strcmp(exp->exp_obd->obd_type->typ_name,
LUSTRE_MGS_NAME) == 0) &&
(exp->exp_flvr.sf_rpc == SPTLRPC_FLVR_NULL ||
- LNET_NETTYP(LNET_NIDNET(exp->exp_connection->c_peer.nid))
- == LOLND))
+ LNetIsPeerLocal(exp->exp_connection->c_peer.nid)))
exp->exp_flvr.sf_rpc = SPTLRPC_FLVR_ANY;
if (exp->exp_flvr.sf_rpc != SPTLRPC_FLVR_ANY &&
int rc;
if (unlikely(tgt == NULL)) {
- CERROR("No target passed");
+ CERROR("No target passed\n");
return -EINVAL;
}
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);
+
+ if (reply->ocd_connect_flags & OBD_CONNECT_FLAGS2 &&
+ reply->ocd_connect_flags2 & OBD_CONNECT2_ENCRYPT &&
+ tsi->tsi_pill->rc_req->rq_export) {
+ bool forbid_encrypt = true;
+ struct lu_nodemap *nm =
+ nodemap_get_from_exp(tsi->tsi_pill->rc_req->rq_export);
+
+ if (!nm) {
+ /* nodemap_get_from_exp returns NULL in case
+ * nodemap is not active, so we do not forbid
+ */
+ forbid_encrypt = false;
+ } else if (!IS_ERR(nm)) {
+ forbid_encrypt = nm->nmf_forbid_encryption;
+ nodemap_putref(nm);
+ }
+
+ if (forbid_encrypt)
+ GOTO(out, rc = -EACCES);
+ }
+ }
+
RETURN(0);
out:
obd_disconnect(class_export_get(tsi->tsi_exp));
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));
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));
int tgt_send_buffer(struct tgt_session_info *tsi, struct lu_rdbuf *rdbuf)
{
- struct tgt_thread_info *tti = tgt_th_info(tsi->tsi_env);
struct ptlrpc_request *req = tgt_ses_req(tsi);
struct obd_export *exp = req->rq_export;
struct ptlrpc_bulk_desc *desc;
- struct l_wait_info *lwi = &tti->tti_u.update.tti_wait_info;
int i;
int rc;
+ int pages = 0;
ENTRY;
- desc = ptlrpc_prep_bulk_exp(req, rdbuf->rb_nbufs, 1,
- PTLRPC_BULK_PUT_SOURCE | PTLRPC_BULK_BUF_KVEC,
- MDS_BULK_PORTAL, &ptlrpc_bulk_kvec_ops);
+ for (i = 0; i < rdbuf->rb_nbufs; i++) {
+ unsigned int offset;
+
+ offset = (unsigned long)rdbuf->rb_bufs[i].lb_buf & ~PAGE_MASK;
+ pages += DIV_ROUND_UP(rdbuf->rb_bufs[i].lb_len + offset,
+ PAGE_SIZE);
+ }
+
+ desc = ptlrpc_prep_bulk_exp(req, pages, 1,
+ PTLRPC_BULK_PUT_SOURCE,
+ MDS_BULK_PORTAL,
+ &ptlrpc_bulk_kiov_nopin_ops);
if (desc == NULL)
RETURN(-ENOMEM);
rdbuf->rb_bufs[i].lb_buf,
rdbuf->rb_bufs[i].lb_len);
- rc = target_bulk_io(exp, desc, lwi);
+ rc = target_bulk_io(exp, desc);
ptlrpc_free_bulk(desc);
RETURN(rc);
}
int tgt_sendpage(struct tgt_session_info *tsi, struct lu_rdpg *rdpg, int nob)
{
- struct tgt_thread_info *tti = tgt_th_info(tsi->tsi_env);
struct ptlrpc_request *req = tgt_ses_req(tsi);
struct obd_export *exp = req->rq_export;
struct ptlrpc_bulk_desc *desc;
- struct l_wait_info *lwi = &tti->tti_u.rdpg.tti_wait_info;
int tmpcount;
int tmpsize;
int i;
ENTRY;
desc = ptlrpc_prep_bulk_exp(req, rdpg->rp_npages, 1,
- PTLRPC_BULK_PUT_SOURCE |
- PTLRPC_BULK_BUF_KIOV,
+ PTLRPC_BULK_PUT_SOURCE,
MDS_BULK_PORTAL,
&ptlrpc_bulk_kiov_pin_ops);
if (desc == NULL)
}
LASSERT(desc->bd_nob == nob);
- rc = target_bulk_io(exp, desc, lwi);
+ rc = target_bulk_io(exp, desc);
ptlrpc_free_bulk(desc);
RETURN(rc);
}
rdpg->rp_npages = (rdpg->rp_count + PAGE_SIZE - 1) >> PAGE_SHIFT;
/* allocate pages to store the containers */
- OBD_ALLOC(rdpg->rp_pages, rdpg->rp_npages * sizeof(rdpg->rp_pages[0]));
+ OBD_ALLOC_PTR_ARRAY(rdpg->rp_pages, rdpg->rp_npages);
if (rdpg->rp_pages == NULL)
GOTO(out, rc = -ENOMEM);
for (i = 0; i < rdpg->rp_npages; i++) {
for (i = 0; i < rdpg->rp_npages; i++)
if (rdpg->rp_pages[i])
__free_page(rdpg->rp_pages[i]);
- OBD_FREE(rdpg->rp_pages,
- rdpg->rp_npages * sizeof(rdpg->rp_pages[0]));
+ OBD_FREE_PTR_ARRAY(rdpg->rp_pages, rdpg->rp_npages);
}
return rc;
}
if (flag == LDLM_CB_CANCELING &&
(lock->l_granted_mode & (LCK_EX | LCK_PW | LCK_GROUP)) &&
- (tgt->lut_sync_lock_cancel == ALWAYS_SYNC_ON_CANCEL ||
- (tgt->lut_sync_lock_cancel == BLOCKING_SYNC_ON_CANCEL &&
+ (tgt->lut_sync_lock_cancel == SYNC_LOCK_CANCEL_ALWAYS ||
+ (tgt->lut_sync_lock_cancel == SYNC_LOCK_CANCEL_BLOCKING &&
ldlm_is_cbpending(lock))) &&
((exp_connect_flags(lock->l_export) & OBD_CONNECT_MDS_MDS) ||
lock->l_resource->lr_type == LDLM_EXTENT)) {
/* 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);
}
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);
}
EXPORT_SYMBOL(tgt_mdt_data_lock);
-void tgt_mdt_data_unlock(struct lustre_handle *lh, enum ldlm_mode mode)
-{
- LASSERT(lustre_handle_is_used(lh));
- ldlm_lock_decref(lh, mode);
-}
-EXPORT_SYMBOL(tgt_mdt_data_unlock);
-
/**
* Helper function for getting server side [start, start+count] DLM lock
* if asked by client.
}
EXPORT_SYMBOL(tgt_extent_lock);
-void tgt_extent_unlock(struct lustre_handle *lh, enum ldlm_mode mode)
+static int tgt_data_lock(const struct lu_env *env, struct obd_export *exp,
+ struct ldlm_res_id *res_id, __u64 start, __u64 end,
+ struct lustre_handle *lh, enum ldlm_mode mode)
+{
+ struct ldlm_namespace *ns = exp->exp_obd->obd_namespace;
+ __u64 flags = 0;
+
+ /* MDT IO for data-on-mdt */
+ if (exp->exp_connect_data.ocd_connect_flags & OBD_CONNECT_IBITS)
+ return tgt_mdt_data_lock(ns, res_id, lh, mode, &flags);
+
+ return tgt_extent_lock(env, ns, res_id, start, end, lh, mode, &flags);
+}
+
+void tgt_data_unlock(struct lustre_handle *lh, enum ldlm_mode mode)
{
LASSERT(lustre_handle_is_used(lh));
ldlm_lock_decref(lh, mode);
}
-EXPORT_SYMBOL(tgt_extent_unlock);
+EXPORT_SYMBOL(tgt_data_unlock);
static int tgt_brw_lock(const struct lu_env *env, struct obd_export *exp,
struct ldlm_res_id *res_id, struct obd_ioobj *obj,
struct niobuf_remote *nb, struct lustre_handle *lh,
enum ldlm_mode mode)
{
- struct ldlm_namespace *ns = exp->exp_obd->obd_namespace;
- __u64 flags = 0;
- int nrbufs = obj->ioo_bufcnt;
- int i;
- int rc;
+ int nrbufs = obj->ioo_bufcnt;
+ int i;
ENTRY;
LASSERT(mode == LCK_PR || mode == LCK_PW);
LASSERT(!lustre_handle_is_used(lh));
- if (ns->ns_obd->obd_recovering)
+ if (exp->exp_obd->obd_recovering)
RETURN(0);
if (nrbufs == 0 || !(nb[0].rnb_flags & OBD_BRW_SRVLOCK))
if (!(nb[i].rnb_flags & OBD_BRW_SRVLOCK))
RETURN(-EFAULT);
- /* MDT IO for data-on-mdt */
- if (exp->exp_connect_data.ocd_connect_flags & OBD_CONNECT_IBITS)
- rc = tgt_mdt_data_lock(ns, res_id, lh, mode, &flags);
- else
- rc = tgt_extent_lock(env, ns, res_id, nb[0].rnb_offset,
- nb[nrbufs - 1].rnb_offset +
- nb[nrbufs - 1].rnb_len - 1,
- lh, mode, &flags);
- RETURN(rc);
+ return tgt_data_lock(env, exp, res_id, nb[0].rnb_offset,
+ nb[nrbufs - 1].rnb_offset +
+ nb[nrbufs - 1].rnb_len - 1, lh, mode);
}
-static void tgt_brw_unlock(struct obd_ioobj *obj, struct niobuf_remote *niob,
+static void tgt_brw_unlock(struct obd_export *exp, struct obd_ioobj *obj,
+ struct niobuf_remote *niob,
struct lustre_handle *lh, enum ldlm_mode mode)
{
ENTRY;
LASSERT(mode == LCK_PR || mode == LCK_PW);
- LASSERT((obj->ioo_bufcnt > 0 &&
- (niob[0].rnb_flags & OBD_BRW_SRVLOCK)) ==
+ LASSERT((!exp->exp_obd->obd_recovering && obj->ioo_bufcnt &&
+ niob[0].rnb_flags & OBD_BRW_SRVLOCK) ==
lustre_handle_is_used(lh));
if (lustre_handle_is_used(lh))
- tgt_extent_unlock(lh, mode);
+ tgt_data_unlock(lh, mode);
EXIT;
}
+
static int tgt_checksum_niobuf(struct lu_target *tgt,
struct niobuf_local *local_nb, int npages,
int opc, enum cksum_types cksum_type,
struct page *np = tgt_page_to_corrupt;
if (np) {
- char *ptr = ll_kmap_atomic(local_nb[i].lnb_page,
- KM_USER0);
+ char *ptr = kmap_atomic(local_nb[i].lnb_page);
char *ptr2 = page_address(np);
memcpy(ptr2 + off, ptr + off, len);
memcpy(ptr2 + off, "bad3", min(4, len));
- ll_kunmap_atomic(ptr, KM_USER0);
+ kunmap_atomic(ptr);
/* LU-8376 to preserve original index for
* display in dump_all_bulk_pages() */
struct page *np = tgt_page_to_corrupt;
if (np) {
- char *ptr = ll_kmap_atomic(local_nb[i].lnb_page,
- KM_USER0);
+ char *ptr = kmap_atomic(local_nb[i].lnb_page);
char *ptr2 = page_address(np);
memcpy(ptr2 + off, ptr + off, len);
memcpy(ptr2 + off, "bad4", min(4, len));
- ll_kunmap_atomic(ptr, KM_USER0);
+ kunmap_atomic(ptr);
/* LU-8376 to preserve original index for
* display in dump_all_bulk_pages() */
* file/fid, not during the resends/retries. */
snprintf(dbgcksum_file_name, sizeof(dbgcksum_file_name),
"%s-checksum_dump-ost-"DFID":[%llu-%llu]-%x-%x",
- (strncmp(libcfs_debug_file_path_arr, "NONE", 4) != 0 ?
- libcfs_debug_file_path_arr :
- LIBCFS_DEBUG_FILE_PATH_DEFAULT),
+ (strncmp(libcfs_debug_file_path, "NONE", 4) != 0 ?
+ libcfs_debug_file_path : LIBCFS_DEBUG_FILE_PATH_DEFAULT),
oa->o_valid & OBD_MD_FLFID ? oa->o_parent_seq : (__u64)0,
oa->o_valid & OBD_MD_FLFID ? oa->o_parent_oid : 0,
oa->o_valid & OBD_MD_FLFID ? oa->o_parent_ver : 0,
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);
- return;
}
static int check_read_checksum(struct niobuf_local *local_nb, int npages,
if (len > size)
return -EINVAL;
- ptr = ll_kmap_atomic(local[i].lnb_page, KM_USER0);
- memcpy(buf + off, ptr, len);
- ll_kunmap_atomic(ptr, KM_USER0);
+ ptr = kmap_atomic(local[i].lnb_page);
+ memcpy(buf, ptr + off, len);
+ kunmap_atomic(ptr);
buf += len;
size -= len;
}
struct page *np = tgt_page_to_corrupt;
if (np) {
- char *ptr = ll_kmap_atomic(local_nb[i].lnb_page,
- KM_USER0);
+ char *ptr = kmap_atomic(local_nb[i].lnb_page);
char *ptr2 = page_address(np);
memcpy(ptr2 + off, ptr + off, len);
memcpy(ptr2 + off, "bad3", min(4, len));
- ll_kunmap_atomic(ptr, KM_USER0);
+ kunmap_atomic(ptr);
/* LU-8376 to preserve original index for
* display in dump_all_bulk_pages() */
* whole page
*/
if (t10_cksum_type && opc == OST_READ &&
+ local_nb[i].lnb_len == PAGE_SIZE &&
local_nb[i].lnb_guard_disk) {
used = DIV_ROUND_UP(local_nb[i].lnb_len, sector_size);
if (used > (guard_number - used_number)) {
struct page *np = tgt_page_to_corrupt;
if (np) {
- char *ptr = ll_kmap_atomic(local_nb[i].lnb_page,
- KM_USER0);
+ char *ptr = kmap_atomic(local_nb[i].lnb_page);
char *ptr2 = page_address(np);
memcpy(ptr2 + off, ptr + off, len);
memcpy(ptr2 + off, "bad4", min(4, len));
- ll_kunmap_atomic(ptr, KM_USER0);
+ kunmap_atomic(ptr);
/* LU-8376 to preserve original index for
* display in dump_all_bulk_pages() */
struct niobuf_local *local_nb;
struct obd_ioobj *ioo;
struct ost_body *body, *repbody;
- struct l_wait_info lwi;
struct lustre_handle lockh = { 0 };
int npages, nob = 0, rc, i, no_reply = 0,
npages_read;
* finish */
if (unlikely(atomic_read(&exp->exp_obd->obd_evict_inprogress))) {
/* We do not care how long it takes */
- lwi = LWI_INTR(NULL, NULL);
- rc = l_wait_event(exp->exp_obd->obd_evict_inprogress_waitq,
- !atomic_read(&exp->exp_obd->obd_evict_inprogress),
- &lwi);
+ wait_event_idle(
+ exp->exp_obd->obd_evict_inprogress_waitq,
+ !atomic_read(&exp->exp_obd->obd_evict_inprogress));
}
/* There must be big cache in current thread to process this request
if (rc != 0)
GOTO(out_lock, rc);
- if (body->oa.o_flags & OBD_FL_SHORT_IO) {
+ if (body->oa.o_valid & OBD_MD_FLFLAGS &&
+ body->oa.o_flags & OBD_FL_SHORT_IO) {
desc = NULL;
} else {
desc = ptlrpc_prep_bulk_exp(req, npages, ioobj_max_brw_get(ioo),
- PTLRPC_BULK_PUT_SOURCE |
- PTLRPC_BULK_BUF_KIOV,
+ PTLRPC_BULK_PUT_SOURCE,
OST_BULK_PORTAL,
&ptlrpc_bulk_kiov_nopin_ops);
if (desc == NULL)
break;
}
}
- if (OBD_FAIL_CHECK(OBD_FAIL_OST_READ_SIZE) &&
- nob != cfs_fail_val)
- rc = -E2BIG;
if (body->oa.o_valid & OBD_MD_FLCKSUM) {
u32 flag = body->oa.o_valid & OBD_MD_FLFLAGS ?
/* Check if client was evicted while we were doing i/o before touching
* network */
if (rc == 0) {
- if (body->oa.o_flags & OBD_FL_SHORT_IO) {
+ if (body->oa.o_valid & OBD_MD_FLFLAGS &&
+ body->oa.o_flags & OBD_FL_SHORT_IO) {
unsigned char *short_io_buf;
int short_io_size;
RCL_SERVER);
rc = rc > 0 ? 0 : rc;
} else if (!CFS_FAIL_PRECHECK(OBD_FAIL_PTLRPC_CLIENT_BULK_CB2)) {
- rc = target_bulk_io(exp, desc, &lwi);
+ rc = target_bulk_io(exp, desc);
}
no_reply = rc != 0;
} else {
- if (body->oa.o_flags & OBD_FL_SHORT_IO)
+ if (body->oa.o_valid & OBD_MD_FLFLAGS &&
+ body->oa.o_flags & OBD_FL_SHORT_IO)
req_capsule_shrink(&req->rq_pill, &RMF_SHORT_IO, 0,
RCL_SERVER);
}
rc = obd_commitrw(tsi->tsi_env, OBD_BRW_READ, exp, &repbody->oa, 1, ioo,
remote_nb, npages, local_nb, rc);
out_lock:
- tgt_brw_unlock(ioo, remote_nb, &lockh, LCK_PR);
+ tgt_brw_unlock(exp, ioo, remote_nb, &lockh, LCK_PR);
if (desc && !CFS_FAIL_PRECHECK(OBD_FAIL_PTLRPC_CLIENT_BULK_CB2))
ptlrpc_free_bulk(desc);
* to reorder. */
if (unlikely(CFS_FAIL_PRECHECK(OBD_FAIL_PTLRPC_CLIENT_BULK_CB2)) &&
desc) {
- wait_queue_head_t waitq;
- struct l_wait_info lwi1;
-
CDEBUG(D_INFO, "reorder BULK\n");
- init_waitqueue_head(&waitq);
- lwi1 = LWI_TIMEOUT_INTR(cfs_time_seconds(3), NULL, NULL, NULL);
- l_wait_event(waitq, 0, &lwi1);
- target_bulk_io(exp, desc, &lwi);
+ ssleep(3);
+ target_bulk_io(exp, desc);
ptlrpc_free_bulk(desc);
}
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;
CDEBUG(D_PAGE, "index %d offset = %d len = %d left = %d\n",
i, off, len, size);
- ptr = ll_kmap_atomic(local[i].lnb_page, KM_USER0);
+ ptr = kmap_atomic(local[i].lnb_page);
if (ptr == NULL)
return -EINVAL;
memcpy(ptr + off, buf, len < size ? len : size);
- ll_kunmap_atomic(ptr, KM_USER0);
+ kunmap_atomic(ptr);
buf += len;
size -= len;
}
struct niobuf_local *local_nb;
struct obd_ioobj *ioo;
struct ost_body *body, *repbody;
- struct l_wait_info lwi;
struct lustre_handle lockh = {0};
__u32 *rcs;
int objcount, niocount, npages;
struct tgt_thread_big_cache *tbc = req->rq_svc_thread->t_data;
bool wait_sync = false;
const char *obd_name = exp->exp_obd->obd_name;
+ /* '1' for consistency with code that checks !mpflag to restore */
+ unsigned int mpflags = 1;
ENTRY;
CFS_FAIL_TIMEOUT(OBD_FAIL_OST_BRW_PAUSE_BULK, cfs_fail_val > 0 ?
cfs_fail_val : (obd_timeout + 1) / 4);
+ /* Delay write commit to show stale size information */
+ CFS_FAIL_TIMEOUT(OBD_FAIL_OSC_NO_SIZE_DATA, cfs_fail_val);
+
/* There must be big cache in current thread to process this request
* if it is NULL then something went wrong and it wasn't allocated,
* report -ENOMEM in that case */
if ((remote_nb[0].rnb_flags & OBD_BRW_MEMALLOC) &&
ptlrpc_connection_is_local(exp->exp_connection))
- memory_pressure_set();
+ mpflags = memalloc_noreclaim_save();
req_capsule_set_size(&req->rq_pill, &RMF_RCS, RCL_SERVER,
niocount * sizeof(*rcs));
objcount, ioo, remote_nb, &npages, local_nb);
if (rc < 0)
GOTO(out_lock, rc);
- if (body->oa.o_flags & OBD_FL_SHORT_IO) {
- int short_io_size;
+ if (body->oa.o_valid & OBD_MD_FLFLAGS &&
+ body->oa.o_flags & OBD_FL_SHORT_IO) {
+ unsigned int short_io_size;
unsigned char *short_io_buf;
short_io_size = req_capsule_get_size(&req->rq_pill,
desc = NULL;
} else {
desc = ptlrpc_prep_bulk_exp(req, npages, ioobj_max_brw_get(ioo),
- PTLRPC_BULK_GET_SINK |
- PTLRPC_BULK_BUF_KIOV,
+ PTLRPC_BULK_GET_SINK,
OST_BULK_PORTAL,
&ptlrpc_bulk_kiov_nopin_ops);
if (desc == NULL)
if (rc != 0)
GOTO(skip_transfer, rc);
- rc = target_bulk_io(exp, desc, &lwi);
+ rc = target_bulk_io(exp, desc);
}
no_reply = rc != 0;
}
}
+ OBD_FAIL_TIMEOUT(OBD_FAIL_OST_BRW_PAUSE_BULK2, cfs_fail_val);
+
out_commitrw:
/* Must commit after prep above in all cases */
rc = obd_commitrw(tsi->tsi_env, OBD_BRW_WRITE, exp, &repbody->oa,
ptlrpc_lprocfs_brw(req, nob);
}
out_lock:
- tgt_brw_unlock(ioo, remote_nb, &lockh, LCK_PW);
+ tgt_brw_unlock(exp, ioo, remote_nb, &lockh, LCK_PW);
if (desc)
ptlrpc_free_bulk(desc);
out:
obd_uuid2str(&exp->exp_client_uuid),
obd_export_nid2str(exp), rc);
}
- memory_pressure_clr();
+
+ if (mpflags)
+ memalloc_noreclaim_restore(mpflags);
+
RETURN(rc);
}
EXPORT_SYMBOL(tgt_brw_write);
+/**
+ * Common request handler for OST_SEEK RPC.
+ *
+ * Unified request handling for OST_SEEK RPC.
+ * It takes object by its FID, does needed lseek and packs result
+ * into reply. Only SEEK_HOLE and SEEK_DATA are supported.
+ *
+ * \param[in] tsi target session environment for this request
+ *
+ * \retval 0 if successful
+ * \retval negative value on error
+ */
+int tgt_lseek(struct tgt_session_info *tsi)
+{
+ struct lustre_handle lh = { 0 };
+ struct dt_object *dob;
+ struct ost_body *repbody;
+ loff_t offset = tsi->tsi_ost_body->oa.o_size;
+ int whence = tsi->tsi_ost_body->oa.o_mode;
+ bool srvlock;
+ int rc = 0;
+
+ ENTRY;
+
+ if (whence != SEEK_HOLE && whence != SEEK_DATA)
+ RETURN(-EPROTO);
+
+ /* Negative offset is prohibited on wire and must be handled on client
+ * prior sending RPC.
+ */
+ if (offset < 0)
+ RETURN(-EPROTO);
+
+ repbody = req_capsule_server_get(tsi->tsi_pill, &RMF_OST_BODY);
+ if (repbody == NULL)
+ RETURN(-ENOMEM);
+ repbody->oa = tsi->tsi_ost_body->oa;
+
+ srvlock = tsi->tsi_ost_body->oa.o_valid & OBD_MD_FLFLAGS &&
+ tsi->tsi_ost_body->oa.o_flags & OBD_FL_SRVLOCK;
+ if (srvlock) {
+ rc = tgt_data_lock(tsi->tsi_env, tsi->tsi_exp, &tsi->tsi_resid,
+ offset, OBD_OBJECT_EOF, &lh, LCK_PR);
+ if (rc)
+ RETURN(rc);
+ }
+
+ dob = dt_locate(tsi->tsi_env, tsi->tsi_tgt->lut_bottom, &tsi->tsi_fid);
+ if (IS_ERR(dob))
+ GOTO(out, rc = PTR_ERR(dob));
+
+ if (!dt_object_exists(dob))
+ GOTO(obj_put, rc = -ENOENT);
+
+ repbody->oa.o_size = dt_lseek(tsi->tsi_env, dob, offset, whence);
+ rc = 0;
+obj_put:
+ dt_object_put(tsi->tsi_env, dob);
+out:
+ if (srvlock)
+ tgt_data_unlock(&lh, LCK_PR);
+
+ RETURN(rc);
+}
+EXPORT_SYMBOL(tgt_lseek);
+
/* Check if request can be reconstructed from saved reply data
* A copy of the reply data is returned in @trd if the pointer is not NULL
*/
-bool req_can_reconstruct(struct ptlrpc_request *req,
+int req_can_reconstruct(struct ptlrpc_request *req,
struct tg_reply_data *trd)
{
struct tg_export_data *ted = &req->rq_export->exp_target_data;
struct lsd_client_data *lcd = ted->ted_lcd;
- bool found;
+ int found;
if (tgt_is_multimodrpcs_client(req->rq_export))
return tgt_lookup_reply(req, trd);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff