From patchwork Fri Apr 28 17:25:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9705137 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 328F3602BE for ; Fri, 28 Apr 2017 17:25:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 25D9525404 for ; Fri, 28 Apr 2017 17:25:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1A9C828693; Fri, 28 Apr 2017 17:25:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 784C425404 for ; Fri, 28 Apr 2017 17:25:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937334AbdD1RZl (ORCPT ); Fri, 28 Apr 2017 13:25:41 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:32896 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S939063AbdD1RZk (ORCPT ); Fri, 28 Apr 2017 13:25:40 -0400 Received: by mail-it0-f65.google.com with SMTP id z67so6486824itb.0 for ; Fri, 28 Apr 2017 10:25:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=Er/afUfuJmsb6KXSLlakPPYOrHCG286dpgz1pZkll4E=; b=Gnt/olwx+YgVXhEvHs/qqdr8zLjZcJZ8h2mhrAd36WZQcQQ1iV6bd9GNrVh0blOXbs WABib2032W9zbegIyI1m2BlteHuQZH4x5gOST9PvMCuIsId1gK2EsqpgOjmlo1N+0dva iUXnXMIQoVszG3y6qYV/464gD/NmJA0JO9EK9N+SPlEz8q+5RG+SO44JswnpseyHTjLL FeINobinW5TGllzo9trOTEMqhDzha5WVLO0vR7fORB8UA19QxlPpPc1gDcFryZhjREL7 TrRb7ckyvFVBVa+MN4OnipcNR9pB5MqkmMB2xLS41hXs9xHdBedc+icFEYVQlKFgDQ7T CT0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=Er/afUfuJmsb6KXSLlakPPYOrHCG286dpgz1pZkll4E=; b=M5KmI4XJSPz2Vj2m5dUmPkGa6FqvQy0m34tKv1r8MMSMlzhoPveItU6AAjE3xb1Kcz M5lFuYXCqyogGzBDfSA/HjM1IzS27SvLXX5T7Mn9aQV3a8jo/PAWTopL348OjGDC4DcB Oj4fcodT1FQd+ipLowkuAlz02XEuJqugF7QYa8xmJVW0WrH9Sd1P+JdPSf4GmJEQwXoe jRG0x6Lxb/tB8psoECeuhogce24q4uOKl7Go6sM4OlA3un8Xi4z9MK3RQiiD3K+MDc96 vfI7fc4we23T6BIbUNunX+dRnsRXO9mKNWQLaSHCg+fp9hx2FPC1QGxqONbykbBWSyqh Pp/g== X-Gm-Message-State: AN3rC/6bN/uq4CpIZl/0X1MIib9o1XaDyetRxjeumOUCz9d6G0GZvsQx qWNem58dyVvkPg== X-Received: by 10.36.73.1 with SMTP id z1mr2755496ita.61.1493400339766; Fri, 28 Apr 2017 10:25:39 -0700 (PDT) Received: from localhost.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id s40sm66842ite.18.2017.04.28.10.25.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Apr 2017 10:25:39 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [RFC PATCH 1/5] SUNRPC: Allow creation of RPC clients with multiple connections Date: Fri, 28 Apr 2017 13:25:31 -0400 Message-Id: <20170428172535.7945-2-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170428172535.7945-1-trond.myklebust@primarydata.com> References: <20170428172535.7945-1-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add an argument to struct rpc_create_args that allows the specification of how many transport connections you want to set up to the server. Signed-off-by: Trond Myklebust --- include/linux/sunrpc/clnt.h | 1 + net/sunrpc/clnt.c | 17 ++++++++++++++++- net/sunrpc/xprtmultipath.c | 3 +-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h index 6095ecba0dde..8c3cb38a385b 100644 --- a/include/linux/sunrpc/clnt.h +++ b/include/linux/sunrpc/clnt.h @@ -120,6 +120,7 @@ struct rpc_create_args { u32 prognumber; /* overrides program->number */ u32 version; rpc_authflavor_t authflavor; + u32 nconnect; unsigned long flags; char *client_name; struct svc_xprt *bc_xprt; /* NFSv4.1 backchannel */ diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 673046c64e48..0ff97288b43f 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -522,6 +522,8 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args) .bc_xprt = args->bc_xprt, }; char servername[48]; + struct rpc_clnt *clnt; + int i; if (args->bc_xprt) { WARN_ON_ONCE(!(args->protocol & XPRT_TRANSPORT_BC)); @@ -584,7 +586,15 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args) if (args->flags & RPC_CLNT_CREATE_NONPRIVPORT) xprt->resvport = 0; - return rpc_create_xprt(args, xprt); + clnt = rpc_create_xprt(args, xprt); + if (IS_ERR(clnt) || args->nconnect <= 1) + return clnt; + + for (i = 0; i < args->nconnect - 1; i++) { + if (rpc_clnt_add_xprt(clnt, &xprtargs, NULL, NULL) < 0) + break; + } + return clnt; } EXPORT_SYMBOL_GPL(rpc_create); @@ -2605,6 +2615,10 @@ int rpc_clnt_test_and_add_xprt(struct rpc_clnt *clnt, return -ENOMEM; data->xps = xprt_switch_get(xps); data->xprt = xprt_get(xprt); + if (rpc_xprt_switch_has_addr(data->xps, (struct sockaddr *)&xprt->addr)) { + rpc_cb_add_xprt_release(data); + goto success; + } cred = authnull_ops.lookup_cred(NULL, NULL, 0); task = rpc_call_null_helper(clnt, xprt, cred, @@ -2614,6 +2628,7 @@ int rpc_clnt_test_and_add_xprt(struct rpc_clnt *clnt, if (IS_ERR(task)) return PTR_ERR(task); rpc_put_task(task); +success: return 1; } EXPORT_SYMBOL_GPL(rpc_clnt_test_and_add_xprt); diff --git a/net/sunrpc/xprtmultipath.c b/net/sunrpc/xprtmultipath.c index 95064d510ce6..486819d0c58b 100644 --- a/net/sunrpc/xprtmultipath.c +++ b/net/sunrpc/xprtmultipath.c @@ -51,8 +51,7 @@ void rpc_xprt_switch_add_xprt(struct rpc_xprt_switch *xps, if (xprt == NULL) return; spin_lock(&xps->xps_lock); - if ((xps->xps_net == xprt->xprt_net || xps->xps_net == NULL) && - !rpc_xprt_switch_has_addr(xps, (struct sockaddr *)&xprt->addr)) + if (xps->xps_net == xprt->xprt_net || xps->xps_net == NULL) xprt_switch_add_xprt_locked(xps, xprt); spin_unlock(&xps->xps_lock); }