From patchwork Thu May 22 00:56:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 4219621 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 969C4BEEAC for ; Thu, 22 May 2014 00:56:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CA91D200FE for ; Thu, 22 May 2014 00:56:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0347320148 for ; Thu, 22 May 2014 00:56:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753142AbaEVA4p (ORCPT ); Wed, 21 May 2014 20:56:45 -0400 Received: from mail-ie0-f179.google.com ([209.85.223.179]:46362 "EHLO mail-ie0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753029AbaEVA4o (ORCPT ); Wed, 21 May 2014 20:56:44 -0400 Received: by mail-ie0-f179.google.com with SMTP id rd18so2752267iec.24 for ; Wed, 21 May 2014 17:56:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:subject:to:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=o5Ux2f4F7M5ovskfxnahsE0pV2WbZj0HdMQVGeWaodk=; b=UDKoKarvOF9CxGdGKxK4wnbwyTvDPxC28QjDCrKnxPWpzxXO10R5QZa1bhZe2GmVb4 LqEzae+u/EjVpSkS2AIDqDHdryxl6EzmSsgWsUFpmIsZ5zQl0hFGpbvw+vKRkWN2WXm+ FtEbmkKZgLS/qQGBMLrTs0uPFy+C63aQN7CiDW1sUZVDe3btJ9Bqp3H5toUA+W/U4c+N PqdidKYeolpDffG0P3wIV2rPTEm2yvW1KI+CGYbPQSg1LSXFVJ7tslxhQIEpMn69G2PX QeRHarzR3jBv/FugOgRUhCJ8x2xqR5swu1ls9hbvUtNalzoAX8SZUxNOvltPhsqFUCki p3Fw== X-Received: by 10.43.26.206 with SMTP id rn14mr51823386icb.13.1400720203771; Wed, 21 May 2014 17:56:43 -0700 (PDT) Received: from manet.1015granger.net ([2604:8800:100:81fc:82ee:73ff:fe43:d64f]) by mx.google.com with ESMTPSA id w4sm9246843igl.7.2014.05.21.17.56.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 May 2014 17:56:43 -0700 (PDT) From: Chuck Lever Subject: [PATCH v4 17/24] xprtrdma: Remove Tavor MTU setting To: linux-nfs@vger.kernel.org, linux-rdma@vger.kernel.org Date: Wed, 21 May 2014 20:56:42 -0400 Message-ID: <20140522005642.27190.68081.stgit@manet.1015granger.net> In-Reply-To: <20140522004505.27190.58897.stgit@manet.1015granger.net> References: <20140522004505.27190.58897.stgit@manet.1015granger.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Clean up. Remove HCA-specific clutter in xprtrdma, which is supposed to be device-independent. Hal Rosenstock observes: > Note that there is OpenSM option (enable_quirks) to return 1K MTU > in SA PathRecord responses for Tavor so that can be used for this. > The default setting for enable_quirks is FALSE so that would need > changing. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/verbs.c | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 54edf2a..515dfc1 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -48,7 +48,6 @@ */ #include -#include /* for Tavor hack below */ #include #include @@ -920,19 +919,6 @@ retry: } } -/* XXX Tavor device performs badly with 2K MTU! */ -if (strnicmp(ia->ri_id->device->dma_device->bus->name, "pci", 3) == 0) { - struct pci_dev *pcid = to_pci_dev(ia->ri_id->device->dma_device); - if (pcid->device == PCI_DEVICE_ID_MELLANOX_TAVOR && - (pcid->vendor == PCI_VENDOR_ID_MELLANOX || - pcid->vendor == PCI_VENDOR_ID_TOPSPIN)) { - struct ib_qp_attr attr = { - .path_mtu = IB_MTU_1024 - }; - rc = ib_modify_qp(ia->ri_id->qp, &attr, IB_QP_PATH_MTU); - } -} - ep->rep_connected = 0; rc = rdma_connect(ia->ri_id, &ep->rep_remote_cma);