From patchwork Thu Feb 23 08:15:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 60831 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp201542wrd; Thu, 23 Feb 2023 00:32:31 -0800 (PST) X-Google-Smtp-Source: AK7set9JrMxcJb1JTycj/aOhGgaDYbWY6Co+Fi7TagrVX9KU1txiBvy1tWNuwRbg/Er8PliEKOHu X-Received: by 2002:a05:6a20:7da9:b0:c7:7a94:f11 with SMTP id v41-20020a056a207da900b000c77a940f11mr13717284pzj.0.1677141150861; Thu, 23 Feb 2023 00:32:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677141150; cv=none; d=google.com; s=arc-20160816; b=Ckk7KJvzpqTKKu5V2OsuhDZWA8Upf0yVxeDcvLpeNTM4ICrHHVV6PZCQGrqOIGdB8u /gqlKBjpbRFEJRdLEBiSqfrnAvr6DzqGc0PDh+9BFieiTKfjy8GuraBpncHQCheQah0I VYRqR9s81RXeg6teoNY4vI5yhklAk59VNtH0ODaZp7YkgtACod17LwNPgCdcypt9dbsE hG6gpEZ9h4nOTZSk/8MhbGXN5RIvMxn2jYm165XWSdthTb3Gl2ix1TUvFeqVdueEpTYA JuuJj/eHZp6vrXUTC2yrFWXwC6qtUYRXeyqKfHgXTWqY8imFzkEEO1Ncc+JprQT4TMEn SHQw== 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=X3ikqoEsv3r0MxS807H4Mv08SZa5kDqPLyNECnlbwYE=; b=gwIlBq2H1X++LqDD7algLvRU9gZ3JrQbA0tS+jaIZDAN/IYgSpLY1CX3Oe5RY4iSp4 nBkNFR4j6r1SRzQazOuwiKy5maN8WVOC7C8F0EyusEuGPx3KhEm5aU8EtiKOjohsEiie XXNvcQZTbeL/bp/VgFrzUFmcYesSCPm6JtgAAJkZnPGsrrZI2xf7KvuoVM7n7YnGDUyn +WqARbrEo5THPM9ptaB0/AFcvWsaL/rZ6FICEwa8UrS7fF2D/wdwVhiTtxHY2PKNgPCl ZYXMC0lYHcB5rnETwpGoOzH6ikHEDvpn6BoNshAhTDfG3yKUmoBIZO/BAcBicneCVDSp 7DUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="F6/1Lhd6"; 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 21-20020a630015000000b004fbd06e0996si10531412pga.610.2023.02.23.00.32.16; Thu, 23 Feb 2023 00:32:30 -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="F6/1Lhd6"; 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 S233462AbjBWIQz (ORCPT + 99 others); Thu, 23 Feb 2023 03:16:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233446AbjBWIQx (ORCPT ); Thu, 23 Feb 2023 03:16:53 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F02814AFC7 for ; Thu, 23 Feb 2023 00:15:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677140147; 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=X3ikqoEsv3r0MxS807H4Mv08SZa5kDqPLyNECnlbwYE=; b=F6/1Lhd6dnKyNrnQxFOGcLLDlwKAvR62mvnr+NOk5XuXUyOkibMc2KpAF4yjr2IzEoodxm oBHOu3VjmRzfGuDwdfgymV02mfRnJhc2Wr0O+uBp2pcm3fc+DKk6Rkc+rZQBpBk8YrnuJi sGrDRXgeePHg6Xlg0ZOrtm8TlqthPS8= 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-206-JGOh3xiMO9emvn2N0KPR9g-1; Thu, 23 Feb 2023 03:15:45 -0500 X-MC-Unique: JGOh3xiMO9emvn2N0KPR9g-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1009F802C18; Thu, 23 Feb 2023 08:15:45 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id C251F1121314; Thu, 23 Feb 2023 08:15:43 +0000 (UTC) From: David Howells To: Steve French Cc: David Howells , Shyam Prasad N , Rohith Surabattula , Tom Talpey , Stefan Metzmacher , Matthew Wilcox , Jeff Layton , linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, Steve French Subject: [PATCH 1/2] cifs: Add some missing xas_retry() calls Date: Thu, 23 Feb 2023 08:15:38 +0000 Message-Id: <20230223081539.970487-2-dhowells@redhat.com> In-Reply-To: <20230223081539.970487-1-dhowells@redhat.com> References: <20230223081539.970487-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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?1758609959381046683?= X-GMAIL-MSGID: =?utf-8?q?1758609959381046683?= The xas_for_each loops added into fs/cifs/file.c need to go round again if indicated by xas_retry(). Fixes: 5f0955c98375 ("cifs: Add some helper functions") 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 0e602173ac76..5c60f4044b65 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -52,6 +52,8 @@ static void cifs_undirty_folios(struct inode *inode, loff_t start, unsigned int end = (start + len - 1) / PAGE_SIZE; xas_for_each_marked(&xas, folio, end, PAGECACHE_TAG_DIRTY) { + if (xas_retry(&xas, folio)) + continue; xas_pause(&xas); rcu_read_unlock(); folio_lock(folio); @@ -81,6 +83,8 @@ void cifs_pages_written_back(struct inode *inode, loff_t start, unsigned int len end = (start + len - 1) / PAGE_SIZE; xas_for_each(&xas, folio, end) { + if (xas_retry(&xas, folio)) + continue; if (!folio_test_writeback(folio)) { WARN_ONCE(1, "bad %x @%llx page %lx %lx\n", len, start, folio_index(folio), end); @@ -112,6 +116,8 @@ void cifs_pages_write_failed(struct inode *inode, loff_t start, unsigned int len end = (start + len - 1) / PAGE_SIZE; xas_for_each(&xas, folio, end) { + if (xas_retry(&xas, folio)) + continue; if (!folio_test_writeback(folio)) { WARN_ONCE(1, "bad %x @%llx page %lx %lx\n", len, start, folio_index(folio), end); From patchwork Thu Feb 23 08:15:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 60832 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp201687wrd; Thu, 23 Feb 2023 00:32:58 -0800 (PST) X-Google-Smtp-Source: AK7set+LSHm8xAnJeM37fIoi68BurK6Yos6qyNwRdzOk9SiGbbyduJjmyoH/AgJT5QHvXkWUr6Mw X-Received: by 2002:a05:6a21:32a5:b0:bc:ba3e:48e7 with SMTP id yt37-20020a056a2132a500b000bcba3e48e7mr13894783pzb.2.1677141177861; Thu, 23 Feb 2023 00:32:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677141177; cv=none; d=google.com; s=arc-20160816; b=kGJrgaTWEcbuXiw9DN5m9NS2QlXXStVQa+VQHeHweaFtWZh8B4lf5rexdhfek6gyhW +NQ6GMdQun4UAeQW9/8BZwpeSyqqFSMVabYE5QDyG5nQ8haFw+V0YvRhqlvI48ilbuYC 3FyRqug5Uhc+eQltWyVg5w4TDmmRpuH5FQiVDFKSKezw6yunE7BGumZwSmYiojU0gzU5 YnZjOTb5OmP3LV39i4O6mFyCLMUQGuBa6khqv639nzA2uMlqM3O7ceGbcz6AG0h2qQ1T 0x2BkwEB4ccTbCAeGG2CrgLRHMu3DeVH5/RACWQA62PMcXBRbyjeI/s/XvfeEausVJ5D J/1Q== 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=AKMYONgMA/W4Xp2CmPvSHz2sn9JYXMHWS8dU6/4wH+A=; b=eQ4oXLi3Nj8cgKMVY7S0fn7zbkAWiqkwE5K9SyEl4XDS/U4fTP5bnvZTCIwT5sG38q uYzw9db3fNbXEfzyH/aDInkeEijKdyxLRK1LfvttnNOAGmpmzeZ4nBrPhJaIiiIZ90u3 5Gtdz2D9BXr+CL0xGgBiIRm7ik9mY9ZABeBR8jnmBUnAzc5Dk/6FxGek+esRLUHelaBL A+5a4hHcD1RXNIVVMZXDS4Pd1Db02SfWJz7UFqsNemw3ekpr8pJJ0QnSJ9KNz54lnay8 zsQqkYi/9cW5QZxhQ+gfCda0mA3QKuwccoflix0CFA30aGSKD5CcEDKe3jahNz9F5fr5 AVmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="YX/kwS4G"; 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 g62-20020a636b41000000b00502f92c3331si890460pgc.560.2023.02.23.00.32.42; Thu, 23 Feb 2023 00:32:57 -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="YX/kwS4G"; 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 S233382AbjBWIRP (ORCPT + 99 others); Thu, 23 Feb 2023 03:17:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233487AbjBWIRG (ORCPT ); Thu, 23 Feb 2023 03:17:06 -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 DA2B14D625 for ; Thu, 23 Feb 2023 00:15:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677140151; 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=AKMYONgMA/W4Xp2CmPvSHz2sn9JYXMHWS8dU6/4wH+A=; b=YX/kwS4GyH59jvv7uM2V7CBv5XDzQ/vqrp2rITe1/yqeKTO0B+H9kNXbyUrU3Z8X8dxiuD aDQyluCvzE7IWRAxn6NwmdkiLh04zvHnWYAqzjMtAz3hli2UzedWDbLLFg3o84L0x5WnE3 +AWpre121K2YUYLgvzsMj1Oxa0WXfYw= 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-157-BOzk5WYFOVe9tUA_9GNWYA-1; Thu, 23 Feb 2023 03:15:47 -0500 X-MC-Unique: BOzk5WYFOVe9tUA_9GNWYA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 04A3F85A588; Thu, 23 Feb 2023 08:15:47 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9DD0840C1423; Thu, 23 Feb 2023 08:15:45 +0000 (UTC) From: David Howells To: Steve French Cc: David Howells , Shyam Prasad N , Rohith Surabattula , Tom Talpey , Stefan Metzmacher , Matthew Wilcox , Jeff Layton , linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, Steve French , linux-rdma@vger.kernel.org Subject: [PATCH 2/2] cifs: Fix an uninitialised variable Date: Thu, 23 Feb 2023 08:15:39 +0000 Message-Id: <20230223081539.970487-3-dhowells@redhat.com> In-Reply-To: <20230223081539.970487-1-dhowells@redhat.com> References: <20230223081539.970487-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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=unavailable 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?1758609987617969884?= X-GMAIL-MSGID: =?utf-8?q?1758609987617969884?= Fix an uninitialised variable introduced in cifs. Fixes: 3d78fe73fa12 ("cifs: Build the RDMA SGE list directly from an iterator") 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 cc: linux-rdma@vger.kernel.org --- fs/cifs/smbdirect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/cifs/smbdirect.c b/fs/cifs/smbdirect.c index 55b6e319a61d..0362ebd4fa0f 100644 --- a/fs/cifs/smbdirect.c +++ b/fs/cifs/smbdirect.c @@ -837,7 +837,7 @@ static int smbd_post_send_iter(struct smbd_connection *info, int data_length; struct smbd_request *request; struct smbd_data_transfer *packet; - int new_credits; + int new_credits = 0; wait_credit: /* Wait for send credits. A SMBD packet needs one credit */