From nobody Sat Apr 9 00:30:24 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 741121921767; Sat, 9 Apr 2022 00:30:25 +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 4KZwxr5MyBz3r14; Sat, 9 Apr 2022 00:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649464225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I6SXhnrX2w3RVRv+h9JE9bhIEtcBMGy/wJ+LK+d3YiQ=; b=uvTWHnvDVWTUfxiaPyGWO9lHLE2W5uynYHBkVvVYTxPwHcjllUu+FDISx+xPfQEEp/ki2c rte1fDL9PGd4kc+Q+xwnPx0yIIhdMpM+O3LrypEL2taA4T0xbWL37apkWQQ1tCT1a6B5ir SOV+VBI/YeGkrEXdoS5MGxwD4JDEXVUcZM7YJ16y5PkIM4F9ankLB6kkTBDyPj6SgkoBwK mNaWwr8aaArHIoc/lKXEjCI2SDVCN8/CRjzdKprzoeEdVICKYYPLFSgiTkc1G/g3ISO/Rx AQPZgL9uSHEfhmytNpzyfZga4wJrgX6JnZS8/q+8sAtx0Lkcih/fHbxm7PDmXQ== 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 9019A73E3; Sat, 9 Apr 2022 00:30:24 +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 2390UOZG065835; Sat, 9 Apr 2022 00:30:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2390UOl8065834; Sat, 9 Apr 2022 00:30:24 GMT (envelope-from git) Date: Sat, 9 Apr 2022 00:30:24 GMT Message-Id: <202204090030.2390UOl8065834@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 6d2a46f0ab89 - main - netmap: Move more_txspace and some_recvd under #ifdef SYNC_KLOOP_POLL. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d2a46f0ab894fb7c3aad3d01c2c15bd531ef5e5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649464225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I6SXhnrX2w3RVRv+h9JE9bhIEtcBMGy/wJ+LK+d3YiQ=; b=sBgol4ErxW7csgcqrwTCMXHGBhQ+vaY4rvxC8xRpWyWWupjQbVUa/gxzbGD+sPH0VGE4ki kjsAZGfPRLIypM/eh6zzRJXIhzyaARZ1AU+03luoiRv3MsL8+mLgm0zXeywRj69Aj9lOXw n17hAgL6stn0cDtuvCSks0E7S/LsK325M1MFY8QYCnzkLvcZdsTq57vWqgK0pYZEHVv+q5 R8rcUU1DY+8hy093B/plz7znP6i+rKhewGKCOodapdsabKKzbv1R50Hwu3qB1V7+E4P2lK ixQtuv7f7Ig52DIpm1l8WYBIRAg/LdXcBAo5bGUmaPcqiJ4p4C9egNaAV2mkRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649464225; a=rsa-sha256; cv=none; b=gHEz5rTiNp1j1JsqOWED85Kox0LhAvhDj3rqQb5zJXnboz6U1wuo/5f+Xq9iUeU3jS0oXS FUSNEtj8iSex49Hrct1+QYmrdxTiPI67DP/VpYiX37LQYcGP+fIliMR2a4Fg2sTJvuW4bP PldpTq1JJ+OTz/G3RmYw+fMWf6hQwd+9ryt6rJNvSX8Qs91KqnmgzFSp5ASkwG4UIg88/o UluWYAtvBtW2hyfXflWp8gXT+vhMOdrwph6GUUzcP2ZSdQ0mUkT30wLy/gE+pj44+ZxpBK 6GXC3pacOkL17q2K88dysH4xBAMOduiP3fur/vJc4Car3Msb2W8TK5AY+IdykQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6d2a46f0ab894fb7c3aad3d01c2c15bd531ef5e5 commit 6d2a46f0ab894fb7c3aad3d01c2c15bd531ef5e5 Author: John Baldwin AuthorDate: 2022-04-09 00:30:14 +0000 Commit: John Baldwin CommitDate: 2022-04-09 00:30:14 +0000 netmap: Move more_txspace and some_recvd under #ifdef SYNC_KLOOP_POLL. --- sys/dev/netmap/netmap_kloop.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/dev/netmap/netmap_kloop.c b/sys/dev/netmap/netmap_kloop.c index 8d9edd4be5f5..c40bbafd60a5 100644 --- a/sys/dev/netmap/netmap_kloop.c +++ b/sys/dev/netmap/netmap_kloop.c @@ -164,7 +164,9 @@ netmap_sync_kloop_tx_ring(const struct sync_kloop_ring_args *a) struct nm_csb_atok *csb_atok = a->csb_atok; struct nm_csb_ktoa *csb_ktoa = a->csb_ktoa; struct netmap_ring shadow_ring; /* shadow copy of the netmap_ring */ +#ifdef SYNC_KLOOP_POLL bool more_txspace = false; +#endif /* SYNC_KLOOP_POLL */ uint32_t num_slots; int batch; @@ -239,7 +241,9 @@ netmap_sync_kloop_tx_ring(const struct sync_kloop_ring_args *a) if (kring->rtail != kring->nr_hwtail) { /* Some more room available in the parent adapter. */ kring->rtail = kring->nr_hwtail; +#ifdef SYNC_KLOOP_POLL more_txspace = true; +#endif /* SYNC_KLOOP_POLL */ } if (unlikely(netmap_debug & NM_DEBUG_TXSYNC)) { @@ -317,7 +321,9 @@ netmap_sync_kloop_rx_ring(const struct sync_kloop_ring_args *a) struct nm_csb_ktoa *csb_ktoa = a->csb_ktoa; struct netmap_ring shadow_ring; /* shadow copy of the netmap_ring */ int dry_cycles = 0; +#ifdef SYNC_KLOOP_POLL bool some_recvd = false; +#endif /* SYNC_KLOOP_POLL */ uint32_t num_slots; if (unlikely(nm_kr_tryget(kring, 1, NULL))) { @@ -371,7 +377,9 @@ netmap_sync_kloop_rx_ring(const struct sync_kloop_ring_args *a) sync_kloop_kernel_write(csb_ktoa, kring->nr_hwcur, hwtail); if (kring->rtail != hwtail) { kring->rtail = hwtail; +#ifdef SYNC_KLOOP_POLL some_recvd = true; +#endif /* SYNC_KLOOP_POLL */ dry_cycles = 0; } else { dry_cycles++;