From owner-svn-src-head@freebsd.org Fri Mar 29 16:43:26 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8A94A156E890; Fri, 29 Mar 2019 16:43:26 +0000 (UTC) (envelope-from np@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 26EDB6E1C9; Fri, 29 Mar 2019 16:43:26 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F1F6918A7; Fri, 29 Mar 2019 16:43:25 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2TGhPQH024195; Fri, 29 Mar 2019 16:43:25 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2TGhOLl024190; Fri, 29 Mar 2019 16:43:24 GMT (envelope-from np@FreeBSD.org) Message-Id: <201903291643.x2TGhOLl024190@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Fri, 29 Mar 2019 16:43:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r345701 - in head/sys/dev/cxgbe: . tom X-SVN-Group: head X-SVN-Commit-Author: np X-SVN-Commit-Paths: in head/sys/dev/cxgbe: . tom X-SVN-Commit-Revision: 345701 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 26EDB6E1C9 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Mar 2019 16:43:26 -0000 Author: np Date: Fri Mar 29 16:43:24 2019 New Revision: 345701 URL: https://svnweb.freebsd.org/changeset/base/345701 Log: cxgbe/t4_tom: Catch up with r344433, which removed tcb_autorcvbuf_inc. The declaration in tcp_var.h is still around so t4_tom continued to compile but wouldn't load. A separate commit will fix tcp_var.h Reported By: Dustin Marquess (dmarquess at gmail) Sponsored by: Chelsio Communications Modified: head/sys/dev/cxgbe/offload.h head/sys/dev/cxgbe/t4_main.c head/sys/dev/cxgbe/tom/t4_cpl_io.c head/sys/dev/cxgbe/tom/t4_ddp.c head/sys/dev/cxgbe/tom/t4_tls.c Modified: head/sys/dev/cxgbe/offload.h ============================================================================== --- head/sys/dev/cxgbe/offload.h Fri Mar 29 16:41:01 2019 (r345700) +++ head/sys/dev/cxgbe/offload.h Fri Mar 29 16:43:24 2019 (r345701) @@ -230,6 +230,7 @@ struct tom_tunables { int tx_align; int tx_zcopy; int cop_managed_offloading; + int autorcvbuf_inc; }; /* iWARP driver tunables */ struct iw_tunables { Modified: head/sys/dev/cxgbe/t4_main.c ============================================================================== --- head/sys/dev/cxgbe/t4_main.c Fri Mar 29 16:41:01 2019 (r345700) +++ head/sys/dev/cxgbe/t4_main.c Fri Mar 29 16:43:24 2019 (r345701) @@ -6266,6 +6266,11 @@ t4_sysctls(struct adapter *sc) &sc->tt.cop_managed_offloading, 0, "COP (Connection Offload Policy) controls all TOE offload"); + sc->tt.autorcvbuf_inc = 16 * 1024; + SYSCTL_ADD_INT(ctx, children, OID_AUTO, "autorcvbuf_inc", + CTLFLAG_RW, &sc->tt.autorcvbuf_inc, 0, + "autorcvbuf increment"); + SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "timer_tick", CTLTYPE_STRING | CTLFLAG_RD, sc, 0, sysctl_tp_tick, "A", "TP timer tick (us)"); Modified: head/sys/dev/cxgbe/tom/t4_cpl_io.c ============================================================================== --- head/sys/dev/cxgbe/tom/t4_cpl_io.c Fri Mar 29 16:41:01 2019 (r345700) +++ head/sys/dev/cxgbe/tom/t4_cpl_io.c Fri Mar 29 16:43:24 2019 (r345701) @@ -1631,7 +1631,7 @@ do_rx_data(struct sge_iq *iq, const struct rss_header sb->sb_hiwat < V_tcp_autorcvbuf_max && len > (sbspace(sb) / 8 * 7)) { unsigned int hiwat = sb->sb_hiwat; - unsigned int newsize = min(hiwat + V_tcp_autorcvbuf_inc, + unsigned int newsize = min(hiwat + sc->tt.autorcvbuf_inc, V_tcp_autorcvbuf_max); if (!sbreserve_locked(sb, newsize, so, NULL)) Modified: head/sys/dev/cxgbe/tom/t4_ddp.c ============================================================================== --- head/sys/dev/cxgbe/tom/t4_ddp.c Fri Mar 29 16:41:01 2019 (r345700) +++ head/sys/dev/cxgbe/tom/t4_ddp.c Fri Mar 29 16:43:24 2019 (r345701) @@ -549,8 +549,9 @@ handle_ddp_data(struct toepcb *toep, __be32 ddp_report V_tcp_do_autorcvbuf && sb->sb_hiwat < V_tcp_autorcvbuf_max && len > (sbspace(sb) / 8 * 7)) { + struct adapter *sc = td_adapter(toep->td); unsigned int hiwat = sb->sb_hiwat; - unsigned int newsize = min(hiwat + V_tcp_autorcvbuf_inc, + unsigned int newsize = min(hiwat + sc->tt.autorcvbuf_inc, V_tcp_autorcvbuf_max); if (!sbreserve_locked(sb, newsize, so, NULL)) Modified: head/sys/dev/cxgbe/tom/t4_tls.c ============================================================================== --- head/sys/dev/cxgbe/tom/t4_tls.c Fri Mar 29 16:41:01 2019 (r345700) +++ head/sys/dev/cxgbe/tom/t4_tls.c Fri Mar 29 16:43:24 2019 (r345701) @@ -1588,7 +1588,7 @@ do_rx_tls_cmp(struct sge_iq *iq, const struct rss_head sb->sb_hiwat < V_tcp_autorcvbuf_max && sb_length > (sbspace(sb) / 8 * 7)) { unsigned int hiwat = sb->sb_hiwat; - unsigned int newsize = min(hiwat + V_tcp_autorcvbuf_inc, + unsigned int newsize = min(hiwat + sc->tt.autorcvbuf_inc, V_tcp_autorcvbuf_max); if (!sbreserve_locked(sb, newsize, so, NULL))