From nobody Tue Sep 24 04:32:08 2024 X-Original-To: dev-commits-src-branches@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 4XCRlr36bMz5XG62; Tue, 24 Sep 2024 04:32: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 4XCRlr1DFmz4RMt; Tue, 24 Sep 2024 04:32:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727152328; 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=6emypY/I/Eof+NVPxj82QCc080qIyiyIzYXyIa7EfHY=; b=qBw6rWkN73yx0NEtKQ28I9YkwjmJFoEWeGUXSM56Vo370CJT1EBiXKa0X4qWuW+PNQnM38 2YtakDehFNCQFLSXb82VujPo7IUvnRvXY8mWrPGoA1npi4/lpd/heS+YPqJzC6v+p45q+r 9RSUErvA4FlAWFC/IjoWW9cXP+8WP0x1qbP034a8N4soroXSiMkxZYJBwlm7r0NwrreQLw FWEJF43eUVzvTpGOJn3hm16Im2W/Y7reVpEBvRtcs9Pjo/a5LuS51987heI8VEf62V5fOf xZRRaYLLIHx3TMGon4wxTmExGnKMSCBi39461wluvnCQ7xHmSQ5I+NrpmshTeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727152328; a=rsa-sha256; cv=none; b=F42ijOEeVaJFUOvpaszqpsbqfRfR30i+Vm1lrTIB8F5Dq+LwCeZPcJc8aYs6X3VTk/crOL 6bEN8n55e0BY3aBhmYAa7WoculBbRjarxLuDE3ZJe5cylXveNAKni7rjjgEXrpAcnPy9b8 9jqJ6QWPfnUwqd15DjRDhijlQ/2HawOGhjmj+vFwGjbu1kPjP46oMMRct50O3xDg9hoCDK EDyPDUwh9fxnjaSeeOnNrv2Get8LBN8rcO9p8zxdfUAtwdKKLgV1Lz91LEpQFlGevYk6Ed 3dBqCvSY1ZHS3Wgspk/eUPgX4pH3wnYMnv08bIE1S2RGqRxsOKIxp1cylxWf3w== 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=1727152328; 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=6emypY/I/Eof+NVPxj82QCc080qIyiyIzYXyIa7EfHY=; b=hTAj/fSebkw77OeiCuQLLya2MSWoHLJv3bIXjVhTYAYPa7JioXvqPAivb9FX7B39+uXWoS bhPcvAUDOg/xsVqdGH0V+H7d+u6FjnxwiPBmTqoaw7oo4ZI1fVHQ7MoRGuxliqQiTL3hC4 kWPeL1CCWJwMQSzfUbOxnZRuNri2d32pPfwv6M4qMwCiHJhZO3CREpgg1ervnRTMifjBXZ l+9C55Lm6NAo9BCmm4xBQQsFHDFb2hhHZsKwfAMIEkqdhcQXmRabOSSguN9pYae4r/8sH/ GlqYGXCXZtHC8wAsvuDDStxDgTv0eQmcFXbC73AM0Gh1JGlNHp/bZV3gV9KXmQ== 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 4XCRlr0rLVzF5K; Tue, 24 Sep 2024 04:32:08 +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 48O4W8aV092937; Tue, 24 Sep 2024 04:32:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48O4W8Lw092934; Tue, 24 Sep 2024 04:32:08 GMT (envelope-from git) Date: Tue, 24 Sep 2024 04:32:08 GMT Message-Id: <202409240432.48O4W8Lw092934@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 4bf231d10070 - stable/14 - bpf: Update a comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4bf231d100702021ae38aafa0583d50d2ba94f70 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=4bf231d100702021ae38aafa0583d50d2ba94f70 commit 4bf231d100702021ae38aafa0583d50d2ba94f70 Author: Zhenlei Huang AuthorDate: 2024-09-10 10:03:32 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-24 04:30:49 +0000 bpf: Update a comment This comment was introduced by fix [1], later the fix was refined by change [2], and the context of the usage of `m_get2()` and `m_getjcl()` got lost, then the comment became obscure. Update to reflect the current behavior. 1. f13da24715a7 net/bpf: Fix writing of buffer bigger than PAGESIZE 2. a051ca72e281 Introduce m_get3() Fixes: a051ca72e281 Introduce m_get3() MFC after: 3 days (cherry picked from commit 343bf78e487190557889c8ba53d8080b268867f7) --- sys/net/bpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index e65d890f891b..c8b2f30dd6bd 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -649,7 +649,7 @@ bpf_movein(struct uio *uio, int linktype, struct ifnet *ifp, struct mbuf **mp, if (len < hlen || len - hlen > ifp->if_mtu) return (EMSGSIZE); - /* Allocate a mbuf for our write, since m_get2 fails if len >= to MJUMPAGESIZE, use m_getjcl for bigger buffers */ + /* Allocate a mbuf, up to MJUM16BYTES bytes, for our write. */ m = m_get3(len, M_WAITOK, MT_DATA, M_PKTHDR); if (m == NULL) return (EIO);