Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp6287456iob; Tue, 10 May 2022 14:59:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdB5/8VWlNEHdeAwB2YfUpEvnX9+Uny9yqWOiOmrzwCLhDEowv1gayraBK6xtDTrM2xX9M X-Received: by 2002:aa7:c656:0:b0:428:3280:a432 with SMTP id z22-20020aa7c656000000b004283280a432mr25720451edr.396.1652219972662; Tue, 10 May 2022 14:59:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652219972; cv=none; d=google.com; s=arc-20160816; b=PZo6rFx6xaAe6yWethbPwnSXTzX0lleTfIRfIMgHkJbHmq21vlXcU1OgIcJ2Z4r1jT jP8zaPTTeT0/W9g6PpH7sAhPUzFxa7Fh355cPR3kFmrhHfpkUsZN07PtkbuAkYy8CRVw G/MIxGtTt1oMM2r5GSngkOWVdI7CnJ2WLjRZ46CiT+ZZkqXlt0KZTcTTBwuDELH1tsxq +BFt4CV+xAjWw95EavmWYBFbwp1Ahk5C0fH2nM0/iaJBBcCr4qBXKnxRHsjB2vgNkW61 ugle+wbVqxbaRdICYR+O2YnpYl5HdrYZ/PHNOxXE/uX/aDFmATMwdyUkUd9FuOKhdY/e XO8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IWPnfqjCwetw/ANMm37r0mApwrYFS4OcwA9KQ+SFfzY=; b=tSOn4RrMSnaPGG5Afp+p2UtJbSiGzNwxA9pcKKF4SoysjKu3CC93++tXHVcxOwLdsv SO9sNVoEUkwy3vAo0sM+RUHMGsdeTPkQEI95+zZvHUTvKn7F1V6uR23+T7BQR5bUSCvI YR4okIN3sirojigNZCkoDrtIKTSaekgM5fhx6z/bol1P4pONg7mWKIsqQunwPfzw7fG3 du+fUwBx/G/bhrM5RydPEFP+f26Y+4QOnaQ+0jVMw/kP4TTOs7qbxW4BOqFli+vLPXzd 3G1czWO+3yGoylCfn8KaTAhqdQW5eefbDsz8J8HkGBpSSPmVfNN7wzpIcY0sWIu5nZEf Y1ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=y8rZlnkQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j17-20020a05640211d100b00425d40720f1si523745edw.156.2022.05.10.14.59.09; Tue, 10 May 2022 14:59:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=y8rZlnkQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344541AbiEJO2G (ORCPT + 99 others); Tue, 10 May 2022 10:28:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245402AbiEJN5g (ORCPT ); Tue, 10 May 2022 09:57:36 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F635BA9B6; Tue, 10 May 2022 06:39:19 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E20CE615E9; Tue, 10 May 2022 13:39:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8F3FC385A6; Tue, 10 May 2022 13:39:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1652189958; bh=+mJTXgsOIxd3Wmqr468P9HZLAksdzKwrV1S7ZpA+WV8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y8rZlnkQv+5NWqtxBs8Fb1iT7ET6ymVhAxjuxYeteeQYEbNmrTeqKsg1IeLR1LDE9 0aZ+eYP1zC1obOlnaQaHwoVQhT+I3XleQC/dPQZVh6NaqzBmA9kfPIXRz37XN2QFJj o9rkEvGpRZ3fB7+DO3hh/ZT5+XkdvUMrzKkGISqM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shiraz Saleem , Jason Gunthorpe Subject: [PATCH 5.17 081/140] RDMA/irdma: Reduce iWARP QP destroy time Date: Tue, 10 May 2022 15:07:51 +0200 Message-Id: <20220510130743.929800313@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220510130741.600270947@linuxfoundation.org> References: <20220510130741.600270947@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shiraz Saleem commit 2df6d895907b2f5dfbc558cbff7801bba82cb3cc upstream. QP destroy is synchronous and waits for its refcnt to be decremented in irdma_cm_node_free_cb (for iWARP) which fires after the RCU grace period elapses. Applications running a large number of connections are exposed to high wait times on destroy QP for events like SIGABORT. The long pole for this wait time is the firing of the call_rcu callback during a CM node destroy which can be slow. It holds the QP reference count and blocks the destroy QP from completing. call_rcu only needs to make sure that list walkers have a reference to the cm_node object before freeing it and thus need to wait for grace period elapse. The rest of the connection teardown in irdma_cm_node_free_cb is moved out of the grace period wait in irdma_destroy_connection. Also, replace call_rcu with a simple kfree_rcu as it just needs to do a kfree on the cm_node Fixes: 146b9756f14c ("RDMA/irdma: Add connection manager") Link: https://lore.kernel.org/r/20220425181703.1634-3-shiraz.saleem@intel.com Signed-off-by: Shiraz Saleem Signed-off-by: Jason Gunthorpe Signed-off-by: Greg Kroah-Hartman --- drivers/infiniband/hw/irdma/cm.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) --- a/drivers/infiniband/hw/irdma/cm.c +++ b/drivers/infiniband/hw/irdma/cm.c @@ -2305,10 +2305,8 @@ err: return NULL; } -static void irdma_cm_node_free_cb(struct rcu_head *rcu_head) +static void irdma_destroy_connection(struct irdma_cm_node *cm_node) { - struct irdma_cm_node *cm_node = - container_of(rcu_head, struct irdma_cm_node, rcu_head); struct irdma_cm_core *cm_core = cm_node->cm_core; struct irdma_qp *iwqp; struct irdma_cm_info nfo; @@ -2356,7 +2354,6 @@ static void irdma_cm_node_free_cb(struct } cm_core->cm_free_ah(cm_node); - kfree(cm_node); } /** @@ -2384,8 +2381,9 @@ void irdma_rem_ref_cm_node(struct irdma_ spin_unlock_irqrestore(&cm_core->ht_lock, flags); - /* wait for all list walkers to exit their grace period */ - call_rcu(&cm_node->rcu_head, irdma_cm_node_free_cb); + irdma_destroy_connection(cm_node); + + kfree_rcu(cm_node, rcu_head); } /**