From nobody Mon Apr 18 19:53:46 2022 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 7A70B11E5245; Mon, 18 Apr 2022 19:53:47 +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 4KhyL25ck2z4jbM; Mon, 18 Apr 2022 19:53:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650311626; 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=Jig/wA9/rFByp9/fPhGswIhv3g0YdniVtw+onpLa7t8=; b=HG6nniosHP49eRlziQToz6R4PXkEQW8/X4L0vLONgwFI+NkJy0j55kdIQLD7eCQ1sdLxVO wsq2ftsUYH3qre+eivLBWtcn+A0QOhTEIpEUNiNpfkQ28ckXGoLErqM5lNurAXBdrww4Zq kv4naiSvHTb8I95pxaUQ+5DvLxYQF01PnGuPR/uyEF7ryKUSNb+fwaHtPM3v6AwrmL4JPS yhWp6hBNc3w3hvk0odkFJ7Mz5RqVGgh5SliolbZc6yr5I2irUsmnGpuPOW0WqkJ1Q+3BGn oxpGjE51qzKDR/2C9txCMKv+24E7w0dsMO8Iu+4U0dqEdGS/ol28/0TTCUf30w== 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 85D5A18BED; Mon, 18 Apr 2022 19:53:46 +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 23IJrkE1056175; Mon, 18 Apr 2022 19:53:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23IJrkLT056174; Mon, 18 Apr 2022 19:53:46 GMT (envelope-from git) Date: Mon, 18 Apr 2022 19:53:46 GMT Message-Id: <202204181953.23IJrkLT056174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 43d5661a9d0f - main - cxgbei: Return limits for the specific adapter the socket is on. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43d5661a9d0f44c73344e0f2fc094b7286987313 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650311626; 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=Jig/wA9/rFByp9/fPhGswIhv3g0YdniVtw+onpLa7t8=; b=AnOZBjPXSvQaAzkI2bBpb2y3NeZUv6U+d9RKGuUZx2OVKYBz2iDTDVxbeDOBWEn/bldgK3 OuAlwcHjQLq2MWq1zWzXrvzMi9CWILPD7QjVuCRIzlMgKKFnGIHm+3Z8wjSo7k4wgqD+hp vFO5p3TcUShjj3Us9Un7H2iG0MmrzTie+7BuFNs4Xmp3P6yXlkBxFSYwQqXRtUVP+Tx48A YInrEFUOQDN1/pT93/5OzLbwyMb8T90fU+e7TvzIk/EG2hXFqowKsMrzGvEAEQZ5l6FKFP JDhyirVnXQHkXHq/6GlH3Viv6O6sHSTksOW9fVP0Zw7UnVzNV75B9cH0Oa0DWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650311626; a=rsa-sha256; cv=none; b=OgjJl8Tl/8yRPiXlaCCjaGWONuyb4QJzGCiyWlvnU+zoRSgmhh/OLEb33My096GXaVPrMr ZZq/WgsrhtwYw3wLDfkJKP1Di9ffsT43NU9a8SCjtd/i4YBhwAdC0GxngVQPrx5Bz3atvL LaIMOVCZJSy+nVBmuQPi/VVfWmyi0k1JWvL7FqwnoindVbiu16gJxKsPBVrM9pzcoE7ZhH DcMhO0/PJA9qDhu3Fzu3q/g3EfRpSdAGcY5Fq9pfWbgqRbY7iyk6RSPfpj5m0OzFwntA30 w7G3n7e257bjlyeh7FfMcWKbWoH3Q1lptBpu4U6JhqpQzFa2TJVjqURDbea07g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=43d5661a9d0f44c73344e0f2fc094b7286987313 commit 43d5661a9d0f44c73344e0f2fc094b7286987313 Author: John Baldwin AuthorDate: 2022-04-18 19:50:20 +0000 Commit: John Baldwin CommitDate: 2022-04-18 19:53:33 +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 --- 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 f0189372bd03..f7b06a472200 100644 --- a/sys/dev/cxgbe/cxgbei/icl_cxgbei.c +++ b/sys/dev/cxgbe/cxgbei/icl_cxgbei.c @@ -1745,6 +1745,7 @@ icl_cxgbei_conn_transfer_done(struct icl_conn *ic, void *arg) } } +#ifdef COMPAT_FREEBSD13 static void cxgbei_limits(struct adapter *sc, void *arg) { @@ -1771,6 +1772,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) @@ -1784,9 +1841,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