From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 39B0B1A08BC; Tue, 16 Jul 2024 18:32:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721154751; cv=none; b=gy0LY2DFcxX5k59l5t03KklpXPy8aVSzREGeQ0OUhHLhON5Wtc7aOa42vbf/7iHqHvPVQKD91y2DEapPgA5mLoU1Opbjuh7AO65CVKEWvwIu4GF+haX24MltvTgKK95FI10++ANCXKk/zpa22wVQNennpd5XLKo1DEoA7JUBLXc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721154751; c=relaxed/simple; bh=dBXkjk2+4pbjgIcFuXpQ7LRM5UyuvfEsUITy3fvaRYg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J+4XrP9UXPZQmISIbnvkGj3+d/iEOJvHJ1K9q76WrxNEdernFVi2cT+Pk8PxmY7uI3Obn4DSXffhdP0p+GeGnhMbmErHuUdPxNKLm2s7hxUhCbE41mXjRZj97EVzoqRl3rDo6pSzplIAuvDNSTDMEFG8xyiS1+51NYeLjeR4vbY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kB9jnCAe; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kB9jnCAe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8DCE4C116B1; Tue, 16 Jul 2024 18:32:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721154750; bh=dBXkjk2+4pbjgIcFuXpQ7LRM5UyuvfEsUITy3fvaRYg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kB9jnCAeqn8Vf3W3eBgUvsndhBLBzIY3BDFHKINxlVdBrQ90UZntpP+fgLsABk3Bo teD+KjM5fXJ7st1Cl6O/xPZ/318KImuVr3SXI2RJF/WbfPuzinc07sz78XcWgPvoUz USjPulkrXd47bWg4+S9j0bjF8vK+EvYx0TmfmCgBX093nETIgSENeR26A/j1XLQwQD jLfI+4HnDY8ikY5p+iqyZC3L3ucvoRLBzk8w9yvTZp9I1i9Gv9eZiA6j289Xx2ZnVO Oamo80Vcaac3KWOtAcAP/HrHiTAyDm41QE0qRhywT1Avn259yVXcaif1TEnP7dQ5ix 0QpS3wxGw6HeQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Baokun Li , Jeff Layton , Gao Xiang , Jia Zhu , Christian Brauner , Sasha Levin , dhowells@redhat.com, netfs@lists.linux.dev Subject: [PATCH AUTOSEL 6.9 04/11] cachefiles: cancel all requests for the object that is being dropped Date: Tue, 16 Jul 2024 14:31:48 -0400 Message-ID: <20240716183222.2813968-4-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240716183222.2813968-1-sashal@kernel.org> References: <20240716183222.2813968-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.9.9 Content-Transfer-Encoding: 8bit From: Baokun Li [ Upstream commit 751f524635a4f076117d714705eeddadaf6748ee ] Because after an object is dropped, requests for that object are useless, cancel them to avoid causing other problems. This prepares for the later addition of cancel_work_sync(). After the reopen requests is generated, cancel it to avoid cancel_work_sync() blocking by waiting for daemon to complete the reopen requests. Signed-off-by: Baokun Li Link: https://lore.kernel.org/r/20240628062930.2467993-7-libaokun@huaweicloud.com Acked-by: Jeff Layton Reviewed-by: Gao Xiang Reviewed-by: Jia Zhu Signed-off-by: Christian Brauner Signed-off-by: Sasha Levin --- fs/cachefiles/ondemand.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/fs/cachefiles/ondemand.c b/fs/cachefiles/ondemand.c index 14f91a9fbe447..1c0fa7412a6fa 100644 --- a/fs/cachefiles/ondemand.c +++ b/fs/cachefiles/ondemand.c @@ -636,12 +636,31 @@ int cachefiles_ondemand_init_object(struct cachefiles_object *object) void cachefiles_ondemand_clean_object(struct cachefiles_object *object) { + unsigned long index; + struct cachefiles_req *req; + struct cachefiles_cache *cache; + if (!object->ondemand) return; cachefiles_ondemand_send_req(object, CACHEFILES_OP_CLOSE, 0, cachefiles_ondemand_init_close_req, NULL); + + if (!object->ondemand->ondemand_id) + return; + + /* Cancel all requests for the object that is being dropped. */ + cache = object->volume->cache; + xa_lock(&cache->reqs); cachefiles_ondemand_set_object_dropping(object); + xa_for_each(&cache->reqs, index, req) { + if (req->object == object) { + req->error = -EIO; + complete(&req->done); + __xa_erase(&cache->reqs, index); + } + } + xa_unlock(&cache->reqs); } int cachefiles_ondemand_init_obj_info(struct cachefiles_object *object, -- 2.43.0