int count = 0;
enum ldlm_mode mode;
int rc;
- int repsize;
+ int repsize, repsize_estimate;
ENTRY;
/* Get real repbuf allocated size as rounded up power of 2 */
repsize = size_roundup_power2(req->rq_replen +
lustre_msg_early_size());
-
/* Estimate free space for DoM files in repbuf */
- repsize -= req->rq_replen - obddev->u.cli.cl_max_mds_easize +
- sizeof(struct lov_comp_md_v1) +
- sizeof(struct lov_comp_md_entry_v1) +
- lov_mds_md_size(0, LOV_MAGIC_V3);
-
- if (repsize < obddev->u.cli.cl_dom_min_inline_repsize) {
- repsize = obddev->u.cli.cl_dom_min_inline_repsize - repsize;
+ repsize_estimate = repsize - (req->rq_replen -
+ obddev->u.cli.cl_max_mds_easize +
+ sizeof(struct lov_comp_md_v1) +
+ sizeof(struct lov_comp_md_entry_v1) +
+ lov_mds_md_size(0, LOV_MAGIC_V3));
+
+ if (repsize_estimate < obddev->u.cli.cl_dom_min_inline_repsize) {
+ repsize = obddev->u.cli.cl_dom_min_inline_repsize -
+ repsize_estimate + sizeof(struct niobuf_remote);
req_capsule_set_size(&req->rq_pill, &RMF_NIOBUF_INLINE,
RCL_SERVER,
sizeof(struct niobuf_remote) + repsize);
ptlrpc_request_set_replen(req);
CDEBUG(D_INFO, "Increase repbuf by %d bytes, total: %d\n",
repsize, req->rq_replen);
+ repsize = size_roundup_power2(req->rq_replen +
+ lustre_msg_early_size());
}
- return req;
+ /* The only way to report real allocated repbuf size to the server
+ * is the lm_repsize but it must be set prior buffer allocation itself
+ * due to security reasons - it is part of buffer used in signature
+ * calculation (see LU-11414). Therefore the saved size is predicted
+ * value as rq_replen rounded to the next higher power of 2.
+ * Such estimation is safe. Though the final allocated buffer might
+ * be even larger, it is not possible to know that at this point.
+ */
+ req->rq_reqmsg->lm_repsize = repsize;
+ RETURN(req);
}
#define GA_DEFAULT_EA_NAME_LEN 20
struct ldlm_intent *lit;
int rc, count = 0;
struct list_head cancels = LIST_HEAD_INIT(cancels);
- u32 min_buf_size = 0;
+ u32 ea_vals_buf_size = GA_DEFAULT_EA_VAL_LEN * GA_DEFAULT_EA_NUM;
ENTRY;
* of LU-9417 when it would be *more* likely to crash the
* server. See LU-9856. */
if (exp->exp_connect_data.ocd_version < OBD_OCD_VERSION(2, 10, 1, 0))
- min_buf_size = exp->exp_connect_data.ocd_max_easize;
+ ea_vals_buf_size = max_t(u32, ea_vals_buf_size,
+ exp->exp_connect_data.ocd_max_easize);
#endif
/* pack the intended request */
mdc_pack_body(req, &op_data->op_fid1, op_data->op_valid,
- max_t(u32, min_buf_size,
- GA_DEFAULT_EA_VAL_LEN * GA_DEFAULT_EA_NUM),
- -1, 0);
+ ea_vals_buf_size, -1, 0);
req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_SERVER,
- max_t(u32, min_buf_size,
- GA_DEFAULT_EA_NAME_LEN * GA_DEFAULT_EA_NUM));
+ GA_DEFAULT_EA_NAME_LEN * GA_DEFAULT_EA_NUM);
req_capsule_set_size(&req->rq_pill, &RMF_EAVALS, RCL_SERVER,
- max_t(u32, min_buf_size,
- GA_DEFAULT_EA_VAL_LEN * GA_DEFAULT_EA_NUM));
+ ea_vals_buf_size);
req_capsule_set_size(&req->rq_pill, &RMF_EAVALS_LENS, RCL_SERVER,
- max_t(u32, min_buf_size,
- sizeof(__u32) * GA_DEFAULT_EA_NUM));
+ sizeof(u32) * GA_DEFAULT_EA_NUM);
req_capsule_set_size(&req->rq_pill, &RMF_ACL, RCL_SERVER, 0);
* It's important that we do this first! Otherwise we might exit the
* function without doing so, and try to replay a failed create
* (bug 3440) */
- if (it->it_op & IT_OPEN && req->rq_replay &&
+ if (it->it_op & IT_OPEN && req->rq_replay &&
(!it_disposition(it, DISP_OPEN_OPEN) || it->it_status != 0))
mdc_clear_replay_flag(req, it->it_status);
- DEBUG_REQ(D_RPCTRACE, req, "op: %d disposition: %x, status: %d",
+ DEBUG_REQ(D_RPCTRACE, req, "op: %x disposition: %x, status: %d",
it->it_op, it->it_disposition, it->it_status);
- /* We know what to expect, so we do any byte flipping required here */
+ /* We know what to expect, so we do any byte flipping required here */
if (it_has_reply_body(it)) {
body = req_capsule_server_get(pill, &RMF_MDT_BODY);
if (body == NULL) {
/* maybe the lock was granted right away and layout
* is packed into RMF_DLM_LVB of req */
lvb_len = req_capsule_get_size(pill, &RMF_DLM_LVB, RCL_SERVER);
+ CDEBUG(D_INFO, "%s: layout return lvb %d transno %lld\n",
+ class_exp2obd(exp)->obd_name, lvb_len, req->rq_transno);
if (lvb_len > 0) {
lvb_data = req_capsule_server_sized_get(pill,
&RMF_DLM_LVB, lvb_len);
generation = obddev->u.cli.cl_import->imp_generation;
if (!it || (it->it_op & (IT_OPEN | IT_CREAT)))
- acl_bufsize = imp->imp_connect_data.ocd_max_easize;
+ acl_bufsize = MIN(imp->imp_connect_data.ocd_max_easize,
+ XATTR_SIZE_MAX);
else
acl_bufsize = LUSTRE_POSIX_ACL_MAX_SIZE_OLD;
if ((int)lockrep->lock_policy_res2 == -ERANGE &&
it->it_op & (IT_OPEN | IT_GETATTR | IT_LOOKUP) &&
- acl_bufsize != imp->imp_connect_data.ocd_max_easize) {
+ acl_bufsize == LUSTRE_POSIX_ACL_MAX_SIZE_OLD) {
mdc_clear_replay_flag(req, -ERANGE);
ptlrpc_req_finished(req);
- acl_bufsize = imp->imp_connect_data.ocd_max_easize;
+ acl_bufsize = MIN(imp->imp_connect_data.ocd_max_easize,
+ XATTR_SIZE_MAX);
goto resend;
}
}
static int mdc_intent_getattr_async_interpret(const struct lu_env *env,
- struct ptlrpc_request *req,
- void *args, int rc)
+ struct ptlrpc_request *req,
+ void *args, int rc)
{
struct mdc_getattr_args *ga = args;
- struct obd_export *exp = ga->ga_exp;
- struct md_enqueue_info *minfo = ga->ga_minfo;
+ struct obd_export *exp = ga->ga_exp;
+ struct md_enqueue_info *minfo = ga->ga_minfo;
struct ldlm_enqueue_info *einfo = &minfo->mi_einfo;
- struct lookup_intent *it;
- struct lustre_handle *lockh;
- struct obd_device *obddev;
- struct ldlm_reply *lockrep;
- __u64 flags = LDLM_FL_HAS_INTENT;
+ struct lookup_intent *it;
+ struct lustre_handle *lockh;
+ struct obd_device *obddev;
+ struct ldlm_reply *lockrep;
+ __u64 flags = LDLM_FL_HAS_INTENT;
ENTRY;
it = &minfo->mi_it;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff