From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BB6DC433E2 for ; Tue, 23 Jun 2020 20:02:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F079C2080C for ; Tue, 23 Jun 2020 20:02:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942575; bh=lqyzhP1PQiVBIkYus2B1GyE3WsU8Zw/YfbY68zxjvR8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1K8TNC9aUwYXoOwzZg3GoHzks9rCSh5Uh0ffNg4zQfVvv/pJAsIFNrAhgr39wLsvD xJBQU2QUucbZZ35Gsq/JVxbGzl0m3bCBYRJ6MTa3ipMaOSBdvVNzCHEMJ1RzRtM7z9 43iEc11pqW4qTR6rTOWlV+tWsSYz5L05d4xEOj68= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387934AbgFWUCw (ORCPT ); Tue, 23 Jun 2020 16:02:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:40280 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387929AbgFWUCv (ORCPT ); Tue, 23 Jun 2020 16:02:51 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 816552078A; Tue, 23 Jun 2020 20:02:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942571; bh=lqyzhP1PQiVBIkYus2B1GyE3WsU8Zw/YfbY68zxjvR8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DD9XhX9spv1rPCy1IDW7HxlHKhSUcOtHoEk25sXPdF7hvSNLtPSarqwIxGKMg9o5I RFVpaT5PW6krgXm+b+sspcdG1pJonXpioSkpoG1Yblk/qCCzOuojuwng5Agg3C4Cgu +ZvOqkriSilbfFikMEgc0gDrEY3WjLfmDGH60Dvg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kamal Heib , Bart Van Assche , Jason Gunthorpe , Sasha Levin Subject: [PATCH 5.7 051/477] RDMA/srpt: Fix disabling device management Date: Tue, 23 Jun 2020 21:50:48 +0200 Message-Id: <20200623195410.019319167@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Kamal Heib [ Upstream commit 23bbd5818e2b0d265aa1835e66f5055f63a8fa4c ] Avoid disabling device management for devices that don't support Management datagrams (MADs) by checking if the "mad_agent" pointer is initialized before calling ib_modify_port, also fix the error flow in srpt_refresh_port() to disable device management if ib_register_mad_agent() fail. Fixes: 09f8a1486dca ("RDMA/srpt: Fix handling of SR-IOV and iWARP ports") Link: https://lore.kernel.org/r/20200514114720.141139-1-kamalheib1@gmail.com Signed-off-by: Kamal Heib Reviewed-by: Bart Van Assche Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/ulp/srpt/ib_srpt.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c index 98552749d71cb..fcf982c60db6a 100644 --- a/drivers/infiniband/ulp/srpt/ib_srpt.c +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c @@ -610,6 +610,11 @@ static int srpt_refresh_port(struct srpt_port *sport) dev_name(&sport->sdev->device->dev), sport->port, PTR_ERR(sport->mad_agent)); sport->mad_agent = NULL; + memset(&port_modify, 0, sizeof(port_modify)); + port_modify.clr_port_cap_mask = IB_PORT_DEVICE_MGMT_SUP; + ib_modify_port(sport->sdev->device, sport->port, 0, + &port_modify); + } } @@ -633,9 +638,8 @@ static void srpt_unregister_mad_agent(struct srpt_device *sdev) for (i = 1; i <= sdev->device->phys_port_cnt; i++) { sport = &sdev->port[i - 1]; WARN_ON(sport->port != i); - if (ib_modify_port(sdev->device, i, 0, &port_modify) < 0) - pr_err("disabling MAD processing failed.\n"); if (sport->mad_agent) { + ib_modify_port(sdev->device, i, 0, &port_modify); ib_unregister_mad_agent(sport->mad_agent); sport->mad_agent = NULL; } -- 2.25.1