Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51b27d27 authored by Conner Huff's avatar Conner Huff Committed by Gerrit - the friendly Code Review server
Browse files

drivers: rmnet: Add option for wq context packets 



Timer in perf module requires that packets be passed
to gro cells instead of regular GRO path since wq
context has no access to napi struct. This change
allows for clients of rmnet to designate what context
packets they are delivering to rmnet are coming from.

Change-Id: I24e1430d85494e5e04405fc3be901f68214022d5
Signed-off-by: default avatarConner Huff <chuff@codeaurora.org>
parent 9fa809c7

drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c

+59 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -86,11 +86,15 @@ void rmnet_set_skb_proto(struct sk_buff *skb) 
EXPORT_SYMBOL(rmnet_set_skb_proto);



/* Shs hook handler */



int (*rmnet_shs_skb_entry)(struct sk_buff *skb,

			   struct rmnet_port *port) __rcu __read_mostly;

EXPORT_SYMBOL(rmnet_shs_skb_entry);



/* Shs hook handler for work queue*/

int (*rmnet_shs_skb_entry_wq)(struct sk_buff *skb,

			      struct rmnet_port *port) __rcu __read_mostly;

EXPORT_SYMBOL(rmnet_shs_skb_entry_wq);



/* Generic handler */



void
@@ -133,6 +137,59 @@ rmnet_deliver_skb(struct sk_buff *skb, struct rmnet_port *port) 
}

EXPORT_SYMBOL(rmnet_deliver_skb);



/* Important to note, port cannot be used here if it has gone stale */

void

rmnet_deliver_skb_wq(struct sk_buff *skb, struct rmnet_port *port,

		     enum rmnet_packet_context ctx)

{

	int (*rmnet_shs_stamp)(struct sk_buff *skb, struct rmnet_port *port);

	struct rmnet_priv *priv = netdev_priv(skb->dev);



	trace_rmnet_low(RMNET_MODULE, RMNET_DLVR_SKB, 0xDEF, 0xDEF,

			0xDEF, 0xDEF, (void *)skb, NULL);

	skb_reset_transport_header(skb);

	skb_reset_network_header(skb);

	rmnet_vnd_rx_fixup(skb->dev, skb->len);



	skb->pkt_type = PACKET_HOST;

	skb_set_mac_header(skb, 0);



	/* packets coming from work queue context due to packet flush timer

	 * must go through the special workqueue path in SHS driver

	 */

	rmnet_shs_stamp = (!ctx) ? rcu_dereference(rmnet_shs_skb_entry) :

				   rcu_dereference(rmnet_shs_skb_entry_wq);

	if (rmnet_shs_stamp) {

		rmnet_shs_stamp(skb, port);

		return;

	}



	if (ctx == RMNET_NET_RX_CTX) {

		if (port->data_format & RMNET_INGRESS_FORMAT_DL_MARKER) {

			if (!rmnet_check_skb_can_gro(skb) &&

			    port->dl_marker_flush >= 0) {

				struct napi_struct *napi =

					get_current_napi_context();

				napi_gro_receive(napi, skb);

				port->dl_marker_flush++;

			} else {

				netif_receive_skb(skb);

			}

		} else {

			if (!rmnet_check_skb_can_gro(skb))

				gro_cells_receive(&priv->gro_cells, skb);

			else

				netif_receive_skb(skb);

		}

	} else {

		if ((port->data_format & RMNET_INGRESS_FORMAT_DL_MARKER) &&

		    port->dl_marker_flush >= 0)

			port->dl_marker_flush++;

		gro_cells_receive(&priv->gro_cells, skb);

	}

}

EXPORT_SYMBOL(rmnet_deliver_skb_wq);



/* MAP handler */



static void

drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.h

+9 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013, 2016-2017 The Linux Foundation. All rights reserved.

/* Copyright (c) 2013, 2016-2017, 2019

 * The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -18,8 +19,15 @@ 


#include "rmnet_config.h"



enum rmnet_packet_context {

	RMNET_NET_RX_CTX,

	RMNET_WQ_CTX,

};



void rmnet_egress_handler(struct sk_buff *skb);

void rmnet_deliver_skb(struct sk_buff *skb, struct rmnet_port *port);

void rmnet_deliver_skb_wq(struct sk_buff *skb, struct rmnet_port *port,

			  enum rmnet_packet_context ctx);

void rmnet_set_skb_proto(struct sk_buff *skb);

rx_handler_result_t _rmnet_map_ingress_handler(struct sk_buff *skb,

					       struct rmnet_port *port);