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 66AE45A0268 for ; Thu, 16 Feb 2023 06:43:23 +0100 (CET) Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4PHP4L0q7Nz4x8L; Thu, 16 Feb 2023 16:43:14 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=201602; t=1676526194; bh=LMBQbwLBygu58Gj0q3edPJ2Lrmc9md5VcuOtcXlgx1A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hzohBwslqPfwfp1vOiXRkieV9MJ1IGq8tT37V2jGmXHrVo5DGfdKGREPBk0/SSfyW Nb+d+N6DgvV0OPYXwWsSyCoA5ckDKtOjKN3HGsB5nINVYSv9dczd7ACV08TrhI8iQD P9MI+g21JL7h1cXloxVTe1SCwR7cAy1NQn0/bwZc= From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH v2 3/4] tcp: Remove 'recvmsg' goto from tcp_data_from_sock Date: Thu, 16 Feb 2023 16:43:10 +1100 Message-Id: <20230216054311.2131853-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230216054311.2131853-1-david@gibson.dropbear.id.au> References: <20230216054311.2131853-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: E5VD5LWM6DVQPBS3NPOU53RW64ZDCO72 X-Message-ID-Hash: E5VD5LWM6DVQPBS3NPOU53RW64ZDCO72 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 f028e01..b101441 100644 --- a/tcp.c +++ b/tcp.c @@ -2186,13 +2186,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