From patchwork Thu Jul 9 10:16:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eyal Birger X-Patchwork-Id: 1325896 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=a89bsqJ8; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B2XD94W1kz9sSd for ; Thu, 9 Jul 2020 20:17:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726533AbgGIKR2 (ORCPT ); Thu, 9 Jul 2020 06:17:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726340AbgGIKR1 (ORCPT ); Thu, 9 Jul 2020 06:17:27 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4FC11C061A0B for ; Thu, 9 Jul 2020 03:17:27 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id l2so1243304wmf.0 for ; Thu, 09 Jul 2020 03:17:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dx7AWW/y8nrFHRfzMfnYM5/Rl5A3rBbQovnBEVFwtSQ=; b=a89bsqJ8HJE1UoI6TuoXYTq9p4Sa20cCvMRbC70HX9PgRYlWWa3avpCYw70d7Y3LXK u8jHqeXiTx8f5Hm4IGw8FSZ5YByt3I1CiWTATjtsZgIyOt7kIEnoPHjHNdoWHSmtiKDg mFELFlkCWIkktprbWrVHAcR/lYbt7Jh3i7yYXOUZMi9LpQS3xfix7T4Ycgyri5ABsIvb OFYkrer4GWfyJvZ6J+EerNYR2N8qMeDWYHDGzgRKjeBDFpRSea0spOaBOnL4nNRgJ5k4 N5J6Yumqnpbd+KT2uka5DCsK09SbXvwh/M4gZIa9fHuGsDqCge3ySXR6wGTNzg4lNQLU TqlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dx7AWW/y8nrFHRfzMfnYM5/Rl5A3rBbQovnBEVFwtSQ=; b=tOPSMPTd6hPFQKDYg7ZBGtFJOQzS20xluyk0H/I2knZOZYV2AEuqpNZvgfK2rKUT8v fzHH8Yg2YI10l0J6BaNi8Ooqn8HE4UAiC82m2Z5jDiMW8apzFKF01Tl/NyHP6rsAmyly pO7jxv6hIH7rNbKm+uyoUATtUFs54+NQs0Iwf78hRtNwSNBnwLeRcZgXwNSzSNAUvgtu tTPKMupIIUBX+e1VAgOBheM4LxMx2VyDbjZzjtL8DOWK1mGZwl/rhKyIuAapzupV2qbY QA9x8cRJ9xWyDvFLe5OgQ6wJj8O2bkmxN9pslqCbrVRAx7hgNwd910VZh0Wl/H6hF8Bj sClA== X-Gm-Message-State: AOAM531A1JEO8Zzynx7/cd8k+r23b9dhycrAJg++9p2NHUNZ92jX+O7z N21qNt2wjW+SPSC11Phqxvk= X-Google-Smtp-Source: ABdhPJzu2osOui+4DQU/mPmnKwg+BFM6BqvfazB550VZRiZyHZryratSwELqYW+N/bFKPSsSpwhZig== X-Received: by 2002:a1c:bb43:: with SMTP id l64mr13918142wmf.151.1594289845993; Thu, 09 Jul 2020 03:17:25 -0700 (PDT) Received: from localhost.localdomain ([77.139.6.232]) by smtp.gmail.com with ESMTPSA id o21sm3988607wmh.18.2020.07.09.03.17.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 03:17:25 -0700 (PDT) From: Eyal Birger To: steffen.klassert@secunet.com, davem@davemloft.net, herbert@gondor.apana.org.au, netdev@vger.kernel.org Cc: Eyal Birger Subject: [PATCH ipsec-next 1/2] xfrm interface: avoid xi lookup in xfrmi_decode_session() Date: Thu, 9 Jul 2020 13:16:51 +0300 Message-Id: <20200709101652.1911784-2-eyal.birger@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200709101652.1911784-1-eyal.birger@gmail.com> References: <20200709101652.1911784-1-eyal.birger@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The xfrmi context exists in the netdevice priv context. Avoid looking for it in a separate list. Signed-off-by: Eyal Birger --- net/xfrm/xfrm_interface.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/net/xfrm/xfrm_interface.c b/net/xfrm/xfrm_interface.c index c407ecbc5d46..069dafeba873 100644 --- a/net/xfrm/xfrm_interface.c +++ b/net/xfrm/xfrm_interface.c @@ -47,6 +47,7 @@ static int xfrmi_dev_init(struct net_device *dev); static void xfrmi_dev_setup(struct net_device *dev); static struct rtnl_link_ops xfrmi_link_ops __read_mostly; static unsigned int xfrmi_net_id __read_mostly; +static const struct net_device_ops xfrmi_netdev_ops; struct xfrmi_net { /* lists for storing interfaces in use */ @@ -73,8 +74,7 @@ static struct xfrm_if *xfrmi_lookup(struct net *net, struct xfrm_state *x) static struct xfrm_if *xfrmi_decode_session(struct sk_buff *skb, unsigned short family) { - struct xfrmi_net *xfrmn; - struct xfrm_if *xi; + struct net_device *dev; int ifindex = 0; if (!secpath_exists(skb) || !skb->dev) @@ -88,18 +88,21 @@ static struct xfrm_if *xfrmi_decode_session(struct sk_buff *skb, ifindex = inet_sdif(skb); break; } - if (!ifindex) - ifindex = skb->dev->ifindex; - xfrmn = net_generic(xs_net(xfrm_input_state(skb)), xfrmi_net_id); + if (ifindex) { + struct net *net = xs_net(xfrm_input_state(skb)); - for_each_xfrmi_rcu(xfrmn->xfrmi[0], xi) { - if (ifindex == xi->dev->ifindex && - (xi->dev->flags & IFF_UP)) - return xi; + dev = dev_get_by_index_rcu(net, ifindex); + } else { + dev = skb->dev; } - return NULL; + if (!dev || !(dev->flags & IFF_UP)) + return NULL; + if (dev->netdev_ops != &xfrmi_netdev_ops) + return NULL; + + return netdev_priv(dev); } static void xfrmi_link(struct xfrmi_net *xfrmn, struct xfrm_if *xi) From patchwork Thu Jul 9 10:16:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eyal Birger X-Patchwork-Id: 1325897 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=cNEue4pL; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B2XDF3QYZz9sSd for ; Thu, 9 Jul 2020 20:17:33 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726630AbgGIKRc (ORCPT ); Thu, 9 Jul 2020 06:17:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726340AbgGIKRa (ORCPT ); Thu, 9 Jul 2020 06:17:30 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05FBEC061A0B for ; Thu, 9 Jul 2020 03:17:30 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id a6so1747069wrm.4 for ; Thu, 09 Jul 2020 03:17:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=D0K4+C2nqch/Dt0T+zQEU+kLab8A/OUkn21nq14ouXc=; b=cNEue4pLm4xx7N1oFLvWO//qIoPtWIXI+ZrXDfZe4WD3bZCUAaLK4F3lxa7Q50uKFj VRNPamQJxJZi8rrpUDHC+2vHrDzM0fznAyO8fqRZKR4rB1gReuufbSkpoPMjAlXZlmDy 4lqyU/Bfkh6KVGOwBTQRHMs0sjr04knHgIDswNMQ4/anuwJsvaW1hkiDaQbUApW0ebGe zc3sC1pCRMRStEr2Zo/dHZnTIuA6hNX9vrQgRxtMH0/93ImjlDEvlHNVQ2k3pYVuLcB2 u97fRG0nZ/dbfWUgvBYdkxKJ5QiXac12FCmqyC/utZ/Ja7OYg0xKS2YRC/CW69c9lver FSxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=D0K4+C2nqch/Dt0T+zQEU+kLab8A/OUkn21nq14ouXc=; b=K9pHTrTFanBoV2VBs/PPznbVOgdp6gL988S20kxDZyTeFd4NpON+Sj6K887/nsqnnb KB5xKK1M6mJnwpxL1EIAn+83nWVXsRZCK5Awt26xSDtPmVegutFBppE894pkEUCv23wd a4hZ5qjOvKMzBGQiPM4jph4R2iQ0VoxPSONacRZsTiPgfv00LLNeZKuWdNqDPlVCBkEL kC7wDJ42XagnNh/z9b9VWorcQuAJfAaljGP2igRq8IFsDdI9iQfHMrc69oltm8nxUMtv hon+8IV/gunH+hF2iRmh98QJ8nORWaMUsOedVrvggw8WPvHC9OuJsDPk3tH21ffVjdmz YVig== X-Gm-Message-State: AOAM531Vfk09quLO2zjC9GfP0grI1LiRYxogXUW1GAgP3cOhCAcSLFcP 8Qu6GKY5AM5rCEEzHw7sr40= X-Google-Smtp-Source: ABdhPJyux2cqLXVjyLKnfLCBdG52rK9NKUIUzHX5BBWeDn7kpmzFUCLGQat17s4TbvHXMAucEO51Lg== X-Received: by 2002:adf:f8cb:: with SMTP id f11mr66059783wrq.358.1594289848688; Thu, 09 Jul 2020 03:17:28 -0700 (PDT) Received: from localhost.localdomain ([77.139.6.232]) by smtp.gmail.com with ESMTPSA id o21sm3988607wmh.18.2020.07.09.03.17.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 03:17:27 -0700 (PDT) From: Eyal Birger To: steffen.klassert@secunet.com, davem@davemloft.net, herbert@gondor.apana.org.au, netdev@vger.kernel.org Cc: Eyal Birger Subject: [PATCH ipsec-next 2/2] xfrm interface: store xfrmi contexts in a hash by if_id Date: Thu, 9 Jul 2020 13:16:52 +0300 Message-Id: <20200709101652.1911784-3-eyal.birger@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200709101652.1911784-1-eyal.birger@gmail.com> References: <20200709101652.1911784-1-eyal.birger@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org xfrmi_lookup() is called on every packet. Using a single list for looking up if_id becomes a bottleneck when having many xfrm interfaces. Signed-off-by: Eyal Birger --- net/xfrm/xfrm_interface.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/net/xfrm/xfrm_interface.c b/net/xfrm/xfrm_interface.c index 069dafeba873..f4ec117e9110 100644 --- a/net/xfrm/xfrm_interface.c +++ b/net/xfrm/xfrm_interface.c @@ -49,20 +49,28 @@ static struct rtnl_link_ops xfrmi_link_ops __read_mostly; static unsigned int xfrmi_net_id __read_mostly; static const struct net_device_ops xfrmi_netdev_ops; +#define XFRMI_HASH_BITS 8 +#define XFRMI_HASH_SIZE BIT(XFRMI_HASH_BITS) + struct xfrmi_net { /* lists for storing interfaces in use */ - struct xfrm_if __rcu *xfrmi[1]; + struct xfrm_if __rcu *xfrmi[XFRMI_HASH_SIZE]; }; #define for_each_xfrmi_rcu(start, xi) \ for (xi = rcu_dereference(start); xi; xi = rcu_dereference(xi->next)) +static u32 xfrmi_hash(u32 if_id) +{ + return hash_32(if_id, XFRMI_HASH_BITS); +} + static struct xfrm_if *xfrmi_lookup(struct net *net, struct xfrm_state *x) { struct xfrmi_net *xfrmn = net_generic(net, xfrmi_net_id); struct xfrm_if *xi; - for_each_xfrmi_rcu(xfrmn->xfrmi[0], xi) { + for_each_xfrmi_rcu(xfrmn->xfrmi[xfrmi_hash(x->if_id)], xi) { if (x->if_id == xi->p.if_id && (xi->dev->flags & IFF_UP)) return xi; @@ -107,7 +115,7 @@ static struct xfrm_if *xfrmi_decode_session(struct sk_buff *skb, static void xfrmi_link(struct xfrmi_net *xfrmn, struct xfrm_if *xi) { - struct xfrm_if __rcu **xip = &xfrmn->xfrmi[0]; + struct xfrm_if __rcu **xip = &xfrmn->xfrmi[xfrmi_hash(xi->p.if_id)]; rcu_assign_pointer(xi->next , rtnl_dereference(*xip)); rcu_assign_pointer(*xip, xi); @@ -118,7 +126,7 @@ static void xfrmi_unlink(struct xfrmi_net *xfrmn, struct xfrm_if *xi) struct xfrm_if __rcu **xip; struct xfrm_if *iter; - for (xip = &xfrmn->xfrmi[0]; + for (xip = &xfrmn->xfrmi[xfrmi_hash(xi->p.if_id)]; (iter = rtnl_dereference(*xip)) != NULL; xip = &iter->next) { if (xi == iter) { @@ -162,7 +170,7 @@ static struct xfrm_if *xfrmi_locate(struct net *net, struct xfrm_if_parms *p) struct xfrm_if *xi; struct xfrmi_net *xfrmn = net_generic(net, xfrmi_net_id); - for (xip = &xfrmn->xfrmi[0]; + for (xip = &xfrmn->xfrmi[xfrmi_hash(p->if_id)]; (xi = rtnl_dereference(*xip)) != NULL; xip = &xi->next) if (xi->p.if_id == p->if_id) @@ -761,11 +769,14 @@ static void __net_exit xfrmi_exit_batch_net(struct list_head *net_exit_list) struct xfrmi_net *xfrmn = net_generic(net, xfrmi_net_id); struct xfrm_if __rcu **xip; struct xfrm_if *xi; + int i; - for (xip = &xfrmn->xfrmi[0]; - (xi = rtnl_dereference(*xip)) != NULL; - xip = &xi->next) - unregister_netdevice_queue(xi->dev, &list); + for (i = 0; i < XFRMI_HASH_SIZE; i++) { + for (xip = &xfrmn->xfrmi[i]; + (xi = rtnl_dereference(*xip)) != NULL; + xip = &xi->next) + unregister_netdevice_queue(xi->dev, &list); + } } unregister_netdevice_many(&list); rtnl_unlock();