From patchwork Fri Aug 23 16:12:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13775481 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 476EFC5321D for ; Fri, 23 Aug 2024 16:13:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D1B896B034F; Fri, 23 Aug 2024 12:13:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CCC946B0350; Fri, 23 Aug 2024 12:13:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B6BCB6B0351; Fri, 23 Aug 2024 12:13:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 98A9A6B034F for ; Fri, 23 Aug 2024 12:13:00 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3CB05161DD3 for ; Fri, 23 Aug 2024 16:13:00 +0000 (UTC) X-FDA: 82484004120.09.D91FBD9 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf12.hostedemail.com (Postfix) with ESMTP id 65B8A4000A for ; Fri, 23 Aug 2024 16:12:58 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YesoxUeY; spf=pass (imf12.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724429497; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=FBChvUZyQ988u9TYFlpOvF0mis7ud805n023OENZupc=; b=bo6dRevHsK+AY1tJRCofE6wejuSKS0Q5HTT6zDWLwvspGLM3LfcZ6nUVcbNu5rRXoEJWNb dSG+k30XkuI49vofBBZi4US4DZnjvOG6GToFuLrzHIUer1L3Gb7pFls9vraKYrCmJGGQUe wIAQaAAxu3JsHQ8KXv8JC2ZzrocbfWY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724429497; a=rsa-sha256; cv=none; b=MuXHZPACanzBm3dGncdfTpsWAgzYgJN/cqyWM6B+OzzZaYxWDPRGIodu4e4B5k4PyXOc5x 5UQQrT0N/BZ2Z+A5zpmr3cjS/rjCbFT7Ob4RraeidPUMO83ZOjYwtKXCEJ0AdfAx4plkao ICtD1LSHQGHkP4H+Zkc3WyupTcFWPuU= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YesoxUeY; spf=pass (imf12.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724429577; 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=FBChvUZyQ988u9TYFlpOvF0mis7ud805n023OENZupc=; b=YesoxUeYcrPLAIqw7/dK0mAtqn8BaIzhq9MadzAGfBJvnJKAP5vcPOkb/d4K4k849ACozh gHZnT+kgtNpG2FBrq4bL5Z6POzgHWLcegeFD3v2fFWjADkCA7LLXX4S4QFYVswluShYNQU Oz2j8/Px4/SffFc7CcLrHmL3lSezWTk= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-640-HzxncWQrPICf3GrzTUMYmQ-1; Fri, 23 Aug 2024 12:12:49 -0400 X-MC-Unique: HzxncWQrPICf3GrzTUMYmQ-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3CFB61954B02; Fri, 23 Aug 2024 16:12:47 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.42.28.30]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 368AE19560A3; Fri, 23 Aug 2024 16:12:43 +0000 (UTC) From: David Howells To: Christian Brauner Cc: David Howells , Pankaj Raghav , Jeff Layton , Matthew Wilcox , netfs@lists.linux.dev, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs@lists.linux.dev, linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Steve French , Paulo Alcantara Subject: [PATCH 5/5] cifs: Fix credit handling Date: Fri, 23 Aug 2024 17:12:06 +0100 Message-ID: <20240823161209.434705-6-dhowells@redhat.com> In-Reply-To: <20240823161209.434705-1-dhowells@redhat.com> References: <20240823161209.434705-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Rspamd-Queue-Id: 65B8A4000A X-Stat-Signature: kijkyre8rn6cskboka575red3d3nnh3u X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1724429578-142899 X-HE-Meta: U2FsdGVkX19EdUULeqa4KmTkd3hz7u/oTsvrp5+MJzbEG2eD59xLtsz5v8NSdZ46Zv4o1tQwSDN3jev6DGBwIOrsGHhArHM3XOMmSkl7IMyYuH5nQVHtJKCd+Ofzr8BsN29YTV16C6YhxE6zXqKbad0Ln5OpzwmZXbBLDFS1Uu64dT0ijvzZd16ifpI5j71NqY0SHBp96nTBV//TBN1wrX2kzpoiQ9JaGGvDpS5T/83OVuU+e7HOdw8lvJtJEp0bCnR9r1H8VW0UuY9fyQlucvBzwOKwPVew8T+tLLchrdrOOpPyOt9OxRsdMThVC4ODqKAJ5eg931wjUql6y/l8LmDGVUzRbDufUg2XLbzeQUQY6ZVMOHxV54K7Kny4nTxwIjuXU0HdsvGoHttomCJdb99OIjebucwOes2huJ+BnSjwmoMsYxlgwnnAU4QoCFvIowB8M8N4RsAih23DSBzT6JCHielkQ7TWMhd4Md8YhEgfv5NyC0T15YJTaTFx/a1b/zJOlHAM85Dq09B/txCIIwykZuSfSN4v2I1sPyTMidtP3jyye3BNcw0PuJ2zQDBenLUb5hWZt9pIvM3KUu794PVZT+cyWGacJE4TncyUnoYlyII16bm2M/yYrh2HNCvNKijyGE7BEuJ5YQs4iit1/Pp/0QfepU0hdo5oI2ufZhP8J91b2jo3+M09dvGICli2pjq7Mji+PyDw/pKO+bI80r65nXn2iZDqXSEmzOZWNsEUZZ8pQlXNoQNUJG1J8Uct9fB8y9ojB7lvFzYScx2GPqY3+mPkTesh4Sz+vMCzao7XpVofTTMmTSaZ2bcubRAjAVupxwbajTa6+d4KgAgxfrC+EdzfgRHdduJ7DXglrANxenbpDytvFedMtNP7YMZAnaBRNK57yAyOMKGDOxm0iiGYNybQQazt0HgZ3zmBfuvwprYqkq+TJG5FARHwm448kWMaOmaNvLjyolnRHrN 4+Vbw2GQ g4+5eOv9rmZEZsXKEQ5/CTNCi5DUpxmFWDo8NSXfHIElVIa6BYnM/zW/VtB3uw7+56HZ375MbzX6s2HURiXkz2E07ACh/HNuW9zS5Qa3K+ygr9YBHLNZnw9JjLK70CPLTOn04daDDAz2/ZX4uv+8OfCu8l/GZGC7Rk12anVroIgJW2B3FrISSLNN6pR38b/0damWoWGhRyF4ctfmEjp9uql0DbImH16PHc3cksD21vOcDXVC7Z2S22w5Xn7/OAKnfzs5NdVA+NOY3Jqho7/JQbtZVGoFVwxFZuGze3Jiy1AZQvfiI6iG4UOSoorvzrcniK3c552/gfXlLyui9PGzwy3pLYTick0amZ0wWhGob+f3p9bfQw2UhxBvsKKEoeovC7Izddce5g2m1QGTIixY1rV/ANNfgrNxW5JTHTNek86JS0bqS0zBNSOvJSVwRGbhXsopek/88EPWx2S2iOnPUwVU02P6oC4Z8ioAj 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: Fix some bits of credit handling: (1) Use the ->actual_len value rather than the total subrequest length in smb2_adjust_credits() so that we don't trip the error message that we don't have sufficient credits allocated in a retry. (2) Set wdata->actual_len in writes as smb2_adjust_credits() now expects to see it set. (3) Reset the in_flight_check flag on a retry as we're doing a new read. (4) Add a missing credit resubmission trace. Fixes: 82d55e76bf2f ("cifs: Fix lack of credit renegotiation on read retry") Signed-off-by: David Howells cc: Steve French cc: Paulo Alcantara cc: Jeff Layton cc: linux-cifs@vger.kernel.org cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- fs/smb/client/file.c | 9 +++++++++ fs/smb/client/smb2ops.c | 2 +- fs/smb/client/trace.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c index 493c16e7c4ab..b94802438c62 100644 --- a/fs/smb/client/file.c +++ b/fs/smb/client/file.c @@ -111,6 +111,7 @@ static void cifs_issue_write(struct netfs_io_subrequest *subreq) goto fail; } + wdata->actual_len = wdata->subreq.len; rc = adjust_credits(wdata->server, wdata, cifs_trace_rw_credits_issue_write_adjust); if (rc) goto fail; @@ -227,6 +228,14 @@ static void cifs_req_issue_read(struct netfs_io_subrequest *subreq) &rdata->credits); if (rc) goto out; + + rdata->credits.in_flight_check = 1; + + trace_smb3_rw_credits(rdata->rreq->debug_id, + rdata->subreq.debug_index, + rdata->credits.value, + server->credits, server->in_flight, 0, + cifs_trace_rw_credits_read_resubmit); } if (req->cfile->invalidHandle) { diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c index 20e674990760..5090088ba727 100644 --- a/fs/smb/client/smb2ops.c +++ b/fs/smb/client/smb2ops.c @@ -301,7 +301,7 @@ smb2_adjust_credits(struct TCP_Server_Info *server, unsigned int /*enum smb3_rw_credits_trace*/ trace) { struct cifs_credits *credits = &subreq->credits; - int new_val = DIV_ROUND_UP(subreq->subreq.len, SMB2_MAX_BUFFER_SIZE); + int new_val = DIV_ROUND_UP(subreq->actual_len, SMB2_MAX_BUFFER_SIZE); int scredits, in_flight; if (!credits->value || credits->value == new_val) diff --git a/fs/smb/client/trace.h b/fs/smb/client/trace.h index 0f0c10c7ada7..8e9964001e2a 100644 --- a/fs/smb/client/trace.h +++ b/fs/smb/client/trace.h @@ -30,6 +30,7 @@ EM(cifs_trace_rw_credits_old_session, "old-session") \ EM(cifs_trace_rw_credits_read_response_add, "rd-resp-add") \ EM(cifs_trace_rw_credits_read_response_clear, "rd-resp-clr") \ + EM(cifs_trace_rw_credits_read_resubmit, "rd-resubmit") \ EM(cifs_trace_rw_credits_read_submit, "rd-submit ") \ EM(cifs_trace_rw_credits_write_prepare, "wr-prepare ") \ EM(cifs_trace_rw_credits_write_response_add, "wr-resp-add") \