From: cem <cem@FreeBSD.org>
Date: Sun, 11 Oct 2015 20:59:02 +0000 (+0000)
Subject: NTB: MFV b77b2637: Link toggle memory leak
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=37418275e11b42a28ca998b72bb5929dd1c4a53c;p=people%2Fjulieng%2Ffreebsd.git

NTB: MFV b77b2637: Link toggle memory leak

Each link-up will allocate a new NTB receive buffer when the NTB
properties are negotiated with the remote system.  These allocations did
not check for existing buffers and thus did not free them.  Now, the
driver will check for an existing buffer and free it if not of the
correct size, before trying to alloc a new one.

Authored by:	Jon Mason
Obtained from:	Linux
Sponsored by:	EMC / Isilon Storage Division
---

diff --git a/sys/dev/ntb/if_ntb/if_ntb.c b/sys/dev/ntb/if_ntb/if_ntb.c
index 101691d0bf0f..09c1736c3fc7 100644
--- a/sys/dev/ntb/if_ntb/if_ntb.c
+++ b/sys/dev/ntb/if_ntb/if_ntb.c
@@ -1129,12 +1129,20 @@ ntb_set_mw(struct ntb_netdev *nt, int num_mw, unsigned int size)
 {
 	struct ntb_transport_mw *mw = &nt->mw[num_mw];
 
+	/* No need to re-setup */
+	if (mw->size == size)
+		return (0);
+
+	if (mw->size != 0)
+		ntb_free_mw(nt, num_mw);
+
 	/* Alloc memory for receiving data.  Must be 4k aligned */
 	mw->size = size;
 
 	mw->virt_addr = contigmalloc(mw->size, M_NTB_IF, M_ZERO, 0,
 	    BUS_SPACE_MAXADDR, mw->size, 0);
 	if (mw->virt_addr == NULL) {
+		mw->size = 0;
 		printf("ntb: Unable to allocate MW buffer of size %d\n",
 		    (int)mw->size);
 		return (ENOMEM);