Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "Benjamin Coddington" <bcodding@redhat.com>
To:     "Olga Kornievskaia" <aglo@umich.edu>
Cc:     "Chuck Lever III" <chuck.lever@oracle.com>,
        "Jeff Layton" <jlayton@kernel.org>,
        "Linux NFS Mailing List" <linux-nfs@vger.kernel.org>
Subject: Re: Is this nfsd kernel oops known?
Date:   Fri, 02 Sep 2022 16:58:04 -0400
Message-ID: <6DC1F4DF-8242-480B-813A-5F87D64593A6@redhat.com>
In-Reply-To: <CAN-5tyHOugPeTsu+gBJ1tkqawyQDkfHXrO=vQ6vZTTzWJWTqGA@mail.gmail.com>
References: <CAN-5tyGkHd+wEHC5NwQGRuQsJie+aPu0RkWNrp_wFo4e+JcQgA@mail.gmail.com>
 <5c423fdf25e6cedb2dcdbb9c8665d6a9ab4ad4b1.camel@kernel.org>
 <CAN-5tyEOTVDhR6FgP7nPVon76qhKkexaWB8AJ_iBVTp6iYOk1g@mail.gmail.com>
 <11BEA7FE-4CBC-4E5C-9B68-A0310CF1F3BE@oracle.com>
 <CAN-5tyHOugPeTsu+gBJ1tkqawyQDkfHXrO=vQ6vZTTzWJWTqGA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; format=flowed
Precedence: bulk

Olga, does this fix it up for you?  I'm testing now, but I think it 
might be
a little harder for me to hit.

Ben

8<------------------------------------------------
 From 6bea39a887495b1748ff3b179d6e2f3d7e552b61 Mon Sep 17 00:00:00 2001
 From: Benjamin Coddington <bcodding@redhat.com>
Date: Fri, 2 Sep 2022 16:49:17 -0400
Subject: [PATCH] SUNRPC: Fix svc_tcp_sendmsg bvec offset calculation

The xdr_buf's bvec member points to an array of struct bio_vec, let's
fixup the calculation to the start of the bio_vec for non-zero
page_base.

Fixes: bad4c6eb5eaa ("SUNRPC: Fix NFS READs that start at 
non-page-aligned offsets")
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
---
  net/sunrpc/svcsock.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 2fc98fea59b4..ecafc9c4bc5c 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -1110,7 +1110,7 @@ static int svc_tcp_sendmsg(struct socket *sock, 
struct xdr_buf *xdr,
                 unsigned int offset, len, remaining;
                 struct bio_vec *bvec;

-               bvec = xdr->bvec + (xdr->page_base >> PAGE_SHIFT);
+               bvec = &xdr->bvec[xdr->page_base >> PAGE_SHIFT];
                 offset = offset_in_page(xdr->page_base);
                 remaining = xdr->page_len;
                 while (remaining > 0) {
--
2.37.2