From nobody Wed Apr 5 16:09:01 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 4Ps8hF5zZpz43hd5; Wed, 5 Apr 2023 16:09:01 +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 4Ps8hF4Ft3z3xH6; Wed, 5 Apr 2023 16:09:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680710941; 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=Jg3gm9l+52CQPo5uCPRYG6d+J5R2LhNqzbTxGnMVHmw=; b=lslJcDUsliDAqLfmPbebnyDRfD+/i8LiQXpsyQDTsBkkDbAYI5vyuZMogLD3MJScLN+ElV m1agz6fvEMF94v7kq2Hlj6TK4Im6ZXM6g5dEniwCNUygLL19o5tsU3VIuoo8chhDVLfUIr Jrx1U1AcqVZHRAyU96PedSvTZwIO6I33Aw7X6UiII7JwEQnoFYZxa1LyUbgdWNGtvV6NZd mAvZYEgfNj62edMnRoCMx2NdMHihcL7vmlGwYwI6vniAFdmGuQ9ObNyXQhzEipsuXm9CJm +xYGt/Dne0EZhaK0VffcvNdr0SVzJM3gvDhPAELSpu/Pp3R/+8B0TXcPTNHZVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680710941; 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=Jg3gm9l+52CQPo5uCPRYG6d+J5R2LhNqzbTxGnMVHmw=; b=WhZNVn0Rv3ZAvKQ7s9rx14VzRybFJXlQAORtgffqLplF+CC4K/9FuKZ9KoPe03r5eFjdkx ZDXnjdQfjToFuaDNm0XaUVdlbriYjmWpV9+BptbJQGKXyG0eTyDqqYfGICp+NlbLB3KUpU XMWltEq2vDz9m6R1KSjD6b1oqdEI0rGuwW1l4WNDLjidtowBpdXKhFbWgmBC03kCtCGlFJ AO7UClgzCyCFpveHc6CIIrGT2G+CXT7fhl57TqjHTEyjEEaORn3ifLaYl0f/1r5UwmIItj 99c+dni4x7Quev/CBHQZWRonW+dqHBSHpJeXYVCDEmv9+4NlLGHm01vkTHtvUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680710941; a=rsa-sha256; cv=none; b=lr1O9ZQU2ZIAa+FG5m24Ps+ZNhw9BOZ9tfiL30MDrPh2h3Ul6y+Mx70MAAp4E1P/1LpqYX fLQun8j3AFU+PT5Ed4mC1Z+i3i+3WdSx1sv0i6gF8zE9v6tk3icAk8otl9QdbkBu9SWX/3 OAsKzRZEhbIe+HZdhvbucXmcbTKJkNZJOcWSJyGIV+ZsfW1aZtpFTnhrY3A3SUcI245KIS XdgK71rkytulZZr0bI8Eo0td/TP5QYxAFKcBKmgZEQ0vuYnj7l9oxhH8esTrnIBOm+5OJ7 u80mgOq0Q3jTIbebqLZ4TgOXPEDpou8RS0+XmFm1XrODjLBpaXFzM5tTsJt+7Q== 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 4Ps8hF3MCDzTcV; Wed, 5 Apr 2023 16:09:01 +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 335G9192032463; Wed, 5 Apr 2023 16:09:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 335G91b1032462; Wed, 5 Apr 2023 16:09:01 GMT (envelope-from git) Date: Wed, 5 Apr 2023 16:09:01 GMT Message-Id: <202304051609.335G91b1032462@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: fc6c93b6a5cf - main - infiniband: Opt-in for net epoch 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc6c93b6a5cf14cbc099f550f745d63779499fec Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=fc6c93b6a5cf14cbc099f550f745d63779499fec commit fc6c93b6a5cf14cbc099f550f745d63779499fec Author: Zhenlei Huang AuthorDate: 2023-04-05 16:05:02 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-05 16:08:23 +0000 infiniband: Opt-in for net epoch This is counterpart to e87c4940156c, which did the same for ethernet. Suggested by: hselasky Reviewed by: hselasky, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D39405 --- sys/net/if_infiniband.c | 9 +++++++-- sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h | 2 +- sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c | 6 ++++-- sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 2 +- sys/ofed/include/rdma/ib_verbs.h | 1 + 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/sys/net/if_infiniband.c b/sys/net/if_infiniband.c index b3cdd15c76f7..30f014ee669d 100644 --- a/sys/net/if_infiniband.c +++ b/sys/net/if_infiniband.c @@ -415,9 +415,13 @@ infiniband_input(struct ifnet *ifp, struct mbuf *m) struct infiniband_header *ibh; struct epoch_tracker et; int isr; + bool needs_epoch; + + needs_epoch = (ifp->if_flags & IFF_KNOWSEPOCH) == 0; CURVNET_SET_QUIET(ifp->if_vnet); - NET_EPOCH_ENTER(et); + if (__predict_false(needs_epoch)) + NET_EPOCH_ENTER(et); if ((ifp->if_flags & IFF_UP) == 0) { if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); @@ -507,7 +511,8 @@ infiniband_input(struct ifnet *ifp, struct mbuf *m) /* Allow monitor mode to claim this frame, after stats are updated. */ netisr_dispatch(isr, m); done: - NET_EPOCH_EXIT(et); + if (__predict_false(needs_epoch)) + NET_EPOCH_EXIT(et); CURVNET_RESTORE(); } diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h index c2cbc553e744..e6f191ef86de 100644 --- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h +++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h @@ -459,7 +459,7 @@ void ipoib_reap_ah(struct work_struct *work); void ipoib_mark_paths_invalid(struct ipoib_dev_priv *priv); void ipoib_flush_paths(struct ipoib_dev_priv *priv); -struct ipoib_dev_priv *ipoib_intf_alloc(const char *format); +struct ipoib_dev_priv *ipoib_intf_alloc(const char *format, struct ib_device *ca); int ipoib_ib_dev_init(struct ipoib_dev_priv *priv, struct ib_device *ca, int port); diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c index 38d8680ebf38..8b2f4724d2fd 100644 --- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c @@ -901,7 +901,7 @@ ipoib_priv_alloc(void) } struct ipoib_dev_priv * -ipoib_intf_alloc(const char *name) +ipoib_intf_alloc(const char *name, struct ib_device *hca) { struct ipoib_dev_priv *priv; if_t dev; @@ -922,6 +922,8 @@ ipoib_intf_alloc(const char *name) } if_initname(dev, name, priv->unit); if_setflags(dev, IFF_BROADCAST | IFF_MULTICAST); + if (hca->attrs.device_cap_flags & IB_DEVICE_KNOWSEPOCH) + if_setflagbits(dev, IFF_KNOWSEPOCH, 0); infiniband_ifattach(priv->dev, NULL, priv->broadcastaddr); @@ -976,7 +978,7 @@ ipoib_add_port(const char *format, struct ib_device *hca, u8 port) struct ib_port_attr attr; int result = -ENOMEM; - priv = ipoib_intf_alloc(format); + priv = ipoib_intf_alloc(format, hca); if (!priv) goto alloc_mem_failed; diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_vlan.c index c9c24acf8529..bcb7e66a114c 100644 --- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_vlan.c +++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_vlan.c @@ -89,7 +89,7 @@ int ipoib_vlan_add(if_t pdev, unsigned short pkey) snprintf(intf_name, sizeof intf_name, "%s.%04x", ppriv->dev->name, pkey); - priv = ipoib_intf_alloc(intf_name); + priv = ipoib_intf_alloc(intf_name, ppriv->ca); if (!priv) { result = -ENOMEM; goto err; diff --git a/sys/ofed/include/rdma/ib_verbs.h b/sys/ofed/include/rdma/ib_verbs.h index 1caa08b6b003..b726526838f5 100644 --- a/sys/ofed/include/rdma/ib_verbs.h +++ b/sys/ofed/include/rdma/ib_verbs.h @@ -242,6 +242,7 @@ enum ib_device_cap_flags { IB_DEVICE_SG_GAPS_REG = (1ULL << 32), IB_DEVICE_VIRTUAL_FUNCTION = (1ULL << 33), IB_DEVICE_RAW_SCATTER_FCS = (1ULL << 34), + IB_DEVICE_KNOWSEPOCH = (1ULL << 35), }; enum ib_atomic_cap {