LU-11158 mdt: grow lvb buffer to hold layout

[fs/lustre-release.git] / lustre / mdc / mdc_locks.c

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index 57144ea..dc42f57 100644 (file)
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -256,7 +256,7 @@ mdc_intent_open_pack(struct obd_export *exp, struct lookup_intent *it,
        int                      count = 0;
        enum ldlm_mode           mode;
        int                      rc;
-       int repsize;
+       int repsize, repsize_estimate;
 
        ENTRY;
 
@@ -351,22 +351,34 @@ mdc_intent_open_pack(struct obd_export *exp, struct lookup_intent *it,
        /* 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());
        }
+       /* 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;
 }
 
@@ -607,14 +619,14 @@ static int mdc_finish_enqueue(struct obd_export *exp,
          * 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) {
@@ -675,6 +687,8 @@ static int mdc_finish_enqueue(struct obd_export *exp,
                /* 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);