From nobody Wed Sep 11 15:06:07 2024 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 4X3kRN0zDPz5Tg6Q; Wed, 11 Sep 2024 15:06:08 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X3kRN0XM0z424d; Wed, 11 Sep 2024 15:06:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726067168; 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=mdb8oCblqXtCGiQefBwvek0A8iy5nY+PDtDzPXXj2Ns=; b=WeK1bnZ5tjHlBeiZvjZkDxqyTV0qKlHJrPmfCPhcuAxWmWa1RxTCogfe/ktU5rq0guDpvj ZA3vzv2U1NWB0Ll6AypluzQAytjQT78aVYfCaKxgX8RFWKkZ22X38yshlscLK97EoKQIR7 SG5l8/50QopBIMQsSET4IMrP/rrPDy1i4AosPIaumhP3P2HAJjHJzU/PF1mSyblPi3RMnk iGZDBGHNB5Z6KZUDRSi4MKHq1CUMxHAlC2y6+Hpyd2huWnlkCVDQXsORQFpS3nqOkwW3Ct pQ6mru7LLGzy1FbO4YTHgtHWXGtYn28RCpAdq6ShoEUhSSsdojsHDyfQm9bwqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726067168; a=rsa-sha256; cv=none; b=w4sfF+wn+Yq5Mz2P/X/X+ZEztLFIqgGZKJ/1mAe0p7fciWCIkxSdkt9tgEl9IHVkoQosJQ N1IIZ3q8Dm012RDrkpzUlVV980BFccxRxsipPKC1PPajYtn2p1aTVzM+R+wNRHy2btKCk7 B07yHXiG3gzby1Xu+znULkj4wHc/+SZtauW9atotX6hXW0L1DiBVpEFxQ8ptEypisU6Bdd jaKPNqtb2i7lyYeKQLTN86YK7netEDswLw7Xfrz4KStyY93Bh01pKSpRoRa7/QD32ngar8 UabkVm2gezqTD2kANeUNKSqBx06EKmfG51qGx7kw8C+iNBCQAQxHWJgNFnWPkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726067168; 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=mdb8oCblqXtCGiQefBwvek0A8iy5nY+PDtDzPXXj2Ns=; b=UPvELUoEY8/CGqOaCLatsgX+XKEcqStoPae0DXHXQ5vt+fkkpwbnolSo5I9s6vNxK9Nyqx cjpalXF3VEUIk7sEeKttWJzci8YQl873PfSH1JLD9SHWBhu8ZGa43GBrezNgCxloy/ojX1 VomACtTkTYSdr9trt61xC0IRme5KdPjm6jTA1NsK/bIQxN1zLbFgJNwsyd+Js/3lJu3VSO k+xUrQ64maQmoQCS6sfew2aLr/vCCQxzX59x6+J56XSiw9ejdoaZCs39JeFid0qOS4sRH1 eLDGm+7P4bEEQowras558F3Dh9cI29r+8Qbs/1hbJsqWz1arKbAl5FV06hxLZQ== 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 4X3kRN01sHzbt2; Wed, 11 Sep 2024 15:06:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48BF67Hx056063; Wed, 11 Sep 2024 15:06:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48BF67kD056060; Wed, 11 Sep 2024 15:06:07 GMT (envelope-from git) Date: Wed, 11 Sep 2024 15:06:07 GMT Message-Id: <202409111506.48BF67kD056060@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 299175f2e52e - main - Revert "Assert that mbufs are writable if we write to them" 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 299175f2e52e1a5cf495316d53a245bea00dfca7 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=299175f2e52e1a5cf495316d53a245bea00dfca7 commit 299175f2e52e1a5cf495316d53a245bea00dfca7 Author: Kristof Provost AuthorDate: 2024-09-11 15:04:35 +0000 Commit: Kristof Provost CommitDate: 2024-09-11 15:04:35 +0000 Revert "Assert that mbufs are writable if we write to them" This reverts commit f08247fd888e6f7db0ecf2aaa39377144ac40b4c. This assertion is triggered by ktls_test:ktls_transmit_aes128_cbc_1_0_sha1_control. Remove the assertion until we fully understand why. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/kern/uipc_mbuf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 3232af880925..f6ce9b5cc74b 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -1280,8 +1280,6 @@ m_copyback(struct mbuf *m0, int off, int len, c_caddr_t cp) if (m0 == NULL) return; - - MPASS(M_WRITABLE(m0)); while (off > (mlen = m->m_len)) { off -= mlen; totlen += mlen;