public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: Stefano Brivio <sbrivio@redhat.com>, passt-dev@passt.top
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH v2 08/11] tcp: Remove unneccessary bounds check in tcp_timer_handler()
Date: Mon, 27 Nov 2023 10:33:45 +1100	[thread overview]
Message-ID: <20231126233348.1599864-9-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20231126233348.1599864-1-david@gibson.dropbear.id.au>

In tcp_timer_handler() we use conn_at_idx() to interpret the flow index
from the epoll reference.  However, this will never be NULL - we always
put a valid index into the epoll_ref.  Simplify slightly based on this.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 tcp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tcp.c b/tcp.c
index f427047..512baf3 100644
--- a/tcp.c
+++ b/tcp.c
@@ -2759,10 +2759,10 @@ void tcp_listen_handler(struct ctx *c, union epoll_ref ref,
  */
 void tcp_timer_handler(struct ctx *c, union epoll_ref ref)
 {
-	struct tcp_tap_conn *conn = conn_at_idx(ref.tcp.index);
 	struct itimerspec check_armed = { { 0 }, { 0 } };
+	struct tcp_tap_conn *conn = CONN(ref.tcp.index);
 
-	if (c->no_tcp || !conn)
+	if (c->no_tcp)
 		return;
 
 	/* We don't reset timers on ~ACK_FROM_TAP_DUE, ~ACK_TO_TAP_DUE. If the
-- 
@@ -2759,10 +2759,10 @@ void tcp_listen_handler(struct ctx *c, union epoll_ref ref,
  */
 void tcp_timer_handler(struct ctx *c, union epoll_ref ref)
 {
-	struct tcp_tap_conn *conn = conn_at_idx(ref.tcp.index);
 	struct itimerspec check_armed = { { 0 }, { 0 } };
+	struct tcp_tap_conn *conn = CONN(ref.tcp.index);
 
-	if (c->no_tcp || !conn)
+	if (c->no_tcp)
 		return;
 
 	/* We don't reset timers on ~ACK_FROM_TAP_DUE, ~ACK_TO_TAP_DUE. If the
-- 
2.43.0


  parent reply	other threads:[~2023-11-26 23:34 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-26 23:33 [PATCH v2 00/11] Introduce unified flow table, first steps David Gibson
2023-11-26 23:33 ` [PATCH v2 01/11] flow, tcp: Generalise connection types David Gibson
2023-11-26 23:33 ` [PATCH v2 02/11] flow, tcp: Move TCP connection table to unified flow table David Gibson
2023-11-26 23:33 ` [PATCH v2 03/11] flow, tcp: Consolidate flow pointer<->index helpers David Gibson
2023-11-26 23:33 ` [PATCH v2 04/11] util: MAX_FROM_BITS() should be unsigned David Gibson
2023-11-26 23:33 ` [PATCH v2 05/11] flow: Make unified version of flow table compaction David Gibson
2023-11-26 23:33 ` [PATCH v2 06/11] flow, tcp: Add logging helpers for connection related messages David Gibson
2023-11-26 23:33 ` [PATCH v2 07/11] flow: Introduce 'sidx' type to represent one side of one flow David Gibson
2023-11-29 14:32   ` Stefano Brivio
2023-11-30  0:37     ` David Gibson
2023-11-30  9:21       ` Stefano Brivio
2023-12-01  0:10         ` David Gibson
2023-11-26 23:33 ` David Gibson [this message]
2023-11-29 14:32   ` [PATCH v2 08/11] tcp: Remove unneccessary bounds check in tcp_timer_handler() Stefano Brivio
2023-11-30  0:42     ` David Gibson
2023-11-26 23:33 ` [PATCH v2 09/11] flow,tcp: Generalise TCP epoll_ref to generic flows David Gibson
2023-11-26 23:33 ` [PATCH v2 10/11] tcp_splice: Use unsigned to represent side David Gibson
2023-11-26 23:33 ` [PATCH v2 11/11] flow,tcp: Use epoll_ref type including flow and side David Gibson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231126233348.1599864-9-david@gibson.dropbear.id.au \
    --to=david@gibson.dropbear.id.au \
    --cc=passt-dev@passt.top \
    --cc=sbrivio@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).