From patchwork Mon Sep 16 07:11:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 11146473 X-Patchwork-Delegate: jgg@ziepe.ca Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D817717E6 for ; Mon, 16 Sep 2019 07:12:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B5D5D20890 for ; Mon, 16 Sep 2019 07:12:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568617925; bh=A+ZIh35ztOXUnx+2f9PWall0qbfum2s3HVg0/rG+mEo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EQ5PfBn+jOnb95/41GYk5bmhXB8i9tWAklrXVAyT80A7gcKnIQWCvlPPh+jnrxLk4 jUOghw+/h3nW9ifnJcT8TeIjlFGAbhA3AxNJcHw9+yoS7DHPck04anXIK4kJXssxfW Xdv09gHCarKUTiHsa5Cl8MESBQVnWxgi0/Dm1hEM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726075AbfIPHMF (ORCPT ); Mon, 16 Sep 2019 03:12:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:37024 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726024AbfIPHMF (ORCPT ); Mon, 16 Sep 2019 03:12:05 -0400 Received: from localhost (unknown [77.137.89.37]) (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 9C3872067D; Mon, 16 Sep 2019 07:12:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568617924; bh=A+ZIh35ztOXUnx+2f9PWall0qbfum2s3HVg0/rG+mEo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SZAmUuhgx0q8nMLJWJGDt06gniqD9McYL4llzjqCFBz3kFVceAb9dK8SnwWHlhJ3Q j7DbZ5NbDP764DPkrY4FetwnLyq5DVYP084UaXe6SYP1jue2ta9UNmMXqPnHQ/57/K 5/tUA0wQClrMLotCwfgY0LiKRu2oup0pKvA+RQbE= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , RDMA mailing list , Jack Morgenstein , Mark Zhang Subject: [PATCH 1/4] RDMA/cm: Fix memory leak in cm_add/remove_one Date: Mon, 16 Sep 2019 10:11:51 +0300 Message-Id: <20190916071154.20383-2-leon@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190916071154.20383-1-leon@kernel.org> References: <20190916071154.20383-1-leon@kernel.org> MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Jack Morgenstein In the process of moving the debug counters sysfs entries, the commit mentioned below eliminated the cm_infiniband sysfs directory. This sysfs directory was tied to the cm_port object allocated in procedure cm_add_one(). Before the commit below, this cm_port object was freed via a call to kobject_put(port->kobj) in procedure cm_remove_port_fs(). Since port no longer uses its kobj, kobject_put(port->kobj) was eliminated. This, however, meant that kfree was never called for the cm_port buffers. Fix this by adding explicit kfree(port) calls to functions cm_add_one() and cm_remove_one(). Note: the kfree call in the first chunk below (in the cm_add_one error flow) fixes an old, undetected memory leak. Fixes: c87e65cfb97c ("RDMA/cm: Move debug counters to be under relevant IB device") Signed-off-by: Jack Morgenstein Signed-off-by: Leon Romanovsky Signed-off-by: Jason Gunthorpe --- drivers/infiniband/core/cm.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.20.1 diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index da10e6ccb43c..5920c0085d35 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c @@ -4399,6 +4399,7 @@ static void cm_add_one(struct ib_device *ib_device) error1: port_modify.set_port_cap_mask = 0; port_modify.clr_port_cap_mask = IB_PORT_CM_SUP; + kfree(port); while (--i) { if (!rdma_cap_ib_cm(ib_device, i)) continue; @@ -4407,6 +4408,7 @@ static void cm_add_one(struct ib_device *ib_device) ib_modify_port(ib_device, port->port_num, 0, &port_modify); ib_unregister_mad_agent(port->mad_agent); cm_remove_port_fs(port); + kfree(port); } free: kfree(cm_dev); @@ -4460,6 +4462,7 @@ static void cm_remove_one(struct ib_device *ib_device, void *client_data) spin_unlock_irq(&cm.state_lock); ib_unregister_mad_agent(cur_mad_agent); cm_remove_port_fs(port); + kfree(port); } kfree(cm_dev); From patchwork Mon Sep 16 07:11:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 11146489 X-Patchwork-Delegate: jgg@ziepe.ca Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E58F31747 for ; Mon, 16 Sep 2019 07:12:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BA605214AF for ; Mon, 16 Sep 2019 07:12:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568617935; bh=st9B31xKUy/VBwiWwoFPkbUMOmiagK1DV0YrEHiryaM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cEuxrQiKZIllqumlDm+3P4zukmysNp4X6ZyymsYaUO+4m4HeiwDd+hpJR4GLDXsTM uZmvyrZp8y3vB+vQyT0/USgmDZK6hieNIYifMQm8vRE2Qd+BaEFsjigbHwvTpgkoDN NPgj2LHDP8/eYTNyfo/HmWvhtEekBWIDRjps5WvY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727681AbfIPHMP (ORCPT ); Mon, 16 Sep 2019 03:12:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:37218 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726024AbfIPHMP (ORCPT ); Mon, 16 Sep 2019 03:12:15 -0400 Received: from localhost (unknown [77.137.89.37]) (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 0226E2067D; Mon, 16 Sep 2019 07:12:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568617934; bh=st9B31xKUy/VBwiWwoFPkbUMOmiagK1DV0YrEHiryaM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OqQYHq5gztV4bzXyKFZyXs26MmN32QvRyBJx7nvBDdgbgTKplKP7DP1Z3WjjHCTab V8W6P8i1h4JX3AqTIe6h1rKb+hYn0rvlU4DSZOrPBCPi/ai5Mf9GYmP6Z4buawjBbn 20P+/FyjIXAoJuQ3ZsAlUoLFMwWoHyLSAwWfb1ZM= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , RDMA mailing list , Jack Morgenstein , Mark Zhang Subject: [PATCH 2/4] RDMA/counter: Prevent QP counter manual binding in auto mode Date: Mon, 16 Sep 2019 10:11:52 +0300 Message-Id: <20190916071154.20383-3-leon@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190916071154.20383-1-leon@kernel.org> References: <20190916071154.20383-1-leon@kernel.org> MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Mark Zhang If auto mode is configured, manual counter allocation and QP bind is not allowed. Fixes: 1bd8e0a9d0fd ("RDMA/counter: Allow manual mode configuration support") Signed-off-by: Mark Zhang Signed-off-by: Leon Romanovsky --- drivers/infiniband/core/counters.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/infiniband/core/counters.c b/drivers/infiniband/core/counters.c index 680ad27f497d..736ab760025d 100644 --- a/drivers/infiniband/core/counters.c +++ b/drivers/infiniband/core/counters.c @@ -463,10 +463,15 @@ static struct rdma_counter *rdma_get_counter_by_id(struct ib_device *dev, int rdma_counter_bind_qpn(struct ib_device *dev, u8 port, u32 qp_num, u32 counter_id) { + struct rdma_port_counter *port_counter; struct rdma_counter *counter; struct ib_qp *qp; int ret; + port_counter = &dev->port_data[port].port_counter; + if (port_counter->mode.mode == RDMA_COUNTER_MODE_AUTO) + return -EINVAL; + qp = rdma_counter_get_qp(dev, qp_num); if (!qp) return -ENOENT; @@ -503,6 +508,7 @@ int rdma_counter_bind_qpn(struct ib_device *dev, u8 port, int rdma_counter_bind_qpn_alloc(struct ib_device *dev, u8 port, u32 qp_num, u32 *counter_id) { + struct rdma_port_counter *port_counter; struct rdma_counter *counter; struct ib_qp *qp; int ret; @@ -510,9 +516,13 @@ int rdma_counter_bind_qpn_alloc(struct ib_device *dev, u8 port, if (!rdma_is_port_valid(dev, port)) return -EINVAL; - if (!dev->port_data[port].port_counter.hstats) + port_counter = &dev->port_data[port].port_counter; + if (!port_counter->hstats) return -EOPNOTSUPP; + if (port_counter->mode.mode == RDMA_COUNTER_MODE_AUTO) + return -EINVAL; + qp = rdma_counter_get_qp(dev, qp_num); if (!qp) return -ENOENT; From patchwork Mon Sep 16 07:11:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 11146477 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 166701747 for ; Mon, 16 Sep 2019 07:12:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DE9F3214C6 for ; Mon, 16 Sep 2019 07:12:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568617929; bh=GWvqmCyeZJZ2w++/99BcZaKWWS6gtv57aOqzrg0OR3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xPGGuxLNnbgycFsjkxPrnFuNeGrgvuRMtw7BvG5IkE7MWB0NZv7EaktslGKxSGueQ jeZA86WWDReLkQ/vpBzBqT7UhZjlLxvXxhn1sJN044DIqusvaxxiTyIwkt8vNkXhdN aBc6FLs3+tePlwHFAVqeQ/YABvdVLjU43jWUJ6iU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726898AbfIPHMI (ORCPT ); Mon, 16 Sep 2019 03:12:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:37086 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726024AbfIPHMI (ORCPT ); Mon, 16 Sep 2019 03:12:08 -0400 Received: from localhost (unknown [77.137.89.37]) (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 1EA322067D; Mon, 16 Sep 2019 07:12:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568617927; bh=GWvqmCyeZJZ2w++/99BcZaKWWS6gtv57aOqzrg0OR3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rz5XS9o8Jqb6Rqqh0yTyblIpMZW9JaTS2cMUDG8JPMa9Q//gjaOcdG88Ku+ZDxpMj Luk2DI+UeQ0FANjXpxQinKysVCT7yitniFqTnSFpw2Aiiw7tkPKBNAj2L80VqSqYmK ZXseZRJO17tb93mSEd09FKXrm9RCiarDjSodvon4= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , RDMA mailing list , Jack Morgenstein , Mark Zhang Subject: [PATCH 3/4] RDMA/nldev: Reshuffle the code to avoid need to rebind QP in error path Date: Mon, 16 Sep 2019 10:11:53 +0300 Message-Id: <20190916071154.20383-4-leon@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190916071154.20383-1-leon@kernel.org> References: <20190916071154.20383-1-leon@kernel.org> MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Leon Romanovsky Properly unwind QP counter rebinding in case of failure. Fixes: b389327df905 ("RDMA/nldev: Allow counter manual mode configration through RDMA netlink") Reviewed-by: Mark Zhang Signed-off-by: Leon Romanovsky --- drivers/infiniband/core/nldev.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) -- 2.20.1 diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c index 5e2b7eb0761b..6eb14481a72e 100644 --- a/drivers/infiniband/core/nldev.c +++ b/drivers/infiniband/core/nldev.c @@ -1860,24 +1860,22 @@ static int nldev_stat_del_doit(struct sk_buff *skb, struct nlmsghdr *nlh, cntn = nla_get_u32(tb[RDMA_NLDEV_ATTR_STAT_COUNTER_ID]); qpn = nla_get_u32(tb[RDMA_NLDEV_ATTR_RES_LQPN]); - ret = rdma_counter_unbind_qpn(device, port, qpn, cntn); - if (ret) - goto err_unbind; - if (fill_nldev_handle(msg, device) || nla_put_u32(msg, RDMA_NLDEV_ATTR_PORT_INDEX, port) || nla_put_u32(msg, RDMA_NLDEV_ATTR_STAT_COUNTER_ID, cntn) || nla_put_u32(msg, RDMA_NLDEV_ATTR_RES_LQPN, qpn)) { ret = -EMSGSIZE; - goto err_fill; + goto err_unbind; } + ret = rdma_counter_unbind_qpn(device, port, qpn, cntn); + if (ret) + goto err_unbind; + nlmsg_end(msg, nlh); ib_device_put(device); return rdma_nl_unicast(sock_net(skb->sk), msg, NETLINK_CB(skb).portid); -err_fill: - rdma_counter_bind_qpn(device, port, qpn, cntn); err_unbind: nlmsg_free(msg); err: From patchwork Mon Sep 16 07:11:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 11146483 X-Patchwork-Delegate: jgg@ziepe.ca Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B077B1745 for ; Mon, 16 Sep 2019 07:12:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8EF96214C6 for ; Mon, 16 Sep 2019 07:12:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568617932; bh=p7wbeqmXqC0Qjyn6d4/0x3bJ5jEUrnDeGfHVQipBIlQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tMUmSk2n7p3bIfPmPbsaMu4wszCWK4e5foWCfOxyDHija9QflzX2zhJ7lyfYiqRzB 9ykKQ3X411/djYfRBopSnrNuv9dZGVFRxn8C/zlOTqwysjggBsbmszEQ027nC0/o7M cWo3rnNRd7TW1BZrkU8DdPZMKW+TyTmTzZKD77I8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727589AbfIPHML (ORCPT ); Mon, 16 Sep 2019 03:12:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:37146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726024AbfIPHML (ORCPT ); Mon, 16 Sep 2019 03:12:11 -0400 Received: from localhost (unknown [77.137.89.37]) (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 8CFCC2067D; Mon, 16 Sep 2019 07:12:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568617931; bh=p7wbeqmXqC0Qjyn6d4/0x3bJ5jEUrnDeGfHVQipBIlQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NpeI30rYUUliDZ7W9roidB0Zup1QNz7uEbOSMjN6Gk4PXLeZWfWEdSV5VL9twzXI3 em+wb9yyS55BNInMJJTKXAv6+xUO5PBho8gQhRgvp8hGWNGOje0sJkB//wLfLMqC1k EXqk6WOLfIg4lSU0aXNsXQnRBQpljxREEjyPFHdQ= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , RDMA mailing list , Jack Morgenstein , Mark Zhang Subject: [PATCH 4/4] RDMA: Fix double-free in srq creation error flow Date: Mon, 16 Sep 2019 10:11:54 +0300 Message-Id: <20190916071154.20383-5-leon@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190916071154.20383-1-leon@kernel.org> References: <20190916071154.20383-1-leon@kernel.org> MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Jack Morgenstein The cited commit introduced a double-free of the srq buffer in the error flow of procedure __uverbs_create_xsrq(). The problem is that procedure ib_destroy_srq_user() called in the error flow also frees the srq buffer. Thus, if uverbs_response() fails in __uverbs_create_srq(), the srq buffer will be freed twice. Fixes: 68e326dea1db ("RDMA: Handle SRQ allocations by IB/core") Signed-off-by: Jack Morgenstein Signed-off-by: Leon Romanovsky --- drivers/infiniband/core/uverbs_cmd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c index 8f4fd4fac159..13af88da5f79 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c @@ -3482,7 +3482,8 @@ static int __uverbs_create_xsrq(struct uverbs_attr_bundle *attrs, err_copy: ib_destroy_srq_user(srq, uverbs_get_cleared_udata(attrs)); - + /* It was released in ib_destroy_srq_user */ + srq = NULL; err_free: kfree(srq); err_put: