From owner-dev-commits-src-branches@freebsd.org Mon Mar 15 03:01:32 2021
Return-Path: <owner-dev-commits-src-branches@freebsd.org>
Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id F248656CD0C;
Mon, 15 Mar 2021 03:01:31 +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 4DzLmC1jN7z3QKM;
Mon, 15 Mar 2021 03:01:31 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 4067A112C;
Mon, 15 Mar 2021 03:01:29 +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 12F31TbB098007;
Mon, 15 Mar 2021 03:01:29 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12F31TFJ098006;
Mon, 15 Mar 2021 03:01:29 GMT (envelope-from git)
Date: Mon, 15 Mar 2021 03:01:29 GMT
Message-Id: <202103150301.12F31TFJ098006@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Alexander Motin <mav@FreeBSD.org>
Subject: git: 3034c0dab755 - stable/12 - Optimize TX coalescing by keeping
pointer to last mbuf.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mav
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 3034c0dab755d29eb24d0187cfc00501b660a9c1
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-branches@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the stable branches of the FreeBSD src repository
<dev-commits-src-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-branches/>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Help: <mailto:dev-commits-src-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Mar 2021 03:01:32 -0000
The branch stable/12 has been updated by mav:
URL: https://cgit.FreeBSD.org/src/commit/?id=3034c0dab755d29eb24d0187cfc00501b660a9c1
commit 3034c0dab755d29eb24d0187cfc00501b660a9c1
Author: Alexander Motin <mav@FreeBSD.org>
AuthorDate: 2021-03-02 04:31:34 +0000
Commit: Alexander Motin <mav@FreeBSD.org>
CommitDate: 2021-03-15 02:52:57 +0000
Optimize TX coalescing by keeping pointer to last mbuf.
Before m_cat() each time traversed through all the coalesced chain.
MFC after: 1 week
(cherry picked from commit b85a67f54a40053e75658a17c620b89bafaba67f)
---
sys/dev/iscsi/icl_soft.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/sys/dev/iscsi/icl_soft.c b/sys/dev/iscsi/icl_soft.c
index caeddc9247ba..7c8ca11f4ae3 100644
--- a/sys/dev/iscsi/icl_soft.c
+++ b/sys/dev/iscsi/icl_soft.c
@@ -785,6 +785,7 @@ static void
icl_conn_send_pdus(struct icl_conn *ic, struct icl_pdu_stailq *queue)
{
struct icl_pdu *request, *request2;
+ struct mbuf *m;
struct socket *so;
long available, size, size2;
int coalesced, error;
@@ -845,8 +846,8 @@ icl_conn_send_pdus(struct icl_conn *ic, struct icl_pdu_stailq *queue)
return;
}
if (coalesce) {
- coalesced = 1;
- for (;;) {
+ m = request->ip_bhs_mbuf;
+ for (coalesced = 1; ; coalesced++) {
request2 = STAILQ_FIRST(queue);
if (request2 == NULL)
break;
@@ -863,13 +864,14 @@ icl_conn_send_pdus(struct icl_conn *ic, struct icl_pdu_stailq *queue)
icl_conn_fail(ic);
return;
}
- m_cat(request->ip_bhs_mbuf, request2->ip_bhs_mbuf);
+ while (m->m_next)
+ m = m->m_next;
+ m_cat(m, request2->ip_bhs_mbuf);
request2->ip_bhs_mbuf = NULL;
request->ip_bhs_mbuf->m_pkthdr.len += size2;
size += size2;
STAILQ_REMOVE_AFTER(queue, request, ip_next);
icl_soft_conn_pdu_free(ic, request2);
- coalesced++;
}
#if 0
if (coalesced > 1) {