Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp241456pxf; Wed, 10 Mar 2021 05:28:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJwbwigxKjZ2cbH9lkI2QEE9YMqkyepVbBpD5JSpiy2FxOfUUORCU9elCYKONigOWqv8oWx4 X-Received: by 2002:a17:907:7692:: with SMTP id jv18mr3600522ejc.475.1615382886579; Wed, 10 Mar 2021 05:28:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615382886; cv=none; d=google.com; s=arc-20160816; b=jVuOG4VhAJijcAyfgNBY3G41BeO9X04/CJGnNVIxncrF+cIv8YzALiMQExiFqFje3/ 1nQamN+ZQ5yhNj+ruysbpDthwZhDSMzS8ZYmfUgaIvdf8UvGTKlr7M5rdj4HgxbeQpwg 4Hms5mfPc0GTApFFCmZxRBoW9Dqs+XQtvDd8qpJmEmjLlh2c81h2J/KTnd9rxvwlRN2B 3eo8BzfzIhzOjht9cP3ifE5VzPrRa0v/xtSCAJR1BuxT/BIRBk63httLO57mSpgI/koi oYiPyKXCDeb5/HMCVAy92kSQUJkjejH3d5T2zvYyEaAYARITzaSHJZstRrd4Ts4MdZSl LB6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=EY39rfRs3Yh7tiO+8ZyXc1j6pdHGp9UQmDnlqDJmMO4=; b=h4U3M/z1/zr2SkiO+x8W1n/Tqt/xAqqLPEExkoAHEK4fMwwRRe818xAviiBN5DFKaz aoIqHbkLrODdzZxh9dE1oGNGZ+Z9AXesqkV+M27ozWJDaI2h4UP83etDtA/VaQOSQhsH 9EZRcLfqIS1CApQOvtXJzjGm3DBzvYlNpbdzoIBabwAinu+0x6PDpcSLp87O2XtAy/JZ Vl+C/bzAnbuV3MEr5LMiigbyvoTTgzivuQ9hmAoDK7H9fpHVl7WxIL2cnJjSU1b4bf54 VZwBDRo5TKxkFAtc1tJWATQ6ljTigYgJT8F+AQHv5O72TvoGXH6YCP9k/VQzYjygVvbV yfgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xqm8u9Is; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j20si11362665ejy.7.2021.03.10.05.27.43; Wed, 10 Mar 2021 05:28:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xqm8u9Is; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233495AbhCJN0u (ORCPT + 99 others); Wed, 10 Mar 2021 08:26:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:46068 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232969AbhCJNYo (ORCPT ); Wed, 10 Mar 2021 08:24:44 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id AF9AB64FD8; Wed, 10 Mar 2021 13:24:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615382682; bh=PdE2ITkHsmSoZi7qf4AEmJ1X7Nc09213l1yP3F9skVM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xqm8u9IsRkZ98k2gz5ZEiJd059IvaVg/qbn70RdUqxUeb1C7BkvOqxQzkrUG+o3Nz 4IJMUZZfWqk/bSrWAgKRWXmUcz2NUVamSkR8cRiSzxydvtYYagpUsHR5pPFJhZo9jX /voaF+eMHjbdBjsK9oWlh2+FvECKpndgAfhyja0k= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexander Lobakin , "David S. Miller" , =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH 5.4 01/24] net: dsa: add GRO support via gro_cells Date: Wed, 10 Mar 2021 14:24:13 +0100 Message-Id: <20210310132320.597893085@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210310132320.550932445@linuxfoundation.org> References: <20210310132320.550932445@linuxfoundation.org> User-Agent: quilt/0.66 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman From: Alexander Lobakin commit e131a5634830047923c694b4ce0c3b31745ff01b upstream. gro_cells lib is used by different encapsulating netdevices, such as geneve, macsec, vxlan etc. to speed up decapsulated traffic processing. CPU tag is a sort of "encapsulation", and we can use the same mechs to greatly improve overall DSA performance. skbs are passed to the GRO layer after removing CPU tags, so we don't need any new packet offload types as it was firstly proposed by me in the first GRO-over-DSA variant [1]. The size of struct gro_cells is sizeof(void *), so hot struct dsa_slave_priv becomes only 4/8 bytes bigger, and all critical fields remain in one 32-byte cacheline. The other positive side effect is that drivers for network devices that can be shipped as CPU ports of DSA-driven switches can now use napi_gro_frags() to pass skbs to kernel. Packets built that way are completely non-linear and are likely being dropped without GRO. This was tested on to-be-mainlined-soon Ethernet driver that uses napi_gro_frags(), and the overall performance was on par with the variant from [1], sometimes even better due to minimal overhead. net.core.gro_normal_batch tuning may help to push it to the limit on particular setups and platforms. iperf3 IPoE VLAN NAT TCP forwarding (port1.218 -> port0) setup on 1.2 GHz MIPS board: 5.7-rc2 baseline: [ID] Interval Transfer Bitrate Retr [ 5] 0.00-120.01 sec 9.00 GBytes 644 Mbits/sec 413 sender [ 5] 0.00-120.00 sec 8.99 GBytes 644 Mbits/sec receiver Iface RX packets TX packets eth0 7097731 7097702 port0 426050 6671829 port1 6671681 425862 port1.218 6671677 425851 With this patch: [ID] Interval Transfer Bitrate Retr [ 5] 0.00-120.01 sec 12.2 GBytes 870 Mbits/sec 122 sender [ 5] 0.00-120.00 sec 12.2 GBytes 870 Mbits/sec receiver Iface RX packets TX packets eth0 9474792 9474777 port0 455200 353288 port1 9019592 455035 port1.218 353144 455024 v2: - Add some performance examples in the commit message; - No functional changes. [1] https://lore.kernel.org/netdev/20191230143028.27313-1-alobakin@dlink.ru/ Signed-off-by: Alexander Lobakin Signed-off-by: David S. Miller Cc: Pali Rohár Signed-off-by: Greg Kroah-Hartman --- net/dsa/Kconfig | 1 + net/dsa/dsa.c | 2 +- net/dsa/dsa_priv.h | 3 +++ net/dsa/slave.c | 10 +++++++++- 4 files changed, 14 insertions(+), 2 deletions(-) --- a/net/dsa/Kconfig +++ b/net/dsa/Kconfig @@ -9,6 +9,7 @@ menuconfig NET_DSA tristate "Distributed Switch Architecture" depends on HAVE_NET_DSA depends on BRIDGE || BRIDGE=n + select GRO_CELLS select NET_SWITCHDEV select PHYLINK select NET_DEVLINK --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -238,7 +238,7 @@ static int dsa_switch_rcv(struct sk_buff if (dsa_skb_defer_rx_timestamp(p, skb)) return 0; - netif_receive_skb(skb); + gro_cells_receive(&p->gcells, skb); return 0; } --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h @@ -11,6 +11,7 @@ #include #include #include +#include enum { DSA_NOTIFIER_AGEING_TIME, @@ -68,6 +69,8 @@ struct dsa_slave_priv { struct pcpu_sw_netstats *stats64; + struct gro_cells gcells; + /* DSA port data, such as switch, port index, etc. */ struct dsa_port *dp; --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1431,6 +1431,11 @@ int dsa_slave_create(struct dsa_port *po free_netdev(slave_dev); return -ENOMEM; } + + ret = gro_cells_init(&p->gcells, slave_dev); + if (ret) + goto out_free; + p->dp = port; INIT_LIST_HEAD(&p->mall_tc_list); INIT_WORK(&port->xmit_work, dsa_port_xmit_work); @@ -1443,7 +1448,7 @@ int dsa_slave_create(struct dsa_port *po ret = dsa_slave_phy_setup(slave_dev); if (ret) { netdev_err(master, "error %d setting up slave phy\n", ret); - goto out_free; + goto out_gcells; } dsa_slave_notify(slave_dev, DSA_PORT_REGISTER); @@ -1462,6 +1467,8 @@ out_phy: phylink_disconnect_phy(p->dp->pl); rtnl_unlock(); phylink_destroy(p->dp->pl); +out_gcells: + gro_cells_destroy(&p->gcells); out_free: free_percpu(p->stats64); free_netdev(slave_dev); @@ -1482,6 +1489,7 @@ void dsa_slave_destroy(struct net_device dsa_slave_notify(slave_dev, DSA_PORT_UNREGISTER); unregister_netdev(slave_dev); phylink_destroy(dp->pl); + gro_cells_destroy(&p->gcells); free_percpu(p->stats64); free_netdev(slave_dev); }