From patchwork Thu Dec 7 21:21:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13484073 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 35405C4167B for ; Thu, 7 Dec 2023 21:25:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C14B66B00D8; Thu, 7 Dec 2023 16:25:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BC21C6B00D9; Thu, 7 Dec 2023 16:25:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A3D726B00DA; Thu, 7 Dec 2023 16:25:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 901D76B00D8 for ; Thu, 7 Dec 2023 16:25:24 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 663C7801FE for ; Thu, 7 Dec 2023 21:25:24 +0000 (UTC) X-FDA: 81541303368.07.C101E84 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf11.hostedemail.com (Postfix) with ESMTP id ABB5A40004 for ; Thu, 7 Dec 2023 21:25:22 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=XvxvZfdF; spf=pass (imf11.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.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=1701984322; 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=1l+FS8mq19pOpm0UjSmptv5Ycz0H+4vPP+t7D9sPQnY=; b=k6UfBSuZzwW1pM8WZrojEbSXl4hbyVtrFehaJyAJ4JKV4ExkbDXxTLZdDMZSDwk0UhoVC9 Jm3KPQDLV2RlKu08PJ3HUddbamAgxm/CJ6K6oVpFFLrvLcxuzFtBa+hnqdiLkMK+VSxLkR gum9+biUWG0KUQN8YbM+IYP7zodp3Pk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701984322; a=rsa-sha256; cv=none; b=SnzPFBky8LZ6Dpqo4v2tCTENEsnuAJMNizcEj9fs1wDeO3ejdMOhMQtIXzmekHXtkMfn2Q s3+7BQhKsihgUXeTrGEWj5NAFureK3AePslUUZqklC0iCMip7lXmivv0ZhR+5GdP6PU7Sp i2OfRBCGtXZoW60cZq13sbV7hg8A4Ts= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=XvxvZfdF; spf=pass (imf11.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.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=1701984322; 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=1l+FS8mq19pOpm0UjSmptv5Ycz0H+4vPP+t7D9sPQnY=; b=XvxvZfdFRaHg5bfcYdivNa+F8/B46jGvuHNYcdkLJmFZnHp1stXSGFAFaQFenFsmY0++QY pgcXtpoh1LWCWT+PaaQQQx0IJO+kXvyHrM70Q9cCtnXzgLntGIDcX0jqGSQ/h7smAzDTGM HdfMgvCGyr27x9fo/rTksJE/1VX+uws= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-515-bVki4nEnMbukiB6G7H8s5A-1; Thu, 07 Dec 2023 16:25:15 -0500 X-MC-Unique: bVki4nEnMbukiB6G7H8s5A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7BFFD86C044; Thu, 7 Dec 2023 21:25:14 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.161]) by smtp.corp.redhat.com (Postfix) with ESMTP id E1AD03C2E; Thu, 7 Dec 2023 21:25:10 +0000 (UTC) From: David Howells To: Jeff Layton , Steve French Cc: David Howells , Matthew Wilcox , Marc Dionne , Paulo Alcantara , Shyam Prasad N , Tom Talpey , Dominique Martinet , Eric Van Hensbergen , Ilya Dryomov , Christian Brauner , linux-cachefs@redhat.com, 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-fsdevel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Steve French , Shyam Prasad N , Rohith Surabattula Subject: [PATCH v3 52/59] cifs: Make wait_mtu_credits take size_t args Date: Thu, 7 Dec 2023 21:21:59 +0000 Message-ID: <20231207212206.1379128-53-dhowells@redhat.com> In-Reply-To: <20231207212206.1379128-1-dhowells@redhat.com> References: <20231207212206.1379128-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Rspamd-Queue-Id: ABB5A40004 X-Rspam-User: X-Stat-Signature: hg3r87gwiiz8zdixjpo8jacw8pzbmzgh X-Rspamd-Server: rspam03 X-HE-Tag: 1701984322-839042 X-HE-Meta: U2FsdGVkX1+eRmqh7NGm6+tR94Q0dOOycJLYy62LggrFm8cKA4Hn+9CR/zfFwB9AQksbxVlF5kQQhastz5BPRK5pn5c8BeMYvnyepSQjcdlDfMbeK4z/CVbXYSqsF82bL7vwTkxZrPhEzzo9T7EZjSMZDYlifaMZlixW4PgOkWIdRBvLrbSBYhSlbU/TbyS8gmYiZPKHvKxtXzlphhzb3/OP1dXRtKp1NNPP0CCXy4sz2rFlioyLXzHO9qSx2gYD7elqrFW2A0ew7sTNKLz1dovKbEtq5h2gaFe7Ee/GCKG/xeb6cm/Q9TXn/PDXCg7kf/Ptpep8qBYYv8W9604/TRCzyMPLU93KgdBBU9Pu3I2or4de86ko8lm/fkwOTcMmCjuy0J566vincSZ+Mq3Jz+11q2FD81eLbpb88d14BZfq4jdzmELFpOInMmTfEgVyiO3PjR1BMwbJ8ctepJ/iqfcFFZj3HkzTOX6SEX13H1fwQLEiml9ZHP3+4qQ9jtrxeCNfVoT5VZyp9eDBP/bSTU/FUPmVii3sUCzFGpQNLTFkloDfBH8WS0L1+nCZCHR+PuEPk0agMwJf09u/Zzkf5qqejVtKf43g/vCfQu+bj316+Edm35Yce3spPglG/lXT9w60jjkTnHDczzJZ87HioOLo1kpLEJGr8tI9dpjCrR3DlIlRJVSkfzPqIrs5gUkgJw4mUW9rK6uFNdLkavuGSkM8Eib1K/0NIselhi7HxmAS9sLu+Tq08sqQe/pcpI4ljgUGjjvW9/mfOtxCbWSUAP06gJhZVURlMcKILI58jxpPIOLcRySM3dXbQ/WanaXuWbBq3XcoykWNvSpJlxPWoLiwdm+7eNgA+ScxBvbA3OW632YsB8PhE72VfBpIoZ8t1ZcOuRaOFZpWVjQOvX/DSc6VM5NwQRe7ZtoE+nqhOW0g214OLlyjO3Ej0zZBaj1i+uxsy5DTlDrgODbedfH f4lYQ2rN vjWa6u/WbvTJrzI8yNG1IbzJghN2EJx0kNqbVxRKA2OKNQSBeCpiGITQvEfUvEByqEgNDZb/Qnoe1xG0Rw5C+sLbGmMreVU5sXo1vB2NOPDGnnxW2r/pwh52xzYJT6bOULwNqwgWeSTKW+f4HyDzYf8/9Qrn0sxUfHocfhHAxKPnooQ6eHYFp7tBsrchIe+x0CcHVFQCvGmJoFFF2mltQ6fN4fHYWq2XmPgbqUC5suX19B+uKAdqcwiFa8VGqi5Yt+Gg8VNbIUjIcx3ZaqTkUNkCLWLgQHcTTy6QZAYZ2i8kfh7r/cSb7j/6SXDs1ygrjr+6DXLeB5oMxs5vHiZ1EhH7ezSACQeOK48Dqom3Z88mQzYaqXBXAYX9Z0JadeRPC1tdPKtKOUP44JkWquR8GzZ6z/VmezgPR9PBmeBHJ0WwWI8w9Yt5wy3dNCm4opkFfjCyt6b3hACMK5o964uvEE6xcetnFSeWamhhjgMOCF/BrIozYU5IzKYgeww== 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: Make the wait_mtu_credits functions use size_t for the size and num arguments rather than unsigned int as netfslib uses size_t/ssize_t for arguments and return values to allow for extra capacity. Signed-off-by: David Howells cc: Steve French cc: Shyam Prasad N cc: Rohith Surabattula cc: Jeff Layton cc: linux-cifs@vger.kernel.org cc: linux-cachefs@redhat.com cc: linux-fsdevel@vger.kernel.org cc: linux-mm@kvack.org --- fs/smb/client/cifsglob.h | 4 ++-- fs/smb/client/cifsproto.h | 2 +- fs/smb/client/file.c | 18 ++++++++++-------- fs/smb/client/smb2ops.c | 4 ++-- fs/smb/client/transport.c | 4 ++-- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h index 80a9f15828cc..a0d348b166c2 100644 --- a/fs/smb/client/cifsglob.h +++ b/fs/smb/client/cifsglob.h @@ -512,8 +512,8 @@ struct smb_version_operations { /* writepages retry size */ unsigned int (*wp_retry_size)(struct inode *); /* get mtu credits */ - int (*wait_mtu_credits)(struct TCP_Server_Info *, unsigned int, - unsigned int *, struct cifs_credits *); + int (*wait_mtu_credits)(struct TCP_Server_Info *, size_t, + size_t *, struct cifs_credits *); /* adjust previously taken mtu credits to request size */ int (*adjust_credits)(struct TCP_Server_Info *server, struct cifs_credits *credits, diff --git a/fs/smb/client/cifsproto.h b/fs/smb/client/cifsproto.h index 47c352426fcf..85e115da8899 100644 --- a/fs/smb/client/cifsproto.h +++ b/fs/smb/client/cifsproto.h @@ -121,7 +121,7 @@ extern struct mid_q_entry *cifs_setup_async_request(struct TCP_Server_Info *, extern int cifs_check_receive(struct mid_q_entry *mid, struct TCP_Server_Info *server, bool log_error); extern int cifs_wait_mtu_credits(struct TCP_Server_Info *server, - unsigned int size, unsigned int *num, + size_t size, size_t *num, struct cifs_credits *credits); extern int SendReceive2(const unsigned int /* xid */ , struct cifs_ses *, struct kvec *, int /* nvec to send */, diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c index 16f6c15e0d06..b47abeefe628 100644 --- a/fs/smb/client/file.c +++ b/fs/smb/client/file.c @@ -2733,9 +2733,9 @@ static ssize_t cifs_write_back_from_locked_folio(struct address_space *mapping, struct cifs_credits credits_on_stack; struct cifs_credits *credits = &credits_on_stack; struct cifsFileInfo *cfile = NULL; - unsigned int xid, wsize, len; + unsigned int xid, len; loff_t i_size = i_size_read(inode); - size_t max_len; + size_t max_len, wsize; long count = wbc->nr_to_write; int rc; @@ -3247,7 +3247,7 @@ static int cifs_resend_wdata(struct cifs_io_subrequest *wdata, struct list_head *wdata_list, struct cifs_aio_ctx *ctx) { - unsigned int wsize; + size_t wsize; struct cifs_credits credits; int rc; struct TCP_Server_Info *server = wdata->server; @@ -3381,7 +3381,8 @@ cifs_write_from_iter(loff_t fpos, size_t len, struct iov_iter *from, do { struct cifs_credits credits_on_stack; struct cifs_credits *credits = &credits_on_stack; - unsigned int wsize, nsegs = 0; + unsigned int nsegs = 0; + size_t wsize; if (signal_pending(current)) { rc = -EINTR; @@ -3818,7 +3819,7 @@ static int cifs_resend_rdata(struct cifs_io_subrequest *rdata, struct list_head *rdata_list, struct cifs_aio_ctx *ctx) { - unsigned int rsize; + size_t rsize; struct cifs_credits credits; int rc; struct TCP_Server_Info *server; @@ -3892,10 +3893,10 @@ cifs_send_async_read(loff_t fpos, size_t len, struct cifsFileInfo *open_file, struct cifs_aio_ctx *ctx) { struct cifs_io_subrequest *rdata; - unsigned int rsize, nsegs, max_segs = INT_MAX; + unsigned int nsegs, max_segs = INT_MAX; struct cifs_credits credits_on_stack; struct cifs_credits *credits = &credits_on_stack; - size_t cur_len, max_len; + size_t cur_len, max_len, rsize; int rc; pid_t pid; struct TCP_Server_Info *server; @@ -4491,12 +4492,13 @@ static void cifs_readahead(struct readahead_control *ractl) * Chop the readahead request up into rsize-sized read requests. */ while ((nr_pages = ra_pages)) { - unsigned int i, rsize; + unsigned int i; struct cifs_io_subrequest *rdata; struct cifs_credits credits_on_stack; struct cifs_credits *credits = &credits_on_stack; struct folio *folio; pgoff_t fsize; + size_t rsize; /* * Find out if we have anything cached in the range of diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c index b27df9e239dd..5850d6afd788 100644 --- a/fs/smb/client/smb2ops.c +++ b/fs/smb/client/smb2ops.c @@ -216,8 +216,8 @@ smb2_get_credits(struct mid_q_entry *mid) } static int -smb2_wait_mtu_credits(struct TCP_Server_Info *server, unsigned int size, - unsigned int *num, struct cifs_credits *credits) +smb2_wait_mtu_credits(struct TCP_Server_Info *server, size_t size, + size_t *num, struct cifs_credits *credits) { int rc = 0; unsigned int scredits, in_flight; diff --git a/fs/smb/client/transport.c b/fs/smb/client/transport.c index 3048516573e8..5cf653463c55 100644 --- a/fs/smb/client/transport.c +++ b/fs/smb/client/transport.c @@ -684,8 +684,8 @@ wait_for_compound_request(struct TCP_Server_Info *server, int num, } int -cifs_wait_mtu_credits(struct TCP_Server_Info *server, unsigned int size, - unsigned int *num, struct cifs_credits *credits) +cifs_wait_mtu_credits(struct TCP_Server_Info *server, size_t size, + size_t *num, struct cifs_credits *credits) { *num = size; credits->value = 0;