From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 646535A026A for ; Fri, 27 Jan 2023 06:11:17 +0100 (CET) Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4P35Jd4g8Yz4xwp; Fri, 27 Jan 2023 16:11:13 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=201602; t=1674796273; bh=/mRwl4lOzy576dNMnZarGuWd8jNsl9NgRg5UUELaPvU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rx41A5i/O2LsFZDcJhl8O6jZdweR6h5TE/CECSaFwX0LkGMDvbINNkv7LM0XyoFle G8iQsdiF5N2hkpCH47FVNklB2PIP5hHlzNPPoo9Vm3nPC3TL3YijLjqC3j6BJZl26j lbBRYuNJieZMcVlnghN5qrI79EG0Jm3uzsYQ7pIo= From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH 3/4] tcp: Remove 'recvmsg' goto from tcp_data_from_sock Date: Fri, 27 Jan 2023 16:11:09 +1100 Message-Id: <20230127051110.2513363-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230127051110.2513363-1-david@gibson.dropbear.id.au> References: <20230127051110.2513363-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 7NP2AYBWZGQDIQLKIJY37Q56FL7WORPF X-Message-ID-Hash: 7NP2AYBWZGQDIQLKIJY37Q56FL7WORPF X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.3 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This goto can be handled just as simply and more clearly with a do while. Signed-off-by: David Gibson --- tcp.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tcp.c b/tcp.c index f0085e3..f7228d1 100644 --- a/tcp.c +++ b/tcp.c @@ -2158,13 +2158,12 @@ static int tcp_data_from_sock(struct ctx *c, struct tcp_tap_conn *conn) iov_sock[fill_bufs].iov_len = iov_rem; /* Receive into buffers, don't dequeue until acknowledged by guest. */ -recvmsg: - len = recvmsg(s, &mh_sock, MSG_PEEK); - if (len < 0) { - if (errno == EINTR) - goto recvmsg; + do { + len = recvmsg(s, &mh_sock, MSG_PEEK); + } while (len < 0 && errno == EINTR); + + if (len < 0) goto err; - } if (!len) goto zero_len; -- 2.39.1