From nobody Tue Jun 14 09:40:24 2022 X-Original-To: dev-commits-src-all@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 7D60A84661B; Tue, 14 Jun 2022 09:40:24 +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 4LMk202Svwz3Jk6; Tue, 14 Jun 2022 09:40:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655199624; 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=n/CsY45IllQyqAyh1naMzVQZDXnTi+FfMj3JTZ5nVF4=; b=VcjKQXFgkSvWoksg5TZj4UH6fEAmnInd3DrEJ4tGej7B4LCgo5wucj7M55iLJXOLATi4fp G3wG29IrdC8csVfLKzNbKwU/ZfI6NJmQFVKJPdsHxvmQ9cbQ1bHlCEtGLX7R3hZtTchZYY QtauyWdh87THEULzlILQaNhqfMyDoy88ZpswdqIvQswJvp8ROLagb3ONdNmtBv8oCAyFFS YtSvREM3Eno95EgiS9mVsmXHM/O5qQ2spppBI+H/Ud9WOuEmhVn7ic79dN2fKK1fAFisT9 QO4bP12XSDsCTTPVlwUtZLY4Z/hrfoIWLZhl/ctMsgGTKJsIYYnhg/BVCHen6Q== 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 2E4CC27D80; Tue, 14 Jun 2022 09:40:24 +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 25E9eOQg066700; Tue, 14 Jun 2022 09:40:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25E9eOX6066699; Tue, 14 Jun 2022 09:40:24 GMT (envelope-from git) Date: Tue, 14 Jun 2022 09:40:24 GMT Message-Id: <202206140940.25E9eOX6066699@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: 43bcc15a4270 - stable/13 - ktls: Refer send tag pointer once. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 43bcc15a4270a3d9247a57c9f92b30c672e4dd13 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655199624; 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=n/CsY45IllQyqAyh1naMzVQZDXnTi+FfMj3JTZ5nVF4=; b=ganJxh5RKdSltWGPGthA5dAttb1kLY1nlS+iuik7vjiHESjqC9Enlkrqq9xYIudsDSEMmx QdfDTikhvOT5+u2lnf3CDOUPai5T7T6mILuH6NK5nYOKaDIBj+sutwVQOcDYdc37/kQgzx MYSC7bha3EnOXl6iaEjMrvA/8iiN/+DlfZYkEIHnMD57CZWnseOLG1gFQzGrLaeomLpb9d jelfdvgEokikbWTCJp4GBetoeOM/cfwNN3SLPTJmL2HmGLp5bNsjJKJDSWpo25fkNB99xV IGFu2+tI2xoRwbsedXn9WrY/JF8CM/IZfXiVqspyDS4uDKjImu9EJfkgfxaONw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655199624; a=rsa-sha256; cv=none; b=I2YMJ+l+urH+tfSH30/rxifTp2g+uVJJASi8vZjuD7diAnp1BDSBJkTSWRR/red2zy38Le jLi+7n4D5DQgHHBgKwjtVeisj9gublMdl+xOxjDWbRFSx9NoXcbuAXRcdg+/23EgstRjL2 2gdiK+1PpYxkMLHG1oboFx6SDC2nEHNeNpTn+ovIE6ivNxKdkIQHufsG/8+tmdUBcUDRz+ ql7LTWTkd2kDGb0mNfDrRljwaKv0yRr6EbynOfhBM/Fr3lWtKGbHAqwNWZcS+agfAhDgGb TU3GQsEFvZZGpE8ATIPrpTliYQrLHZTbT4445CYYbUtgeSHTXsHruc2ReHBnEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=43bcc15a4270a3d9247a57c9f92b30c672e4dd13 commit 43bcc15a4270a3d9247a57c9f92b30c672e4dd13 Author: Hans Petter Selasky AuthorDate: 2022-05-25 12:16:27 +0000 Commit: Hans Petter Selasky CommitDate: 2022-06-14 09:39:23 +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 Sponsored by: NVIDIA Networking (cherry picked from commit f0fca64618045bba23f4d61a377b64f9acb96220) --- 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 fa01113c7c8e..f6190e24a6b2 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -1480,10 +1480,11 @@ ktls_modify_txrtlmt(struct ktls_session *tls, uint64_t max_pacing_rate) return (0); } - MPASS(tls->snd_tag != NULL); - MPASS(tls->snd_tag->type == IF_SND_TAG_TYPE_TLS_RATE_LIMIT); - mst = tls->snd_tag; + + MPASS(mst != NULL); + MPASS(mst->type == IF_SND_TAG_TYPE_TLS_RATE_LIMIT); + ifp = mst->ifp; return (ifp->if_snd_tag_modify(mst, ¶ms)); }