From owner-dev-commits-src-main@freebsd.org Thu Apr 22 07:59:58 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 71ED75E3370; Thu, 22 Apr 2021 07:59:58 +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 4FQqb22pngz3H9Q; Thu, 22 Apr 2021 07:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 533C31640C; Thu, 22 Apr 2021 07:59: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 13M7xwpa034093; Thu, 22 Apr 2021 07:59:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13M7xwCt034092; Thu, 22 Apr 2021 07:59:58 GMT (envelope-from git) Date: Thu, 22 Apr 2021 07:59:58 GMT Message-Id: <202104220759.13M7xwCt034092@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 4044af03a4e9 - main - Fix vtnet TCP lro panic MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4044af03a4e95642d8d1982800c079029c2b087c Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 07:59:58 -0000 The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=4044af03a4e95642d8d1982800c079029c2b087c commit 4044af03a4e95642d8d1982800c079029c2b087c Author: Alexander V. Chernikov AuthorDate: 2021-04-19 15:58:41 +0000 Commit: Alexander V. Chernikov CommitDate: 2021-04-19 16:06:34 +0000 Fix vtnet TCP lro panic Differential Revision: https://reviews.freebsd.org/D29900 Reviewed by: hps, kp --- sys/dev/virtio/network/if_vtnet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 3650d19fbe0e..e65914c5184f 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -2145,7 +2145,8 @@ vtnet_rxq_eof(struct vtnet_rxq *rxq) if (deq > 0) { #if defined(INET) || defined(INET6) - tcp_lro_flush_all(&rxq->vtnrx_lro); + if (vtnet_software_lro(sc)) + tcp_lro_flush_all(&rxq->vtnrx_lro); #endif virtqueue_notify(vq); }