From nobody Wed Aug 06 22:29:35 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4by4jG0thkz64JNc; Wed, 06 Aug 2025 22:29:38 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4by4jF6zyWz3VdG; Wed, 06 Aug 2025 22:29:37 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754519378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tDem6P9sUWjDRt40BG3VGcqApq2DserpS8BiyOFM31g=; b=czC6slSuwWqYlYXa5RJrx4GAtCPs0jTZyWTqA7HMyy2jZiiPBkXlGGm4EZ4+y1OanEMRc0 OwtIkoSecCFL120UhKg5Ptr9KTc6mAIsgh8cF86mZKnd7y1am6sdazjUSb7RVU29uMltFo rYzeD1uRrZoOFld8RIouPvcqpVZ3WbS8dXViHo7nn6KNGDG3ckP4ROvNcyvY69u2HbnFFT QtK4seN/1DBpZJzQXxBcv+sqtsdXyclBqz/X9ld6QpwLdqKu7vDcPU26MaVksn6b3wpdTo qZk4HnLdMtghgCD8MI0mpAo+/BvMJTKLvvVkHcAkosCyeJAIr1WGpUfPj3xTFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754519378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tDem6P9sUWjDRt40BG3VGcqApq2DserpS8BiyOFM31g=; b=GuKMg4BiMyi2OdwedKa2puSfBmRJpEOKp+C9BGDpZ+5ur9H9oKDA3EklL+f73WNWYVEFwR 2Up51Ngp1AUNvXQnMMVApoxp6zaKJ2LbEmAEdxqVbLucSjEKQjJy+dnut9fPEZkZ9UCfTN C+p0YY5PMCvuzCU69kAxuWvCxIPCsx/6gwUahXJeL2kD7yTavw3MV12ixzmIzKYlRsuXQ1 81TGEiem6TclF3bHAz4Kv2idtv79Aaj8iHgngSnliPvsvRzx9UrKqMu6UKuBeh1ktgnHyS ffR8KJ3OFpZeO7+VDXp1GOQmE0RvE4UGoS63vhCYK8NA+HJEYwjCrdmq0EStWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754519378; a=rsa-sha256; cv=none; b=u4N5B7rMCEi8IVfPPHzhMg+RtLGGDbiYMjDv7pvE8EUPbnsPeMhM7LqzzpoSccOg7KhZ0U KlgDRA4MsZ85Sy9rJiR7l8m1geKwngkXoDpP7X2PfrkBAj9MlZJSYEgdbRLTdEXzkdr+yw q3ooB4bt4q9txoLM1KmC4q95Ud7hRib4fz3V3yzbR78wR4QaCpeOWrUTbQtQFjOKNUvqZV ChWjDDKDO0i1HSs5PT+FQT6UKZAhmlsu1xK15jm/HEXjZUuTWjVBWWS5CQOsUVl9hvEL85 E4rCWQguESfWPhFLEhskSxKYdrpE1jqSUx1MilQ3ab5gPFt6HSToGTsjFngv2g== Received: from cell.glebi.us (glebi.us [162.251.186.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4by4jF2tZYzQff; Wed, 06 Aug 2025 22:29:37 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Wed, 6 Aug 2025 15:29:35 -0700 From: Gleb Smirnoff To: Michael Tuexen Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: feeb19201dca - main - tcp: improve consistency of KASSERTs in tcp_sack.c Message-ID: References: <202508060830.5768UUcN052133@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202508060830.5768UUcN052133@gitrepo.freebsd.org> On Wed, Aug 06, 2025 at 08:30:30AM +0000, Michael Tuexen wrote: M> When panicing, don't print the condition, which was violated, M> but the condition which holds at the time of the panic. M> M> Reviewed by: Nick Banks M> MFC after: 1 week M> Sponsored by: Netflix, Inc. M> Differential Revision: https://reviews.freebsd.org/D51726 M> --- M> sys/netinet/tcp_sack.c | 30 +++++++++++++++++------------- M> 1 file changed, 17 insertions(+), 13 deletions(-) M> M> diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c M> index 4405098a8620..f48e60207cc2 100644 M> --- a/sys/netinet/tcp_sack.c M> +++ b/sys/netinet/tcp_sack.c M> @@ -283,7 +283,7 @@ tcp_update_sack_list(struct tcpcb *tp, tcp_seq rcv_start, tcp_seq rcv_end) M> INP_WLOCK_ASSERT(tptoinpcb(tp)); M> M> /* Check arguments. */ M> - KASSERT(SEQ_LEQ(rcv_start, rcv_end), ("rcv_start <= rcv_end")); M> + KASSERT(SEQ_LEQ(rcv_start, rcv_end), ("SEG_GT(rcv_start, rcv_end)")); M> M> if ((rcv_start == rcv_end) && M> (tp->rcv_numsacks >= 1) && M> @@ -498,8 +498,8 @@ tcp_sackhole_free(struct tcpcb *tp, struct sackhole *hole) M> tp->snd_numholes--; M> atomic_subtract_int(&V_tcp_sack_globalholes, 1); M> M> - KASSERT(tp->snd_numholes >= 0, ("tp->snd_numholes >= 0")); M> - KASSERT(V_tcp_sack_globalholes >= 0, ("tcp_sack_globalholes >= 0")); M> + KASSERT(tp->snd_numholes >= 0, ("tp->snd_numholes < 0")); M> + KASSERT(V_tcp_sack_globalholes >= 0, ("tcp_sack_globalholes < 0")); IMHO, better just through MPASS() instead of self-repetitive KASSERT. -- Gleb Smirnoff