From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:34246 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751014AbcIINjC (ORCPT ); Fri, 9 Sep 2016 09:39:02 -0400 Subject: Patch "[PATCH 025/135] fm10k: Cleanup exception handling for mailbox" has been added to the 4.4-stable tree 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: , From: Date: Fri, 09 Sep 2016 15:37:56 +0200 Message-ID: <147342827620464@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled [PATCH 025/135] fm10k: Cleanup exception handling for mailbox 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: 0025-fm10k-Cleanup-exception-handling-for-mailbox-interru.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 know about it. >>From c24ba4c3209f024567e1835cac517c92d7e528eb Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Tue, 27 Oct 2015 16:59:18 -0700 Subject: [PATCH 025/135] fm10k: Cleanup exception handling for mailbox interrupt [ Upstream commit e00e23bceba48a8f0c94fefe26948404cbd43d0a ] This patch addresses two issues. First is the fact that the fm10k_mbx_free_irq was assuming msix_entries was valid and that will not always be the case. As such we need to add a check for if it is NULL. Second is the fact that we weren't freeing the IRQ if the mailbox API returned an error on trying to connect. Signed-off-by: Alexander Duyck Reviewed-by: Bruce Allan Tested-by: Krishneil Singh Signed-off-by: Jeff Kirsher Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c @@ -1122,6 +1122,10 @@ void fm10k_mbx_free_irq(struct fm10k_int struct fm10k_hw *hw = &interface->hw; int itr_reg; + /* no mailbox IRQ to free if MSI-X is not enabled */ + if (!interface->msix_entries) + return; + /* disconnect the mailbox */ hw->mbx.ops.disconnect(hw, &hw->mbx); @@ -1444,10 +1448,15 @@ int fm10k_mbx_request_irq(struct fm10k_i err = fm10k_mbx_request_irq_pf(interface); else err = fm10k_mbx_request_irq_vf(interface); + if (err) + return err; /* connect mailbox */ - if (!err) - err = hw->mbx.ops.connect(hw, &hw->mbx); + err = hw->mbx.ops.connect(hw, &hw->mbx); + + /* if the mailbox failed to connect, then free IRQ */ + if (err) + fm10k_mbx_free_irq(interface); return err; } 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