From owner-svn-src-projects@freebsd.org Thu Nov 19 15:09:58 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7AB82A32EB5 for ; Thu, 19 Nov 2015 15:09:58 +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 mx1.freebsd.org (Postfix) with ESMTPS id 43515180B; Thu, 19 Nov 2015 15:09:58 +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 tAJF9vGW082487; Thu, 19 Nov 2015 15:09:57 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAJF9vpF082486; Thu, 19 Nov 2015 15:09:57 GMT (envelope-from np@FreeBSD.org) Message-Id: <201511191509.tAJF9vpF082486@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Thu, 19 Nov 2015 15:09:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r291075 - projects/cxl_iscsi/sys/dev/cxgbe/tom X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2015 15:09:58 -0000 Author: np Date: Thu Nov 19 15:09:57 2015 New Revision: 291075 URL: https://svnweb.freebsd.org/changeset/base/291075 Log: Deal with tx credits within t4_tom. This should have gone in with r290376. Modified: projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_cpl_io.c Modified: projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_cpl_io.c ============================================================================== --- projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_cpl_io.c Thu Nov 19 14:04:53 2015 (r291074) +++ projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_cpl_io.c Thu Nov 19 15:09:57 2015 (r291075) @@ -1656,11 +1656,8 @@ do_fw4_ack(struct sge_iq *iq, const stru sbdrop_locked(sb, min(sbu, plen)); plen -= min(sbu, plen); } - /* XXXNP: sowwakeup_locked causes a LOR. */ - SOCKBUF_UNLOCK(sb); - - if (__predict_true(plen > 0)) - cxgbei_fw4_ack(toep, plen); + sowwakeup_locked(so); /* unlocks so_snd */ + rqdrop_locked(&toep->ulp_pdu_reclaimq, plen); } else { sbdrop_locked(sb, plen); sowwakeup_locked(so); /* unlocks so_snd */