From nobody Sat Feb 7 09:35:20 2026 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 D93E51A5AC for ; Wed, 6 Mar 2024 00:07:16 +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=1709683638; cv=none; b=fW3D7/e1L6Nv7kxDGEw1WXLyrKiWN/L+fc+j+KurVwFHZM0Hk3cPndy46BQquR72Cp8gGg8v+bRqyAAO6omAUCUoQgrnxf2hwxDXoozcUZhmvqanx0sNUtVM66y6xDVMEIoxfs6aGGoDy/mhha2n5pS1UmDJmZ2MtqP09U4sGr0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709683638; c=relaxed/simple; bh=MQ2ZFjtue/mlbT3gPUeVjpfqMS/NxZ1JCX8pts1RXQw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Bl3RR05m3Cq1/+x4rjRnAu5nBVNfb5vWyIDOJ4vJHYTKTdfwiYbk3o2Cvqibvij0W6sI6fxyCDIwlUfbyKhqXZAYuR7jMgOYhZBvWy5hCglVNf76ycCv/mQMLiKbp0iPsi6to3GhbpO/JsWuqNjGYgL94QwO5lYZXcpWe/H8OXw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none 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=harNdq3f; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none 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="harNdq3f" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709683635; 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=Ccm9SVhd+bAluRvWjYsOnhrUMg2QaaHeYK4kvnT54uM=; b=harNdq3fTe8NXz1sIbaXW93o0ocw8kvzpJg/+0aOrJgAG6lcJcVLXtS2cfU70oBhLF4Vja LbRhwUdJ8VOPeM5CizMte+mD8aD7BEHeFKm0ZaUbQkrHacU/Q+aF/enMcbY9mJNh7l3f7k mbmnWr4Z5lDH8gUv3XhvhXMv0QL1B9g= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-561-ELytR4K7O3CYR-lvPKjhvg-1; Tue, 05 Mar 2024 19:07:11 -0500 X-MC-Unique: ELytR4K7O3CYR-lvPKjhvg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0D9798007AD; Wed, 6 Mar 2024 00:07:11 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id B83A616A9B; Wed, 6 Mar 2024 00:07:09 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , Marc Dionne , Simon Horman , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v3 05/21] rxrpc: Strip barriers and atomics off of timer tracking Date: Wed, 6 Mar 2024 00:06:35 +0000 Message-ID: <20240306000655.1100294-6-dhowells@redhat.com> In-Reply-To: <20240306000655.1100294-1-dhowells@redhat.com> References: <20240306000655.1100294-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: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 Content-Type: text/plain; charset="utf-8" Strip the atomic ops and barriering off of the call timer tracking as this is handled solely within the I/O thread, except for expect_term_by which is set by sendmsg(). Signed-off-by: David Howells cc: Marc Dionne cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: linux-afs@lists.infradead.org cc: netdev@vger.kernel.org --- net/rxrpc/call_event.c | 32 ++++++++++++++++---------------- net/rxrpc/conn_client.c | 4 ++-- net/rxrpc/input.c | 15 ++++++--------- net/rxrpc/output.c | 18 ++++++++---------- 4 files changed, 32 insertions(+), 37 deletions(-) diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c index 77eacbfc5d45..84eedbb49fcb 100644 --- a/net/rxrpc/call_event.c +++ b/net/rxrpc/call_event.c @@ -27,7 +27,7 @@ void rxrpc_propose_ping(struct rxrpc_call *call, u32 seri= al, unsigned long ping_at =3D now + rxrpc_idle_ack_delay; =20 if (time_before(ping_at, call->ping_at)) { - WRITE_ONCE(call->ping_at, ping_at); + call->ping_at =3D ping_at; rxrpc_reduce_call_timer(call, ping_at, now, rxrpc_timer_set_for_ping); trace_rxrpc_propose_ack(call, why, RXRPC_ACK_PING, serial); @@ -53,7 +53,7 @@ void rxrpc_propose_delay_ACK(struct rxrpc_call *call, rxr= pc_serial_t serial, ack_at +=3D READ_ONCE(call->tx_backoff); ack_at +=3D now; if (time_before(ack_at, call->delay_ack_at)) { - WRITE_ONCE(call->delay_ack_at, ack_at); + call->delay_ack_at =3D ack_at; rxrpc_reduce_call_timer(call, ack_at, now, rxrpc_timer_set_for_ack); } @@ -220,7 +220,7 @@ void rxrpc_resend(struct rxrpc_call *call, struct sk_bu= ff *ack_skb) resend_at =3D nsecs_to_jiffies(ktime_to_ns(ktime_sub(now, oldest))); resend_at +=3D jiffies + rxrpc_get_rto_backoff(call->peer, !list_empty(&retrans_queue)); - WRITE_ONCE(call->resend_at, resend_at); + call->resend_at =3D resend_at; =20 if (unacked) rxrpc_congestion_timeout(call); @@ -260,7 +260,7 @@ static void rxrpc_begin_service_reply(struct rxrpc_call= *call) unsigned long now =3D jiffies; =20 rxrpc_set_call_state(call, RXRPC_CALL_SERVER_SEND_REPLY); - WRITE_ONCE(call->delay_ack_at, now + MAX_JIFFY_OFFSET); + call->delay_ack_at =3D now + MAX_JIFFY_OFFSET; if (call->ackr_reason =3D=3D RXRPC_ACK_DELAY) call->ackr_reason =3D 0; trace_rxrpc_timer(call, rxrpc_timer_init_for_send_reply, now); @@ -399,13 +399,13 @@ bool rxrpc_input_call_event(struct rxrpc_call *call, = struct sk_buff *skb) =20 /* If we see our async-event poke, check for timeout trippage. */ now =3D jiffies; - t =3D READ_ONCE(call->expect_rx_by); + t =3D call->expect_rx_by; if (time_after_eq(now, t)) { trace_rxrpc_timer(call, rxrpc_timer_exp_normal, now); expired =3D true; } =20 - t =3D READ_ONCE(call->expect_req_by); + t =3D call->expect_req_by; if (__rxrpc_call_state(call) =3D=3D RXRPC_CALL_SERVER_RECV_REQUEST && time_after_eq(now, t)) { trace_rxrpc_timer(call, rxrpc_timer_exp_idle, now); @@ -418,41 +418,41 @@ bool rxrpc_input_call_event(struct rxrpc_call *call, = struct sk_buff *skb) expired =3D true; } =20 - t =3D READ_ONCE(call->delay_ack_at); + t =3D call->delay_ack_at; if (time_after_eq(now, t)) { trace_rxrpc_timer(call, rxrpc_timer_exp_ack, now); - cmpxchg(&call->delay_ack_at, t, now + MAX_JIFFY_OFFSET); + call->delay_ack_at =3D now + MAX_JIFFY_OFFSET; rxrpc_send_ACK(call, RXRPC_ACK_DELAY, 0, rxrpc_propose_ack_ping_for_lost_ack); } =20 - t =3D READ_ONCE(call->ack_lost_at); + t =3D call->ack_lost_at; if (time_after_eq(now, t)) { trace_rxrpc_timer(call, rxrpc_timer_exp_lost_ack, now); - cmpxchg(&call->ack_lost_at, t, now + MAX_JIFFY_OFFSET); + call->ack_lost_at =3D now + MAX_JIFFY_OFFSET; set_bit(RXRPC_CALL_EV_ACK_LOST, &call->events); } =20 - t =3D READ_ONCE(call->keepalive_at); + t =3D call->keepalive_at; if (time_after_eq(now, t)) { trace_rxrpc_timer(call, rxrpc_timer_exp_keepalive, now); - cmpxchg(&call->keepalive_at, t, now + MAX_JIFFY_OFFSET); + call->keepalive_at =3D now + MAX_JIFFY_OFFSET; rxrpc_send_ACK(call, RXRPC_ACK_PING, 0, rxrpc_propose_ack_ping_for_keepalive); } =20 - t =3D READ_ONCE(call->ping_at); + t =3D call->ping_at; if (time_after_eq(now, t)) { trace_rxrpc_timer(call, rxrpc_timer_exp_ping, now); - cmpxchg(&call->ping_at, t, now + MAX_JIFFY_OFFSET); + call->ping_at =3D now + MAX_JIFFY_OFFSET; rxrpc_send_ACK(call, RXRPC_ACK_PING, 0, rxrpc_propose_ack_ping_for_keepalive); } =20 - t =3D READ_ONCE(call->resend_at); + t =3D call->resend_at; if (time_after_eq(now, t)) { trace_rxrpc_timer(call, rxrpc_timer_exp_resend, now); - cmpxchg(&call->resend_at, t, now + MAX_JIFFY_OFFSET); + call->resend_at =3D now + MAX_JIFFY_OFFSET; resend =3D true; } =20 diff --git a/net/rxrpc/conn_client.c b/net/rxrpc/conn_client.c index 3b9b267a4431..d25bf1cf3670 100644 --- a/net/rxrpc/conn_client.c +++ b/net/rxrpc/conn_client.c @@ -636,7 +636,7 @@ void rxrpc_disconnect_client_call(struct rxrpc_bundle *= bundle, struct rxrpc_call test_bit(RXRPC_CALL_EXPOSED, &call->flags)) { unsigned long final_ack_at =3D jiffies + 2; =20 - WRITE_ONCE(chan->final_ack_at, final_ack_at); + chan->final_ack_at =3D final_ack_at; smp_wmb(); /* vs rxrpc_process_delayed_final_acks() */ set_bit(RXRPC_CONN_FINAL_ACK_0 + channel, &conn->flags); rxrpc_reduce_conn_timer(conn, final_ack_at); @@ -770,7 +770,7 @@ void rxrpc_discard_expired_client_conns(struct rxrpc_lo= cal *local) =20 conn_expires_at =3D conn->idle_timestamp + expiry; =20 - now =3D READ_ONCE(jiffies); + now =3D jiffies; if (time_after(conn_expires_at, now)) goto not_yet_expired; } diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c index ea2df62e05e7..e53a49accc16 100644 --- a/net/rxrpc/input.c +++ b/net/rxrpc/input.c @@ -288,14 +288,12 @@ static void rxrpc_end_tx_phase(struct rxrpc_call *cal= l, bool reply_begun, static bool rxrpc_receiving_reply(struct rxrpc_call *call) { struct rxrpc_ack_summary summary =3D { 0 }; - unsigned long now, timo; + unsigned long now; rxrpc_seq_t top =3D READ_ONCE(call->tx_top); =20 if (call->ackr_reason) { now =3D jiffies; - timo =3D now + MAX_JIFFY_OFFSET; - - WRITE_ONCE(call->delay_ack_at, timo); + call->delay_ack_at =3D now + MAX_JIFFY_OFFSET; trace_rxrpc_timer(call, rxrpc_timer_init_for_reply, now); } =20 @@ -594,7 +592,7 @@ static void rxrpc_input_data(struct rxrpc_call *call, s= truct sk_buff *skb) if (timo) { now =3D jiffies; expect_req_by =3D now + timo; - WRITE_ONCE(call->expect_req_by, expect_req_by); + call->expect_req_by =3D now + timo; rxrpc_reduce_call_timer(call, expect_req_by, now, rxrpc_timer_set_for_idle); } @@ -1048,11 +1046,10 @@ void rxrpc_input_call_packet(struct rxrpc_call *cal= l, struct sk_buff *skb) =20 timo =3D READ_ONCE(call->next_rx_timo); if (timo) { - unsigned long now =3D jiffies, expect_rx_by; + unsigned long now =3D jiffies; =20 - expect_rx_by =3D now + timo; - WRITE_ONCE(call->expect_rx_by, expect_rx_by); - rxrpc_reduce_call_timer(call, expect_rx_by, now, + call->expect_rx_by =3D now + timo; + rxrpc_reduce_call_timer(call, call->expect_rx_by, now, rxrpc_timer_set_for_normal); } =20 diff --git a/net/rxrpc/output.c b/net/rxrpc/output.c index 3803bf900a46..2386b01b2231 100644 --- a/net/rxrpc/output.c +++ b/net/rxrpc/output.c @@ -67,11 +67,10 @@ static void rxrpc_tx_backoff(struct rxrpc_call *call, i= nt ret) */ static void rxrpc_set_keepalive(struct rxrpc_call *call) { - unsigned long now =3D jiffies, keepalive_at =3D call->next_rx_timo / 6; + unsigned long now =3D jiffies; =20 - keepalive_at +=3D now; - WRITE_ONCE(call->keepalive_at, keepalive_at); - rxrpc_reduce_call_timer(call, keepalive_at, now, + call->keepalive_at =3D now + call->next_rx_timo / 6; + rxrpc_reduce_call_timer(call, call->keepalive_at, now, rxrpc_timer_set_for_keepalive); } =20 @@ -449,7 +448,7 @@ int rxrpc_send_data_packet(struct rxrpc_call *call, str= uct rxrpc_txbuf *txb) =20 ack_lost_at =3D rxrpc_get_rto_backoff(call->peer, false); ack_lost_at +=3D nowj; - WRITE_ONCE(call->ack_lost_at, ack_lost_at); + call->ack_lost_at =3D ack_lost_at; rxrpc_reduce_call_timer(call, ack_lost_at, nowj, rxrpc_timer_set_for_lost_ack); } @@ -458,11 +457,10 @@ int rxrpc_send_data_packet(struct rxrpc_call *call, s= truct rxrpc_txbuf *txb) if (txb->seq =3D=3D 1 && !test_and_set_bit(RXRPC_CALL_BEGAN_RX_TIMER, &call->flags)) { - unsigned long nowj =3D jiffies, expect_rx_by; + unsigned long nowj =3D jiffies; =20 - expect_rx_by =3D nowj + call->next_rx_timo; - WRITE_ONCE(call->expect_rx_by, expect_rx_by); - rxrpc_reduce_call_timer(call, expect_rx_by, nowj, + call->expect_rx_by =3D nowj + call->next_rx_timo; + rxrpc_reduce_call_timer(call, call->expect_rx_by, nowj, rxrpc_timer_set_for_normal); } =20 @@ -724,7 +722,7 @@ void rxrpc_transmit_one(struct rxrpc_call *call, struct= rxrpc_txbuf *txb) unsigned long now =3D jiffies; unsigned long resend_at =3D now + call->peer->rto_j; =20 - WRITE_ONCE(call->resend_at, resend_at); + call->resend_at =3D resend_at; rxrpc_reduce_call_timer(call, resend_at, now, rxrpc_timer_set_for_send); }