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=-6.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS 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 F146CC43612 for ; Wed, 19 Dec 2018 15:58:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C0D73217D9 for ; Wed, 19 Dec 2018 15:58:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YwEqyzyO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729323AbeLSP6i (ORCPT ); Wed, 19 Dec 2018 10:58:38 -0500 Received: from mail-it1-f195.google.com ([209.85.166.195]:36365 "EHLO mail-it1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728889AbeLSP6h (ORCPT ); Wed, 19 Dec 2018 10:58:37 -0500 Received: by mail-it1-f195.google.com with SMTP id c9so10052767itj.1; Wed, 19 Dec 2018 07:58:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=JrjAwoYZLatTrSpjWp1zdL2hQdofaBBegzEeSbKdEko=; b=YwEqyzyOglQrkEocV35NPH2bwQ/LmSsAuNvs7n4u43EN/Se+cpe5VRCLfpyZY4VXqa O4PTNr+nXFG//Tl/cE1Ew3WayPk8a3vkdToKqne4oPawmw0ZbzVAcRVkdL7vseZmF19S sbGZS2QqqX8u8jicLPedpvwFAgTOOpueV9JJSYVJ4OM1aCfrdqoK8dkDP8jCT85KKz+1 ngEwfMrgLRGglkvypedoEeU2VNhGZiGGMPURqtv31zk70L3PhRVY72R4L/ET5USJgxa5 O2OmztvGNOkTs2cfht1lxTscw+mnvacs0PeN9fdimxLnCx6yg4USZ3TPNdE0h1iHvDf3 PKGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:from:to:cc:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=JrjAwoYZLatTrSpjWp1zdL2hQdofaBBegzEeSbKdEko=; b=ewBoOQRi8/r2vBHhTwcz+xoyPdslak7Y8d/FakKxKoP0Jbs18mbw+7JnTlqFxgiMfZ ZbXOwde01pn59Oi6gsNLsrXSzmE06hMKSMcLVEit1DO089Y0D/oXqdnY+IQ5oa2pIuXE 16KqI6F0FzONYnJcB58r8zzw+j93WYBKvbz56FLm3IzGxk4PsFr1pe+BI5D27VWmtlvy Xks15s45ODpYk8aBWHpfgGGXG+xonfzN3WiQm3Pm0n+eNec/pTK0GcCsxQkyw6EziOZ5 F7RNowiSMD1MO9n1qXD7YfBRlKHY4Gz5/v8UyqhUuoeAGTaYLy4XBBwXSzkQF3cqZKV3 zuVA== X-Gm-Message-State: AA+aEWaoa/OTlg7ONmtXQHw5DDZHfZz3V06owm2IWL+VcdNLqbi3WiDF X5RvxfapWOTnRLDZSASJIlcTJnCC X-Google-Smtp-Source: AFSGD/WX3QNHw2ceoJIdtJQ7/kBtdaPb1mdT9Yxhc9syyMzmfnccm4Zj6AeZ47vpgLTfCcFrVP0Vww== X-Received: by 2002:a02:4311:: with SMTP id s17mr18296700jab.124.1545235116737; Wed, 19 Dec 2018 07:58:36 -0800 (PST) Received: from gateway.1015granger.net (c-68-61-232-219.hsd1.mi.comcast.net. [68.61.232.219]) by smtp.gmail.com with ESMTPSA id e16sm9410718iob.43.2018.12.19.07.58.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Dec 2018 07:58:36 -0800 (PST) Received: from manet.1015granger.net (manet.1015granger.net [192.168.1.51]) by gateway.1015granger.net (8.14.7/8.14.7) with ESMTP id wBJFwZWd025771; Wed, 19 Dec 2018 15:58:35 GMT Subject: [PATCH v5 05/30] xprtrdma: No qp_event disconnect From: Chuck Lever To: anna.schumaker@netapp.com Cc: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Wed, 19 Dec 2018 10:58:35 -0500 Message-ID: <20181219155835.11602.87412.stgit@manet.1015granger.net> In-Reply-To: <20181219155152.11602.18605.stgit@manet.1015granger.net> References: <20181219155152.11602.18605.stgit@manet.1015granger.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org After thinking about this more, and auditing other kernel ULP imple- mentations, I believe that a DISCONNECT cm_event will occur after a fatal QP event. If that's the case, there's no need for an explicit disconnect in the QP event handler. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/verbs.c | 32 -------------------------------- net/sunrpc/xprtrdma/xprt_rdma.h | 1 - 2 files changed, 33 deletions(-) diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index cff3a5d..9a0a765 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -100,25 +100,6 @@ static void rpcrdma_xprt_drain(struct rpcrdma_xprt *r_xprt) } /** - * rpcrdma_disconnect_worker - Force a disconnect - * @work: endpoint to be disconnected - * - * Provider callbacks can possibly run in an IRQ context. This function - * is invoked in a worker thread to guarantee that disconnect wake-up - * calls are always done in process context. - */ -static void -rpcrdma_disconnect_worker(struct work_struct *work) -{ - struct rpcrdma_ep *ep = container_of(work, struct rpcrdma_ep, - rep_disconnect_worker.work); - struct rpcrdma_xprt *r_xprt = - container_of(ep, struct rpcrdma_xprt, rx_ep); - - xprt_force_disconnect(&r_xprt->rx_xprt); -} - -/** * rpcrdma_qp_event_handler - Handle one QP event (error notification) * @event: details of the event * @context: ep that owns QP where event occurred @@ -134,15 +115,6 @@ static void rpcrdma_xprt_drain(struct rpcrdma_xprt *r_xprt) rx_ep); trace_xprtrdma_qp_event(r_xprt, event); - pr_err("rpcrdma: %s on device %s connected to %s:%s\n", - ib_event_msg(event->event), event->device->name, - rpcrdma_addrstr(r_xprt), rpcrdma_portstr(r_xprt)); - - if (ep->rep_connected == 1) { - ep->rep_connected = -EIO; - schedule_delayed_work(&ep->rep_disconnect_worker, 0); - wake_up_all(&ep->rep_connect_wait); - } } /** @@ -571,8 +543,6 @@ static void rpcrdma_xprt_drain(struct rpcrdma_xprt *r_xprt) cdata->max_requests >> 2); ep->rep_send_count = ep->rep_send_batch; init_waitqueue_head(&ep->rep_connect_wait); - INIT_DELAYED_WORK(&ep->rep_disconnect_worker, - rpcrdma_disconnect_worker); ep->rep_receive_count = 0; sendcq = ib_alloc_cq(ia->ri_device, NULL, @@ -646,8 +616,6 @@ static void rpcrdma_xprt_drain(struct rpcrdma_xprt *r_xprt) void rpcrdma_ep_destroy(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia) { - cancel_delayed_work_sync(&ep->rep_disconnect_worker); - if (ia->ri_id && ia->ri_id->qp) { rpcrdma_ep_disconnect(ep, ia); rdma_destroy_qp(ia->ri_id); diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h index 3f198cd..7c1b519 100644 --- a/net/sunrpc/xprtrdma/xprt_rdma.h +++ b/net/sunrpc/xprtrdma/xprt_rdma.h @@ -101,7 +101,6 @@ struct rpcrdma_ep { wait_queue_head_t rep_connect_wait; struct rpcrdma_connect_private rep_cm_private; struct rdma_conn_param rep_remote_cma; - struct delayed_work rep_disconnect_worker; int rep_receive_count; };