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:   Chuck Lever III <chuck.lever@oracle.com>
To:     Anna Schumaker <anna@kernel.org>
CC:     Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH v4 1/2] NFSD: Return nfserr_serverfault if splice_ok but
 buf->pages have data
Thread-Topic: [PATCH v4 1/2] NFSD: Return nfserr_serverfault if splice_ok but
 buf->pages have data
Thread-Index: AQHYx5rr/lc8S5bVRUSZRf9utUmxSK3dywCA
Date:   Tue, 13 Sep 2022 20:12:12 +0000
Message-ID: <DE16B82B-67D9-49BA-B797-AC21AC8E7CE4@oracle.com>
References: <20220913180151.1928363-1-anna@kernel.org>
 <20220913180151.1928363-2-anna@kernel.org>
In-Reply-To: <20220913180151.1928363-2-anna@kernel.org>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?dixP5WGMXKj9jG6CzTPhYyL0r5JjedTiMkonKubQB4owe1x2WU2EQR6JCFag?=
 =?us-ascii?Q?c5/HZWy4+RbwdhTf03GolGQ+PddS+ZrR6NYtTzljfGHNZs7DYWBhZYZ5kkQu?=
 =?us-ascii?Q?t/WYCAPl6qLa5xjcQk5OACnG+bpOkG0zaZrDC5rrNpAkF68H+9uSgHNnP1kD?=
 =?us-ascii?Q?bPdTZJXvGv53OZT0WSbfZDom+UzvzoHmHuTfvaursVm4gfcuD3kTALkRt2iE?=
 =?us-ascii?Q?NMLvKtSq8vM5IUwd4bcn2qaGnikuvgt9uE8wPVJ0RGo2SkszgzO2g4nBEZ5M?=
 =?us-ascii?Q?kiQh2jsRYNZKHiDFUVpK9KsVUcVhj/CnKsHRpECR6yWXfxhHObROMbyYLenA?=
 =?us-ascii?Q?DXScLoaEeYHNPHw5pLIGTRCxGlDJwHu73OAjiyaWo1GZ43XqBZ/CLtg12ze3?=
 =?us-ascii?Q?NjizYyIOudqDEw8aRwM84WTBetuvLlWxWvFXeFf08EKuLUkLJRNSqNvHR+Sn?=
 =?us-ascii?Q?kmA55QVM8kMFYDP4Fy7SlCpmRJtxusQeERWc4zOADjPrCZ6p5sTUKgOmQ+aQ?=
 =?us-ascii?Q?TC/WAXcjLjZAR3auAN0GCr9hmCs9SuDc0rbofJ8FNWKb7FJZAR2wzRFXYXgZ?=
 =?us-ascii?Q?tqvs/0zy4nghuX3J47SLe2FlIVlF483mGd0v5qOpzsl4YZL8uuiBncwkB0BD?=
 =?us-ascii?Q?XlKGuvybWDGVrR0WFEiPG+3bsJOOpyfG/RSB5aP4X5Qyk4nbyAEjVQVKDGXL?=
 =?us-ascii?Q?melg4mECSs781UwlXdSKOz0+FfuezOZa/B7F1Z7m0+SNvg1Zjhz0e7zkLPWT?=
 =?us-ascii?Q?PZQ/J/0AqeJUczPreY+fK5J//baFvLP6t0cTu7jJDN/QDWUj+CMtM2ocpV4a?=
 =?us-ascii?Q?tC1dFnSFN8XKfxRJncqRgWXDIN5YS9k3vG9YykzZE7dTnrQD7pZk1+tIeNz3?=
 =?us-ascii?Q?TJm/MMCHhzWtoAJqE9rNJyesSOQ43rdnD+2RDLvubpgqkcbfT6FN1p7roiTo?=
 =?us-ascii?Q?WVDkogKnVOi0dtnhq1eXbih5bioAY6djjHnVr2rp2E4glGMBnGWhCn2gXCV3?=
 =?us-ascii?Q?39kG17Ujx0/E3jnTEndrJ3X9ttwHWB/nG66eu4sDqkZV2mw8og8ZEfaOeQqQ?=
 =?us-ascii?Q?G2FoZtFti7aV8p1byAUbHeDuY4zlgqFgJ82DCOdrA2DM+cBn3U23HUZsCoIw?=
 =?us-ascii?Q?//BYZda0mXZ6JDl+0OvDauPNDXR/O8uuHt4GrLtrCgcfOH9cAAC4+/nIgCcD?=
 =?us-ascii?Q?bfaztWP253JJYkYOCFUXrufoLQl5KMAog2B8LqxgNf+mJJHcLC8ChVqaBV0f?=
 =?us-ascii?Q?lPBcB0S9oQohYFI7v8EyAT/e/D5OyoPjaqFiQZ85Moz4dB3poLTT14fCXAWa?=
 =?us-ascii?Q?HaWQcIpRlyn973u9hrKese1a419KFeGFJn+aCWzFxiiRuPPuyG74dinkFA6W?=
 =?us-ascii?Q?o4y1tqHsHpLCRG+jqTvO4NVVF7zcjUKDIz4ywjKX+bBU46Owr0X5RqEgPHjF?=
 =?us-ascii?Q?Wn1tadK16UF+IJmIfYsoq+qTTgPZbQzT1S/dh2yHIqNXsfKNv9sOIWy/rYuH?=
 =?us-ascii?Q?tuGuhU3tFIrd7puexLEge5wIO0zftdYKDMMUzuPyq+aX3IxJnuewQH5LNdjE?=
 =?us-ascii?Q?DAZoZTU5RepNGD6J1tv/hGmyhUCiqRfl9sixxew6rgj7IYUtbHYwwjv+Mo85?=
 =?us-ascii?Q?zg=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <32900A8F10F4D64082739D4DC724089C@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a6d80456-9b68-452f-203a-08da95c43ed2
