From patchwork Thu Nov 21 23:43:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Schubert X-Patchwork-Id: 13882485 Received: from outbound-ip168b.ess.barracuda.com (outbound-ip168b.ess.barracuda.com [209.222.82.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8273510F1 for ; Fri, 22 Nov 2024 00:18:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=209.222.82.102 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732234723; cv=fail; b=C+6FvqNOXyzkSc1HtWHmy+mjqQZM2vH7pnMxnJtJg0iJEB+c0VaXNlqbYFtIwujLvbYzbjl4YFfqURls/l4yechaRJ8Jn/BpdtxWiZWN9D7EeHb6FodumhF6jg/fPqLFvY5vm2ItQ6E9uKu5FNtKOUo9zN5YhHlp+yjwtUHWlHg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732234723; c=relaxed/simple; bh=uUXs1hSMjDEi/7Epvfs44qM9emPwLUYdDB03mRcLkH4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XdLHvCkEGGiITA91pjL52MdsIM/CZEAxA2QNkHYVowMpWdkfDxYs2s9uDoJ5iRLyCS7DCZNy12DMUfCqvFhN+fypBzejKBDaORBdBi++icC9YOWTJBpjuRrHiz2tsWw4/peLmWchjL8dluXzcXt7yieZKC8cQFtCr4ecawIouUg= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=ddn.com; spf=pass smtp.mailfrom=ddn.com; dkim=pass (1024-bit key) header.d=ddn.com header.i=@ddn.com header.b=mOvk1by5; arc=fail smtp.client-ip=209.222.82.102 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=ddn.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ddn.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ddn.com header.i=@ddn.com header.b="mOvk1by5" Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2175.outbound.protection.outlook.com [104.47.57.175]) by mx-outbound20-244.us-east-2b.ess.aws.cudaops.com (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 22 Nov 2024 00:18:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jeSWMaXNj+2rQm2H2hq0Y3FLsRecSrhucsvphRbTrdnD7lOjoUE4OQUXGHtxDkopaDI8g+IS2hZZggZQto/U30XkLVrcEjCtFRvlkwRMObjD98/Tlnc0iXUC1dbnO3rwV8655rwnZd0wzdV5d7X+n2YfAYDdvg2VXOr/+FMiBMWXI1ePO30MOUMV5yLl10sdg1fxyDLcMVBawntXy094R9vIdy/qLlyDO3W9Bir9Aul6+htgFXz00/wckUzoMEVfTGQzfVCloKNTdJ36W3mfT9dUZYMX8usM37e8q9VSfEnDGkzGPRLpCM6NEGHBVfKgwC/w7w4yRi8ZXQXTTO7ziA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=rdyDw2y5vJF6YtfioCiYZQ1YHjH3jaK/Nj7D6eeI1eM=; b=UCkhnJ/WP0eW7A8pDiTZfTVd4fwR5OtM9xrvkVlYUijb+Hbh3dZfN3uWdJUOWynXE3B5HqjJ/nzx27GCHnjlngSnHbAK5o09B3NoDPYMmqW5EfkdmANrCYqNvyaqfkTw8PawGgG7HrMGR+qrkSGp5na+XdxY82hyA/P+XLPA8Yo+18rCL5SupmKKbheqFj+8uBYEMYvPHoeihvv2HfR9v7gzYfdKJd4i4mSz/8bdx0owea6OvWdokokxxtVNYlvC//Jnc/OPoejvfs+rfzyXK6LMQNn70feELsxYAqI1LOoTV/Vsh1ycalGSskPu0mXRNFtiTaKBQUwrdbSf+mE/Mg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 50.222.100.11) smtp.rcpttodomain=bsbernd.com smtp.mailfrom=ddn.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=ddn.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ddn.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rdyDw2y5vJF6YtfioCiYZQ1YHjH3jaK/Nj7D6eeI1eM=; b=mOvk1by5aLHUwiesV6ZZx5v9tfBthzdNgTJwEdFW63I8DLToPqY/WuudQ6Dvz4rBURWjHMSUjEFVvKBYGlS/G1ZbP9f5vQX8DP1M8M2taQBA4fMFhZ3kpRII7/jXh8ESv4lsYEWcFGrSXT1xtK6t8g8CugRQ0z0uLcfBBvEfQfQ= Received: from BN9PR03CA0031.namprd03.prod.outlook.com (2603:10b6:408:fb::6) by SA1PR19MB4880.namprd19.prod.outlook.com (2603:10b6:806:1aa::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8182.17; Thu, 21 Nov 2024 23:43:52 +0000 Received: from BN1PEPF0000468A.namprd05.prod.outlook.com (2603:10b6:408:fb:cafe::bc) by BN9PR03CA0031.outlook.office365.com (2603:10b6:408:fb::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8182.16 via Frontend Transport; Thu, 21 Nov 2024 23:43:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 50.222.100.11) smtp.mailfrom=ddn.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=ddn.com; Received-SPF: Pass (protection.outlook.com: domain of ddn.com designates 50.222.100.11 as permitted sender) receiver=protection.outlook.com; client-ip=50.222.100.11; helo=uww-mrp-01.datadirectnet.com; pr=C Received: from uww-mrp-01.datadirectnet.com (50.222.100.11) by BN1PEPF0000468A.mail.protection.outlook.com (10.167.243.135) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8182.16 via Frontend Transport; Thu, 21 Nov 2024 23:43:52 +0000 Received: from localhost (unknown [10.68.0.8]) by uww-mrp-01.datadirectnet.com (Postfix) with ESMTP id EC5C332; Thu, 21 Nov 2024 23:43:50 +0000 (UTC) From: Bernd Schubert Date: Fri, 22 Nov 2024 00:43:17 +0100 Subject: [PATCH RFC v6 01/16] fuse: rename to fuse_dev_end_requests and make non-static Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241122-fuse-uring-for-6-10-rfc4-v6-1-28e6cdd0e914@ddn.com> References: <20241122-fuse-uring-for-6-10-rfc4-v6-0-28e6cdd0e914@ddn.com> In-Reply-To: <20241122-fuse-uring-for-6-10-rfc4-v6-0-28e6cdd0e914@ddn.com> To: Miklos Szeredi Cc: Jens Axboe , Pavel Begunkov , linux-fsdevel@vger.kernel.org, io-uring@vger.kernel.org, Joanne Koong , Josef Bacik , Amir Goldstein , Ming Lei , David Wei , bernd@bsbernd.com, Bernd Schubert X-Mailer: b4 0.15-dev-2a633 X-Developer-Signature: v=1; a=ed25519-sha256; t=1732232629; l=2733; i=bschubert@ddn.com; s=20240529; h=from:subject:message-id; bh=uUXs1hSMjDEi/7Epvfs44qM9emPwLUYdDB03mRcLkH4=; b=yOS0tjfGNPy9fEvTuavjFUWWyFUkiDcMWd/gPLwRRaWZcsBqKmMmVNC8cNYfSOyvdLGTriRRi wyfg2yFvOyDA71N8ASUXW/fp4Cz11JiMNUGO47guXsHh+1dYnm3RB+J X-Developer-Key: i=bschubert@ddn.com; a=ed25519; pk=EZVU4bq64+flgoWFCVQoj0URAs3Urjno+1fIq9ZJx8Y= X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF0000468A:EE_|SA1PR19MB4880:EE_ X-MS-Office365-Filtering-Correlation-Id: 48376ed9-ddf2-41ca-689a-08dd0a865ad5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?q?deOugaYTDH+QsYicHVDLLJrBoOXNtwJ?= =?utf-8?q?s3y2ktlEeKjRxLSLkXpwJ339HLp/U2T4BDmXT3oQpRiPu8SIh5gmpnRvuAw57xVeT?= =?utf-8?q?HP9nJyAWBRHWiVxib3mBKx1Ikf7lL6HwCUSzD4BWlnI8QJ3YHStXzskbmn3k9ljDW?= =?utf-8?q?3rchFktRrradXJ5dVsTOsZGfljw+oizT+SAncFliCBsoIRm2cxlz95YBKqQo85nHZ?= =?utf-8?q?5NEeFgkCICIpp0h/Eyji2mH8evcTntdYFq3FUZWsFIL9YywgkOH65vZeFHTTPuGmE?= =?utf-8?q?l0UNr9+LSVXhFC34Hz3skhMMVcsiOmDZMwOcGgKGrxXY2QYKVJQnXsiNOFO1KXYAu?= =?utf-8?q?Dv44KEpcGoTHcu37YUSASJKnLosnoSU4RwQIjn2adOCBrzv2s4Zbr8rVIZs6Z5Nye?= =?utf-8?q?zRUc7Qio/hZ6BdZS7WKvwgjS6lAgjYFrJVj13Kj6lqPyhhilNcBj8051pb7NOW9Nr?= =?utf-8?q?51D4381j0yQ4nN2mrXDjUwsF7qdq+4/LhLr0/NqM9bfTqEECgfg2ySi8w+s+rKCK/?= =?utf-8?q?WYAPwNGvwVQJI8YtViCb9jVbpFbOO3JocYXegPOYJiJ10JUptJhfVitQnAtruZSmu?= =?utf-8?q?AbT6elPolLGB0l6Cg21zv066MJjDnhoy4l6Qyo3/QPgbwUMv5QJmzdba59mbnwzaB?= =?utf-8?q?hqBYGyLMCyCdDMFpfgIGkJ9c7/CXCJGZkLhyIabeDNFJGjepeHxkwf060NdWkMXF2?= =?utf-8?q?VT9J2FqS5IqxxUH7jQ5SBI3WcTjmosgqKtjZaT0UembOp5wj1ZxkOXBbdZERmx8LP?= =?utf-8?q?U1l3YfyaWUhFqqzYZxr1R89vdUcT9OiDqh7VAeEAbdRA2atr6aBGSA26lv7sKsXmk?= =?utf-8?q?37fxG2Rlk1sYGOTwaU2QPaAAHs1lEoijOPDg12tH94LkwNpzo2f8Pd92vGZD/3gRd?= =?utf-8?q?6oQZ/uPSGkMgfNfvgL+fihZayOHwT6aGr6puTLSgj7gIW6k1F/i6lMk5xjUfP3R+Y?= =?utf-8?q?WG71rPHIbResXzleOqdyUMNSGWDS5VZnxjksZSOUcJ94m82pdGJNuMlejDTDznpsG?= =?utf-8?q?xHY6CQM8EjPdDDtZqTL92sD3RjoItOK2k2J0oyqyIp84mgsmH0tcq5mLmUdMxPeXM?= =?utf-8?q?P1y9FFymTNgz67L3kbRNzvinbvsgAyI6rBjhuf8KcU3qk0b+LY8f9cKaqPWgSsPkd?= =?utf-8?q?u7jgcUUbWu+R1eZ+lwIcEswhZwy30qxiiGPSIh2PbTygojQlcCO1+Evqx0Tbfywnx?= =?utf-8?q?vpRi40svlf18GvXSgbNylsrmAR7t8O0N98z91BOJ8RaaIBHJnMsDF1Rul1RbBh65a?= =?utf-8?q?O46po7bUW29wg9pE09PSpqJoiMteV9j+eDfPNNz1XMdtZ+9jDMWqDYoFvM4gtn9Zq?= =?utf-8?q?UsLoZCK68xBOTJntSL6wgoyPSTFWMoA3pw=3D=3D?= X-Forefront-Antispam-Report: CIP:50.222.100.11;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:uww-mrp-01.datadirectnet.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: +wiY5czHwJq1Vc7RRU2ToWIHnsed19vIgJqsImZnvj4eGrmeKqU3qjJKRGSV/0qVsNqJ7VnbOHsxEgAF/aH+BZ1Jb9b/67Impn+7eTEbGp/pHXewdO/qAlSPBv0yfe5xuDKt3pwHunPCvZP9qX28JGc+69nhYj8ZOYc4w5gqZNM+8YoslDVM3rlfpcSVziC8ZntOxp65XDMP88gOW6UCVnYaElut7VUGvSP4NV5niJl3u9k1bzmoYFB45K9WN4D642MYXuxHYOAp8bS11kSNzWDVSA/IGb4j3Gck55Ip4dExBfbh+lKGHZftCBWUDmek0MBitIWojkgxv4RIP7BgydZOdiwAAL0iLr8AFVjr7IofBPuxoyKkatX+acUCcXqgxBG/jKgA/nhovXSySK5uaIuWH1+UXRC0GcBZdsXuUlDj1rId/D897ofXTYUIPesPyHUwmUFm1tghpK6Fu6SrokQXNi83foSQqNg6Yo0r4lq2CZNvrjfTINYtl2PSw1AvO3NZDza45N0W/ruuNa2gSTIARR4kbsIBSCJwJd10Cwa/0McMzx6SlcSMQWI7pveGKakSF7+SRWR+DIXXtL7be4PIL/NfiPgJ4E0hGKJYiLMSDcdCgYD99tgBXKv5XEQ40tje7tmxp4e33SEqK8rXOg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Nov 2024 23:43:52.0903 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 48376ed9-ddf2-41ca-689a-08dd0a865ad5 X-MS-Exchange-CrossTenant-Id: 753b6e26-6fd3-43e6-8248-3f1735d59bb4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=753b6e26-6fd3-43e6-8248-3f1735d59bb4;Ip=[50.222.100.11];Helo=[uww-mrp-01.datadirectnet.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF0000468A.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR19MB4880 X-OriginatorOrg: ddn.com X-BESS-ID: 1732234719-105364-29565-6323-1 X-BESS-VER: 2019.1_20241121.1615 X-BESS-Apparent-Source-IP: 104.47.57.175 X-BESS-Parts: H4sIAAAAAAACA4uuVkqtKFGyUioBkjpK+cVKVkZmJkZAVgZQMDXVyMDEJDHJ1C zZNMXMOBVIWRgnJ6VamJoZpKWkGinVxgIAekW70kEAAAA= X-BESS-Outbound-Spam-Score: 0.50 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.260588 [from cloudscan12-172.us-east-2a.ess.aws.cudaops.com] Rule breakdown below pts rule name description ---- ---------------------- -------------------------------- 0.00 BSF_SC0_MISMATCH_TO META: Envelope rcpt doesn't match header 0.50 BSF_RULE7568M META: Custom Rule 7568M 0.00 BSF_BESS_OUTBOUND META: BESS Outbound X-BESS-Outbound-Spam-Status: SCORE=0.50 using account:ESS124931 scores of KILL_LEVEL=7.0 tests=BSF_SC0_MISMATCH_TO, BSF_RULE7568M, BSF_BESS_OUTBOUND X-BESS-BRTS-Status: 1 This function is needed by fuse_uring.c to clean ring queues, so make it non static. Especially in non-static mode the function name 'end_requests' should be prefixed with fuse_ Signed-off-by: Bernd Schubert Reviewed-by: Josef Bacik --- fs/fuse/dev.c | 11 +++++------ fs/fuse/fuse_dev_i.h | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 1f64ae6d7a69e53c8d96f2e1f5caca3ff2b4ab26..09b73044a9b6748767d2479dda0a09a97b8b4c0f 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -7,6 +7,7 @@ */ #include "fuse_i.h" +#include "fuse_dev_i.h" #include #include @@ -34,8 +35,6 @@ MODULE_ALIAS("devname:fuse"); static struct kmem_cache *fuse_req_cachep; -static void end_requests(struct list_head *head); - static struct fuse_dev *fuse_get_dev(struct file *file) { /* @@ -1873,7 +1872,7 @@ static void fuse_resend(struct fuse_conn *fc) spin_unlock(&fiq->lock); list_for_each_entry(req, &to_queue, list) clear_bit(FR_PENDING, &req->flags); - end_requests(&to_queue); + fuse_dev_end_requests(&to_queue); return; } /* iq and pq requests are both oldest to newest */ @@ -2192,7 +2191,7 @@ static __poll_t fuse_dev_poll(struct file *file, poll_table *wait) } /* Abort all requests on the given list (pending or processing) */ -static void end_requests(struct list_head *head) +void fuse_dev_end_requests(struct list_head *head) { while (!list_empty(head)) { struct fuse_req *req; @@ -2295,7 +2294,7 @@ void fuse_abort_conn(struct fuse_conn *fc) wake_up_all(&fc->blocked_waitq); spin_unlock(&fc->lock); - end_requests(&to_end); + fuse_dev_end_requests(&to_end); } else { spin_unlock(&fc->lock); } @@ -2325,7 +2324,7 @@ int fuse_dev_release(struct inode *inode, struct file *file) list_splice_init(&fpq->processing[i], &to_end); spin_unlock(&fpq->lock); - end_requests(&to_end); + fuse_dev_end_requests(&to_end); /* Are we the last open device? */ if (atomic_dec_and_test(&fc->dev_count)) { diff --git a/fs/fuse/fuse_dev_i.h b/fs/fuse/fuse_dev_i.h new file mode 100644 index 0000000000000000000000000000000000000000..5a1b8a2775d84274abee46eabb3000345b2d9da0 --- /dev/null +++ b/fs/fuse/fuse_dev_i.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * FUSE: Filesystem in Userspace + * Copyright (C) 2001-2008 Miklos Szeredi + */ +#ifndef _FS_FUSE_DEV_I_H +#define _FS_FUSE_DEV_I_H + +#include + +void fuse_dev_end_requests(struct list_head *head); + +#endif + +