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

Commit 23326187 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android11-5.4.61+ (3a3ba4b7) into msm-5.4 



* refs/heads/tmp-3a3ba4b7
  UPSTREAM: udp: initialize is_flist with 0 in udp_gro_receive
  UPSTREAM: udp: Support UDP fraglist GRO/GSO.
  UPSTREAM: net: Support GRO/GSO fraglist chaining.
  UPSTREAM: net: Add a netdev software feature set that defaults to off.
  BACKPORT: net: Add fraglist GRO/GSO feature flags
  Revert "BACKPORT: net: core: use listified Rx for GRO_NORMAL in napi_gro_receive()"
  ANDROID: vendor_hooks: Add vendor hooks for key combination

Change-Id: If5fd73581f5038b9f82be74a19c2deef8aaa1e4a
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 06f4c52a 3a3ba4b7

android/abi_gki_aarch64_d6430e6763.xml

+791 −618

File changed.

Preview size limit exceeded, changes collapsed.

drivers/android/vendor_hooks.c

+1 −0
Original line number Diff line number Diff line
@@ -55,3 +55,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alter_rwsem_list_add); 
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alter_futex_plist_add);

EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_is_fpsimd_save);

EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ipi_stop);

EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_input_handle_event);

drivers/input/input.c

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ 
#include "input-compat.h"

#include "input-poller.h"



#ifndef __GENKSYMS__

#include <trace/hooks/debug.h>

#endif



MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");

MODULE_DESCRIPTION("Input core");

MODULE_LICENSE("GPL");
@@ -438,6 +442,7 @@ void input_event(struct input_dev *dev, 
	if (is_event_supported(type, dev->evbit, EV_MAX)) {



		spin_lock_irqsave(&dev->event_lock, flags);

		trace_android_vh_input_handle_event(dev, type, code, value);

		input_handle_event(dev, type, code, value);

		spin_unlock_irqrestore(&dev->event_lock, flags);

	}

include/linux/netdev_features.h

+8 −1
Original line number Diff line number Diff line
@@ -53,8 +53,9 @@ enum { 
	NETIF_F_GSO_ESP_BIT,		/* ... ESP with TSO */

	NETIF_F_GSO_UDP_BIT,		/* ... UFO, deprecated except tuntap */

	NETIF_F_GSO_UDP_L4_BIT,		/* ... UDP payload GSO (not UFO) */

	NETIF_F_GSO_FRAGLIST_BIT,		/* ... Fraglist GSO */

	/**/NETIF_F_GSO_LAST =		/* last bit, see GSO_MASK */

		NETIF_F_GSO_UDP_L4_BIT,

		NETIF_F_GSO_FRAGLIST_BIT,



	NETIF_F_FCOE_CRC_BIT,		/* FCoE CRC32 */

	NETIF_F_SCTP_CRC_BIT,		/* SCTP checksum offload */
@@ -80,6 +81,7 @@ enum { 


	NETIF_F_GRO_HW_BIT,		/* Hardware Generic receive offload */

	NETIF_F_HW_TLS_RECORD_BIT,	/* Offload TLS record */

	NETIF_F_GRO_FRAGLIST_BIT,	/* Fraglist GRO */



	/*

	 * Add your fresh new feature above and remember to update
@@ -150,6 +152,8 @@ enum { 
#define NETIF_F_GSO_UDP_L4	__NETIF_F(GSO_UDP_L4)

#define NETIF_F_HW_TLS_TX	__NETIF_F(HW_TLS_TX)

#define NETIF_F_HW_TLS_RX	__NETIF_F(HW_TLS_RX)

#define NETIF_F_GRO_FRAGLIST	__NETIF_F(GRO_FRAGLIST)

#define NETIF_F_GSO_FRAGLIST	__NETIF_F(GSO_FRAGLIST)



/* Finds the next feature with the highest number of the range of start till 0.

 */
@@ -226,6 +230,9 @@ static inline int find_next_netdev_feature(u64 feature, unsigned long start) 
/* changeable features with no special hardware requirements */

#define NETIF_F_SOFT_FEATURES	(NETIF_F_GSO | NETIF_F_GRO)



/* Changeable features with no special hardware requirements that defaults to off. */

#define NETIF_F_SOFT_FEATURES_OFF	NETIF_F_GRO_FRAGLIST



#define NETIF_F_VLAN_FEATURES	(NETIF_F_HW_VLAN_CTAG_FILTER | \

				 NETIF_F_HW_VLAN_CTAG_RX | \

				 NETIF_F_HW_VLAN_CTAG_TX | \

include/linux/netdevice.h

+4 −1
Original line number Diff line number Diff line
@@ -2350,7 +2350,8 @@ struct napi_gro_cb { 
	/* Number of gro_receive callbacks this packet already went through */

	u8 recursion_counter:4;



	/* 1 bit hole */

	/* GRO is done by frag_list pointer chaining. */

	u8	is_flist:1;



	/* used to support CHECKSUM_COMPLETE for tunneling protocols */

	__wsum	csum;
@@ -2705,6 +2706,7 @@ struct net_device *dev_get_by_napi_id(unsigned int napi_id); 
int netdev_get_name(struct net *net, char *name, int ifindex);

int dev_restart(struct net_device *dev);

int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb);

int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb);



static inline unsigned int skb_gro_offset(const struct sk_buff *skb)

{
@@ -4572,6 +4574,7 @@ static inline bool net_gso_ok(netdev_features_t features, int gso_type) 
	BUILD_BUG_ON(SKB_GSO_ESP != (NETIF_F_GSO_ESP >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_UDP != (NETIF_F_GSO_UDP >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_UDP_L4 != (NETIF_F_GSO_UDP_L4 >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_FRAGLIST != (NETIF_F_GSO_FRAGLIST >> NETIF_F_GSO_SHIFT));



	return (features & feature) == feature;

}