From nobody Sat Oct 29 12:53:15 2022 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 4MzzqH5d81z4h0hc; Sat, 29 Oct 2022 12:53:15 +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 4MzzqH580pz3W4t; Sat, 29 Oct 2022 12:53:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667047995; 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=MrGme60OF0tGccyf3/dylU3Y3gQrJGPVSr1rqn5PWnk=; b=pb0Co3yCH1R7xtj+PgDRBs0iynj4xcR4eOPXWRs1AON40YMK3neJzcJN/+ippPwQWNmNZ4 K2G+JT3KGOsnhmeYfg11aR6UDGGTJFIKCq1PQueXHKK88dJGUFOEYSyPCIcWPgMdRjpR1Z f2n/jLfouaGECdJJ1bqsTCFMIRyEAobjvUZVCNEuP3O2Gtp+SrfobrTTTzSxtqcZut5XTR bz09KzfyFbne84F+HsXsKZvghgK3OtRU8oVj4VkOpeMG3s19FO6YEcGPZH+xN1HvSRWews efC8//dOR+jWvH1q67FpDCkP+uVLtRqrGKuWKIZvnNdjnxPxusXnTQ29w1U/Ww== 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 4MzzqH4CY8zHm9; Sat, 29 Oct 2022 12:53:15 +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 29TCrFoc064393; Sat, 29 Oct 2022 12:53:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29TCrF3I064392; Sat, 29 Oct 2022 12:53:15 GMT (envelope-from git) Date: Sat, 29 Oct 2022 12:53:15 GMT Message-Id: <202210291253.29TCrF3I064392@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: 234c1463a79a - main - genet: add another case where headers need pullup 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: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 234c1463a79a05e72b4167360c940b9bb2ca2f32 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667047995; 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=MrGme60OF0tGccyf3/dylU3Y3gQrJGPVSr1rqn5PWnk=; b=yNvc7LTQsfI+AYOCN3bzDSMrGjHSmlkOiHxQxHnCXyobUwW+e7m87pEfHsKaTVKc5f+gk4 ZtrmXfS/lOrim60JAasF1196xb7UcdNh0xhP3Dpj5B4GyOIs4f9quKsM5ExMgzwV8eiDDQ rDolQZbjoJhdVCGvdUSifFp2Y0ZCNNdEWrezCzfRDm7a8VQDmWd8fkkzwU62JIZeTNyrCW A4rvytv0KfaI7PgehHfGzCROZqvQh2nIp8I4ERw3EI7WH4YMGXG3FFK7avfwKaZ4NTTlJs ECWFVaCLluP9KVdqB7DT7fER24QThNTBqKfaw/cKkOvbzG8sUU4I1dSxeKfaeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667047995; a=rsa-sha256; cv=none; b=p3/QCs8cS+/hUzhjoBX8M+AmDNw0s7DWs/UhY7F1xb9NOBG6N5KG2kTErCy6DuzZcDlm6x Xi6nhC+mkpnV/jlh0ug/H7Jzxci8DytLyAPGgk6JH2QVKZ28Rq6WCBbWuYzfW6r3YxLaRa DwY+3xg1Psm+AGatbiKdgcJKO/ouDOQR2vP/b4xt7aSDK8nxriFZk0Gz4lGBgFUqF+9cEK do0Rd1rv94jueUIOXqYT3qxQ1IbS+cOIg+B4kizwY4qVOpvba5B6DEcvr3xMwxSKfiwc/s 92ICboYNDAWt8+6eM5izTb0lk4rnpVxqthBVW0VcgZ5/RcbJJ+m91zMXlmdJkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=234c1463a79a05e72b4167360c940b9bb2ca2f32 commit 234c1463a79a05e72b4167360c940b9bb2ca2f32 Author: Mike Karels AuthorDate: 2022-10-25 19:23:18 +0000 Commit: Mike Karels CommitDate: 2022-10-29 12:52:57 +0000 genet: add another case where headers need pullup Wake On LAN packets sent by wake(8) via BPF are lost if txcsum is enabled. These fall into the "other protocol" case where gen_parse_tx did nothing. Add code to shift up to gen_tx_hdr_min bytes of the packet along with the Ethernet header in this case. --- sys/arm64/broadcom/genet/if_genet.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/arm64/broadcom/genet/if_genet.c b/sys/arm64/broadcom/genet/if_genet.c index 978106fdfad5..10ec4dde8955 100644 --- a/sys/arm64/broadcom/genet/if_genet.c +++ b/sys/arm64/broadcom/genet/if_genet.c @@ -1302,9 +1302,12 @@ gen_parse_tx(struct mbuf *m, int csum_flags) offset += sizeof(struct ip6_hdr); } else { /* - * Unknown whether other cases require moving a header; - * ARP works without. + * Unknown whether most other cases require moving a header; + * ARP works without. However, Wake On LAN packets sent + * by wake(8) via BPF need something like this. */ + COPY(MIN(gen_tx_hdr_min, m->m_len)); + offset += MIN(gen_tx_hdr_min, m->m_len); } return (offset); #undef COPY