From nobody Wed Feb 1 17:31:58 2023 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 4P6TW3116rz3bJ1P; Wed, 1 Feb 2023 17:31:59 +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 4P6TW30Dkqz3P5T; Wed, 1 Feb 2023 17:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675272719; 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=boOMdEdTYypExb2wjJ8/+XyNgAvoBnla2e90Ua3rwkU=; b=QlckSkax3FsjaND0RfxHI9Q25WWlXl3zTMWJH6f0aztrzAE6yKadv74vpoqct/3c7uCAgJ FYJGLZQk2NIupULLFMdqm1rAjzfmL0GjKKS49gKJWfsuaTInSpVGBg6WfrBE/KEO4ZtQxU 8IVLHvs31xQPA0mubILCBJGMsMfgHu7yJ9Dj0lEmU4vzI1D8odRa9xM8VwkwvURgGNlFsQ cKT7w9kVfXaqXtgxudaiP9KmmAqRzGWBFvG1fDi+J+wBm88SLOpyVU7oxu/lIMVhUt8AEW 50k42dGuDU8R2Z7jkeaGG/D8BxbsPQ9KHn3MCoa3lJkwcxVUTa0g9VbRcx2KnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675272719; 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=boOMdEdTYypExb2wjJ8/+XyNgAvoBnla2e90Ua3rwkU=; b=svxUyqF4j4By4mF33JWdC5L4SmTDHtaxsOQhWPa3Hr4bU2KJy/CypS3edspu0T/SLmwNrl EznoACExEqq/sgOBoJ+ZYtSvLAoyYtH8c8AdyQlWY3YMimGHyjMsDArsNCLLZMYzXbyOqN Bo6ZsqNrqpOLPksnbJAP9kA0inxtk+HGdog0FOCAGDyxjsQ014DHRg/EEXJ8+hK/m3cjGm PazTnZQp3sw5fWK/G3pZiy19uMA3TQtIuR32GqkS2yWZGVn9MGIjKW/6FjsAo2hFKiNxvo 6epnIYEn9oMaDEIKiS3s0ubaE+694X9H5apTNfN/FNSxuDMlNNEMG68F7U5Aqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675272719; a=rsa-sha256; cv=none; b=DH60lFz4cDcfu6R8E7a9UnRBFzQauqFNzoR0t0UtTGSV9ex0U0hoHyKi+iwmlsxfK/nQg4 NyqSRN370IzAtoRYnMgCtHrAy1Wc6EjtrErIe7ztyypGNZxltqqZH6qOdFvpG8D4fw78b8 IZxaLWsr47VNBZqBSkGcmKXTiRv3zzklJBicb7XyKtj6YBPmmDr2uj8e0cWQI+mGMNyL6D FNcIehhXhqH6mQFkTvUT5BFXY8cLsFQRqJ7utJtCwLNHFXGrsyj7aQy0YLORKbHiL3NErt Ny907RPCHg8IObYUb0/h5VRySUenS8C1X1BIBqgRjm2BlIxdSnUM3FVah9nD8Q== 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 4P6TW26PmwzMxN; Wed, 1 Feb 2023 17:31:58 +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 311HVwDc058041; Wed, 1 Feb 2023 17:31:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311HVwTc058040; Wed, 1 Feb 2023 17:31:58 GMT (envelope-from git) Date: Wed, 1 Feb 2023 17:31:58 GMT Message-Id: <202302011731.311HVwTc058040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1a57779234d4 - stable/13 - netmap: Fix a queue length check in the generic port rx path 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1a57779234d4590fc16cba26305105f5c6fdd42b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1a57779234d4590fc16cba26305105f5c6fdd42b commit 1a57779234d4590fc16cba26305105f5c6fdd42b Author: Mark Johnston AuthorDate: 2023-01-23 19:41:55 +0000 Commit: Mark Johnston CommitDate: 2023-02-01 17:22:31 +0000 netmap: Fix a queue length check in the generic port rx path The check is ok by default, since the default value of netmap_generic_ringsize is 1024. But we should check against the configured "ring" size. Reviewed by: vmaffione MFC after: 1 week Sponsored by: Zenarmor Sponsored by: OPNsense Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D38062 (cherry picked from commit 539437c8281d24450bacded3734276acd9983e90) --- sys/dev/netmap/netmap_generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/netmap/netmap_generic.c b/sys/dev/netmap/netmap_generic.c index f3125860b869..f726cf471177 100644 --- a/sys/dev/netmap/netmap_generic.c +++ b/sys/dev/netmap/netmap_generic.c @@ -838,7 +838,7 @@ generic_rx_handler(struct ifnet *ifp, struct mbuf *m) nm_prlim(2, "Warning: driver pushed up big packet " "(size=%d)", (int)MBUF_LEN(m)); m_freem(m); - } else if (unlikely(mbq_len(&kring->rx_queue) > 1024)) { + } else if (unlikely(mbq_len(&kring->rx_queue) > na->num_rx_desc)) { m_freem(m); } else { mbq_safe_enqueue(&kring->rx_queue, m);