From patchwork Wed Jul 12 16:10:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 9837113 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 1B2F5602BD for ; Wed, 12 Jul 2017 16:10:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0CF4E2861F for ; Wed, 12 Jul 2017 16:10:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 01CE628640; Wed, 12 Jul 2017 16:10:45 +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 6040E2861F for ; Wed, 12 Jul 2017 16:10:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753706AbdGLQKn (ORCPT ); Wed, 12 Jul 2017 12:10:43 -0400 Received: from mail-io0-f195.google.com ([209.85.223.195]:34443 "EHLO mail-io0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753699AbdGLQKm (ORCPT ); Wed, 12 Jul 2017 12:10:42 -0400 Received: by mail-io0-f195.google.com with SMTP id f66so2386935iof.1 for ; Wed, 12 Jul 2017 09:10:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:from:to:cc:date:message-id:user-agent:mime-version :content-transfer-encoding; bh=G6vy6QqdzcOt7w6WArZFB5hVB8QGWqXJrzyDigldHic=; b=X1ExODb4m0gesmC4ni9D+uQVmjOc4bQKTlz+K6z95E7Vr7+eKigBhQaxUBBfRbesR5 U6ujavt9Ikr6FrRiF+JtOmpP0ploNAwC3+w7fTle2KMNPWY1GkwZEEE9ZWAsvK4Ivl+u m73mtGU+578F8KNrxD8svEjLh1In0VWJHQFCSwhOlTPe+rnyN+FKLeWAg4iEjR3dW0iN 8WKFIuO1qdTOucEIwnSjLts3J75/HwX5OEgYSVUqgyQNGy+5RUxtOjIleeWtZBYLUYrW rwBxKI30JM5jzfeKmA4MchzbOQ2eikr3uy/kmxwn7YueqyI2Y5fmnmCR+3Ys6nK9QJrS amgA== 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 :user-agent:mime-version:content-transfer-encoding; bh=G6vy6QqdzcOt7w6WArZFB5hVB8QGWqXJrzyDigldHic=; b=Ptj8eAeudjYTYSBlxMDUXOWBVyGHN66yDwyh6d7hbVUp05KftOzhfOZXXIh5T5yoJp a+K5SUztRJfcvsks/PUp1+DNUW3mvmkvB6oJ4/VXbzNtjrvNrbbG5OGmyu/pStP4rJ74 xpgCnMokFz2a9XQfOm/65sKOkw49oeMCi702GOz1swBZjiG0RkCZD5fy0ntEfJuQMTyX U0INY/ELYXpIMatL283cdUnuRgwni+DZSd11003nT71JEo8gbrxLZ/ooPCEariorNC3f /rckJXvM/tlVlJt8vjOAF+7O2MJdqJSjfcqfmz2h7l/eBUcsaCS48qXnewvMfMJEJL11 0qSg== X-Gm-Message-State: AIVw1134OlIrvH5nrRY8ZifzeDXLjb0OYkpMNzDAtc5UtT9iYqmcmCOw uwaoGXhnBm1PK2Zr X-Received: by 10.107.3.234 with SMTP id e103mr6073857ioi.136.1499875842047; Wed, 12 Jul 2017 09:10:42 -0700 (PDT) Received: from klimt.1015granger.net (c-68-46-169-226.hsd1.mi.comcast.net. [68.46.169.226]) by smtp.gmail.com with ESMTPSA id 131sm1433110itk.10.2017.07.12.09.10.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Jul 2017 09:10:41 -0700 (PDT) Subject: [PATCH] sunrpc: Remove NULL element at the end of rq_pages From: Chuck Lever To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Date: Wed, 12 Jul 2017 12:10:40 -0400 Message-ID: <20170712160657.24663.66681.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-Virus-Scanned: ClamAV using ClamSMTP Bruce points out that the NULL final element of rq_pages is unneeded by nfs_read_actor. Remove it. Thus the 260th element of rq_pages is also no longer needed. Signed-off-by: Chuck Lever --- Hi Bruce- I've been testing this one. No issues for NFSv4.0 on RDMA with krb5i, but NFSv4.0 on TCP with krb5i encounters a problem. The server log shows this message: rpc-srv/tcp: nfsd: sent only 108 when sending 140 bytes - shutting down socket And iozone stalls on the client. I haven't looked more closely. include/linux/sunrpc/svc.h | 2 +- net/sunrpc/svc_xprt.c | 1 - 2 files changed, 1 insertion(+), 2 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/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h index d741399..5500544 100644 --- a/include/linux/sunrpc/svc.h +++ b/include/linux/sunrpc/svc.h @@ -246,7 +246,7 @@ struct svc_rqst { size_t rq_xprt_hlen; /* xprt header len */ struct xdr_buf rq_arg; struct xdr_buf rq_res; - struct page *rq_pages[RPCSVC_MAXPAGES + 1]; + struct page *rq_pages[RPCSVC_MAXPAGES]; struct page * *rq_respages; /* points into rq_pages */ struct page * *rq_next_page; /* next reply page to use */ struct page * *rq_page_end; /* one past the last page */ diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index d16a8b4..b7efd16 100644 --- a/net/sunrpc/svc_xprt.c +++ b/net/sunrpc/svc_xprt.c @@ -680,7 +680,6 @@ static int svc_alloc_arg(struct svc_rqst *rqstp) rqstp->rq_pages[i] = p; } rqstp->rq_page_end = &rqstp->rq_pages[i]; - rqstp->rq_pages[i++] = NULL; /* this might be seen in nfs_read_actor */ /* Make arg->head point to first page and arg->pages point to rest */ arg = &rqstp->rq_arg;