From patchwork Mon Feb 27 13:04:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 61940 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2405142wrd; Mon, 27 Feb 2023 05:09:34 -0800 (PST) X-Google-Smtp-Source: AK7set8CCguwFhtrKL/Bbwo3TOt79a5ZORKjqqjJxoeySZorem6oyjHKDoqZ5i0wFFVcjm1oVsbk X-Received: by 2002:a05:6a20:4421:b0:cc:75b8:7cac with SMTP id ce33-20020a056a20442100b000cc75b87cacmr14351755pzb.27.1677503374201; Mon, 27 Feb 2023 05:09:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677503374; cv=none; d=google.com; s=arc-20160816; b=iSiQYtDvY01Z7ZNDz62T3moeQgqlATjc9bG/3JSU+xuf45OP5qK3L553+urN05gA2y SEYNdWV/g1xTrQrywZyckMFB+fJjrDuGmmBs3jmaflLeKURSrZTVCca6PibmXUbdipqr z5gcEguI2We+hnM5XFRkAug6mCJQWY377NoRJTLZowKMktuXng63mpWSKGvxkFMIw0+v ffH/86MNrJkPu49fa6SM0fjlhTk+e23vjEJ9qOiPdqosEe2ZNptrJeIP8K+a7oiYk29P SvTokCbeDlz6O0Au5mvo1TW3Pdbfdk+gyeJVC6ZvirI1oTeD3D+ByLwocnIrsc1Zv30w IF+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rbgMV4+Gw07qIFcKv0NDtwcmvgDQ6J2Uk8Vw7BugGlw=; b=bItB5nbH/q1VTBoz/dJD/w1wqRsAvq4YJ4wXhglkhpVcRfieY1VbZUErYdRLn3K0kA tB3rne5GWiQjHJYH1dPAmXTxxHUfs7uKwZNIPfWSlVzgxl+0giaA8njccYO3nmJ5rwNs XQ9zfFfJgME+V7Ad7D5WZ4sBVuERfUDmE2Opb7IzuWM5FVFa0mtw5sfukS7JH1EWhM99 qEnzUwV+XoBMuhSxTa36rBmmeLGgUsK1gAtrjiuJfehA1X5HuGyPuvLR9NeeO8UHy1Gv /YQEm5NxBuqM4u4iqheewPJjdgG3nb1zP60AlY6MUkCpEz3nqmN+1mNeGRPlVhQs7s9Y GD8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=DzLODSpE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c4-20020a631c04000000b004fb149738c0si7037770pgc.81.2023.02.27.05.09.20; Mon, 27 Feb 2023 05:09:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=DzLODSpE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229887AbjB0NFq (ORCPT + 99 others); Mon, 27 Feb 2023 08:05:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229845AbjB0NFo (ORCPT ); Mon, 27 Feb 2023 08:05:44 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC27DC14A for ; Mon, 27 Feb 2023 05:05:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677503102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rbgMV4+Gw07qIFcKv0NDtwcmvgDQ6J2Uk8Vw7BugGlw=; b=DzLODSpEMgkzecyNbe186stqwlJqt5uAD+FeTESucVM/U1yW4RSEuMj6DJRgik0HEByrEq cHv7dFjgtLEKLg4jdP+sUwscUOyB69I+qhFVo0pcbGTtJb+5hh7qcMF313USHSwHljaQIE 9o5triTcBnqwT49N2ZSNCL9BWn9YVek= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-517-xNV1IN3UPr2PH4RBXTQMdA-1; Mon, 27 Feb 2023 08:05:01 -0500 X-MC-Unique: xNV1IN3UPr2PH4RBXTQMdA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DA7331991C41; Mon, 27 Feb 2023 13:05:00 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id B05582166B2C; Mon, 27 Feb 2023 13:04:59 +0000 (UTC) From: David Howells To: Steve French Cc: David Howells , Shyam Prasad N , Rohith Surabattula , Tom Talpey , Stefan Metzmacher , Jeff Layton , linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, Steve French Subject: [PATCH 1/2] cifs: Fix cifs_write_back_from_locked_folio() Date: Mon, 27 Feb 2023 13:04:53 +0000 Message-Id: <20230227130454.2673622-2-dhowells@redhat.com> In-Reply-To: <20230227130454.2673622-1-dhowells@redhat.com> References: <20230227130454.2673622-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758989777884734839?= X-GMAIL-MSGID: =?utf-8?q?1758989777884734839?= cifs_write_back_from_locked_folio() should return the number of bytes read, but returns the result of ->async_writev(), which will be 0 on success. As it happens, this doesn't prevent cifs_writepages_region() from working as it will then examine and ignore the pages that are no longer dirty rather than just skipping over them. Fixes: d08089f649a0 ("cifs: Change the I/O paths to use an iterator rather than a page list") Signed-off-by: David Howells cc: Steve French cc: Shyam Prasad N cc: Rohith Surabattula cc: Tom Talpey cc: Jeff Layton cc: linux-cifs@vger.kernel.org --- fs/cifs/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/cifs/file.c b/fs/cifs/file.c index ebfcaae8c437..f8cc68ce9d8a 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -2839,6 +2839,7 @@ static ssize_t cifs_write_back_from_locked_folio(struct address_space *mapping, free_xid(xid); if (rc == 0) { wbc->nr_to_write = count; + rc = len; } else if (is_retryable_error(rc)) { cifs_pages_write_redirty(inode, start, len); } else { From patchwork Mon Feb 27 13:04:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 61941 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2405513wrd; Mon, 27 Feb 2023 05:10:08 -0800 (PST) X-Google-Smtp-Source: AK7set/R9BEyCyBG35J8tdvqyOoSWCyeGLuHRE79FLf4l8Iu3fNB+DKyh+Q1km6PKnoyQGC8iXAs X-Received: by 2002:a17:906:ef8c:b0:8b1:806b:7dbb with SMTP id ze12-20020a170906ef8c00b008b1806b7dbbmr35724625ejb.51.1677503408332; Mon, 27 Feb 2023 05:10:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677503408; cv=none; d=google.com; s=arc-20160816; b=TCUReF92Zs74Qy50FhzRIJDik2aRMgx+1AIii2bGnGsCm6n2HHTkixBH8e5fR33hk1 q5eo7ggnvecRO3q0a5jhTBSRETf9h5vhzGvCWSRovc9GrCo11kn5FIFZuD/g0zW24lfo oJxR0/gY7ttLfMBp4tlHr+fMOxQDYouKQwAyKbkO1LbM34dVMYa4zVHFknCG5kwPUHgd yPIJ+wi7FET9IjKObu2cgo3NpOLVjoW/KPKeZtoGdMa8R+bRJwGY30DdQxb/udRtywS3 lrB2WxInEzDzz6jt+vbwNac5Pa/Q8UizQy/iyPMFIk69Qt1fFhHTbse1F7ByH2MGYb6O 9Frg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=IrBksrjGGrO7Pe4rnel32zeNt4JHO/Z42+RfOEvS6Hg=; b=RKU1Z5uIuUWVL5sg33jV4497pANYtLh9pU8aD7YB9Q34eMM0/vNKWvlQ1L+AJQlBwe YucD+2PJeQf60grINltn6TOPLn25tdtNb50udqFWy+um6tFvx2kh08F06WoTJuaKQa2C 8dE8J1jJRJHCZX+gw9i9/Lvu13wqgyJSOkfxXVN9KnY3h2md5GLyeIvcwob6s+h866xL 960Z96+QgaA/tAiOk11NXfmegAxDqhyKepgQynwn/qn4SaIAoW1KW1cQJJxFw+B2FUL6 SocQ/4Sw4WMOZ/iZV0qDCwBpY9LdeGbo/IPvQ3k979ZdC44QZtLfOG4E2NeXLcK+MU13 sJPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=V4tTBDok; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dr6-20020a170907720600b008db13af5642si10299044ejc.84.2023.02.27.05.09.45; Mon, 27 Feb 2023 05:10:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=V4tTBDok; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229911AbjB0NF7 (ORCPT + 99 others); Mon, 27 Feb 2023 08:05:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229914AbjB0NFy (ORCPT ); Mon, 27 Feb 2023 08:05:54 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DA6517177 for ; Mon, 27 Feb 2023 05:05:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677503107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IrBksrjGGrO7Pe4rnel32zeNt4JHO/Z42+RfOEvS6Hg=; b=V4tTBDokm3n71AbjjMZqguyVdV4gjRl2niE/DIZD87q65GQx0LhjnoKzhCWAQ5/ncRz1NE /fa+vAjmQF8Z43rkcyZ4w37yjb9ohApZ7TlH+q3eSfH4y8Od2V8Bqv6ST3DfWNaYr0s+Jt xEPMibj4ZdWp3427k0+GQ/9xV9SpW/o= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-655-ksird7C0MBWvJ_egAW0PtA-1; Mon, 27 Feb 2023 08:05:04 -0500 X-MC-Unique: ksird7C0MBWvJ_egAW0PtA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 113273C14841; Mon, 27 Feb 2023 13:05:03 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 752E618EC7; Mon, 27 Feb 2023 13:05:01 +0000 (UTC) From: David Howells To: Steve French Cc: David Howells , Shyam Prasad N , Rohith Surabattula , Tom Talpey , Stefan Metzmacher , Jeff Layton , linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, kernel test robot , Dan Carpenter , Steve French , linux-cachefs@redhat.com Subject: [PATCH 2/2] iov: Fix netfs_extract_user_to_sg() Date: Mon, 27 Feb 2023 13:04:54 +0000 Message-Id: <20230227130454.2673622-3-dhowells@redhat.com> In-Reply-To: <20230227130454.2673622-1-dhowells@redhat.com> References: <20230227130454.2673622-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758989813844028927?= X-GMAIL-MSGID: =?utf-8?q?1758989813844028927?= Fix the loop check in netfs_extract_user_to_sg() for extraction from user-backed iterators to do the body if npages > 0, not if npages < 0 (which it can never be). This isn't currently used by cifs, which only ever extracts data from BVEC, KVEC and XARRAY iterators at this level, user-backed iterators having being decanted into BVEC iterators at a higher level to accommodate the work being done in a kernel thread. Found by smatch: fs/netfs/iterator.c:139 netfs_extract_user_to_sg() warn: unsigned 'npages' is never less than zero. Fixes: 018584697533 ("netfs: Add a function to extract an iterator into a scatterlist") Reported-by: kernel test robot Reported-by: Dan Carpenter Signed-off-by: David Howells cc: Steve French cc: Jeff Layton cc: linux-cifs@vger.kernel.org cc: linux-cachefs@redhat.com Link: https://lore.kernel.org/oe-kbuild-all/202302261115.P3TQi1ZO-lkp@intel.com/ --- fs/netfs/iterator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/netfs/iterator.c b/fs/netfs/iterator.c index f00d43b8ac0a..e9a45dea748a 100644 --- a/fs/netfs/iterator.c +++ b/fs/netfs/iterator.c @@ -134,7 +134,7 @@ static ssize_t netfs_extract_user_to_sg(struct iov_iter *iter, npages = DIV_ROUND_UP(off + len, PAGE_SIZE); sg_max -= npages; - for (; npages < 0; npages--) { + for (; npages > 0; npages--) { struct page *page = *pages; size_t seg = min_t(size_t, PAGE_SIZE - off, len);