svn commit: r345701 - in head/sys/dev/cxgbe: . tom

[Navdeep Parhar]

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))