From nobody Tue Jun 07 10:59:30 2022 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 18C0B5D6733; Tue, 7 Jun 2022 10:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LHS6V4WJTz4mds; Tue, 7 Jun 2022 10:59:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654599570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kPccEW3oomMMQ2TDMv11TC1r9mNYdGNk6O1wiZcBaO0=; b=x+YQmhwRCSMd9Rv7TqHttOef8ytqSmdzADRxkPE4UHcWvez0RHEZUkDae9X9aZJvEcL3fa XvzOo4FpGazWnPY5IX9cTucB14snhbDcQSuUGluSN+5hVgjmaVZRUDk5rEzXNbdGaopoP9 ezXkC/EZgGHH93TSrEiKtMDl0qvI3Q6QOp1yfFMnwbQrs8ECF0rvq4toRwijifj3AT6rsq 4afveaVBMcp2qi7oPriT9GNFijFs+OZhHB0JnWRvma37q0EBffIZNGzub2plQRGOZD8IG2 v2OsaKxcKf2XWsVJhz4YrhLIjOpVSluLaVJhd1iNOPZ0RNsVc6MyXsqFJOik1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7131719B8B; Tue, 7 Jun 2022 10:59:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 257AxUgx035552; Tue, 7 Jun 2022 10:59:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 257AxUTA035551; Tue, 7 Jun 2022 10:59:30 GMT (envelope-from git) Date: Tue, 7 Jun 2022 10:59:30 GMT Message-Id: <202206071059.257AxUTA035551@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: f0fca6461804 - main - ktls: Refer send tag pointer once. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f0fca64618045bba23f4d61a377b64f9acb96220 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654599570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kPccEW3oomMMQ2TDMv11TC1r9mNYdGNk6O1wiZcBaO0=; b=ebiaONzqXrySylX8jB/oQiSEWst5fNdQD9MeVQq1+VHmzhle6nP3FgGonwlg8Zr6GqoFlN mvgTwO7SgBONm3n2Qi1HhuzOefjE22L0fKAs90wb7jvma1cTbHU5N+04OjlLgofiYOd357 fwxITt7CMkb0X8M6JX+2t25k73cvaNpCprp19l1ZsTrZxmlClAeSMY4QAiyFbuHPzX5ZLY awrwyrQs6gu5hNG7shKuvOmmsG8MG5jbGwt+pnvBAyR9nTCNZqjaT8Ar+Hi3dXPzHSB3Jd eH/opViT4Z9Is48SFl+Oxg3POlQ1qAjdx7f6IoeGi8RLI6qmIiutMycqV4ZbgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654599570; a=rsa-sha256; cv=none; b=BwKvdeTKqYjouy/x0HmZ8E0i4zzDDCkRSxfN8CZzGLk5o8NurVpaiCANrfP+riYW6DuHnD TFIn9BzTq4cD5/e0Npt5zTvBA8k+/+rX0/1tVLHkHVoCaYWVzUEoSETFwoaVvrq7bx0JPq u697ZI7dEDAejxrzmKpSHjGY9VV137GhuI7jw1sPXU0XSOZt7jPvmYfDyTY95Nwk73hxUj 5QyCGSxhDWb0YWGYV+0QwYYNOcRc/m1uxJEC4pzb8vPxy1Bt/0lPdmiuzTrAqYGB23VOkm lFMX//c5JVLBEpDxJaJdM7UpxmAgcPBGgIvDDNnW/WRL7A283KvQOwM0aDfdeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=f0fca64618045bba23f4d61a377b64f9acb96220 commit f0fca64618045bba23f4d61a377b64f9acb96220 Author: Hans Petter Selasky AuthorDate: 2022-05-25 12:16:27 +0000 Commit: Hans Petter Selasky CommitDate: 2022-06-07 10:57:03 +0000 ktls: Refer send tag pointer once. So that the asserts and the actual code see the same values. Differential revision: https://reviews.freebsd.org/D32356 MFC after: 1 week Sponsored by: NVIDIA Networking --- sys/kern/uipc_ktls.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index ea20532a4d8c..e55f4fd0cb62 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -1615,10 +1615,11 @@ ktls_modify_txrtlmt(struct ktls_session *tls, uint64_t max_pacing_rate) return (0); } - MPASS(tls->snd_tag != NULL); - MPASS(tls->snd_tag->sw->type == IF_SND_TAG_TYPE_TLS_RATE_LIMIT); - mst = tls->snd_tag; + + MPASS(mst != NULL); + MPASS(mst->sw->type == IF_SND_TAG_TYPE_TLS_RATE_LIMIT); + return (mst->sw->snd_tag_modify(mst, ¶ms)); } #endif