From patchwork Tue Apr 30 14:00:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13649077 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 24B9DC4345F for ; Tue, 30 Apr 2024 14:01:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A54D46B00A1; Tue, 30 Apr 2024 10:01:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A06256B00A2; Tue, 30 Apr 2024 10:01:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 856E66B00A3; Tue, 30 Apr 2024 10:01:35 -0400 (EDT) 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 5EAC46B00A1 for ; Tue, 30 Apr 2024 10:01:35 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 87E301A08A0 for ; Tue, 30 Apr 2024 14:01:34 +0000 (UTC) X-FDA: 82066360908.22.023F244 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf02.hostedemail.com (Postfix) with ESMTP id 4E04480006 for ; Tue, 30 Apr 2024 14:01:31 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GPJCaNH5; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf02.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714485691; 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=uYKvItVfQ5vMLpVWGuG4Wu9Mz+mrcrwjH5IKasVHZvQ=; b=WGwnTG3TdgO1Goip5ZgnzAd9b473xYhzc5AfGyv5qdPH81SxUd4whExdWKFfb2XytnBdzb YmH07oc+vZcsfHE1QYF912/Qz7W176HxDD+1doKxRbK5XgjBH2ZsSaGxYwns4eFlK5F9Z/ 9GRxWavDFtlfzzRmcS8p3FFQxVdCUA0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714485691; a=rsa-sha256; cv=none; b=tLSqab1sRk7Wtlbs4qK/N07RrFPC0MJQhcmeNOE9MYWExIPEqxdrH7t+DvKLyVQ2SLXJ2d l/NpxkakwJiPa11oYjOhScRFJAYMf1MfeZAEATxUgMIBsicB2IDSlTxydHS92c3hae+L4D 7Ki2tVU3Cf0CH2DaOXTpn+HpG4P2Nr0= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GPJCaNH5; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf02.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714485690; 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=uYKvItVfQ5vMLpVWGuG4Wu9Mz+mrcrwjH5IKasVHZvQ=; b=GPJCaNH5OuGMz5FMUNJs9PPvCcxSj/4dNeIXKtwlMFE5zQ0g65ZSs0NG61gJ7YIrHnoQv+ BfuVg7N92dYsq4uq15Gvg7LXUviufOmtS3dTDjKgfVD19DevyeI67GtzRBzl+CfltIwJbj OmHFiKV5XZ6zBXcs7vjQ/13ACsSjU0c= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-618--sMwcTQuMLKiRlu_VVUNdw-1; Tue, 30 Apr 2024 10:01:25 -0400 X-MC-Unique: -sMwcTQuMLKiRlu_VVUNdw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 04A6C1C4C397; Tue, 30 Apr 2024 14:01:24 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2175A202450F; Tue, 30 Apr 2024 14:01:20 +0000 (UTC) From: David Howells To: Christian Brauner , Jeff Layton , Gao Xiang , Dominique Martinet Cc: David Howells , Matthew Wilcox , Steve French , Marc Dionne , Paulo Alcantara , Shyam Prasad N , Tom Talpey , Eric Van Hensbergen , Ilya Dryomov , netfs@lists.linux.dev, 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-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 05/22] netfs: Make netfs_io_request::subreq_counter an atomic_t Date: Tue, 30 Apr 2024 15:00:36 +0100 Message-ID: <20240430140056.261997-6-dhowells@redhat.com> In-Reply-To: <20240430140056.261997-1-dhowells@redhat.com> References: <20240430140056.261997-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 4E04480006 X-Stat-Signature: g9bppdjdwep459whbhawa8yz3y1f78je X-Rspam-User: X-HE-Tag: 1714485691-907129 X-HE-Meta: U2FsdGVkX1+IEjRPRmaQvooYt1hxRw49c0oqqtcTpOsLOy3t6EDT1c2O9anyMKakDBzAlAB5xfxtJ3GyebKuiPqlSqh7hhZdFJiwtajF14ggkG6StRfVYTzARaXfoH4a8ehohHkCtZoeZTCxLLz2QSB4wrRFYBK4ilsBnVdaVgwhvRkcDeWeOHxRzFfMfeKqq/OoPnBCuvcGzC4bdeWXOkqNtTYopo1x+4MaGxc18ingj7Krls3OSwpesyR4ufRN71LUyVzM1Hc5RdmgXhDEnQKJaV3LAhDT8vfygAmxeCeaRRZtHkVUEGAs9v1zGkMDEixg49BX2n9m9Kf+2r8eYBncWv5mxOFg7F02pXTKe4ajx7hfshvEER4yJliaCJsp+Qpr+n6gaNretFNRwO6Q98VStF7FZJnxGqYFGMsEQmu9ZFJFGzJFvZ01V2Ze1xxIGTUdorFG2/X73IY5ok9wWIbdIym42Jvdu9JQ8a2BJm6cBDjkVvz+2KnucS6mg9XtxUOCqmAXnFH3wc+hKu1euEP+KeEfgxPbgy+8Ehqs0wJV/2mCKvRlV946If7W2i5W4iotO8WvfaPDb0RkDQDEeHUo4E82FaY3iaKy2HtwoAaZISZWrMBRUIyNTj/bgGg7cBMoRxWoSaTPVNR/1WVg7/xU3lLGVRdgPrHo1ziu4GxWd0rFu19UWUdbqm2TYf3vWkqh8agx6lso2jAd7O4UqIFap/EVEzQMdksodE4pBWaVik6vLOcH2FjVlE3dpGJEb6cFLB3rlWE3lDXNmSO9baA9Q/XrvZ1E05Od1hNOe/szuJbE0Gp8jSjxbXei3tkkVdIJECgG43NRcdOMPu6TeeV2pBZkwXVD2LB7DiESV5IwFdjq98zyBMIFuE6KY1tDxvE7GeAWb3gu4Ibob71ZpPP7zoUTfbzBl6nX4YITqAqnLcQ+U+BvcooKE0zm5yh/ 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 netfs_io_request::subreq_counter, used to generate values for netfs_io_subrequest::debug_index, into an atomic_t so that it can be called from the retry thread at the same time as the app thread issuing writes. Signed-off-by: David Howells Reviewed-by: Jeff Layton cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- fs/netfs/output.c | 2 +- include/linux/netfs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/netfs/output.c b/fs/netfs/output.c index 625eb68f3e5a..fbdbb4f78234 100644 --- a/fs/netfs/output.c +++ b/fs/netfs/output.c @@ -37,7 +37,7 @@ struct netfs_io_subrequest *netfs_create_write_request(struct netfs_io_request * subreq->source = dest; subreq->start = start; subreq->len = len; - subreq->debug_index = wreq->subreq_counter++; + subreq->debug_index = atomic_inc_return(&wreq->subreq_counter); switch (subreq->source) { case NETFS_UPLOAD_TO_SERVER: diff --git a/include/linux/netfs.h b/include/linux/netfs.h index f36a6d8163d1..ddafc6ebff42 100644 --- a/include/linux/netfs.h +++ b/include/linux/netfs.h @@ -202,7 +202,7 @@ struct netfs_io_request { unsigned int debug_id; unsigned int rsize; /* Maximum read size (0 for none) */ unsigned int wsize; /* Maximum write size (0 for none) */ - unsigned int subreq_counter; /* Next subreq->debug_index */ + atomic_t subreq_counter; /* Next subreq->debug_index */ atomic_t nr_outstanding; /* Number of ops in progress */ atomic_t nr_copy_ops; /* Number of copy-to-cache ops in progress */ size_t submitted; /* Amount submitted for I/O so far */