From patchwork Wed May 4 14:53:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 9015581 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3B5E5BF29F for ; Wed, 4 May 2016 14:54:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4CC0D203A1 for ; Wed, 4 May 2016 14:54:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 56735203A0 for ; Wed, 4 May 2016 14:53:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751819AbcEDOx6 (ORCPT ); Wed, 4 May 2016 10:53:58 -0400 Received: from mail-io0-f177.google.com ([209.85.223.177]:33148 "EHLO mail-io0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751100AbcEDOx5 (ORCPT ); Wed, 4 May 2016 10:53:57 -0400 Received: by mail-io0-f177.google.com with SMTP id f89so56311661ioi.0; Wed, 04 May 2016 07:53:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=AyWhI6qdJ6e98roYn5tCXAHdcSZuughMsPXDHYTRVN8=; b=UawsKMJvlIP4WFWd4lSxReta9wrxKbpRNKMxnAzzqvWTBvqONKoPzdsH3uJF2HKkmJ ZgHJi9nx13i9qDlF7yi4y1qXfnw2+Ijg+MXFEP36Mj88SxfA9guHQPP8u8ZeEPQ6f0NY EDYUsyaFvdqLE0Ae5bh36T3hK784pbpl8JxKXTmFDPd2qnwJaqE2KI8sDA3RInbfZcdr bxOvK2cfBz0iVf3ZMC9EQ/dhDPq+IzWIG+bYo4L6tszrASKQJT69ygxh0jU+Db7ZO4h8 Qqwnk3tmHUtoGPjd7wh+b7YABJH18mTGCUxe1on41+T1r6J6AwzQZ29gU9W6hlKdl7lo OWJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; 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=AyWhI6qdJ6e98roYn5tCXAHdcSZuughMsPXDHYTRVN8=; b=m4YwRwggy634W1XWSD0IPtV66Cqvt3M8WXX/r0KuEYJSId48ZOIoYFNsYeUVSv8kDu C4+bLS9WfuMDW7Z1aRHL+0ZqwPiZXmzQ1XhTD7ZyiIPrd/Q+b8bmhf+diMRCRutZISN6 Gxtx3j34ov0JzhOzDYiLFM5wd8S2ZHF5rH0DjbcQdGryHIKTYxQp9Dl3JZ/jCQ7z5b91 TzAzopzwnUcwq6OHSPjgVp1oU9EU+YMHNHQgO5M8Rtc/vJi5c5X4U7NyDAALlBrof8pG g6O+x3CIJyBXMNtahIZqec3DtmNOTDg45eGO5o69fa8sdITqTsMD2GeRszjsEohHngqq ODGw== X-Gm-Message-State: AOPr4FVsjqGX7K9Ba1MXLoZ+fQuvqcn0wQe1Nfk307kUcgIkyv3JfPQU8VW0wPjUspO4cQ== X-Received: by 10.107.131.136 with SMTP id n8mr11344680ioi.132.1462373636623; Wed, 04 May 2016 07:53:56 -0700 (PDT) Received: from klimt.1015granger.net ([2604:8800:100:81fc:ec4:7aff:fe6c:6aa0]) by smtp.gmail.com with ESMTPSA id e101sm1542694iod.29.2016.05.04.07.53.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 May 2016 07:53:56 -0700 (PDT) Subject: [PATCH v2 9/9] svcrdma: Simplify the check for backward direction replies From: Chuck Lever To: bfields@fieldses.org Cc: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Wed, 04 May 2016 10:53:55 -0400 Message-ID: <20160504145355.6602.64946.stgit@klimt.1015granger.net> In-Reply-To: <20160504144730.6602.89073.stgit@klimt.1015granger.net> References: <20160504144730.6602.89073.stgit@klimt.1015granger.net> User-Agent: StGit/0.17.1-dirty 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=-8.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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: rq_arg.head[0] already points to the RPC header. No need to walk down the RPC-over-RDMA header again. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 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/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c index c984b0a..f30a43b 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c @@ -549,35 +549,24 @@ static void rdma_read_complete(struct svc_rqst *rqstp, rqstp->rq_arg.buflen = head->arg.buflen; } -/* By convention, backchannel calls arrive via rdma_msg type - * messages, and never populate the chunk lists. This makes - * the RPC/RDMA header small and fixed in size, so it is - * straightforward to check the RPC header's direction field. +/* Currently, this implementation does not support chunks in the + * backward direction. Thus only RDMA_MSG bc replies are accepted. */ static bool -svc_rdma_is_backchannel_reply(struct svc_xprt *xprt, struct rpcrdma_msg *rmsgp) +svc_rdma_is_backchannel_reply(struct svc_xprt *xprt, struct rpcrdma_msg *rmsgp, + struct xdr_buf *msgp) { - __be32 *p = (__be32 *)rmsgp; + __be32 *p = (__be32 *)msgp->head[0].iov_base; + /* Is there a backchannel transport associated with xprt? */ if (!xprt->xpt_bc_xprt) return false; - + /* Is there an RPC message in the inline buffer? */ if (rmsgp->rm_type != rdma_msg) return false; - if (rmsgp->rm_body.rm_chunks[0] != xdr_zero) - return false; - if (rmsgp->rm_body.rm_chunks[1] != xdr_zero) + /* Is that message a Call or a Reply? */ + if (p[1] != cpu_to_be32(RPC_REPLY)) return false; - if (rmsgp->rm_body.rm_chunks[2] != xdr_zero) - return false; - - /* sanity */ - if (p[7] != rmsgp->rm_xid) - return false; - /* call direction */ - if (p[8] == cpu_to_be32(RPC_CALL)) - return false; - return true; } @@ -643,7 +632,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp) goto out_drop; rqstp->rq_xprt_hlen = ret; - if (svc_rdma_is_backchannel_reply(xprt, rmsgp)) { + if (svc_rdma_is_backchannel_reply(xprt, rmsgp, &rqstp->rq_arg)) { ret = svc_rdma_handle_bc_reply(xprt->xpt_bc_xprt, rmsgp, &rqstp->rq_arg); svc_rdma_put_context(ctxt, 0);