From nobody Tue Jun 6 08:52:27 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 4Qb43v54RCz4ZjKg; Tue, 6 Jun 2023 08:52:27 +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 4Qb43v4bx4z47Ds; Tue, 6 Jun 2023 08:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686041547; 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=QQQT7VRmt8b+4wNUx2hM0B5hSr6DEdjRegj2Gz/kv4Q=; b=FGoTCTqKXOA/gAPg28osnvQeCUmpykN3yf85tQGwKCwwfjofUE0OSjlVAJ6bARsdyfcKui mKpG7eEVkRGVtANEb77W16e1Hljx5/Gp+gfXnYBzi70/Bjcf6WK8WlvkQWHwpgc62zpAxS PiwwG+cprn74din4+AtOgG052q0JowTdTthyNHxioUhnuOgIxn/T5fBISUmpup3PTJnbGi T7GKn5eSwrTwLD4HmHj7M9hXAUl/ajcCahMzLUWZZ8OCZt5DXNwtIbQ2Y+pRkGeAzavaPK dmxBPAqRz/tP/TN7vx02d3VPlj+Yf5ZLrq60mOIzE6IXnaNwh1G4MrLvLuIJgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686041547; 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=QQQT7VRmt8b+4wNUx2hM0B5hSr6DEdjRegj2Gz/kv4Q=; b=mkNbPSSFK3h4J6MGTqZ93cvh/i9yaJnpQYJjfK404Y57QJv0tLlZvXyR3t9G2eJZ4/nNa+ MFemuL517vLjE/iwqRxDFhwcOTkGP2vBW9pXbJ0cBUTc5sey0nB/3xfA7UX7gTilA4ZrCW Byg1rLqGnvv8qKpb4WuUEysrgbs6cQfJZgSOEpyvnETsJ9CZaRb7uG8RFTzi+Dg+Wz2hH0 /9vzfaXB20IQ3Pu8xhAFRRFx9GfSGsJkoSzAwST+/pjbm1jb+1xYPsmoZZfX1ZZLbOKZ8P 4XZpbufVfrHntRatlfP1mvm6yjRtgt86dWtOabfozTVrF9JW7aUPHx9uXQm9NQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686041547; a=rsa-sha256; cv=none; b=WkhOcFdVEP1mGmSHkm+G5aOxatgFCAgv6vncHVffvakHc2NpOmqT+FXQ7FUuYR5ewGAS5c 3Cl/PnIzKyj+/7FdaumqPOGePyhQgq4v52UVYBISt1UN0rBcCaHLIc0SK3yQuTLIz/WeK4 9ELAam0PtwKHHzMbKfEx2Q4e0lOpY2ODRQ1fbGkXEjCd+o0ZHRRxDxd2oruYm40hjs3SmK 4ntrUx7yASPWWE1IJzRn93nkTIfc89xqvrFU4zDR+ZGJ7WUMb73BMaqT7KPl1peUuMskg7 5/POwfWqEzn5hNclMUNC95aXIBHQYTILSh1at9PMK+p14FamzED6thwWfq0BKg== 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 4Qb43v3gpPzNy8; Tue, 6 Jun 2023 08:52:27 +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 3568qRaS051939; Tue, 6 Jun 2023 08:52:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3568qRZT051938; Tue, 6 Jun 2023 08:52:27 GMT (envelope-from git) Date: Tue, 6 Jun 2023 08:52:27 GMT Message-Id: <202306060852.3568qRZT051938@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: a9bfd080d09a - main - if_epair: do not transmit packets that exceed the interface MTU 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9bfd080d09a915055af51103defb5c38b94a236 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a9bfd080d09a915055af51103defb5c38b94a236 commit a9bfd080d09a915055af51103defb5c38b94a236 Author: Kristof Provost AuthorDate: 2023-06-02 14:37:09 +0000 Commit: Kristof Provost CommitDate: 2023-06-06 08:00:48 +0000 if_epair: do not transmit packets that exceed the interface MTU While if_epair has no issues doing this we should drop those packets anyway, because it improves the fidelity of the automated tests. Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D40397 --- sys/net/if_epair.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c index aee5a76a046b..56bfdfbd610f 100644 --- a/sys/net/if_epair.c +++ b/sys/net/if_epair.c @@ -336,6 +336,17 @@ epair_transmit(struct ifnet *ifp, struct mbuf *m) return (0); M_ASSERTPKTHDR(m); + /* + * We could just transmit this, but it makes testing easier if we're a + * little bit more like real hardware. + * Allow just that little bit extra for ethernet (and vlan) headers. + */ + if (m->m_pkthdr.len > (ifp->if_mtu + sizeof(struct ether_vlan_header))) { + m_freem(m); + if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); + return (E2BIG); + } + /* * We are not going to use the interface en/dequeue mechanism * on the TX side. We are called from ether_output_frame()