LU-12930 various: use schedule_timeout_*interruptible

[fs/lustre-release.git] / lustre / osp / osp_trans.c

diff --git a/lustre/osp/osp_trans.c b/lustre/osp/osp_trans.c
index c28d13b..f366951 100644 (file)
--- a/lustre/osp/osp_trans.c
+++ b/lustre/osp/osp_trans.c
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2014, 2016, Intel Corporation.
+ * Copyright (c) 2014, 2017, Intel Corporation.
  */
 /*
  * lustre/osp/osp_trans.c
@@ -97,20 +97,6 @@ struct osp_update_callback {
        osp_update_interpreter_t        ouc_interpreter;
 };
 
-static struct object_update_request *object_update_request_alloc(size_t size)
-{
-       struct object_update_request *ourq;
-
-       OBD_ALLOC_LARGE(ourq, size);
-       if (ourq == NULL)
-               return ERR_PTR(-ENOMEM);
-
-       ourq->ourq_magic = UPDATE_REQUEST_MAGIC;
-       ourq->ourq_count = 0;
-
-       return ourq;
-}
-
 /**
  * Allocate new update request
  *
@@ -126,21 +112,28 @@ int osp_object_update_request_create(struct osp_update_request *our,
                                     size_t size)
 {
        struct osp_update_request_sub *ours;
+       struct object_update_request *ourq;
 
        OBD_ALLOC_PTR(ours);
        if (ours == NULL)
                return -ENOMEM;
 
-       if (size < OUT_UPDATE_INIT_BUFFER_SIZE)
-               size = OUT_UPDATE_INIT_BUFFER_SIZE;
-
-       ours->ours_req = object_update_request_alloc(size);
-
-       if (IS_ERR(ours->ours_req)) {
+       /* The object update request will be added to an SG list for
+        * bulk transfer. Some IB HW cannot handle partial pages in SG
+        * lists (since they create gaps in memory regions) so we
+        * round the size up to the next multiple of PAGE_SIZE. See
+        * LU-9983. */
+       LASSERT(size > 0);
+       size = round_up(size, PAGE_SIZE);
+       OBD_ALLOC_LARGE(ourq, size);
+       if (ourq == NULL) {
                OBD_FREE_PTR(ours);
                return -ENOMEM;
        }
 
+       ourq->ourq_magic = UPDATE_REQUEST_MAGIC;
+       ourq->ourq_count = 0;
+       ours->ours_req = ourq;
        ours->ours_req_size = size;
        INIT_LIST_HEAD(&ours->ours_list);
        list_add_tail(&ours->ours_list, &our->our_req_list);
@@ -199,7 +192,7 @@ struct osp_update_request *osp_update_request_create(struct dt_device *dt)
        INIT_LIST_HEAD(&our->our_invalidate_cb_list);
        spin_lock_init(&our->our_list_lock);
 
-       rc = osp_object_update_request_create(our, OUT_UPDATE_INIT_BUFFER_SIZE);
+       rc = osp_object_update_request_create(our, PAGE_SIZE);
        if (rc != 0) {
                OBD_FREE_PTR(our);
                return ERR_PTR(rc);
@@ -383,8 +376,8 @@ int osp_prep_update_req(const struct lu_env *env, struct obd_import *imp,
                buf_count++;
        }
        repsize += sizeof(*reply);
-       repsize = (repsize + OUT_UPDATE_REPLY_SIZE - 1) &
-                       ~(OUT_UPDATE_REPLY_SIZE - 1);
+       if (repsize < OUT_UPDATE_REPLY_SIZE)
+               repsize = OUT_UPDATE_REPLY_SIZE;
        LASSERT(buf_count > 0);
 
        req = ptlrpc_request_alloc(imp, &RQF_OUT_UPDATE);
@@ -609,17 +602,17 @@ static void osp_update_callback_fini(const struct lu_env *env,
  * \retval             negative error number on failure
  */
 static int osp_update_interpret(const struct lu_env *env,
-                               struct ptlrpc_request *req, void *arg, int rc)
+                               struct ptlrpc_request *req, void *args, int rc)
 {
-       struct object_update_reply      *reply  = NULL;
-       struct osp_update_args          *oaua   = arg;
-       struct osp_update_request       *our = oaua->oaua_update;
-       struct osp_thandle              *oth;
-       struct osp_update_callback      *ouc;
-       struct osp_update_callback      *next;
-       int                              count  = 0;
-       int                              index  = 0;
-       int                              rc1    = 0;
+       struct object_update_reply *reply = NULL;
+       struct osp_update_args *oaua = args;
+       struct osp_update_request *our = oaua->oaua_update;
+       struct osp_thandle *oth;
+       struct osp_update_callback *ouc;
+       struct osp_update_callback *next;
+       int count = 0;
+       int index = 0;
+       int rc1 = 0;
 
        ENTRY;
 
@@ -742,7 +735,7 @@ int osp_unplug_async_request(const struct lu_env *env,
                }
                osp_update_request_destroy(env, our);
        } else {
-               args = ptlrpc_req_async_args(req);
+               args = ptlrpc_req_async_args(args, req);
                args->oaua_update = our;
                args->oaua_count = NULL;
                args->oaua_waitq = NULL;
@@ -1125,7 +1118,7 @@ static int osp_send_update_req(const struct lu_env *env,
                RETURN(rc);
        }
 
-       args = ptlrpc_req_async_args(req);
+       args = ptlrpc_req_async_args(args, req);
        args->oaua_update = our;
        /* set env to NULL, in case the interrupt cb and current function
         * are in different thread */
@@ -1180,7 +1173,10 @@ static int osp_send_update_req(const struct lu_env *env,
                rc = ptlrpc_queue_wait(req);
                if (osp->opd_connect_mdt)
                        osp_put_rpc_lock(osp);
-               if ((rc == -ENOMEM && req->rq_set == NULL) ||
+
+               /* We use rq_queued_time to distinguish between local
+                * and remote -ENOMEM. */
+               if ((rc == -ENOMEM && req->rq_queued_time == 0) ||
                    (req->rq_transno == 0 && !req->rq_committed)) {
                        if (args->oaua_update != NULL) {
                                /* If osp_update_interpret is not being called,
@@ -1380,8 +1376,6 @@ void osp_invalidate_request(struct osp_device *osp)
                return;
        }
 
-       INIT_LIST_HEAD(&list);
-
        spin_lock(&ou->ou_lock);
        /* invalidate all of request in the sending list */
        list_for_each_entry_safe(our, tmp, &ou->ou_list, our_list) {
@@ -1436,7 +1430,6 @@ int osp_send_update_thread(void *arg)
 {
        struct lu_env           env;
        struct osp_device       *osp = arg;
-       struct l_wait_info       lwi = { 0 };
        struct osp_updates      *ou = osp->opd_update;
        struct ptlrpc_thread    *thread = &osp->opd_update_thread;
        struct osp_update_request *our = NULL;
@@ -1455,9 +1448,9 @@ int osp_send_update_thread(void *arg)
        wake_up(&thread->t_ctl_waitq);
        while (1) {
                our = NULL;
-               l_wait_event(ou->ou_waitq,
-                            !osp_send_update_thread_running(osp) ||
-                            osp_get_next_request(ou, &our), &lwi);
+               wait_event_idle(ou->ou_waitq,
+                               !osp_send_update_thread_running(osp) ||
+                               osp_get_next_request(ou, &our));
 
                if (!osp_send_update_thread_running(osp)) {
                        if (our != NULL) {