From nobody Mon Jan 8 20:07:21 2024 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 4T84px4KDmz56crc; Mon, 8 Jan 2024 20:07:21 +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 4T84px3kP8z4Pf8; Mon, 8 Jan 2024 20:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704744441; 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=FGqfUn1JsPnOwtZZUMIQM37bQitYwu9TB68Du/++tOg=; b=WFjm+5LtzKltSEJbVfQoahmfH0rMATW3a1oZDPJuAXHbgrvibp6UOqXJnIUHZCaddYWO08 oeZBzUpKILsVTeapb1uqYM/5AxLUMfBVyZ4Teb325dY0KjcxR2tG3FnsNY6ZAp2y+/iZ4C 2mX7umyoiByLA2cX1gQ/qoAY9+ke4wLZutyre99bf4tjviL7jKTX1TQpXyVwqFEt5RO1rH TbKHiyDrvl259AJ8X2Xuhz9c9kNUyp0D0e00mFaGc09mnsD/WPRBL/iIv4b+DwdEkQUqc9 5IP1HG57RddCMKItJyRf8FTnc7e9Xq6HhZZCPCbSYMZtDSx29+FaczalgzGMYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704744441; 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=FGqfUn1JsPnOwtZZUMIQM37bQitYwu9TB68Du/++tOg=; b=ectGY1+YyCeYu8QtSgfKqtqaGA/7ZPux4e0ugb82Yik34bHnJ0CWza8YrOW1Dae58Xhzu1 ivu6BHAOdS9Ij9818rQWSIgJN5P9YD66RuC8dOZdnextbvie2JRErCo6JFyxSVgtvqSDp2 eAo/ODNKfiBpJbfVQTPxEAsEV0Bh7+UOEB4Q0HiKAx3L7BLYUyNWoZYoQQ9ZYRbOAy305W j9RXmla9MQBWWBcvUjgazWVN9nj8ky2GLDnSTtONW0HYbUJvvM9b/YBmzvu+Ur5EEvrm4E 0lHi3ldkG4LWswkexFqNpJM7PR5XXkdiKAHfU5+OkmsPfWitTgw/j1M3hIftQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704744441; a=rsa-sha256; cv=none; b=K3X5ky4dB1WZjUVUIdih8AROxW4NJPuFm6slqxVnjMw64wSebI9c5Q+oBz0WBFhW6TMTte FVyOdnjc5Pizb/IdAvY7kLrbb94nz+n+sYIpgjUNBxNh0ZRVii9Qm6k3CZHKUrNP65Wo3x dp21cus9/qxo9+NYPDvKW3QHrE+zn05hbcfVTUjLuIpbwP1BZ49YUbvAP/unIDAQQvSmh0 ofFIQQ1wnwvu2hWcgih7+VmtpMeG4llTCiQGzJxWZ0JyKURZ1BhcTqdDVDr9ppcZ9FAnqA L7GFjClI5raNX0PdpbXy8mp1CL/K9Q3jfdxgqVhaiBQgzq+H2e2N7OBZLXd/eA== 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 4T84px2msLzLBW; Mon, 8 Jan 2024 20:07:21 +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 408K7LrY074319; Mon, 8 Jan 2024 20:07:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 408K7Ltc074316; Mon, 8 Jan 2024 20:07:21 GMT (envelope-from git) Date: Mon, 8 Jan 2024 20:07:21 GMT Message-Id: <202401082007.408K7Ltc074316@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: df8a58b17a19 - main - cxgbe(4): Add support for netmap offsets. 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: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df8a58b17a1907ed3b4597475d1cb8eacc9636de Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=df8a58b17a1907ed3b4597475d1cb8eacc9636de commit df8a58b17a1907ed3b4597475d1cb8eacc9636de Author: Navdeep Parhar AuthorDate: 2024-01-05 01:39:31 +0000 Commit: Navdeep Parhar CommitDate: 2024-01-08 20:04:07 +0000 cxgbe(4): Add support for netmap offsets. PR: 253069 MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/t4_netmap.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/dev/cxgbe/t4_netmap.c b/sys/dev/cxgbe/t4_netmap.c index 64fba4410364..0377f65acc3e 100644 --- a/sys/dev/cxgbe/t4_netmap.c +++ b/sys/dev/cxgbe/t4_netmap.c @@ -1003,7 +1003,7 @@ cxgbe_nm_tx(struct adapter *sc, struct sge_nm_txq *nm_txq, usgl->cmd_nsge = htobe32(V_ULPTX_CMD(ULP_TX_SC_DSGL) | V_ULPTX_NSGE(1)); usgl->len0 = htobe32(slot->len); - usgl->addr0 = htobe64(ba); + usgl->addr0 = htobe64(ba + nm_get_offset(kring, slot)); slot->flags &= ~(NS_REPORT | NS_BUF_CHANGED); cpl = (void *)(usgl + 1); @@ -1269,7 +1269,7 @@ cxgbe_nm_attach(struct vi_info *vi) bzero(&na, sizeof(na)); na.ifp = vi->ifp; - na.na_flags = NAF_BDG_MAYSLEEP; + na.na_flags = NAF_BDG_MAYSLEEP | NAF_OFFSETS; /* Netmap doesn't know about the space reserved for the status page. */ na.num_tx_desc = vi->qsize_txq - sc->params.sge.spg_len / EQ_ESIZE; @@ -1286,7 +1286,7 @@ cxgbe_nm_attach(struct vi_info *vi) na.nm_register = cxgbe_netmap_reg; na.num_tx_rings = vi->nnmtxq; na.num_rx_rings = vi->nnmrxq; - na.rx_buf_maxsize = MAX_MTU; + na.rx_buf_maxsize = MAX_MTU + sc->params.sge.fl_pktshift; netmap_attach(&na); /* This adds IFCAP_NETMAP to if_capabilities */ } @@ -1368,6 +1368,14 @@ service_nm_rxq(struct sge_nm_rxq *nm_rxq) handle_nm_sge_egr_update(sc, ifp, cpl); break; case CPL_RX_PKT: + /* + * Note that the application must have netmap + * offsets (NETMAP_REQ_OPT_OFFSETS) enabled on + * the ring or its rx will not work correctly + * when fl_pktshift > 0. + */ + nm_write_offset(kring, &ring->slot[fl_cidx], + sc->params.sge.fl_pktshift); ring->slot[fl_cidx].len = G_RSPD_LEN(lq) - sc->params.sge.fl_pktshift; ring->slot[fl_cidx].flags = 0;