From nobody Tue Feb 01 15:24:26 2022 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 0DF80191688D; Tue, 1 Feb 2022 15:24:29 +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 4Jp7yM61g3z3Fc5; Tue, 1 Feb 2022 15:24:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643729068; 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=jpkN6bCeY9B2+15iKESv4zAOXZ3H4F2j0zN0MDBFiaI=; b=SWv/17Igz00qLYUwYI0Xp4HT/IsT7pN60aRoHj7dK7sY49cRz+P4phZXqDE3jfeP1uiUoT R9MRU8RIw2xWJTH+bRInH+TyLUxd2HNCs11TyNWDq2uZqqra0CKmg6EsWlyYCfeY8ojn7J 579YqFkWBE3GVQa+I+7y/ifM2JTZKYb2v+Vs8TuVvspMk7ZuLD6R1o3sa2yE01XnmMsxI1 Zj7dVK1NMCrT2rYlxAFtHGYJo9qmnx4lo9pJIrjTr4OkzKW3oCvz3ZEGjDL8CeEv7i7ntz Nu8slPtsu5BNv1bhnRFwYgBUs9zuWsvIRnXqZst7JOIPotBZcgbqev0CtkMh4Q== 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 E6E801326F; Tue, 1 Feb 2022 15:24:26 +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 211FOQvd051148; Tue, 1 Feb 2022 15:24:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 211FOQDg051147; Tue, 1 Feb 2022 15:24:26 GMT (envelope-from git) Date: Tue, 1 Feb 2022 15:24:26 GMT Message-Id: <202202011524.211FOQDg051147@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: aabca1034c74 - main - mlx5en: Properly account for no-checksum on tunneled 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: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aabca1034c742ed6160ffec57a7e481d929153f7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643729068; 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=jpkN6bCeY9B2+15iKESv4zAOXZ3H4F2j0zN0MDBFiaI=; b=EnwMWDpnoZOVDC0nPfrfi4Jo1ulWJvgnxCuHOOeL5mmEjzlsBMt/6wwaMGyrdumr1rB16t rTiwUscTWCnRNNB/vS1y9RM4w+J0uFZe5oQpNKgDncmYAeVuexOrup887ObHEpJJvIYJnZ 5v5FhK8oIPzvHl2UCgq/+zwIpBgroZW91tJ9z06bEvO2dFELkqSNB+IRMWeG0oZYX1wISE Tov2F8XVQZPKScYr+QGgtITRhbEZ7MfhHlKO0s9im1DTsn654bS54yIUhvMYIq8KQPQAZq EGXGmJOH8EqL9JBERZGz221++jDG2IFMLZxQg5J4+AlFNmZBauqdoqgxuYAwVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643729068; a=rsa-sha256; cv=none; b=L1HbSETBORZ8Q1M7lpeuqeX0oZrTNLsGHK7AMq9aIwWkI9Ao0ApCfUS+7slBuLhFlwJotF U+Ff2LbUoJfoj50QZU1uyntD7IjkKWtzIoWPqFhR9L2EcMNb0Salfh0qf+RjDQ6iCxsIta /iL0c5MVsFCuocdT2zEKxQZ2Va1e77oEosUcS8YnEsIqwy7bYiPTIf9mjOkg2fdXlAzp66 fKZOykUxP6vT5LA0ssXqIr6Azn7ldI/cklyi03Akz1Euk6wg7mYfghVdk5Qz8+MxwA1sM7 lRZcjoaGvufGp4rnaCIicefu/oFP+BrT9wESIdW1GCk9FuDRMO83IBOZHK/w1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=aabca1034c742ed6160ffec57a7e481d929153f7 commit aabca1034c742ed6160ffec57a7e481d929153f7 Author: Hans Petter Selasky AuthorDate: 2022-02-01 15:20:12 +0000 Commit: Hans Petter Selasky CommitDate: 2022-02-01 15:21:15 +0000 mlx5en: Properly account for no-checksum on tunneled packets. MFC after: 1 week Sponsored by: NVIDIA Networking --- sys/dev/mlx5/mlx5_en/mlx5_en_rx.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c index 522e3f09df2c..9e58a9bd7904 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c @@ -333,11 +333,13 @@ mlx5e_build_rx_mbuf(struct mlx5_cqe64 *cqe, CSUM_IP_CHECKED | CSUM_IP_VALID | CSUM_DATA_VALID | CSUM_PSEUDO_HDR; mb->m_pkthdr.csum_data = htons(0xffff); - } - if (((cqe->hds_ip_ext & (CQE_L2_OK | CQE_L3_OK | CQE_L4_OK)) == - (CQE_L2_OK | CQE_L3_OK | CQE_L4_OK))) { - mb->m_pkthdr.csum_flags |= - CSUM_INNER_L4_CALC | CSUM_INNER_L4_VALID; + + if (likely((cqe->hds_ip_ext & CQE_L4_OK) == CQE_L4_OK)) { + mb->m_pkthdr.csum_flags |= + CSUM_INNER_L4_CALC | CSUM_INNER_L4_VALID; + } + } else { + rq->stats.csum_none++; } } else if (likely((ifp->if_capenable & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6)) != 0) &&