From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A95BC4706C for ; Sat, 13 Jan 2024 17:08:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 81E166B0085; Sat, 13 Jan 2024 12:08:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7A5786B0087; Sat, 13 Jan 2024 12:08:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 61F366B0089; Sat, 13 Jan 2024 12:08:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 4FF3A6B0085 for ; Sat, 13 Jan 2024 12:08:16 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 28791A1AE2 for ; Sat, 13 Jan 2024 17:08:16 +0000 (UTC) X-FDA: 81674920992.25.EDC01F4 Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) by imf21.hostedemail.com (Postfix) with ESMTP id 5ED451C000C for ; Sat, 13 Jan 2024 17:08:14 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=NKTW4Ff4; spf=pass (imf21.hostedemail.com: domain of smfrench@gmail.com designates 209.85.208.182 as permitted sender) smtp.mailfrom=smfrench@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705165694; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Cm11gLN7uX50vZggqWudT8LWdsIOgXMLZmApJD5u7nI=; b=wGOaOtKBiiC7r0awPvmJGuVlql9hd1Q3pf4qUfbuUzXEOXEbWAjoJbH0IXIihH3kfsfQjV 1zViqY3x/Chs9/joB1lqzwP71+4E/amkeXHnZZdEMzJnCngneR5a6Zf8uvOGFnro4RlNUM tz5cDCYzcVT0zp/cVCf1TcHpBrEJsOM= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=NKTW4Ff4; spf=pass (imf21.hostedemail.com: domain of smfrench@gmail.com designates 209.85.208.182 as permitted sender) smtp.mailfrom=smfrench@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705165694; a=rsa-sha256; cv=none; b=Gj35qtXM2ueFrECb5VMgNKaXl2QfnKZy8ezG8An5XPL4zKMCwffC5UifvHQS195Hgay+U7 4uqnWP9IlhkEocGKfBZWbZ47Grb4kiSq8g3GHiAJkbu2/0KyJQsFbaPt5mCj3HM0c2w/H5 P8x9zCU1Zg4ANzhyAK+F7BkIK9ouGHk= Received: by mail-lj1-f182.google.com with SMTP id 38308e7fff4ca-2cdae52d355so3302161fa.2 for ; Sat, 13 Jan 2024 09:08:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705165692; x=1705770492; darn=kvack.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Cm11gLN7uX50vZggqWudT8LWdsIOgXMLZmApJD5u7nI=; b=NKTW4Ff4FOEs0uP+ime9UnnC9FtEFr0z0Cd43xfmE7SZ+yP2TQbt5hkFDhHeTDdg0M N1nedbXXpNCYUlqhXZOVvZv/JTAgfEGg4uS7+Uw7bzx9nxRFCwdrBeU80uzr5/jXDbAr /mkOrLtm5puBZJRSo+OcgtYJjXvteJCRbFfVai4gaaAnmMljIa4iN1yyqPSCYACmKxvl fE5/qWmDSkOBvT0GhL8M/QNXXRzcZrNyqDyeMDELCfkYLt0cprv1SLQwn6qRWHnfOCHj z5nSJZOS4eSub+5FqEaw2TrcQ6RcBOZuFGY2kAdnW2gYDyHSPaMAJ+1IkyrC64L+dhFE Cxlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705165692; x=1705770492; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Cm11gLN7uX50vZggqWudT8LWdsIOgXMLZmApJD5u7nI=; b=hUkdBy7W2z1Vwjnt1Hb2vAwssFRMXPix0RjM5NibYzYC0pVHaan1hoCA1TJhBKP2/M pFpfbKixbcEJSPHOEPJwrEglVkr0sqVIdUx/gTGaDCBOVBXa2izl9bB0DiFUBNx0mZOK zNfTGSE39c3Y8B3635vih5vHyK7BzErhcQyKQfZhwrsecuO2wFHQ1OpgbUjkOGPEwF4n EMWn9T2SXTi/1o4bPyUEFDUv44WgLHMFD4olqifegaa/xnZDxSRkZfsmEsGqcYm6lzqS ZDrxqd+2eAIAVwSjl1zaOJyRG247iIw3RdjPe9w9fRcfLIEnW+n6nHI43Wwdjv03+ni8 1lLA== X-Gm-Message-State: AOJu0YzliAhXZa184cT6rWcwbfxnVD22sHuZdPMtC5UOFbHT5DUcHHSG MjO9zpWY86kjIenlj4oQvpWNnpntsF/5/O9f12g= X-Google-Smtp-Source: AGHT+IHvOSmTb39KNL5cNnZsjCHWyhAbQGAOOgNEVn95OgR+UNltyBeNQP6ekbjpS7WHIlDiH/ivtmv/79JiDFJSEW4= X-Received: by 2002:a2e:b0d9:0:b0:2cd:2b6a:b43a with SMTP id g25-20020a2eb0d9000000b002cd2b6ab43amr1378124ljl.44.1705165692199; Sat, 13 Jan 2024 09:08:12 -0800 (PST) MIME-Version: 1.0 References: <2023121124-trifle-uncharted-2622@gregkh> <8e59220d-b0f3-4dae-afc3-36acfa6873e4@leemhuis.info> <13a70cc5-78fc-49a4-8d78-41e5479e3023@leemhuis.info> <2024011115-neatly-trout-5532@gregkh> <2162049.1705069551@warthog.procyon.org.uk> In-Reply-To: From: Steve French Date: Sat, 13 Jan 2024 11:08:00 -0600 Message-ID: Subject: Re: [Regression 6.1.y] From "cifs: Fix flushing, invalidation and file size with copy_file_range()" To: Matthew Wilcox Cc: David Howells , Greg KH , Salvatore Bonaccorso , Paulo Alcantara , Shyam Prasad N , Rohith Surabattula , Jeff Layton , Steve French , "Jitindar Singh, Suraj" , linux-mm , stable-commits@vger.kernel.org, Stable , CIFS , Linux regressions mailing list Content-Type: multipart/alternative; boundary="0000000000005dea42060ed6d36c" X-Rspamd-Queue-Id: 5ED451C000C X-Rspam-User: X-Stat-Signature: ty3gu3jp1ka9zc5yqdmt1t9x1c1ey8jp X-Rspamd-Server: rspam01 X-HE-Tag: 1705165694-426567 X-HE-Meta: U2FsdGVkX1+ayfDxotXwFAWUIljxg2dbxdTSlMBX5sZS+GHfeZ2zDZSJYWhEIZowOs3ZG/hDeQb38eBCP1uGOiEhhEuGFAfuJSFycl2W7jEUu2yeg32Pwo/VUe6jawTzB/WGKzKd+Nn8sGteEnkeGI/60VE00RxhazYL/roEQH9i/8ZYjZmtBA6ARgfxa6ZEqzDdzSzaCYNhq+qYM1chrpcXHesh9XqS2B384NaSv4cL2/s/pBGqSK5JrqFC8nXEfzSbCyVXgpKoWiqKxe+aivKKonmmBaX9IV0aILkTZ8TRUdCbz4EkIgIYpr1Y92+9fUk3n+9EGq56/x8Oyn3AjFlKu9YO+FMkUdlfemuejHe6f1QJ+GwSdL7Pqrgii57vevPChbxVqoXY+q0KOk9YudaRNxXjiQlVhh+JplQv/wWDNRCNgy6FJ5GX3ncy4EL/ZARe08+MsmT3vgmeUrHVb0FsAkDEWemMTrgTHLHL4h2CK4abx55dvjwnoRa88MM7uY/tnqcHo7KgMUwXi/Zjjj1c+eHDObOyxI39C+7jFHOYqaHwhDd1dZD8KhpV4zvR0bIxUm1+M8CzVFWlEjrFTuwj9ZyOg2B3wbj2/TmTG+tPEQ/BX7cm8d8aN38WOMSAJjDYvA3864F/YVFlMKNX1XpCVxSoDx2AkHBYMTRRd/iAjxGU+lsDwto6CQYuk2xSJOogHaNmXpjdIlRsrc7clM6VlqAluKz1aR21Y8r+q0yKbLdsHbtMsm9EhP5V1BzS21gXFGbFS409AmkKmJFeTeZoXsA97H+BkZda5kSAC2PIXQZ9MQKCoZlpCesRSGVuP7MeRCQTxEfz7upMyRGCc2ze4HLYVY57qjiMXa2AtFCerTcS0Wyewmagj4E9csjCvsZYwdXzzQNEUJz61pcmhhBqA2m2rMcmhqWhkT1ew7tpLPNOVQhKEd73Hsnlu39PQunziyVf+BqXA5v2A6i 0QcwhGyW pqqXRhr4PNc4/Z5YARxHIjUZvAuAxhCisLrv7STk7la537XzIxXXctBxmkUg036OUcG0aly8p+zkJ6Qm53D90usgnTTA19JJx9DyyleNeectNX5L/v9DyTof0xImnGYaS6czNbB7H2hVcEWGVy1+UCs7NVt40rZoOgmV/99uRQrHYEoR7LWIRtAAEUR/RR7N/0OWqtUjtuNpdLV09xhat0hj05COOUyf2ZEK15mJKS5RxdobjgN5nL8MskJQ5ajcCL3nsMtC+xOzlzPeyLIHL/2Jb1zPURF1HeGQMCxQD/4xPJl4gPf4MBkhDQO9CqtRplJuxR+6JuYw8OtWcPPyQiB/soOUZBGsbaE60I4ebnSMsqQvGpJuwtzbzaz+bPvXYGYtrNYipffe3jqRDF6WemU6ukkI/F+EX3tKzTMt676eiI3fPeTG5U5CJKi1vLccVyBaNlVBudZN8nOJCE3vpXQGmhVU4NH21//KJawvNzn36xb49eSVX1o34UlqXXrVLqQv2Tw/D+AkOqXqdIPpGqFN/Arnzt9MeN0eRZ6v5LVAN74hYDHaGXkGWQzLepClYdf2GRzSXMmRoghqOrOBHqwH43qO7ySRd0Rvo/76FW1V0f47PpQ1E7Mm0a4b7ZB7xGuk+ X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: --0000000000005dea42060ed6d36c Content-Type: text/plain; charset="UTF-8" I thought that it was "safer" since if it was misapplied to version where new folio rc behavior it wouldn't regress anything On Sat, Jan 13, 2024, 11:02 Matthew Wilcox wrote: > On Fri, Jan 12, 2024 at 11:20:53PM -0600, Steve French wrote: > > Here is a patch similar to what David suggested. Seems > > Similar to, but worse. > > > +++ b/fs/smb/client/cifsfs.c > > @@ -1240,7 +1240,7 @@ static int cifs_flush_folio(struct inode *inode, > loff_t pos, loff_t *_fstart, lo > > int rc = 0; > > > > folio = filemap_get_folio(inode->i_mapping, index); > > - if (IS_ERR(folio)) > > + if ((!folio) || (IS_ERR(folio))) > > return 0; > > filemap_get_folio() cannot return an err_ptr in 6.1, so this should > simply be: > > - if (IS_ERR(folio)) > + if (!folio) > > --0000000000005dea42060ed6d36c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
I thought that it was "safer" since if it was m= isapplied to version where new folio rc behavior it wouldn't regress an= ything=C2=A0

