From nobody Wed Jan 18 23:39:20 2023 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 4Ny2KP0JNBz2v5JN; Wed, 18 Jan 2023 23:39:21 +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 4Ny2KN6sf7z4Q2r; Wed, 18 Jan 2023 23:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674085161; 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=5hop1fx2g2nGTwOr9tIhtm5QDp1ezkj4qb+oUmDSuN0=; b=XpMwpxpjMIpUe+inF/LbpPcU8qMCibcyFEcrkjLzS4MQB14rpXnxdg2S3Zu27drsm3tCMr Au27fazpidGU26BbElYArnoXokk3X0p43tof0sGM1Dpui61GKBFsihx9vJVB9ioxKy1hBV Tc9wwEuXo6c5WcXvcTgHrPSh9zA24Elxm9O5VoE1eCiwS80r3sy+Zca+DuZJTPyqlxeQFt h1RQh2O+ErgyMjD+36TDvzgNvEOxtQdo9R9zJy6GE2b0FaTmXKBma+eXtako8G8g6ujLqr u6B5g3MFIpqmmGV7irlA+Ybsz7lchEO6AitCYJx3kvLDNC7DgNL53orBgJJ/zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674085161; 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=5hop1fx2g2nGTwOr9tIhtm5QDp1ezkj4qb+oUmDSuN0=; b=pcFadtb6m7YK9b63ZHyTwqjMrBTSumXfy5CvMuXhUc68wKC9QDZ9U2lyblIttSP9O0ypA4 PLLchgBz3vPjd9/IkerxsUuRSUj9SH8Fbap6VArcBwiBbsq9wh6lEU//ubTHKYLfQKkHdS I5iqTHUHcOiOfdNNEz72TAWmZUcsDgPVHobX0EPUK48w7uWqgFbCVewTy8j8f3BrOrY4vb JjrzDjf/nTjnn5sSYYGzY1+SNIbV+IWyliWnoKxNxx/C1Ffuli5c9Xq27XHGzMtWTtRcSA glmeVMF8Nw8NcZ5SZ7+TZ7Eq12SaQm44EKhjcxrgVi/BbyqlNmYDJdQXRvY3rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674085161; a=rsa-sha256; cv=none; b=ARmjYCYPB/OWYZHN1wNPKbMEiPpqmyxqWWy0g3oeyhhiBYlAVqhuAFAe/JGXEXoa9LhK7D ANUM+yihRQpV6STgbYYCckGl8aucRB41/NWswd/fjypfwTHN9pr3Y1pkPPny5I0y5njjfh umRN38nLQqhOiGWDG7l2NPkP8Za7kOUPdDXYvl7qBa/68fwqgoeGfc5hy+IxSfLWDCdU4G /W75dzsEAHGgigEhKr06gq0A+RhYIwgVkpU1l6QP2uSVSa87WtyPvdl9bdOGdWtr8zW1hJ tv0SrLuu3Ykjm7dDBZlcveZn83XRusu6yAhzGfts+5QNRKYc8jTJDYCjwR4jmQ== 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 4Ny2KN5v7TzVKr; Wed, 18 Jan 2023 23:39:20 +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 30INdKpT056679; Wed, 18 Jan 2023 23:39:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30INdK04056678; Wed, 18 Jan 2023 23:39:20 GMT (envelope-from git) Date: Wed, 18 Jan 2023 23:39:20 GMT Message-Id: <202301182339.30INdK04056678@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 846e4a206fab - main - ktls_disable_ifnet_help: Set curvnet around sorele(). 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 846e4a206fabf18b7ace01f6a41f65252da3dd95 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=846e4a206fabf18b7ace01f6a41f65252da3dd95 commit 846e4a206fabf18b7ace01f6a41f65252da3dd95 Author: John Baldwin AuthorDate: 2023-01-18 23:39:04 +0000 Commit: John Baldwin CommitDate: 2023-01-18 23:39:04 +0000 ktls_disable_ifnet_help: Set curvnet around sorele(). This is required in kernels with VIMAGE such as GENERIC. MFC after: 1 week Sponsored by: Chelsio Communications --- sys/kern/uipc_ktls.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index 330a7a2dbdcd..ac55268728e9 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -3210,7 +3210,9 @@ ktls_disable_ifnet_help(void *context, int pending __unused) } out: + CURVNET_SET(so->so_vnet); sorele(so); + CURVNET_RESTORE(); if (!in_pcbrele_wlocked(inp)) INP_WUNLOCK(inp); ktls_free(tls);