From nobody Fri Jan 13 15:33:11 2023 X-Original-To: dev-commits-src-main@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 4Ntlml5HDsz2qykD; Fri, 13 Jan 2023 15:33:11 +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 4Ntlml4pTJz4JRj; Fri, 13 Jan 2023 15:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673623991; 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=xRwajn82apufsKfAFy6NfH7tBQMQzmI57sGUgA8xLjg=; b=FjB1scPa1yXIWMM4Kq7bs1hwqwPiU5AKwOfICQvizgV9o+ySCVCVZmuLTi8jRo0vQlYnck jnyi2rBeQ2sjbjoSqSsIj19sfYIugEXcoV0EhlN7pXU1R4d8wTaR7jPhLOSiS5jWAONxh5 4F9BI2zyCsg/WTGkWHMgvLchK/dOAReogrdtSRn+Cyuf3X2ip6csCccsiDl/r8dJtgBS5D dwWfxIUwdpUOWgW0vUA59eU4+n++0OdfqBIF4Cc/d49AbPTkWpHjRHZN+jI+HgQICccDsk YTnpwQaWr0f8OzHRfRPt3W0GrSXOwiywUJimndLLztQpnt0B8ZogEXnrifozVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673623991; 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=xRwajn82apufsKfAFy6NfH7tBQMQzmI57sGUgA8xLjg=; b=idhctCODpmC/RSy0tDRwCbzYabe2v+JDJU2h3R4sO+qluO52w2ObJDm79gmLlcC2SlbnnL 0lgrtQ8iGs9h7c99AQnQK82vIPTT+56npqgyzZu5Ynatuej7gU3EpFg7EpAl356xggfYUu LQiDnx1HM/cfk67RZGFrrQgmnYqAbSMq/K1NLWto9okINFK0jkQy11VZ96meNsNqfKSP2h v1gcJYjr/OqZ6BbSKpcbNyLtBjMvsGjFJxee0Y67yuZCuLGi+nh4vBEhML8Nyc6sFHeAa3 jVbvpgsET/ECBwR0traPGN2lfA+0YBT59rNjmlHugwdlkJmkUuoUTzlSMpoZrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673623991; a=rsa-sha256; cv=none; b=Q5IVZ6YCWWfBpfyrxtOAk+50pjp2B4hSK0RGsxXgkAPLAYp6j4P3h9LO5ORTCp+WnxgysC hUzcnchrAoLRAd3eQscbZ05JZISwjQAhBwGuqI5PCP+nt3ryot8+j4v6bVnp8o+SkyHmTe pj9tgBfLVJkz9THf7Q92GtwajQ2A8YlTGfju2AxXEqve+huG9GXC+v9iFF6nR5dDbex5EX zLY1WJGUD2XmvB/X7j2kuMjFtp63zhnS8jrIfV9QQfGshasyRDyf0Ne4TmGQYvJBgQmAk4 urRr8XGY0bH9diDxwhUwxJOWimuBXGtQ9yYf0pA47SL3WTC0NIaqltFgRKa3mQ== 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 4Ntlml3mzSz1CD2; Fri, 13 Jan 2023 15:33:11 +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 30DFXBuD037701; Fri, 13 Jan 2023 15:33:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30DFXBcc037700; Fri, 13 Jan 2023 15:33:11 GMT (envelope-from git) Date: Fri, 13 Jan 2023 15:33:11 GMT Message-Id: <202301131533.30DFXBcc037700@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 110ce09c90dc - main - if_lagg: Allow lagg interfaces to be used with netmap List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 110ce09c90dc452fa5669874535e1f3984e166f9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=110ce09c90dc452fa5669874535e1f3984e166f9 commit 110ce09c90dc452fa5669874535e1f3984e166f9 Author: Tom Jones AuthorDate: 2023-01-13 15:26:55 +0000 Commit: Tom Jones CommitDate: 2023-01-13 15:31:58 +0000 if_lagg: Allow lagg interfaces to be used with netmap Reviewed by: zlei Sponsored by: Zenarmor Sponsored by: OPNsense Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D37436 --- sys/dev/netmap/netmap_freebsd.c | 4 ++++ sys/net/if_lagg.c | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/sys/dev/netmap/netmap_freebsd.c b/sys/dev/netmap/netmap_freebsd.c index 7a3f2ceacdbb..0f7372e959bb 100644 --- a/sys/dev/netmap/netmap_freebsd.c +++ b/sys/dev/netmap/netmap_freebsd.c @@ -351,6 +351,8 @@ nm_os_catch_rx(struct netmap_generic_adapter *gna, int intercept) ret = EBUSY; /* already set */ goto out; } + + ifp->if_capenable |= IFCAP_NETMAP; gna->save_if_input = ifp->if_input; ifp->if_input = freebsd_generic_rx_handler; } else { @@ -360,6 +362,8 @@ nm_os_catch_rx(struct netmap_generic_adapter *gna, int intercept) ret = EINVAL; /* not saved */ goto out; } + + ifp->if_capenable &= ~IFCAP_NETMAP; ifp->if_input = gna->save_if_input; gna->save_if_input = NULL; } diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 7c5e0127d7ff..58157e0dff3f 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -84,6 +84,10 @@ __FBSDID("$FreeBSD$"); extern void nd6_setmtu(struct ifnet *); #endif +#ifdef DEV_NETMAP +MODULE_DEPEND(if_lagg, netmap, 1, 1, 1); +#endif + #define LAGG_SX_INIT(_sc) sx_init(&(_sc)->sc_sx, "if_lagg sx") #define LAGG_SX_DESTROY(_sc) sx_destroy(&(_sc)->sc_sx) #define LAGG_XLOCK(_sc) sx_xlock(&(_sc)->sc_sx) @@ -2201,6 +2205,13 @@ lagg_input_ethernet(struct ifnet *ifp, struct mbuf *m) m = NULL; } +#ifdef DEV_NETMAP + if (m != NULL && scifp->if_capenable & IFCAP_NETMAP) { + scifp->if_input(scifp, m); + m = NULL; + } +#endif /* DEV_NETMAP */ + NET_EPOCH_EXIT(et); return (m); }