smb: server: make use of smbdirect_connection_recv_io_refill[_work]()

This is basically a copy of smb_direct_post_recv_credits(), but
there are several improvements compared to the existing function:

1. We calculate the number of missing posted buffers by getting the
   difference between recv_io.credits.target and recv_io.posted.count.

   Instead of the difference between recv_io.credits.target
   and recv_io.credits.count, because recv_io.credits.count is
   only updated once a message is send to the peer.

   It was not really a problem before, because we have
   a fixed number smbdirect_recv_io buffers, so the
   loop terminated when smbdirect_connection_get_recv_io()
   returns NULL.

   But using recv_io.posted.count makes it easier to
   understand.

2. In order to tell the peer about the newly posted buffer
   and grant the credits, we only trigger the send immediate
   when we're not granting only the last possible credit.

   This is mostly a difference relative to the servers
   smb_direct_post_recv_credits() implementation,
   which should avoid useless ping pong messages.

Cc: Namjae Jeon <linkinjeon@kernel.org>
Cc: Steve French <smfrench@gmail.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: linux-cifs@vger.kernel.org
Cc: samba-technical@lists.samba.org
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/smb/server/transport_rdma.c b/fs/smb/server/transport_rdma.c
index 17642ba35d8d7431ea541a71dc05d117f4f261e1..b03e68bab4b5cc63559e7380b493b49476184e6f 100644 (file)
--- a/fs/smb/server/transport_rdma.c
+++ b/fs/smb/server/transport_rdma.c
@@ -215,7 +215,6 @@ static inline int get_buf_page_count(void *buf, int size)
                (uintptr_t)buf / PAGE_SIZE;
 }
 
-static void smb_direct_post_recv_credits(struct work_struct *work);
 static int smb_direct_post_send_data(struct smbdirect_socket *sc,
                                     struct smbdirect_send_batch *send_ctx,
                                     struct kvec *iov, int niov,
@@ -778,49 +777,6 @@ read_rfc1002_done:
        goto again;
 }
 
-static void smb_direct_post_recv_credits(struct work_struct *work)
-{
-       struct smbdirect_socket *sc =
-               container_of(work, struct smbdirect_socket, recv_io.posted.refill_work);
-       struct smbdirect_recv_io *recvmsg;
-       int credits = 0;
-       int ret;
-
-       if (atomic_read(&sc->recv_io.credits.count) < sc->recv_io.credits.target) {
-               while (true) {
-                       recvmsg = smbdirect_connection_get_recv_io(sc);
-                       if (!recvmsg)
-                               break;
-
-                       recvmsg->first_segment = false;
-
-                       ret = smbdirect_connection_post_recv_io(recvmsg);
-                       if (ret) {
-                               pr_err("Can't post recv: %d\n", ret);
-                               smbdirect_connection_put_recv_io(recvmsg);
-                               break;
-                       }
-                       credits++;
-
-                       atomic_inc(&sc->recv_io.posted.count);
-               }
-       }
-
-       atomic_add(credits, &sc->recv_io.credits.available);
-
-       /*
-        * If the last send credit is waiting for credits
-        * it can grant we need to wake it up
-        */
-       if (credits &&
-           atomic_read(&sc->send_io.bcredits.count) == 0 &&
-           atomic_read(&sc->send_io.credits.count) == 0)
-               wake_up(&sc->send_io.credits.wait_queue);
-
-       if (credits)
-               queue_work(sc->workqueue, &sc->idle.immediate_work);
-}
-
 static int manage_credits_prior_sending(struct smbdirect_socket *sc)
 {
        int missing;
@@ -1986,24 +1942,24 @@ put:
 
        /*
         * We negotiated with success, so we need to refill the recv queue.
-        * We do that with sc->idle.immediate_work still being disabled
-        * via smbdirect_socket_init(), so that queue_work(sc->workqueue,
-        * &sc->idle.immediate_work) in smb_direct_post_recv_credits()
-        * is a no-op.
         *
         * The message that grants the credits to the client is
         * the negotiate response.
         */
-       INIT_WORK(&sc->recv_io.posted.refill_work, smb_direct_post_recv_credits);
-       smb_direct_post_recv_credits(&sc->recv_io.posted.refill_work);
-       if (unlikely(sc->first_error))
-               return sc->first_error;
-       INIT_WORK(&sc->idle.immediate_work, smb_direct_send_immediate_work);
+       ret = smbdirect_connection_recv_io_refill(sc);
+       if (ret < 0)
+               return ret;
+       ret = 0;
 
 respond:
        ret = smb_direct_send_negotiate_response(sc, ret);
+       if (ret)
+               return ret;
 
-       return ret;
+       INIT_WORK(&sc->recv_io.posted.refill_work, smbdirect_connection_recv_io_refill_work);
+       INIT_WORK(&sc->idle.immediate_work, smb_direct_send_immediate_work);
+
+       return 0;
 }
 
 static int smb_direct_connect(struct smbdirect_socket *sc)