From: <gregkh@linuxfoundation.org>
To: aduyck@mirantis.com, Krishneil.k.singh@intel.com,
alexander.levin@verizon.com, bruce.w.allan@intel.com,
gregkh@linuxfoundation.org, jeffrey.t.kirsher@intel.com
Cc: <stable@vger.kernel.org>, <stable-commits@vger.kernel.org>
Subject: Patch "[PATCH 024/135] fm10k: Cleanup MSI-X interrupts in case of failure" has been added to the 4.4-stable tree
Date: Fri, 09 Sep 2016 15:37:55 +0200 [thread overview]
Message-ID: <147342827512647@kroah.com> (raw)
This is a note to let you know that I've just added the patch titled
[PATCH 024/135] fm10k: Cleanup MSI-X interrupts in case of failure
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
0024-fm10k-Cleanup-MSI-X-interrupts-in-case-of-failure.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From bb8414d058ba1c5a49749428f167cd8a28a9a879 Mon Sep 17 00:00:00 2001
From: Alexander Duyck <aduyck@mirantis.com>
Date: Tue, 27 Oct 2015 16:59:12 -0700
Subject: [PATCH 024/135] fm10k: Cleanup MSI-X interrupts in case of failure
[ Upstream commit 587731e684dcf3522215194a02357d26b9bc7277 ]
If the q_vector allocation fails we should free the resources associated
with the MSI-X vector table.
Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
Reviewed-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/net/ethernet/intel/fm10k/fm10k_main.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -1970,8 +1970,10 @@ int fm10k_init_queueing_scheme(struct fm
/* Allocate memory for queues */
err = fm10k_alloc_q_vectors(interface);
- if (err)
+ if (err) {
+ fm10k_reset_msix_capability(interface);
return err;
+ }
/* Map rings to devices, and map devices to physical queues */
fm10k_assign_rings(interface);
Patches currently in stable-queue which might be from aduyck@mirantis.com are
queue-4.4/0014-ixgbe-Fix-handling-of-NAPI-budget-when-multiple-queu.patch
queue-4.4/0025-fm10k-Cleanup-exception-handling-for-mailbox-interru.patch
queue-4.4/0020-fm10k-Fix-handling-of-NAPI-budget-when-multiple-queu.patch
queue-4.4/0024-fm10k-Cleanup-MSI-X-interrupts-in-case-of-failure.patch
reply other threads:[~2016-09-09 13:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=147342827512647@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=Krishneil.k.singh@intel.com \
--cc=aduyck@mirantis.com \
--cc=alexander.levin@verizon.com \
--cc=bruce.w.allan@intel.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=stable-commits@vger.kernel.org \
--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).