From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8E91751FCB8 for ; Wed, 23 Sep 2026 13:37:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790170653; cv=none; b=YcETHh6+kGmDo7FgKWS9w+bKweJn36JaDvPA1E/DLN2s55yhjn4EbeiCGotxzd6dTgohv0YRVDLRnL4FaSWStLcH49nPkjCtu/1R7jNQwbFChh+SPDRpFqK1x4cs1uLXs3+z34wmd7wI4DyKR+72Vw57FnFKDykGwVXu9pSIBKc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790170653; c=relaxed/simple; bh=FWaRv3kf9APlFjcIzyaybvvNmgnIfAt26p/skW9RPu4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N2LIyv7OZLQbbE+TYBFbraVOD6hyxAsaA3qFxVUg9N+rzKWrDvHYadwQPmNdLeO/wo1SOvQJ2SuNsNXslEztYQ9C5UT8ABHhnecymQs8kSpu52EdEq9Nl3Im77uTUnjpciXQ++wJ1lC5stAVjQtkcjIOkvsOh6MJFkg3mekGggU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=f/u0UuGv; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="f/u0UuGv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1790170650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s+c9Y0t5SKsPrOe0nx0dWN7zTgZlRH54f91QGpPHh3Y=; b=f/u0UuGvsUmyTgaHpkA6IVs83cw7zg+cyaw+ttoNhk+kvaOD41an1w1aAQu+t9Q+ETrGFa EEsvAoZxBfBiATNEUB3/Q/vpnQONJxighsA/rOOu86eRyoE7yqorw+186gZYxnSBGwJ4nt mJETcjvWa/o0x9C9c7hIpJtiNQNf7ec= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-215-W9A4yalKMG6elUo2_AFlaQ-1; Wed, 23 Sep 2026 09:37:26 -0400 X-MC-Unique: W9A4yalKMG6elUo2_AFlaQ-1 X-Mimecast-MFC-AGG-ID: W9A4yalKMG6elUo2_AFlaQ_1790170643 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2A084180074A; Wed, 23 Sep 2026 13:37:23 +0000 (UTC) Received: from warthog.com (unknown [10.44.32.54]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 159CE418; Wed, 23 Sep 2026 13:37:19 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , Marc Dionne , Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net v11 01/17] rxrpc: Revert "rxrpc: rxperf: Fix missing decoding of terminal magic cookie" Date: Wed, 23 Sep 2026 14:36:48 +0100 Message-ID: <20260923133706.1496540-2-dhowells@redhat.com> In-Reply-To: <20260923133706.1496540-1-dhowells@redhat.com> References: <20260923133706.1496540-1-dhowells@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 Revert 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. Actually, this isn't true; it's just that other Rx implementations ignore the extra data in the request and so my test programs are sending too much data without noticeable consequence. Fixes: c34d999ca314 ("rxrpc: rxperf: Fix missing decoding of terminal magic cookie") Signed-off-by: David Howells cc: Marc Dionne cc: Eric Dumazet cc: "David S. Miller" cc: Jakub Kicinski cc: Paolo Abeni cc: Simon Horman cc: linux-afs@lists.infradead.org --- net/rxrpc/rxperf.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/net/rxrpc/rxperf.c b/net/rxrpc/rxperf.c index b8df6d22314d..f1f41151589c 100644 --- a/net/rxrpc/rxperf.c +++ b/net/rxrpc/rxperf.c @@ -483,18 +483,6 @@ 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;