X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Sep 2022 20:12:12.6277
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: v/wW4VtHDLNwMv6LLLtR3D1hD7GkjWpP24U8a0+dcX96iEovvtRF/h6ea0mLeo9+S+gvBaDKYL1Up5sQWZ2ISw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR10MB6235
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1
 definitions=2022-09-13_09,2022-09-13_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 bulkscore=0
 mlxlogscore=999 mlxscore=0 suspectscore=0 malwarescore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2208220000
 definitions=main-2209130093
X-Proofpoint-ORIG-GUID: OEReD4l6BzJ-4cupR0gO_hX-zH4dkpSP
X-Proofpoint-GUID: OEReD4l6BzJ-4cupR0gO_hX-zH4dkpSP
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org


> On Sep 13, 2022, at 11:01 AM, Anna Schumaker <anna@kernel.org> wrote:
>=20
> From: Anna Schumaker <Anna.Schumaker@Netapp.com>
>=20
> This was discussed with Chuck as part of this patch set. Returning
> nfserr_resource was decided to not be the best error message here, and
> he suggested changing to nfserr_serverfault instead.
>=20
> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
> ---
> fs/nfsd/nfs4xdr.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

I've applied this one for nfsd for-next. Thanks!

As I mentioned, 2/2 looks OK, and I'll apply it to my private
tree for testing while we work out why it's a little slower.


> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> index 1e9690a061ec..01dd73ed5720 100644
> --- a/fs/nfsd/nfs4xdr.c
> +++ b/fs/nfsd/nfs4xdr.c
> @@ -3994,7 +3994,7 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, _=
_be32 nfserr,
> 	}
> 	if (resp->xdr->buf->page_len && splice_ok) {
> 		WARN_ON_ONCE(1);
> -		return nfserr_resource;
> +		return nfserr_serverfault;

Odd, I couldn't find a definition for nfserr_serverfault when
I asked for this patch last week, but this one-liner seems to
compile correctly. Oh well!


> 	}
> 	xdr_commit_encode(xdr);
>=20
> --=20
> 2.37.3
>=20

--
Chuck Lever