From patchwork Mon Dec 30 14:30:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Lobakin X-Patchwork-Id: 1216452 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=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=dlink.ru Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=dlink.ru header.i=@dlink.ru header.b="HjAWVF7f"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47mfyw1YN5z9sRC for ; Tue, 31 Dec 2019 01:32:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727691AbfL3OcW (ORCPT ); Mon, 30 Dec 2019 09:32:22 -0500 Received: from mail.dlink.ru ([178.170.168.18]:40796 "EHLO fd.dlink.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727661AbfL3OcU (ORCPT ); Mon, 30 Dec 2019 09:32:20 -0500 Received: by fd.dlink.ru (Postfix, from userid 5000) id 78B151B21990; Mon, 30 Dec 2019 17:32:17 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 fd.dlink.ru 78B151B21990 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dlink.ru; s=mail; t=1577716337; bh=SYnifMPQP4kzdSLpDkUORDps+aCxCuIpXYmwM1fEL9I=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HjAWVF7fJOydlUu7w4y+Nj7t3lh9CsZSwnpvNJrr9JZgyGQ2iKuBzLZB12ahEdSI/ kFoLJ6RIJtMyn8A9Yo6Q7CH8w24P1jKYfI711/d6vpyLzP6CkHYgKPE9nTxPytuePA c2xf96yt8jcMptCMC806qRahzuNRJpLHM9L+G27I= Received: from mail.rzn.dlink.ru (mail.rzn.dlink.ru [178.170.168.13]) by fd.dlink.ru (Postfix) with ESMTP id 3C8BB1B21825; Mon, 30 Dec 2019 17:31:29 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 fd.dlink.ru 3C8BB1B21825 Received: from mail.rzn.dlink.ru (localhost [127.0.0.1]) by mail.rzn.dlink.ru (Postfix) with ESMTP id 678DC1B229D0; Mon, 30 Dec 2019 17:31:27 +0300 (MSK) Received: from localhost.localdomain (unknown [196.196.203.126]) by mail.rzn.dlink.ru (Postfix) with ESMTPA; Mon, 30 Dec 2019 17:31:27 +0300 (MSK) From: Alexander Lobakin To: "David S. Miller" Cc: Edward Cree , Andrew Lunn , Vivien Didelot , Florian Fainelli , Hauke Mehrtens , Sean Wang , Matthias Brugger , Jiri Pirko , Eric Dumazet , Paolo Abeni , Jakub Kicinski , Alexander Lobakin , Taehee Yoo , Stephen Hemminger , Stanislav Fomichev , Daniel Borkmann , Song Liu , Matteo Croce , Jakub Sitnicki , Paul Blakey , Yoshiki Komachi , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH RFC net-next 13/19] net: dsa: tag_lan9303: add GRO callbacks Date: Mon, 30 Dec 2019 17:30:21 +0300 Message-Id: <20191230143028.27313-14-alobakin@dlink.ru> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191230143028.27313-1-alobakin@dlink.ru> References: <20191230143028.27313-1-alobakin@dlink.ru> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add GRO callbacks for LAN9303 tagger to make GRO available for frames tagged with it. Signed-off-by: Alexander Lobakin --- net/dsa/tag_lan9303.c | 77 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/net/dsa/tag_lan9303.c b/net/dsa/tag_lan9303.c index ba03502986a4..77aba4311f2d 100644 --- a/net/dsa/tag_lan9303.c +++ b/net/dsa/tag_lan9303.c @@ -151,12 +151,89 @@ static void lan9303_flow_dissect(const struct sk_buff *skb, __be16 *proto, *proto = lan9303_encap_proto(skb->data); } +static struct sk_buff *lan9303_gro_receive(struct list_head *head, + struct sk_buff *skb) +{ + const struct packet_offload *ptype; + struct sk_buff *p, *pp = NULL; + const u8 *data, *data_p; + u32 data_off, data_end; + int flush = 1; + + data_off = skb_gro_offset(skb); + data_end = data_off + LAN9303_TAG_LEN; + + data = skb_gro_header_fast(skb, data_off); + if (skb_gro_header_hard(skb, data_end)) { + data = skb_gro_header_slow(skb, data_end, data_off); + if (unlikely(!data)) + goto out; + } + + /* Data that is to the left to the current position is already + * pulled to the head + */ + if (!lan9303_sanity_check(skb->data + data_off)) + goto out; + + rcu_read_lock(); + + ptype = gro_find_receive_by_type(lan9303_encap_proto(data)); + if (!ptype) + goto out_unlock; + + flush = 0; + + list_for_each_entry(p, head, list) { + if (!NAPI_GRO_CB(p)->same_flow) + continue; + + data_p = p->data + data_off; + if (lan9303_source_port(data) ^ lan9303_source_port(data_p)) + NAPI_GRO_CB(p)->same_flow = 0; + } + + skb_gro_pull(skb, LAN9303_TAG_LEN); + skb_gro_postpull_rcsum(skb, data, LAN9303_TAG_LEN); + + pp = call_gro_receive(ptype->callbacks.gro_receive, head, skb); + +out_unlock: + rcu_read_unlock(); +out: + skb_gro_flush_final(skb, pp, flush); + + return pp; +} + +static int lan9303_gro_complete(struct sk_buff *skb, int nhoff) +{ + const struct packet_offload *ptype; + int err = -ENOENT; + __be16 proto; + + proto = lan9303_encap_proto(skb->data + nhoff); + nhoff += LAN9303_TAG_LEN; + + rcu_read_lock(); + + ptype = gro_find_complete_by_type(proto); + if (ptype) + err = ptype->callbacks.gro_complete(skb, nhoff); + + rcu_read_unlock(); + + return err; +} + static const struct dsa_device_ops lan9303_netdev_ops = { .name = "lan9303", .proto = DSA_TAG_PROTO_LAN9303, .xmit = lan9303_xmit, .rcv = lan9303_rcv, .flow_dissect = lan9303_flow_dissect, + .gro_receive = lan9303_gro_receive, + .gro_complete = lan9303_gro_complete, .overhead = LAN9303_TAG_LEN, };