From nobody Thu Nov 10 21:48:55 2022 X-Original-To: dev-commits-src-branches@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 4N7b7r1KWkz4XMsP; Thu, 10 Nov 2022 21:48:56 +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 4N7b7q5Z8qz4Jb1; Thu, 10 Nov 2022 21:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668116935; 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=EhNICBDw0JcoxpfuhKjnTbpnLmrEcxzuvhDLwzUFByg=; b=DKYnSFU3yzYv3xMzfHqLufLJiy0TkT7axkfoCLz2sUBS/e+2mJbBeBWgZ7TRaYw4liHKut 5iTGT900Hsz7fTiW7feh0S2PHfL63wmjMQ1Tk84uweJA+ySptbbZYZR/U+oOgWohzDWtgS EsLijwG2jVho8QuRV/D6DLAl8FWPAUgju6It7oCruwGX0Tg6/FN2N7YgFeNKYv2AEl9eH1 iK5R4vvtlFfJu2GAu2CdYCSpCnOmQUZYbuWCnhwdrbVjZCa6rdT3FiJWxeBiTmXtu4yOhz oyxWhOduiA1vktDjTbV29IXry5/eqDgGWWDsb7+Oz+4GWg6pizu500jajeZuqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668116935; 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=EhNICBDw0JcoxpfuhKjnTbpnLmrEcxzuvhDLwzUFByg=; b=a0ZUwTdEAIsMPl6eebCZunqd6lSJ6CTjBTS4/IKstlzq/KGAYKNWcJUXnP4XzEpNfDHDio VUtf+KfaaX9Km8AbCBzeVXLvpSDLhIDJtVvy+3B8vfoqL4X+S/odQPB71nIdf1PpXXg5J0 l+fcIyVnfpG5t7By+3rhtNoGXFbglgjIVyaCqKde7Wq4L57KhyJ6+l2boMppudLxTnxAzA I1oA6unH8+3K4p2t01+ZP6t1V5Z8uWXzFpUmdm4BJ9uiX4n4o/xwVTyRpkU7/Yeu2xdDtz p8+0cUiz3kMW4Qhn4+xif29xY/KwKHSGNq1P+L2Ds0D2voMKOTu2vrKN/mCNaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668116935; a=rsa-sha256; cv=none; b=meRJSSG0B1OzvMJWhd+JHf4qPB8ul1G6vzqrsaOilpjgq59IAEbJyE6CseZeTlZZ/+aEO2 Lgozt2CwyJFHc5yWp2ThWKfk7I/bcbLnRKKjHeuwuUwFR+zqINZn7KRuMQr6eFDsAc9GJA uHQjxQa5N8vxWVsltlR/s/1Uobq9mU0L5Ks3rMV6qysq4NSijYdM/fxIWvuhIrMVebFLNM 4cU9Y/4CD0XbsU/38dUyJevI0P+kWJt3Q9J9zgxEZ9TQXQ7iqDejPrapcVBZkuF6Q0btmP JTLk24CTLeReZjx/5j0osVlYdc45oJvO0m0EVLTHDve2IEckQvRA3wZ9iTMrtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N7b7q4WP2zHTw; Thu, 10 Nov 2022 21:48:55 +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 2AALmtcd014371; Thu, 10 Nov 2022 21:48:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AALmtIF014370; Thu, 10 Nov 2022 21:48:55 GMT (envelope-from git) Date: Thu, 10 Nov 2022 21:48:55 GMT Message-Id: <202211102148.2AALmtIF014370@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 2c273cf4ceb7 - stable/13 - cxgbei: Return limits for the specific adapter the socket is on. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2c273cf4ceb711adcdd42c6d5ce6ec5d7b622372 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2c273cf4ceb711adcdd42c6d5ce6ec5d7b622372 commit 2c273cf4ceb711adcdd42c6d5ce6ec5d7b622372 Author: John Baldwin AuthorDate: 2022-04-18 19:50:20 +0000 Commit: John Baldwin CommitDate: 2022-11-10 21:48:36 +0000 cxgbei: Return limits for the specific adapter the socket is on. Reviewed by: mav Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D34929 (cherry picked from commit 43d5661a9d0f44c73344e0f2fc094b7286987313) --- sys/dev/cxgbe/cxgbei/icl_cxgbei.c | 66 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/sys/dev/cxgbe/cxgbei/icl_cxgbei.c b/sys/dev/cxgbe/cxgbei/icl_cxgbei.c index c77261146e76..ca1a97957154 100644 --- a/sys/dev/cxgbe/cxgbei/icl_cxgbei.c +++ b/sys/dev/cxgbe/cxgbei/icl_cxgbei.c @@ -1750,6 +1750,7 @@ icl_cxgbei_conn_transfer_done(struct icl_conn *ic, void *arg) } } +#ifdef COMPAT_FREEBSD13 static void cxgbei_limits(struct adapter *sc, void *arg) { @@ -1776,6 +1777,62 @@ cxgbei_limits(struct adapter *sc, void *arg) end_synchronized_op(sc, LOCK_HELD); } +#endif + +static int +cxgbei_limits_fd(struct icl_drv_limits *idl, int fd) +{ + struct find_ofld_adapter_rr fa; + struct file *fp; + struct socket *so; + struct adapter *sc; + struct cxgbei_data *ci; + cap_rights_t rights; + int error; + + error = fget(curthread, fd, + cap_rights_init_one(&rights, CAP_SOCK_CLIENT), &fp); + if (error != 0) + return (error); + if (fp->f_type != DTYPE_SOCKET) { + fdrop(fp, curthread); + return (EINVAL); + } + so = fp->f_data; + if (so->so_type != SOCK_STREAM || + so->so_proto->pr_protocol != IPPROTO_TCP) { + fdrop(fp, curthread); + return (EINVAL); + } + + /* Find the adapter offloading this socket. */ + fa.sc = NULL; + fa.so = so; + t4_iterate(find_offload_adapter, &fa); + if (fa.sc == NULL) { + fdrop(fp, curthread); + return (ENXIO); + } + fdrop(fp, curthread); + + sc = fa.sc; + error = begin_synchronized_op(sc, NULL, HOLD_LOCK, "t4lims"); + if (error != 0) + return (error); + + if (uld_active(sc, ULD_ISCSI)) { + ci = sc->iscsi_ulp_softc; + MPASS(ci != NULL); + + idl->idl_max_recv_data_segment_length = ci->max_rx_data_len; + idl->idl_max_send_data_segment_length = ci->max_tx_data_len; + } else + error = ENXIO; + + end_synchronized_op(sc, LOCK_HELD); + + return (error); +} static int icl_cxgbei_limits(struct icl_drv_limits *idl, int socket) @@ -1789,9 +1846,14 @@ icl_cxgbei_limits(struct icl_drv_limits *idl, int socket) idl->idl_max_burst_length = max_burst_length; idl->idl_first_burst_length = first_burst_length; - t4_iterate(cxgbei_limits, idl); +#ifdef COMPAT_FREEBSD13 + if (socket == 0) { + t4_iterate(cxgbei_limits, idl); + return (0); + } +#endif - return (0); + return (cxgbei_limits_fd(idl, socket)); } int