From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Rakesh Pillai <pillair@qti.qualcomm.com>,
Kalle Valo <kvalo@qca.qualcomm.com>,
Christian Lamparter <chunkeey@googlemail.com>
Subject: [PATCH 4.4 10/31] ath10k: fix memory leak in rx ring buffer allocation
Date: Tue, 12 Sep 2017 09:56:05 -0700 [thread overview]
Message-ID: <20170912165247.940482019@linuxfoundation.org> (raw)
In-Reply-To: <20170912165247.436880944@linuxfoundation.org>
4.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rakesh Pillai <pillair@qti.qualcomm.com>
commit f35a7f91f66af528b3ee1921de16bea31d347ab0 upstream.
The rx ring buffers are added to a hash table if
firmware support full rx reorder. If the full rx
reorder support flag is not set before allocating
the rx ring buffers, none of the buffers are added
to the hash table.
There is a race condition between rx ring refill and
rx buffer replenish from napi poll. The interrupts are
enabled in hif start, before the rx ring is refilled during init.
We replenish buffers from napi poll due to the interrupts which
get enabled after hif start. Hence before the entire rx ring is
refilled during the init, the napi poll replenishes a few buffers
in steps of 100 buffers per attempt. During this rx ring replenish
from napi poll, the rx reorder flag has not been set due to which
the replenished buffers are not added to the hash table
Set the rx full reorder support flag before we allocate
the rx ring buffer to avoid the memory leak.
Signed-off-by: Rakesh Pillai <pillair@qti.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Cc: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/net/wireless/ath/ath10k/core.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -1607,6 +1607,12 @@ int ath10k_core_start(struct ath10k *ar,
goto err_wmi_detach;
}
+ /* If firmware indicates Full Rx Reorder support it must be used in a
+ * slightly different manner. Let HTT code know.
+ */
+ ar->htt.rx_ring.in_ord_rx = !!(test_bit(WMI_SERVICE_RX_FULL_REORDER,
+ ar->wmi.svc_map));
+
status = ath10k_htt_rx_alloc(&ar->htt);
if (status) {
ath10k_err(ar, "failed to alloc htt rx: %d\n", status);
@@ -1669,12 +1675,6 @@ int ath10k_core_start(struct ath10k *ar,
goto err_hif_stop;
}
- /* If firmware indicates Full Rx Reorder support it must be used in a
- * slightly different manner. Let HTT code know.
- */
- ar->htt.rx_ring.in_ord_rx = !!(test_bit(WMI_SERVICE_RX_FULL_REORDER,
- ar->wmi.svc_map));
-
status = ath10k_htt_rx_ring_refill(ar);
if (status) {
ath10k_err(ar, "failed to refill htt rx ring: %d\n", status);
next prev parent reply other threads:[~2017-09-12 16:58 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-12 16:55 [PATCH 4.4 00/31] 4.4.88-stable review Greg Kroah-Hartman
2017-09-12 16:55 ` [PATCH 4.4 01/31] usb: quirks: add delay init quirk for Corsair Strafe RGB keyboard Greg Kroah-Hartman
2017-09-12 16:55 ` [PATCH 4.4 02/31] USB: serial: option: add support for D-Link DWM-157 C1 Greg Kroah-Hartman
2017-09-12 16:55 ` [PATCH 4.4 03/31] usb: Add device quirk for Logitech HD Pro Webcam C920-C Greg Kroah-Hartman
2017-09-12 16:55 ` [PATCH 4.4 04/31] usb:xhci:Fix regression when ATI chipsets detected Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 05/31] USB: core: Avoid race of async_completed() w/ usbdev_release() Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 06/31] staging/rts5208: fix incorrect shift to extract upper nybble Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 07/31] driver core: bus: Fix a potential double free Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 08/31] intel_th: pci: Add Cannon Lake PCH-H support Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 09/31] intel_th: pci: Add Cannon Lake PCH-LP support Greg Kroah-Hartman
2017-09-12 16:56 ` Greg Kroah-Hartman [this message]
2017-09-12 16:56 ` [PATCH 4.4 11/31] Input: trackpoint - assume 3 buttons when buttons detection fails Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 12/31] rtlwifi: rtl_pci_probe: Fix fail path of _rtl_pci_find_adapter Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 13/31] Bluetooth: Add support of 13d3:3494 RTL8723BE device Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 15/31] mwifiex: correct channel stat buffer overflows Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 16/31] drm/nouveau/pci/msi: disable MSI on big-endian platforms by default Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 17/31] workqueue: Fix flag collision Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 18/31] cs5536: add support for IDE controller variant Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 19/31] scsi: sg: protect against races between mmap() and SG_SET_RESERVED_SIZE Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 20/31] scsi: sg: recheck MMAP_IO request length with lock held Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 21/31] drm: adv7511: really enable interrupts for EDID detection Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 22/31] drm/bridge: adv7511: Fix mutex deadlock when interrupts are disabled Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 23/31] drm/bridge: adv7511: Use work_struct to defer hotplug handing to out of irq context Greg Kroah-Hartman
2017-10-13 13:53 ` Ben Hutchings
2017-09-12 16:56 ` [PATCH 4.4 24/31] drm/bridge: adv7511: Switch to using drm_kms_helper_hotplug_event() Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 25/31] drm/bridge: adv7511: Re-write the i2c address before EDID probing Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 26/31] btrfs: resume qgroup rescan on rw remount Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 28/31] ALSA: msnd: Optimize / harden DSP and MIDI loops Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 29/31] Bluetooth: Properly check L2CAP config option output buffer length Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 30/31] ARM: 8692/1: mm: abort uaccess retries upon fatal signal Greg Kroah-Hartman
2017-09-12 16:56 ` [PATCH 4.4 31/31] NFS: Fix 2 use after free issues in the I/O code Greg Kroah-Hartman
2017-09-13 0:11 ` [PATCH 4.4 00/31] 4.4.88-stable review Shuah Khan
[not found] ` <59b8666e.cd5e1c0a.73fbf.2682@mx.google.com>
2017-09-13 1:03 ` Greg Kroah-Hartman
2017-09-13 21:57 ` Kevin Hilman
2017-09-19 5:50 ` Stephen Boyd
2017-09-19 11:14 ` Mark Brown
2017-09-13 14:32 ` Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170912165247.940482019@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=chunkeey@googlemail.com \
--cc=kvalo@qca.qualcomm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pillair@qti.qualcomm.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).