From nobody Thu Jul 27 22:58:25 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 4RBmQT4yCqz4pkkw; Thu, 27 Jul 2023 22:58:25 +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 4RBmQT431Rz3q0P; Thu, 27 Jul 2023 22:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690498705; 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=EKP4ETi29Rd41sfzbtosA2iAruV+tR2mkB5AI6hf9d0=; b=SzPjnuJhqA1/QTCyyyFfh2/jmqTBVpLrOv96Ruy7d/V1Q/zkl78g7vKY0cXs/HC0rWfEh1 O1KxiIedzEZtoPvKxN0ahgmDrbzn+mYFa3tkp3+YacWEDKVJ3w+KeZjbl2MvfMsx5yZR7W k4kvJ6emwrChR1E3zvngNmeE0cq06ZGDiB9GXV702nChFnkTaVJHHqr0f5XjLfXzniBNUf qnRlsEZz+ehj1TmasVLVC7PeKVts35f9siYKfFBKz/CVc++m6sN+VyqMwzH6LBKtJRV7GP ADQdA5hRy7eSP6ks6pwCzWfm2RCpApIrqcDkjPxabj7+Z3edn2zLXyBAgrF+7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690498705; 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=EKP4ETi29Rd41sfzbtosA2iAruV+tR2mkB5AI6hf9d0=; b=m0rDAZQI1ihUNFVc8w4lErXTQAwBXY+Q6T5k5xc5cyvTTEhrPFGIsB4aej9SafjxjKILw/ Fzv+pkOXSGc4CHpqCO3h3Wxhm8ZH+lC0DRyj/Fbb5Fw776bJw/uo6YHVPwnl98dfIL38zR lGfwJaaSGQGeypyVh42XQmJSoCaistXjsfZcAiEEX4GBgS3Xaap51P4mQlfPnXSmWZPdtT er3d5TBQTwVktwSd3XkdC7qwL/cmD9aRdzRYZBGNPpToQ3SWKyFt2P9QOqOJz7dBiH7Cy/ aS5xgQ+BbzaQwmEBZSyb4tUZAJZYuWzLerMV79E3yBCUzbSBtXTKxTggSyltnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690498705; a=rsa-sha256; cv=none; b=Z2rQ0TlIvs+FAC6K3XLmC/eIRD0ySVCK3ZA+oLg+u9iROUnfbPwtU6k7pLVF9tbW5lUyC1 55UTyRKpI9VrDklLEjGvh6NEZ+1oTEpwCsIbKCtphGhCv78l+X8TJFjQCykpSIoxX/drn5 yc1IJbcND+B35ukM2auYfhpaRDaMgstXCq39h4bDCMKlvf6JVzlXqKuVft+E87u7zi8Yhi ncjhkaaJTBPeD5dOkbcyiM5kd+xNfoxf4UeIsbRlJLizHP4jBpysNlMHGMxNZjJqF9W/mk 9v5UfK/xDOGAMRanPNl2xvsc+3Tb32kmQbQTbsAWFUMzkWsm0uszxQKMRcqckQ== 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 4RBmQT31Z8zSfs; Thu, 27 Jul 2023 22:58:25 +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 36RMwP8T052296; Thu, 27 Jul 2023 22:58:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36RMwPnG052295; Thu, 27 Jul 2023 22:58:25 GMT (envelope-from git) Date: Thu, 27 Jul 2023 22:58:25 GMT Message-Id: <202307272258.36RMwPnG052295@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: cbcab907f8ad - main - e1000: Corrections for lem(4)/em(4) txcsum offload 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbcab907f8ad1a4ac38dbc574c747ac2901faa54 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=cbcab907f8ad1a4ac38dbc574c747ac2901faa54 commit cbcab907f8ad1a4ac38dbc574c747ac2901faa54 Author: Kevin Bowling AuthorDate: 2023-07-27 22:50:32 +0000 Commit: Kevin Bowling CommitDate: 2023-07-27 22:58:05 +0000 e1000: Corrections for lem(4)/em(4) txcsum offload Explicitly set ipcss/ipcse/ipcso for IPv6 per intel SDM as indicated in inline comments. Fix and consolidate 82543/82547 hwcsum exemption. While here rearrange and expand some commentary. --- sys/dev/e1000/em_txrx.c | 37 +++++++++++++++++++++++-------------- sys/dev/e1000/if_em.c | 11 ++++------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index 8b1d2817490f..0e433f388ac5 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -186,7 +186,7 @@ em_tso_setup(struct e1000_softc *sc, if_pkt_info_t pi, uint32_t *txd_upper, TXD->tcp_seg_setup.fields.hdr_len = hdr_len; /* - * 8254x SDM4.0 page 45, and PCIe GbE SDM2.5 page 63 + * "PCI/PCI-X SDM 4.0" page 45, and "PCIe GbE SDM 2.5" page 63 * - Set up basic TUCMDs * - Enable IP bit on 82544 * - For others IP bit on indicates IPv4, while off indicates IPv6 @@ -212,10 +212,6 @@ em_tso_setup(struct e1000_softc *sc, if_pkt_info_t pi, uint32_t *txd_upper, return (cur); } -#define TSO_WORKAROUND 4 -#define DONT_FORCE_CTX 1 - - /********************************************************************* * The offload context is protocol specific (TCP/UDP) and thus * only needs to be set when the protocol changes. The occasion @@ -232,6 +228,7 @@ em_tso_setup(struct e1000_softc *sc, if_pkt_info_t pi, uint32_t *txd_upper, * in turn greatly slow down performance to send small sized * frames. **********************************************************************/ +#define DONT_FORCE_CTX 1 static int em_transmit_checksum_setup(struct e1000_softc *sc, if_pkt_info_t pi, @@ -271,20 +268,30 @@ em_transmit_checksum_setup(struct e1000_softc *sc, if_pkt_info_t pi, } TXD = (struct e1000_context_desc *)&txr->tx_base[cur]; + /* + * ipcss - Start offset for header checksum calculation. + * ipcse - End offset for header checksum calculation. + * ipcso - Offset of place to put the checksum. + * + * We set ipcsX values regardless of IP version to work around HW issues + * and ipcse must be 0 for IPv6 per "PCIe GbE SDM 2.5" page 61. + * IXSM controls whether it's inserted. + */ + TXD->lower_setup.ip_fields.ipcss = pi->ipi_ehdrlen; + TXD->lower_setup.ip_fields.ipcso = pi->ipi_ehdrlen + + offsetof(struct ip, ip_sum); if (csum_flags & CSUM_IP) { *txd_upper |= E1000_TXD_POPTS_IXSM << 8; - /* - * Start offset for header checksum calculation. - * End offset for header checksum calculation. - * Offset of place to put the checksum. - */ - TXD->lower_setup.ip_fields.ipcss = pi->ipi_ehdrlen; TXD->lower_setup.ip_fields.ipcse = htole16(hdr_len); - TXD->lower_setup.ip_fields.ipcso = pi->ipi_ehdrlen + - offsetof(struct ip, ip_sum); cmd |= E1000_TXD_CMD_IP; - } + } else if (csum_flags & (CSUM_IP6_TCP | CSUM_IP6_UDP)) + TXD->lower_setup.ip_fields.ipcse = htole16(0); + /* + * tucss - Start offset for payload checksum calculation. + * tucse - End offset for payload checksum calculation. + * tucso - Offset of place to put the checksum. + */ if (csum_flags & (CSUM_TCP | CSUM_UDP | CSUM_IP6_TCP | CSUM_IP6_UDP)) { uint8_t tucso; @@ -320,6 +327,8 @@ em_transmit_checksum_setup(struct e1000_softc *sc, if_pkt_info_t pi, return (cur); } +#define TSO_WORKAROUND 4 /* TSO sentinel descriptor */ + static int em_isc_txd_encap(void *arg, if_pkt_info_t pi) { diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 0da1f0a2dc67..32d8c3282e33 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -948,15 +948,13 @@ em_if_attach_pre(if_ctx_t ctx) scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP | CSUM_IP_TSO | CSUM_IP6_TCP | CSUM_IP6_UDP; - /* 8254x SDM4.0 page 33 - FDX requirement on these chips */ - if (hw->mac.type == e1000_82547 || hw->mac.type == e1000_82547_rev_2) + /* "PCI/PCI-X SDM 4.0" page 33 (b) - FDX requirement on these chips */ + if (hw->mac.type < e1000_82543 || hw->mac.type == e1000_82547 || + hw->mac.type == e1000_82547_rev_2) scctx->isc_capenable &= ~(IFCAP_HWCSUM|IFCAP_VLAN_HWCSUM); - - if (hw->mac.type < e1000_82543) - scctx->isc_capabilities &= ~(IFCAP_HWCSUM|IFCAP_VLAN_HWCSUM); /* 82541ER doesn't do HW tagging */ if (hw->device_id == E1000_DEV_ID_82541ER || hw->device_id == E1000_DEV_ID_82541ER_LOM) - scctx->isc_capabilities &= ~IFCAP_VLAN_HWTAGGING; + scctx->isc_capenable &= ~IFCAP_VLAN_HWTAGGING; /* INTx only */ scctx->isc_msix_bar = 0; } @@ -1352,7 +1350,6 @@ em_if_init(if_ctx_t ctx) E1000_RAR_ENTRIES - 1); } - /* Initialize the hardware */ em_reset(ctx); em_if_update_admin_status(ctx);