struct object_update_reply *reply,
int index)
{
- CDEBUG(D_INFO, "%s: fork reply reply %p index %d: rc = %d\n",
+ CDEBUG(D_HA, "%s: fork reply reply %p index %d: rc = %d\n",
dt_obd_name(dt), reply, index, 0);
object_update_result_insert(reply, NULL, 0, index, 0);
- return;
}
typedef void (*out_reconstruct_t)(const struct lu_env *env,
struct object_update_reply *reply,
int index);
-static inline int out_check_resent(const struct lu_env *env,
- struct dt_device *dt,
- struct dt_object *obj,
- struct ptlrpc_request *req,
- out_reconstruct_t reconstruct,
- struct object_update_reply *reply,
- int index)
+static inline bool out_check_resent(struct ptlrpc_request *req)
{
if (likely(!(lustre_msg_get_flags(req->rq_reqmsg) & MSG_RESENT)))
- return 0;
+ return false;
if (req_xid_is_last(req)) {
struct lsd_client_data *lcd;
lustre_msg_set_transno(req->rq_repmsg, req->rq_transno);
lustre_msg_set_status(req->rq_repmsg, req->rq_status);
- DEBUG_REQ(D_RPCTRACE, req, "restoring resent RPC");
-
- reconstruct(env, dt, obj, reply, index);
- return 1;
+ DEBUG_REQ(D_HA, req, "reconstruct resent RPC");
+ return true;
}
- DEBUG_REQ(D_HA, req, "no reply for RESENT req (have %lld)",
- req->rq_export->exp_target_data.ted_lcd->lcd_last_xid);
- return 0;
+ DEBUG_REQ(D_HA, req, "reprocess RESENT req, last_xid is %lld",
+ req->rq_export->exp_target_data.ted_lcd->lcd_last_xid);
+ return false;
}
static int out_create(struct tgt_session_info *tsi)
RETURN(PTR_ERR(wobdo));
}
- if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
+ if (req_capsule_req_need_swab(tsi->tsi_pill))
lustre_swab_obdo(wobdo);
lustre_get_wire_obdo(NULL, lobdo, wobdo);
la_from_obdo(attr, lobdo, lobdo->o_valid);
tgt_name(tsi->tsi_tgt), PTR_ERR(fid));
RETURN(PTR_ERR(fid));
}
- if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
+ if (req_capsule_req_need_swab(tsi->tsi_pill))
lustre_swab_lu_fid(fid);
if (!fid_is_sane(fid)) {
CERROR("%s: invalid fid "DFID": rc = %d\n",
attr->la_valid = 0;
attr->la_valid = 0;
- if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
+ if (req_capsule_req_need_swab(tsi->tsi_pill))
lustre_swab_obdo(wobdo);
lustre_get_wire_obdo(NULL, lobdo, wobdo);
la_from_obdo(attr, lobdo, lobdo->o_valid);
RETURN(PTR_ERR(tmp));
}
- if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
+ if (req_capsule_req_need_swab(tsi->tsi_pill))
__swab32s(tmp);
flag = *tmp;
RETURN(PTR_ERR(fid));
}
- if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
+ if (req_capsule_req_need_swab(tsi->tsi_pill))
lustre_swab_lu_fid(fid);
if (!fid_is_sane(fid)) {
RETURN(PTR_ERR(ptype));
}
- if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
+ if (req_capsule_req_need_swab(tsi->tsi_pill))
__swab32s(ptype);
rec->rec_fid = fid;
RETURN(PTR_ERR(tmp));
}
- if (ptlrpc_req_need_swab(tsi->tsi_pill->rc_req))
+ if (req_capsule_req_need_swab(tsi->tsi_pill))
__swab64s(tmp);
pos = *tmp;
orr = (struct out_read_reply *)update_result->our_data;
nbufs = (size + OUT_BULK_BUFFER_SIZE - 1) / OUT_BULK_BUFFER_SIZE;
- OBD_ALLOC(rdbuf, sizeof(struct lu_rdbuf) +
- nbufs * sizeof(rdbuf->rb_bufs[0]));
+ OBD_ALLOC(rdbuf, sizeof(*rdbuf) + nbufs * sizeof(rdbuf->rb_bufs[0]));
if (rdbuf == NULL)
GOTO(out, rc = -ENOMEM);
rdbuf->rb_bufs[i].lb_len);
}
}
- OBD_FREE(rdbuf, sizeof(struct lu_rdbuf) +
+ OBD_FREE(rdbuf, sizeof(*rdbuf) +
nbufs * sizeof(rdbuf->rb_bufs[0]));
out:
/* Insert read buffer */
struct object_update *update;
struct object_update_reply *reply;
struct ptlrpc_bulk_desc *desc = NULL;
- struct l_wait_info lwi;
void **update_bufs;
int current_batchid = -1;
__u32 update_buf_count;
int rc1 = 0;
int ouh_size, reply_size;
int updates;
+ bool need_reconstruct;
+
ENTRY;
req_capsule_set(pill, &RQF_OUT_UPDATE);
if (update_buf_count == 0)
RETURN(err_serious(-EPROTO));
- OBD_ALLOC(update_bufs, sizeof(*update_bufs) * update_buf_count);
+ OBD_ALLOC_PTR_ARRAY(update_bufs, update_buf_count);
if (update_bufs == NULL)
RETURN(err_serious(-ENOMEM));
update_bufs[0] = ouh->ouh_inline_data;
} else {
struct out_update_buffer *tmp;
+ int page_count = 0;
oub = req_capsule_client_get(pill, &RMF_OUT_UPDATE_BUF);
if (oub == NULL)
GOTO(out_free, rc = err_serious(-EPROTO));
- desc = ptlrpc_prep_bulk_exp(pill->rc_req, update_buf_count,
+ for (i = 0; i < update_buf_count; i++)
+ /* First *and* last might be partial pages, hence +1 */
+ page_count += DIV_ROUND_UP(oub[i].oub_size,
+ PAGE_SIZE) + 1;
+
+ desc = ptlrpc_prep_bulk_exp(pill->rc_req, page_count,
PTLRPC_BULK_OPS_COUNT,
- PTLRPC_BULK_GET_SINK |
- PTLRPC_BULK_BUF_KVEC,
+ PTLRPC_BULK_GET_SINK,
MDS_BULK_PORTAL,
- &ptlrpc_bulk_kvec_ops);
+ &ptlrpc_bulk_kiov_nopin_ops);
if (desc == NULL)
GOTO(out_free, rc = err_serious(-ENOMEM));
if (rc != 0)
GOTO(out_free, rc = err_serious(rc));
- rc = target_bulk_io(pill->rc_req->rq_export, desc, &lwi);
+ rc = target_bulk_io(pill->rc_req->rq_export, desc);
if (rc < 0)
GOTO(out_free, rc = err_serious(rc));
}
int j;
our = update_bufs[i];
- if (ptlrpc_req_need_swab(pill->rc_req))
- lustre_swab_object_update_request(our);
+ if (req_capsule_req_need_swab(pill))
+ lustre_swab_object_update_request(our, 0);
if (our->ourq_magic != UPDATE_REQUEST_MAGIC) {
CERROR("%s: invalid update buffer magic %x"
update = object_update_request_get(our, j, NULL);
if (update == NULL)
GOTO(out, rc = err_serious(-EPROTO));
- if (ptlrpc_req_need_swab(pill->rc_req))
+ if (req_capsule_req_need_swab(pill))
lustre_swab_object_update(update);
if (!fid_is_sane(&update->ou_fid)) {
tti->tti_u.update.tti_update_reply = reply;
tti->tti_mult_trans = !req_is_replay(tgt_ses_req(tsi));
+ need_reconstruct = out_check_resent(pill->rc_req);
+
/* Walk through updates in the request to execute them */
for (i = 0; i < update_buf_count; i++) {
struct tgt_handler *h;
/* Check resend case only for modifying RPC */
if (h->th_flags & IS_MUTABLE) {
- struct ptlrpc_request *req = tgt_ses_req(tsi);
+ /* sanity check for last XID changing */
+ if (unlikely(!need_reconstruct &&
+ req_xid_is_last(pill->rc_req))) {
+ DEBUG_REQ(D_ERROR, pill->rc_req,
+ "unexpected last XID change");
+ GOTO(next, rc = -EINVAL);
+ }
- if (out_check_resent(env, dt, dt_obj, req,
- out_reconstruct, reply,
- reply_index))
+ if (need_reconstruct) {
+ out_reconstruct(env, dt, dt_obj, reply,
+ reply_index);
GOTO(next, rc = 0);
+ }
if (dt->dd_rdonly)
GOTO(next, rc = -EROFS);
/* start transaction for modification RPC only */
if (h->th_flags & IS_MUTABLE && current_batchid == -1) {
current_batchid = update->ou_batchid;
+
+ if (reply_index == 0)
+ CFS_RACE(OBD_FAIL_PTLRPC_RESEND_RACE);
+
rc = out_tx_start(env, dt, ta, tsi->tsi_exp);
if (rc != 0)
GOTO(next, rc);
}
}
- OBD_FREE(update_bufs, sizeof(*update_bufs) * update_buf_count);
+ OBD_FREE_PTR_ARRAY(update_bufs, update_buf_count);
}
if (desc != NULL)