summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-24Merge branch 'LA.UM.9.1.C11.11.00.00.841.013' via branch 'qcom-msm-4.14' ↵android-t-preview-2_r0.2android-t-preview-2_r0.1android-t-preview-1_r0.2android-t-preview-1_r0.1android-t-beta-1_r0.2android-t-beta-1_r0.1android-s-v2-beta-3_r0.3android-s-v2-beta-3_r0.2android-s-v2-beta-2_r0.3android-s-v2-beta-2_r0.2android-s-v2-beta-1_r0.3android-s-v2-beta-1_r0.2android-s-qpr3-beta-3_r0.2android-s-qpr3-beta-3_r0.1android-s-qpr3-beta-2_r0.2android-s-qpr3-beta-2_r0.1android-s-qpr3-beta-1_r0.2android-s-qpr3-beta-1_r0.1android-s-beta-5_r0.4android-s-beta-5_r0.3android-s-beta-4_r0.4android-s-beta-4_r0.3android-12.1.0_r0.32android-12.1.0_r0.31android-12.1.0_r0.3android-12.1.0_r0.25android-12.1.0_r0.24android-12.1.0_r0.2android-12.1.0_r0.19android-12.1.0_r0.18android-12.1.0_r0.13android-12.1.0_r0.12android-12.0.0_r0.5android-12.0.0_r0.4android-12.0.0_r0.39android-12.0.0_r0.38android-12.0.0_r0.33android-12.0.0_r0.32android-12.0.0_r0.23android-12.0.0_r0.22android-12.0.0_r0.13android-12.0.0_r0.12android-msm-sunfish-4.14-t-preview-2android-msm-sunfish-4.14-t-preview-1android-msm-sunfish-4.14-t-beta-1android-msm-sunfish-4.14-s-v2-beta-3android-msm-sunfish-4.14-s-v2-beta-1android-msm-sunfish-4.14-s-qpr3-beta-3android-msm-sunfish-4.14-s-qpr3-beta-2android-msm-sunfish-4.14-s-beta-5android-msm-sunfish-4.14-s-beta-4android-msm-sunfish-4.14-android12Landroid-msm-sunfish-4.14-android12-v2-beta-2android-msm-sunfish-4.14-android12-qpr3android-msm-sunfish-4.14-android12-qpr1android-msm-sunfish-4.14-android12android-msm-coral-4.14-t-preview-2android-msm-coral-4.14-t-preview-1android-msm-coral-4.14-t-beta-1android-msm-coral-4.14-s-v2-beta-3android-msm-coral-4.14-s-v2-beta-1android-msm-coral-4.14-s-qpr3-beta-3android-msm-coral-4.14-s-qpr3-beta-2android-msm-coral-4.14-s-beta-5android-msm-coral-4.14-s-beta-4android-msm-coral-4.14-android12Landroid-msm-coral-4.14-android12-v2-beta-2android-msm-coral-4.14-android12-qpr3android-msm-coral-4.14-android12-qpr1android-msm-coral-4.14-android12JohnnLee
into android-msm-pixel-4.14 Bug: 189072771 Signed-off-by: JohnnLee <johnnlee@google.com> Change-Id: Ib31408da89e8abe757189840164536b6246b2bbd
2021-05-24Merge branch 'LA.UM.9.1.C11.11.00.00.841.013' into qcom-msm-4.14Wilson Sung
Change-Id: Ie52cd28ef37eea973ffc252682e5d026de842138
2021-03-10Merge branch 'LA.UM.9.1.R1.11.00.00.604.091' via branch 'qcom-msm-4.14' into ↵android-s-beta-3_r0.4android-s-beta-3_r0.3android-msm-sunfish-4.14-s-beta-3android-msm-coral-4.14-s-beta-3JohnnLee
android-msm-pixel-4.14 Conflicts: drivers/emac-dwc-eqos/DWC_ETH_QOS_yheader.h drivers/rmnet/shs/rmnet_shs_wq.c Bug: 182255618 Change-Id: I0f714fea8500701efe1c717b3f94686796c88fe8
2021-03-10Merge branch 'LA.UM.9.1.R1.11.00.00.604.091' into qcom-msm-4.14Robin Peng
Change-Id: Ic460de7770bb9b37ef0515f29951a55ae3a1140b
2021-03-09data-kernel: rps settingSuraj Jaiswal
RPS script support to install the RPS setting as per target. Change-Id: Ib5ebb73f620b307508d6f4eeeb87eda0c0bcda4b
2020-08-13Merge e3abf2d2c67f52f4b9ab683b1119c4bd8de771bf on remote branchLinux Build Service Account
Change-Id: Ia0340a65398bf3996dc1a3393346261a7e6ef47a
2020-07-16drivers: rmnet: shs: Remove unecessary dereferenceSubash Abhinov Kasiviswanathan
Remove double dereference to get segs_per_skb. This should prevent a null dereference is node is invalid. Change-Id: I6f199457088c9f33d69192dd24360b95718db54d Acked-by: Raul Martinez <mraul@qti.qualcomm.com> Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2020-07-09Merge c7f0fbe8f0d8f723000441c4afc2270c88fd011e on remote branchLinux Build Service Account
Change-Id: I6d05f236a2a497aa5b050800f0cbdd724b7a21c4
2020-06-22Merge c2621585f4cd96e5965099eb975c156328775481 on remote branchLinux Build Service Account
Change-Id: Iaeef7c1bdc0a6c5a8b0b21653a69e498c3ddf3cc
2020-06-18rmnet_shs: avoid setting gso info for single segmentsSubash Abhinov Kasiviswanathan
Avoid setting the gso info when there is only one segment in an SKB. Change-Id: I666fac9500caef5fb9b82b7678df533de9213663 Acked-by: Ryan Chapman <rchapman@qti.qualcomm.com> Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2020-06-17rmnet_shs: set gso_type when partially segmenting SKBsSubash Abhinov Kasiviswanathan
Copy the gso_type in segmented SKBs to avoid warning of packets not being able to be forwarded. Change-Id: I163b00233439edead2508f63766d3531053bd57b Acked-by: Ryan Chapman <rchapman@qti.qualcomm.com> Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2020-06-01drivers: rmnet_shs: Reset hstat node correctlySubash Abhinov Kasiviswanathan
Previously hstat node was not being cleared correctly. This change correctly resets segmentation field to prevent the stale field from being used on a recycle. CRs-Fixed: 2699690 Change-Id: Ie9d6b5f64d2e94d8a8c3fb99fdcee1b13ae2ec6d Acked-by: Raul Martinez <mraul@qti.qualcomm.com> Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2020-05-28Merge android-msm-floral-4.14 into android-msm-pixel-4.14android-s-preview-3_r0.4android-s-preview-3_r0.3android-s-preview-2_r0.4android-s-preview-2_r0.3android-s-preview-1_r0.4android-s-preview-1_r0.3android-s-beta-2_r0.4android-s-beta-2_r0.3android-s-beta-1_r0.4android-s-beta-1_r0.3android-msm-sunfish-4.14-s-preview-3android-msm-sunfish-4.14-s-preview-2android-msm-sunfish-4.14-s-preview-1android-msm-sunfish-4.14-s-beta-2android-msm-sunfish-4.14-s-beta-1android-msm-coral-4.14-s-preview-3android-msm-coral-4.14-s-preview-2android-msm-coral-4.14-s-preview-1android-msm-coral-4.14-s-beta-2android-msm-coral-4.14-s-beta-1Wilson Sung
Bug: 149536833 Change-Id: I106366dcc7a77197807409318eb55402104679dc Signed-off-by: Wilson Sung <wilsonsung@google.com>
2020-05-28Merge branch 'LA.UM.9.1.R1.10.00.00.604.038' via branch 'qcom-msm-4.14' into ↵android-r-beta-3_r0.6android-11.0.0_r0.99android-11.0.0_r0.94android-11.0.0_r0.85android-11.0.0_r0.80android-11.0.0_r0.75android-11.0.0_r0.64android-11.0.0_r0.55android-11.0.0_r0.5android-11.0.0_r0.45android-11.0.0_r0.31android-11.0.0_r0.25android-11.0.0_r0.14android-11.0.0_r0.114android-11.0.0_r0.104android-msm-sunfish-4.14-r-beta-3android-msm-sunfish-4.14-android11-qpr3android-msm-sunfish-4.14-android11-qpr2android-msm-sunfish-4.14-android11-qpr1android-msm-sunfish-4.14-android11Wilson Sung
android-msm-pixel-4.14 Conflicts: drivers/emac-dwc-eqos/DWC_ETH_QOS_yheader.h drivers/rmnet/shs/rmnet_shs_wq.c Bug: 155859424 Signed-off-by: Wilson Sung <wilsonsung@google.com> Change-Id: Ia233ce675f3ffea5de23e0e146199f9da937abd4
2020-05-26rmnet_shs: Remove local_bh_disable in oom handlerSubash Abhinov Kasiviswanathan
Low memory handler in shs is in atomic context so prevent the disabling of bottom halves. Change-Id: I0eae18f8876edddd964346fee5b6b39af952d6fa Acked-by: Raul Martinez <mraul@qti.qualcomm.com> Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2020-05-20Merge e002315f6197f00982564ff5053ab98dce682e6c on remote branchLinux Build Service Account
Change-Id: I71fb209d29e14d0f3a95c9a2a6b5c4a9943a06da
2020-05-20drivers: rmnet: shs: Fix Error reported in Static AnalysisChinmay Agarwal
NULL check added in "rmnet_shs_wq_mem_init" for "shs_proc_dir" . Change-Id: I75296da8476ee52e4c49dc0e7f8d83ac7568782d Signed-off-by: Chinmay Agarwal <chinagar@codeaurora.org>
2020-05-07Merge branch 'LA.UM.9.1.R1.10.00.00.604.038' via branch 'qcom-msm-4.14' into ↵android-r-beta-3_r0.4android-r-beta-2_r0.4android-11.0.0_r0.98android-11.0.0_r0.93android-11.0.0_r0.84android-11.0.0_r0.79android-11.0.0_r0.74android-11.0.0_r0.62android-11.0.0_r0.54android-11.0.0_r0.44android-11.0.0_r0.4android-11.0.0_r0.30android-11.0.0_r0.24android-11.0.0_r0.12android-11.0.0_r0.113android-11.0.0_r0.103android-msm-coral-4.14-r-beta-3android-msm-coral-4.14-r-beta-2android-msm-coral-4.14-android11-qpr3android-msm-coral-4.14-android11-qpr2android-msm-coral-4.14-android11-qpr1android-msm-coral-4.14-android11Wilson Sung
android-msm-floral-4.14 Bug: 155859424 Change-Id: I0a01d96563211cfa85f3822527dbed8039f83de5 Signed-off-by: Wilson Sung <wilsonsung@google.com>
2020-05-07Merge branch 'LA.UM.9.1.R1.10.00.00.604.038' into qcom-msm-4.14Wilson Sung
Change-Id: I9bf50b7deba8eb0b44c05d1567a990f0424e99d6
2020-05-01Merge "drivers: rmnet: shs: Add oom handler"qctecmdr
2020-04-29drivers: rmnet: shs: Add oom handlerSubash Abhinov Kasiviswanathan
Add RX packet drops when out of memory reaper runs. Remove WQ_MEM_RECLAIM from rmnet_shs_wq. Change-Id: I4b9ff4762be272ca162beb9aa691db1c29467cbf Acked-by: Raul Martinez <mraul@qti.qualcomm.com> Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2020-04-29Merge b74079bcf465e1c0789c337f90d9e24c13aeb6de on remote branchLinux Build Service Account
Change-Id: I7fee54d46b8684a9d863bf7a9bf81390e07afa71
2020-04-28Merge "rmnet_shs: Change file permissions"qctecmdr
2020-04-24drivers: rmnet: shs: add segmentation levels for slow start flowsSubash Abhinov Kasiviswanathan
Adds various levels of segmentation for flows in TCP slow start. Instead of segmentation causing all packets to be 1500 bytes, we will control how much larger packets get broken up by passing segs_per_skb, which indicates how many MTU sizes packets should be in the newly segmented SKBs. i.e. segs_per_skb = 2 means 2*MTU can be passed in a segmented skb. Change-Id: I422a794f3b1d3f2e313ce8f89695a536984cd947 Acked-by: Ryan Chapman <rchapman@qti.qualcomm.com> Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2020-04-21Merge branch 'LA.UM.9.1.R1.10.00.00.604.035' via branch 'qcom-msm-4.14' into ↵android-r-beta-1_r0.4Wilson Sung
android-msm-floral-4.14 Bug: 152368391 Change-Id: Ife9545fb8abb9ab82b2d44370e0b8dbee0103269 Signed-off-by: Wilson Sung <wilsonsung@google.com>
2020-04-20rmnet_shs: Change file permissionsSubash Abhinov Kasiviswanathan
Remove the root user and group permissions from the proc files. CRs-Fixed: 2668115 Change-Id: Ib0b9502db4d52c20554e19762d72afd05c7b1532 Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2020-04-17Merge 901b28da5ea27d7abc9c462ba370fa4ae2db0795 on remote branchLinux Build Service Account
Change-Id: I0676bb33de92d5d5d5b8ad22cee9ca7e835a1a8a
2020-04-10Merge "drivers: rmnet: shs: Check backlog on all flushes"qctecmdr
2020-04-08drivers: rmnet: shs: Check backlog on all flushesSubash Abhinov Kasiviswanathan
Checking for backlog will no longer occur for only cpus with segmented flows. Backlog NET_RX switching will now be checked for on every silver CPU regardless if segmented flows are available. Change-Id: Ic6912e9c3ddd719cb9b0f5b13609ba7161d31b1f Acked-by: Raul Martinez <mraul@qti.qualcomm.com> Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2020-04-08drivers: rmnet: shs: Reduce Max Backlog limitSubash Abhinov Kasiviswanathan
Some small OOO packets were still seen in extreme cases. Reducing the backlog limit threshold slightly. Change-Id: I9ccd09445d521e94879bef5cba2041702086e83d Acked-by: Raul Martinez <mraul@qti.qualcomm.com> Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2020-04-08Merge branch 'LA.UM.9.1.R1.10.00.00.604.035' in qcom-msm-4.14Wilson Sung
Change-Id: I6e141612f0aa7319272685bcaedf938116f8be30
2020-04-06Merge "drivers: rmnet_perf: Avoid recursive spinlock in legacy mode"qctecmdr
2020-04-06Merge "drivers: rmnet_perf: Increase number of flow nodes"qctecmdr
2020-04-01drivers: rmnet_perf: Increase number of flow nodesSean Tranchetti
Allow up to 50 flows to be coalesced by software; Change-Id: I0c578f3c5b65b2826767c4bd7421b585f2125936 Signed-off-by: Sean Tranchetti <stranche@codeaurora.org>
2020-04-01drivers: rmnet_perf: Avoid recursive spinlock in legacy modeSean Tranchetti
Commit 56901a4a6639 ("drivers: rmnet_perf: Take lock during DL marker handling") locks the DL marker handling to ensure synchronization. When rmnet_perf handles deaggregation of QMAP frames, this will result in attempting to take the lock recursively, as the lock will already be held by the deaggregation logic. Change-Id: I731574ed56e770193c9b094758d7f4119ef91781 Signed-off-by: Sean Tranchetti <stranche@codeaurora.org>
2020-04-01drivers: rmnet_perf: Take lock during DL marker handlingSean Tranchetti
Since handling DL markers can result in flushing the various flow nodes, the rmnet_perf lock must be taken to ensure synchronization with the rest of the driver. During hotplug scenarios, a regular flush could be going on while a DL marker handling callback is invoked. In certain cases, the callback can proceed farther than it should, and send a second pointer to a previously flushed descriptor down the call chain. This phantom descriptor can cause various problems, but the most "common" case seen is a NULL dereference such as the following: rmnet_frag_deliver+0x110/0x730 rmnet_perf_core_send_desc+0x44/0x50 [rmnet_perf] rmnet_perf_opt_flush_single_flow_node+0x220/0x430 [rmnet_perf] rmnet_perf_opt_flush_all_flow_nodes+0x40/0x70 [rmnet_perf] rmnet_perf_core_handle_map_control_start+0x38/0x130 [rmnet_perf] rmnet_map_dl_hdr_notify_v2+0x3c/0x58 rmnet_frag_flow_command+0x104/0x120 rmnet_frag_ingress_handler+0x2c8/0x3c8 rmnet_rx_handler+0x188/0x238 Change-Id: I79cb626732358c827d6c9df4239c0c55821bd3a5 Signed-off-by: Sean Tranchetti <stranche@codeaurora.org>
2020-03-29Merge c390153e4f08c5b5fe985a0afc9f73c559ab0441 on remote branchLinux Build Service Account
Change-Id: I73033efb6a6ec59825cc40967cc348e8c05e6df1
2020-03-25Merge android-msm-floral-4.14 into android-msm-pixel-4.14Wilson Sung
Bug: 149536833 Change-Id: I08a58cb15fed67b2a41d51fdee7f3b20ed541dd4 Signed-off-by: Wilson Sung <wilsonsung@google.com>
2020-03-25Merge branch 'LA.UM.9.1.R1.10.00.00.604.030' into HEADWilson Sung
Change-Id: I59341cd10deaf65dfaaa8307d1c01b1dfa2e015a
2020-03-23data-kerenl: Remove GSB code from LAAman Gupta
GSB is needed only for MDM PLs
2020-03-19Merge af399a1677059208970e9f71ffa6bccb1f3db770 on remote branchLinux Build Service Account
Change-Id: Iacc25275348ec8ab156b20243c6b15fdac4fcf28
2020-03-18drivers: rmnet: shs: Snapshot of data.lnx.5.1Subash Abhinov Kasiviswanathan
Snapshot of shs driver on data.lnx.5.1 up to the following change id. drivers: rmnet: shs: Unrevert Deadlock fix I1307d82ffa12d0cc1115baa25a19df8ada924e89 Change-Id: I868f2fff8a90d1e99860803c994cee0f69af60b2 Acked-by: Raul Martinez <mraul@qti.qualcomm.com> Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2020-03-11drivers: rmnet_shs: Add Max Backlog switch for TCPSubash Abhinov Kasiviswanathan
Change instant rate timer to rely more on byte limit counts. Add backlog limit to loaded core metric that will only be active when a slow start flow is on the cpu. This type of NET_RX switch will also have a longer core switch timer. Change-Id: I414db0d10c1b72d54df25138bd8adf0902357847 Acked-by: Raul Martinez <mraul@qti.qualcomm.com> Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2020-03-11Merge 762f7ff9d5f6c3973d3eae970927f43825925aaf on remote branchLinux Build Service Account
Change-Id: Icb6c973a2d6c4282156c1836605aabb0d10bf785
2020-02-20Merge "data-kernel: emac: Emac probe end marker"qctecmdr
2020-02-20Merge "drivers: shs: Add filter flow module param"qctecmdr
2020-02-20Merge "drivers: rmnet_shs: Fix invalid mask on vnd creation"qctecmdr
2020-02-18drivers: rmnet_shs: Fix invalid mask on vnd creationSubash Abhinov Kasiviswanathan
For a time after a vnd is created, the shs internal map_mask is updated to an invalid state. If this happens during data transfer it could cause invalid cpu states. This fix will cause the map_mask to only take into acount already initialized vnd rps values. Fixes the following- Unable to handle kernel write to read-only memory at virtual address ffffff99a0b5484c pc : rmnet_shs_flush_lock_table+0x264/0x688 [rmnet_shs] lr : rmnet_shs_flush_lock_table+0x238/0x688 [rmnet_shs] Call trace: rmnet_shs_flush_lock_table+0x264/0x688 [rmnet_shs] rmnet_shs_chain_to_skb_list+0x320/0x340 [rmnet_shs] rmnet_shs_assign+0x980/0x1290 [rmnet_shs] rmnet_deliver_skb+0x240/0x410 rmnet_frag_deliver+0x618/0x778 rmnet_perf_core_flush_curr_pkt+0x12c/0x148 [rmnet_perf] rmnet_perf_tcp_opt_ingress+0x88/0x268 [rmnet_perf] rmnet_perf_opt_ingress+0x348/0x398 [rmnet_perf] rmnet_perf_core_desc_entry+0x128/0x180 [rmnet_perf] rmnet_frag_ingress_handler+0x3a8/0x578 rmnet_rx_handler+0x230/0x400 __netif_receive_skb_core+0x518/0xd60 process_backlog+0x1d4/0x438 net_rx_action+0x124/0x5b8 __do_softirq+0x2f8/0x5d8 irq_exit+0xec/0x110 handle_IPI+0x1b8/0x2f8 gic_handle_irq+0x10c/0x1d0 el0_irq_naked+0x50/0x5c Change-Id: I4c10ebb83140eb14ee3b643d057e3de29dfa851b Acked-by: Raul Martinez <mraul@qti.qualcomm.com> Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
2020-02-17Merge branch 'LA.UM.9.1.R1.10.00.00.604.021' via branch 'qcom-msm-4.14' into ↵android-r-preview-4_r0.7android-msm-coral-4.14-r-preview-4Wilson Sung
android-msm-floral-4.14 Bug: 149660093 Change-Id: Ibc0260e3160dd1a4b421b2559312bc16a5c0c7d8 Signed-off-by: Wilson Sung <wilsonsung@google.com>
2020-02-17Merge branch 'LA.UM.9.1.R1.10.00.00.604.021' into qcom-msm-4.14Wilson Sung
Change-Id: Ibf8e4f1ea80214c92cc710655b962f2abbaa00a5