rxrpc: rxperf: Fix missing decoding of terminal magic cookie

[ Upstream commit c34d999ca3145d9fe858258cc3342ec493f47d2e ]

The rxperf RPCs seem to have a magic cookie at the end of the request that
was failing to be taken account of by the unmarshalling of the request.
Fix the rxperf code to expect this.

Fixes: 75bfdbf2fca3 ("rxrpc: Implement an in-kernel rxperf server for testing purposes")
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: Simon Horman <horms@kernel.org>
cc: linux-afs@lists.infradead.org
Link: https://patch.msgid.link/20250218192250.296870-2-dhowells@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/rxrpc/rxperf.c b/net/rxrpc/rxperf.c
index 085e7892d31040a8b3f18bbb8332f3f26f7321df..b1536da2246b82cde77aa37a9c84734c8a9af7e2 100644 (file)
--- a/net/rxrpc/rxperf.c
+++ b/net/rxrpc/rxperf.c
@@ -478,6 +478,18 @@ static int rxperf_deliver_request(struct rxperf_call *call)
                call->unmarshal++;
                fallthrough;
        case 2:
+               ret = rxperf_extract_data(call, true);
+               if (ret < 0)
+                       return ret;
+
+               /* Deal with the terminal magic cookie. */
+               call->iov_len = 4;
+               call->kvec[0].iov_len   = call->iov_len;
+               call->kvec[0].iov_base  = call->tmp;
+               iov_iter_kvec(&call->iter, READ, call->kvec, 1, call->iov_len);
+               call->unmarshal++;
+               fallthrough;
+       case 3:
                ret = rxperf_extract_data(call, false);
                if (ret < 0)
                        return ret;