On Sat, Jan 13, 2024, 11:02 Matthew Wilcox <willy@infradead.org> wrote:
On Fri, Jan 12, 2024 at 11:20:53PM -0600, Steve Fren= ch wrote:
> Here is a patch similar to what David suggested.=C2=A0 Seems

Similar to, but worse.

> +++ b/fs/smb/client/cifsfs.c
> @@ -1240,7 +1240,7 @@ static int cifs_flush_folio(struct inode *inode,= loff_t pos, loff_t *_fstart, lo
>=C2=A0 =C2=A0 =C2=A0 =C2=A0int rc =3D 0;
>=C2=A0
>=C2=A0 =C2=A0 =C2=A0 =C2=A0folio =3D filemap_get_folio(inode->i_mapp= ing, index);
> -=C2=A0 =C2=A0 =C2=A0if (IS_ERR(folio))
> +=C2=A0 =C2=A0 =C2=A0if ((!folio) || (IS_ERR(folio)))
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return 0;

filemap_get_folio() cannot return an err_ptr in 6.1, so this should
simply be:

-=C2=A0 =C2=A0 =C2=A0 =C2=A0if (IS_ERR(folio))
+=C2=A0 =C2=A0 =C2=A0 =C2=A0if (!folio)

--0000000000005dea42060ed6d36c--