From nobody Wed Oct 04 03:38:48 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 4S0gQd1gb9z4wXl4; Wed, 4 Oct 2023 03:38:49 +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 4S0gQd18ljz3K1N; Wed, 4 Oct 2023 03:38:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696390729; 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=yF+8AURP7+ygXK1zMYN6F3YATjvj7aKfucCghI1UWFE=; b=UBcTiGYpMZyViPTTum2JkYNajbhuoqsiGOhckKzgOgYlVzFO7PRgryIl6CnHNBpkSvpPbW BEuiQ7Jz5e8Yxz9LuliCXXdXvUAu4MFtSWTCWIMjFTBwbSO7eYaA2kZLzAnRkmRghe8KxB nMj1dH9h9G6o5x7l695bygNjNuJIJigZ5rXq98sx8LBqLc/339LrqhTIASAtZckrGJRYo4 vNA8SiIpn+w7ZV/pqHcmznvrvXnvubFZKyA0d9N7dDvyS0lnKXeSwuqr2Nu9levYTtexUj RvZzAtiuHIOwtOYqQpo5jfZRHFLs6YQ424XScy4EFFhdsYTiHoZbGZaCr2nwaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696390729; a=rsa-sha256; cv=none; b=aIGIQ03wRKGEL16nucFz3ZOnVa4zMNviEKZWK2453VRGDIj+yfq0+qfIrr5Q32qpJFhH0m 3bW/dcXged+fyHy+rdk7L+B/hoDDV54+G6wmJ2nkTwm454q7xQqbRqDnpH6Fbs9ovwZPAV wUlNDfO8YlhJRrFldCtnQZ5P1xLwdt1RdPHSVh9w8dus2SAjRo8MufbOE5o5pWXmD2Myop CjIltf+20M1TrOvLMWeTeVA+ACzrriZJgZohInVeEBKo9CWUcS5VvcdN6fs51kyTFsXrZ9 9R3JLUeOVsVUR27M3IqtGcgGozQJ9BlNP2+F9ZcWF6tGgsbS/wsro9R0fiDQWQ== 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=1696390729; 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=yF+8AURP7+ygXK1zMYN6F3YATjvj7aKfucCghI1UWFE=; b=R6GuI1jbk73oaEDWxKxlR2y32wVSK+8FGRR+UPdlT6iK0Ae9P5hyXAIG2IuuWajE766v6d ykH14ouTDy0dy+cGF/LdfRydhV+Mak3BFq6fAPG1oAykz+sAnyuHO1G0tJ8k9s36sjH5Qh b21665iguhbLLPTIUoLjMtObnNRTY771mZqIRwOsTXNoZtxfX0eNlExXO71X95R6LfzbCn M4I+tRzpXXtW5vqix8rmaR35r5p1vgBW9jph4C9BSzQgWYn+0OAx0kI7fwGdH7j9GrPVAo jF593+8quxiiZBVDCIwYckiforkTpeQj5b1KRkKeLK2lkB3PHy1mKNrV5snpbw== 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 4S0gQc6v1zz74Q; Wed, 4 Oct 2023 03:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3943cmZO005729; Wed, 4 Oct 2023 03:38:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3943cmZ8005726; Wed, 4 Oct 2023 03:38:48 GMT (envelope-from git) Date: Wed, 4 Oct 2023 03:38:48 GMT Message-Id: <202310040338.3943cmZ8005726@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: a2c359c0f771 - stable/13 - gve: Make LRO work for jumbo packets 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: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a2c359c0f7715507f6a49a911becbd50a8521b9a Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=a2c359c0f7715507f6a49a911becbd50a8521b9a commit a2c359c0f7715507f6a49a911becbd50a8521b9a Author: Shailend Chand AuthorDate: 2023-09-07 13:28:26 +0000 Commit: Xin LI CommitDate: 2023-10-04 03:38:44 +0000 gve: Make LRO work for jumbo packets Each Rx descriptor points to a packet buffer of size 2K, which means that MTUs greater than 2K see multi-descriptor packets. The TCP-hood of such packets was being incorrectly determined by looking for a flag on the last descriptor instead of the first descriptor. Also fixed and progressed the version number. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D41754 (cherry picked from commit 5f62584a9adb7887bae33af617cfa4f43017abf8) --- sys/dev/gve/gve.h | 1 + sys/dev/gve/gve_main.c | 8 ++++---- sys/dev/gve/gve_rx.c | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/dev/gve/gve.h b/sys/dev/gve/gve.h index 61781cddee94..c446199dff2d 100644 --- a/sys/dev/gve/gve.h +++ b/sys/dev/gve/gve.h @@ -164,6 +164,7 @@ struct gve_rx_ctx { struct mbuf *mbuf_tail; uint32_t total_size; uint8_t frag_cnt; + bool is_tcp; bool drop_pkt; }; diff --git a/sys/dev/gve/gve_main.c b/sys/dev/gve/gve_main.c index c3ee6d5c3433..cd7849778bce 100644 --- a/sys/dev/gve/gve_main.c +++ b/sys/dev/gve/gve_main.c @@ -31,10 +31,10 @@ #include "gve.h" #include "gve_adminq.h" -#define GVE_DRIVER_VERSION "GVE-FBSD-1.0.0\n" -#define GVE_VERSION_MAJOR 0 -#define GVE_VERSION_MINOR 9 -#define GVE_VERSION_SUB 0 +#define GVE_DRIVER_VERSION "GVE-FBSD-1.0.1\n" +#define GVE_VERSION_MAJOR 1 +#define GVE_VERSION_MINOR 0 +#define GVE_VERSION_SUB 1 #define GVE_DEFAULT_RX_COPYBREAK 256 diff --git a/sys/dev/gve/gve_rx.c b/sys/dev/gve/gve_rx.c index f5d8fd7a7b75..9be96cf1ee3a 100644 --- a/sys/dev/gve/gve_rx.c +++ b/sys/dev/gve/gve_rx.c @@ -546,6 +546,7 @@ gve_rx(struct gve_priv *priv, struct gve_rx_ring *rx, struct gve_rx_desc *desc, if (is_first_frag) { mbuf->m_pkthdr.rcvif = priv->ifp; + ctx->is_tcp = desc->flags_seq & GVE_RXF_TCP; if (gve_needs_rss(desc->flags_seq)) { gve_set_rss_type(desc->flags_seq, mbuf); @@ -567,7 +568,7 @@ gve_rx(struct gve_priv *priv, struct gve_rx_ring *rx, struct gve_rx_desc *desc, do_if_input = true; if (((if_getcapenable(priv->ifp) & IFCAP_LRO) != 0) && /* LRO is enabled */ - (desc->flags_seq & GVE_RXF_TCP) && /* pkt is a TCP pkt */ + (ctx->is_tcp) && /* pkt is a TCP pkt */ ((mbuf->m_pkthdr.csum_flags & CSUM_DATA_VALID) != 0) && /* NIC verified csum */ (rx->lro.lro_cnt != 0) && /* LRO resources exist */ (tcp_lro_rx(&rx->lro, mbuf, 0) == 0))