From nobody Fri Apr 10 23:25:36 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC52CC00140 for ; Thu, 18 Aug 2022 13:52:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245328AbiHRNwv (ORCPT ); Thu, 18 Aug 2022 09:52:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239171AbiHRNws (ORCPT ); Thu, 18 Aug 2022 09:52:48 -0400 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 792F8642EE for ; Thu, 18 Aug 2022 06:52:44 -0700 (PDT) Received: by mail-pj1-x1034.google.com with SMTP id w11-20020a17090a380b00b001f73f75a1feso4808206pjb.2 for ; Thu, 18 Aug 2022 06:52:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=RqIFS3uQuz8ZCr2lEZPiUaSyj69GXTkqlo83y6u621E=; b=2EvxctSr5Q1/SEgne3HxcS5c+B/3gWCA39X7INMzilFPkSA9H+kby2xQzG7rcKBZFd f80LGnLpUjBedwg6SVbJeuaqRtPjTS5pUQdzctsm2V2wDR7Ny7N7r2XrKP3+Lj0S3bEW CJVROTC5Q24ZFdOkFCI4X/0WOHUhLkuglMyno53yIAjgarw+KlzOJhtLL3hITb8uelAC yeruTZjyM+f6056n4AFa/ZfbsSh1HNyL3hehweMvPJeMrMQ7OuWPTtoVqYNLLuyF1ZlA JN5kAYtC+JQLwCFeL+bsSh4gkqeOrteyAkrX5wg+MTnIyl3y7b5ZuavzGXb2JViNWRA/ tDJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=RqIFS3uQuz8ZCr2lEZPiUaSyj69GXTkqlo83y6u621E=; b=n0Gy9RwHQfpEoZmAYWu/gdLEMpEmtRQmPXmB6CSFOfCjCL+NwGKZGAjz3jUIncoCh7 BhQcmf9ZB3StQ4+4WTKi3D83FIVDJSjSU/jeZ1vT7uQVPZ+2GFXGo3b5LLX+RtS0Fvce Sr+Yy20ZlI7YKdl7WJvTDp06N0qplz/Jo4a5q8hD7Evevs2uU+v8ss9Fvb3Co21zLd9J W6SoRbKAP/gHa5JGoeAW5FcOkvUj9lPHwpR4q+fEzJB9BUcGamtslgBvdYPwGHiEnQDR 2tRTV++A7fll/wDf2FMio028f5eAJruXk44rFba0uWolmCICvgSkS1T33S0H9uokRaF8 /8Gg== X-Gm-Message-State: ACgBeo1lHqcgl30qXZ+xicR4qSM4mLD7XmrKbzDArzk+IH8q1Wv/E4Q3 LgEj8oO+0eUma6bQn9PTYOf54w== X-Google-Smtp-Source: AA6agR4SjEpLT0u/4ZBNuQ8cCRUtgkNLidJHqdyeYP8+AO/WKZHP6NeAErRqiv9WYEWSQg06XXdwFg== X-Received: by 2002:a17:90b:3ec2:b0:1f7:3f49:17c3 with SMTP id rm2-20020a17090b3ec200b001f73f4917c3mr8674863pjb.203.1660830763941; Thu, 18 Aug 2022 06:52:43 -0700 (PDT) Received: from C02G705SMD6V.bytedance.net ([139.177.225.242]) by smtp.gmail.com with ESMTPSA id k17-20020a170902ce1100b0016db0d877e4sm1385697plg.221.2022.08.18.06.52.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 06:52:43 -0700 (PDT) From: Jia Zhu To: dhowells@redhat.com, xiang@kernel.org, jefflexu@linux.alibaba.com Cc: linux-cachefs@redhat.com, linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, yinxin.x@bytedance.com, Jia Zhu Subject: [RFC PATCH 1/5] cachefiles: introduce object ondemand state Date: Thu, 18 Aug 2022 21:52:00 +0800 Message-Id: <20220818135204.49878-2-zhujia.zj@bytedance.com> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220818135204.49878-1-zhujia.zj@bytedance.com> References: <20220818135204.49878-1-zhujia.zj@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Previously, @ondemand_id field was used not only to identify ondemand state of the object, but also to represent the index of the xarray. This commit introduces @state field to decouple the role of @ondemand_id and adds helpers to access it. Signed-off-by: Jia Zhu Reviewed-by: Xin Yin --- fs/cachefiles/internal.h | 33 +++++++++++++++++++++++++++++++++ fs/cachefiles/ondemand.c | 15 +++++++++------ 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h index 6cba2c6de2f9..6661b3e361da 100644 --- a/fs/cachefiles/internal.h +++ b/fs/cachefiles/internal.h @@ -17,6 +17,7 @@ #include #include #include +#include =20 #define CACHEFILES_DIO_BLOCK_SIZE 4096 =20 @@ -44,6 +45,11 @@ struct cachefiles_volume { struct dentry *fanout[256]; /* Fanout subdirs */ }; =20 +enum cachefiles_object_state { + CACHEFILES_ONDEMAND_OBJSTATE_close, /* Anonymous fd closed by daemon or i= nitial state */ + CACHEFILES_ONDEMAND_OBJSTATE_open, /* Anonymous fd associated with object= is available */ +}; + /* * Backing file state. */ @@ -62,6 +68,7 @@ struct cachefiles_object { #define CACHEFILES_OBJECT_USING_TMPFILE 0 /* Have an unlinked tmpfile */ #ifdef CONFIG_CACHEFILES_ONDEMAND int ondemand_id; + enum cachefiles_object_state state; #endif }; =20 @@ -295,6 +302,32 @@ extern void cachefiles_ondemand_clean_object(struct ca= chefiles_object *object); extern int cachefiles_ondemand_read(struct cachefiles_object *object, loff_t pos, size_t len); =20 +#define CACHEFILES_OBJECT_STATE_FUNCS(_state) \ +static inline bool \ +cachefiles_ondemand_object_is_##_state(const struct cachefiles_object *obj= ect) \ +{ \ + /* + * Pairs with smp_store_release() in set_object_##_state() + * I.e. another task can publish state concurrently, by executing + * a RELEASE barrier. We need to use smp_load_acquire() here + * to safely ACQUIRE the memory the other task published. + */ \ + return smp_load_acquire(&object->state) =3D=3D CACHEFILES_ONDEMAND_OBJSTA= TE_##_state; \ +} \ + \ +static inline void \ +cachefiles_ondemand_set_object_##_state(struct cachefiles_object *object) \ +{ \ + /* + * Pairs with smp_load_acquire() in object_is_##_state() + * I.e. here we publish a state with a RELEASE barrier + * so that concurrent tasks can ACQUIRE it. + */ \ + smp_store_release(&object->state, CACHEFILES_ONDEMAND_OBJSTATE_##_state);= \ +} + +CACHEFILES_OBJECT_STATE_FUNCS(open); +CACHEFILES_OBJECT_STATE_FUNCS(close); #else static inline ssize_t cachefiles_ondemand_daemon_read(struct cachefiles_ca= che *cache, char __user *_buffer, size_t buflen) diff --git a/fs/cachefiles/ondemand.c b/fs/cachefiles/ondemand.c index 1fee702d5529..e3155a5f32e4 100644 --- a/fs/cachefiles/ondemand.c +++ b/fs/cachefiles/ondemand.c @@ -15,6 +15,7 @@ static int cachefiles_ondemand_fd_release(struct inode *i= node, =20 xa_lock(&cache->reqs); object->ondemand_id =3D CACHEFILES_ONDEMAND_ID_CLOSED; + cachefiles_ondemand_set_object_close(object); =20 /* * Flush all pending READ requests since their completion depends on @@ -172,6 +173,8 @@ int cachefiles_ondemand_copen(struct cachefiles_cache *= cache, char *args) set_bit(FSCACHE_COOKIE_NO_DATA_TO_READ, &cookie->flags); trace_cachefiles_ondemand_copen(req->object, id, size); =20 + cachefiles_ondemand_set_object_open(req->object); + out: complete(&req->done); return ret; @@ -353,7 +356,8 @@ static int cachefiles_ondemand_send_req(struct cachefil= es_object *object, /* coupled with the barrier in cachefiles_flush_reqs() */ smp_mb(); =20 - if (opcode !=3D CACHEFILES_OP_OPEN && object->ondemand_id <=3D 0) { + if (opcode !=3D CACHEFILES_OP_OPEN && + !cachefiles_ondemand_object_is_open(object)) { WARN_ON_ONCE(object->ondemand_id =3D=3D 0); xas_unlock(&xas); ret =3D -EIO; @@ -420,7 +424,6 @@ static int cachefiles_ondemand_init_close_req(struct ca= chefiles_req *req, void *private) { struct cachefiles_object *object =3D req->object; - int object_id =3D object->ondemand_id; =20 /* * It's possible that object id is still 0 if the cookie looking up @@ -428,10 +431,10 @@ static int cachefiles_ondemand_init_close_req(struct = cachefiles_req *req, * sending CLOSE request for CACHEFILES_ONDEMAND_ID_CLOSED, which means * anon_fd has already been closed. */ - if (object_id <=3D 0) + if (!cachefiles_ondemand_object_is_open(object)) return -ENOENT; =20 - req->msg.object_id =3D object_id; + req->msg.object_id =3D object->ondemand_id; trace_cachefiles_ondemand_close(object, &req->msg); return 0; } @@ -450,7 +453,7 @@ static int cachefiles_ondemand_init_read_req(struct cac= hefiles_req *req, int object_id =3D object->ondemand_id; =20 /* Stop enqueuing requests when daemon has closed anon_fd. */ - if (object_id <=3D 0) { + if (!cachefiles_ondemand_object_is_open(object)) { WARN_ON_ONCE(object_id =3D=3D 0); pr_info_once("READ: anonymous fd closed prematurely.\n"); return -EIO; @@ -475,7 +478,7 @@ int cachefiles_ondemand_init_object(struct cachefiles_o= bject *object) * creating a new tmpfile as the cache file. Reuse the previously * allocated object ID if any. */ - if (object->ondemand_id > 0) + if (cachefiles_ondemand_object_is_open(object)) return 0; =20 volume_key_size =3D volume->key[0] + 1; --=20 2.20.1 From nobody Fri Apr 10 23:25:36 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F333AC00140 for ; Thu, 18 Aug 2022 13:53:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245375AbiHRNxZ (ORCPT ); Thu, 18 Aug 2022 09:53:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245336AbiHRNxG (ORCPT ); Thu, 18 Aug 2022 09:53:06 -0400 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F00462A99 for ; Thu, 18 Aug 2022 06:52:48 -0700 (PDT) Received: by mail-pj1-x1034.google.com with SMTP id s3-20020a17090a2f0300b001facfc6fdbcso1239642pjd.1 for ; Thu, 18 Aug 2022 06:52:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=AO4PYjCx0vXpaCKfQl5aDcYdKlf6Zm6zj4mxVrexpEo=; b=QyHAjRjjrjiZ9oGIrd+FGPpO7TvOj5bbsDQ3W2m70ZnRfRYHjt8r1XThHlgmtt32Uo rF7GZe9cx1pKlGKPRMLGCqoHQZzS31r0AWKclhM9hIxqCfj+ZB/yM16iq4U7CuSafLwr evPcyB4EqlXbRkQfgeGNfPMlIcxtv0IXxuhCCKjGKsSue42E9LqZDlJcudVDxql8tZYi b0IBNIqrHcZ8olq2KgIKnIr2wy1qAcjunRsZP83Nqh6cAM/D09xR8zvohBpypiR9bk2w SkpTvbWIjgLlD4wG4OTJrWH4kZUG/ddnmpdQgd6TJ+yYoclTy4/NGj8awscyH2NCOKWp /lGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=AO4PYjCx0vXpaCKfQl5aDcYdKlf6Zm6zj4mxVrexpEo=; b=SOpyrJZMRUUpEkHrSAh67YNd01CLb2Rg31R2fvMJl93ouU0q3m8djJs5Cf1RCjIzl9 AIThzfYZVZr+qcJz9M8Q8KvrN3iP+HtgIX/olSHJ8KCcXtu0NTzj9oNcMJ6wpTf+uXuj UGGVuvQkyHiheNt+Djbrfno2saUabp/Xrh5h/CyI4CPatM+9z2g5OiHou7IQkpvKa1GN Z0DjPinDq/rzEuCgenT6TASpAcP0VgjkemDXqYeXmE1JL8PlGuOKlHaOtFgLHqLyxC3G UIHM865N79Gigwzwh0UziMJzh0pDUR+tecVUL5L7T5agGIZLch24hfCdmqVsvapW8jNw UteA== X-Gm-Message-State: ACgBeo1JXxWjpyeTsmMA8aOXi6ayd6DRV/ZrF+k4ENNCYgnWCw+XmxiV Lg+AtDM6wBqUapLrRxdQkBMa7g== X-Google-Smtp-Source: AA6agR6Prqv2loglSrJuFS5LnkbzxN6+zNWILCKh5CNTaNFa7imFiGHdHiZIU75qH8+TDRaSFves3g== X-Received: by 2002:a17:90b:314e:b0:1f3:189c:518f with SMTP id ip14-20020a17090b314e00b001f3189c518fmr3195014pjb.193.1660830767981; Thu, 18 Aug 2022 06:52:47 -0700 (PDT) Received: from C02G705SMD6V.bytedance.net ([139.177.225.242]) by smtp.gmail.com with ESMTPSA id k17-20020a170902ce1100b0016db0d877e4sm1385697plg.221.2022.08.18.06.52.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 06:52:47 -0700 (PDT) From: Jia Zhu To: dhowells@redhat.com, xiang@kernel.org, jefflexu@linux.alibaba.com Cc: linux-cachefs@redhat.com, linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, yinxin.x@bytedance.com, Jia Zhu Subject: [RFC PATCH 2/5] cachefiles: extract ondemand info field from cachefiles_object Date: Thu, 18 Aug 2022 21:52:01 +0800 Message-Id: <20220818135204.49878-3-zhujia.zj@bytedance.com> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220818135204.49878-1-zhujia.zj@bytedance.com> References: <20220818135204.49878-1-zhujia.zj@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" We'll introduce a @work_struct field for @object in subsequent patches, it will enlarge the size of @object. As the result of that, this commit extracts ondemand info field from @object. Signed-off-by: Jia Zhu --- fs/cachefiles/interface.c | 6 ++++++ fs/cachefiles/internal.h | 29 +++++++++++++++++++++++++---- fs/cachefiles/ondemand.c | 28 ++++++++++++++++++++++------ 3 files changed, 53 insertions(+), 10 deletions(-) diff --git a/fs/cachefiles/interface.c b/fs/cachefiles/interface.c index a69073a1d3f0..f21f5660ea7f 100644 --- a/fs/cachefiles/interface.c +++ b/fs/cachefiles/interface.c @@ -31,6 +31,11 @@ struct cachefiles_object *cachefiles_alloc_object(struct= fscache_cookie *cookie) if (!object) return NULL; =20 + if (cachefiles_ondemand_init_obj_info(object, volume)) { + kmem_cache_free(cachefiles_object_jar, object); + return NULL; + } + refcount_set(&object->ref, 1); =20 spin_lock_init(&object->lock); @@ -88,6 +93,7 @@ void cachefiles_put_object(struct cachefiles_object *obje= ct, ASSERTCMP(object->file, =3D=3D, NULL); =20 kfree(object->d_name); + kfree(CACHEFILES_ONDEMAND_OBJINFO(object)); =20 cache =3D object->volume->cache->cache; fscache_put_cookie(object->cookie, fscache_cookie_put_object); diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h index 6661b3e361da..cdf4ec781933 100644 --- a/fs/cachefiles/internal.h +++ b/fs/cachefiles/internal.h @@ -50,6 +50,12 @@ enum cachefiles_object_state { CACHEFILES_ONDEMAND_OBJSTATE_open, /* Anonymous fd associated with object= is available */ }; =20 +struct cachefiles_ondemand_info { + int ondemand_id; + enum cachefiles_object_state state; + struct cachefiles_object *object; +}; + /* * Backing file state. */ @@ -67,8 +73,7 @@ struct cachefiles_object { unsigned long flags; #define CACHEFILES_OBJECT_USING_TMPFILE 0 /* Have an unlinked tmpfile */ #ifdef CONFIG_CACHEFILES_ONDEMAND - int ondemand_id; - enum cachefiles_object_state state; + void *private; #endif }; =20 @@ -302,6 +307,12 @@ extern void cachefiles_ondemand_clean_object(struct ca= chefiles_object *object); extern int cachefiles_ondemand_read(struct cachefiles_object *object, loff_t pos, size_t len); =20 +extern int cachefiles_ondemand_init_obj_info(struct cachefiles_object *obj= ect, + struct cachefiles_volume *volume); + +#define CACHEFILES_ONDEMAND_OBJINFO(object) \ + ((struct cachefiles_ondemand_info *)(object)->private) + #define CACHEFILES_OBJECT_STATE_FUNCS(_state) \ static inline bool \ cachefiles_ondemand_object_is_##_state(const struct cachefiles_object *obj= ect) \ @@ -312,7 +323,8 @@ cachefiles_ondemand_object_is_##_state(const struct cac= hefiles_object *object) \ * a RELEASE barrier. We need to use smp_load_acquire() here * to safely ACQUIRE the memory the other task published. */ \ - return smp_load_acquire(&object->state) =3D=3D CACHEFILES_ONDEMAND_OBJSTA= TE_##_state; \ + return smp_load_acquire(&(CACHEFILES_ONDEMAND_OBJINFO(object)->state)) = =3D=3D \ + CACHEFILES_ONDEMAND_OBJSTATE_##_state; \ } \ \ static inline void \ @@ -323,12 +335,15 @@ cachefiles_ondemand_set_object_##_state(struct cachef= iles_object *object) \ * I.e. here we publish a state with a RELEASE barrier * so that concurrent tasks can ACQUIRE it. */ \ - smp_store_release(&object->state, CACHEFILES_ONDEMAND_OBJSTATE_##_state);= \ + smp_store_release(&(CACHEFILES_ONDEMAND_OBJINFO(object)->state), \ + CACHEFILES_ONDEMAND_OBJSTATE_##_state); \ } =20 CACHEFILES_OBJECT_STATE_FUNCS(open); CACHEFILES_OBJECT_STATE_FUNCS(close); #else +#define CACHEFILES_ONDEMAND_OBJINFO(object) NULL + static inline ssize_t cachefiles_ondemand_daemon_read(struct cachefiles_ca= che *cache, char __user *_buffer, size_t buflen) { @@ -349,6 +364,12 @@ static inline int cachefiles_ondemand_read(struct cach= efiles_object *object, { return -EOPNOTSUPP; } + +static inline int cachefiles_ondemand_init_obj_info(struct cachefiles_obje= ct *object, + struct cachefiles_volume *volume) +{ + return 0; +} #endif =20 /* diff --git a/fs/cachefiles/ondemand.c b/fs/cachefiles/ondemand.c index e3155a5f32e4..f51266554e4d 100644 --- a/fs/cachefiles/ondemand.c +++ b/fs/cachefiles/ondemand.c @@ -9,12 +9,13 @@ static int cachefiles_ondemand_fd_release(struct inode *i= node, { struct cachefiles_object *object =3D file->private_data; struct cachefiles_cache *cache =3D object->volume->cache; - int object_id =3D object->ondemand_id; + struct cachefiles_ondemand_info *info =3D CACHEFILES_ONDEMAND_OBJINFO(obj= ect); + int object_id =3D info->ondemand_id; struct cachefiles_req *req; XA_STATE(xas, &cache->reqs, 0); =20 xa_lock(&cache->reqs); - object->ondemand_id =3D CACHEFILES_ONDEMAND_ID_CLOSED; + info->ondemand_id =3D CACHEFILES_ONDEMAND_ID_CLOSED; cachefiles_ondemand_set_object_close(object); =20 /* @@ -218,7 +219,7 @@ static int cachefiles_ondemand_get_fd(struct cachefiles= _req *req) load =3D (void *)req->msg.data; load->fd =3D fd; req->msg.object_id =3D object_id; - object->ondemand_id =3D object_id; + CACHEFILES_ONDEMAND_OBJINFO(object)->ondemand_id =3D object_id; =20 cachefiles_get_unbind_pincount(cache); trace_cachefiles_ondemand_open(object, &req->msg, load); @@ -358,7 +359,7 @@ static int cachefiles_ondemand_send_req(struct cachefil= es_object *object, =20 if (opcode !=3D CACHEFILES_OP_OPEN && !cachefiles_ondemand_object_is_open(object)) { - WARN_ON_ONCE(object->ondemand_id =3D=3D 0); + WARN_ON_ONCE(CACHEFILES_ONDEMAND_OBJINFO(object)->ondemand_id =3D=3D 0); xas_unlock(&xas); ret =3D -EIO; goto out; @@ -434,7 +435,7 @@ static int cachefiles_ondemand_init_close_req(struct ca= chefiles_req *req, if (!cachefiles_ondemand_object_is_open(object)) return -ENOENT; =20 - req->msg.object_id =3D object->ondemand_id; + req->msg.object_id =3D CACHEFILES_ONDEMAND_OBJINFO(object)->ondemand_id; trace_cachefiles_ondemand_close(object, &req->msg); return 0; } @@ -450,7 +451,7 @@ static int cachefiles_ondemand_init_read_req(struct cac= hefiles_req *req, struct cachefiles_object *object =3D req->object; struct cachefiles_read *load =3D (void *)req->msg.data; struct cachefiles_read_ctx *read_ctx =3D private; - int object_id =3D object->ondemand_id; + int object_id =3D CACHEFILES_ONDEMAND_OBJINFO(object)->ondemand_id; =20 /* Stop enqueuing requests when daemon has closed anon_fd. */ if (!cachefiles_ondemand_object_is_open(object)) { @@ -496,6 +497,21 @@ void cachefiles_ondemand_clean_object(struct cachefile= s_object *object) cachefiles_ondemand_init_close_req, NULL); } =20 +int cachefiles_ondemand_init_obj_info(struct cachefiles_object *object, + struct cachefiles_volume *volume) +{ + if (!cachefiles_in_ondemand_mode(volume->cache)) + return 0; + + object->private =3D kzalloc(sizeof(struct cachefiles_ondemand_info), + GFP_KERNEL); + if (!object->private) + return -ENOMEM; + + CACHEFILES_ONDEMAND_OBJINFO(object)->object =3D object; + return 0; +} + int cachefiles_ondemand_read(struct cachefiles_object *object, loff_t pos, size_t len) { --=20 2.20.1 From nobody Fri Apr 10 23:25:36 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62535C28B2B for ; Thu, 18 Aug 2022 13:53:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245362AbiHRNxQ (ORCPT ); Thu, 18 Aug 2022 09:53:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245342AbiHRNw4 (ORCPT ); Thu, 18 Aug 2022 09:52:56 -0400 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7192F63F3E for ; Thu, 18 Aug 2022 06:52:52 -0700 (PDT) Received: by mail-pf1-x432.google.com with SMTP id f28so1614105pfk.1 for ; Thu, 18 Aug 2022 06:52:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=gOTOSimzRInzIF9tRyR7wLEvlpNDEpWviLzVhGKpvgs=; b=WCbM+4/NKJJDt0kRk6rJwkWEkflQ6N1dGlE9bMBj4GfRk/vaWuvMGhpZ7qok9H59pt FzzGmSb879NTnucQQeVU2UviTYhO+ZKbhhupO0Y89TpwWa/xKqK/siYSPnCnXJ/EdyXS FRZ5ybT3D3C+M+v98Ea92xLRhT4/F1gDLrMEHGfonb7b0fdSnAvKvV1u2iknqlkvja3S dQJeFQMeCcruokhXJ93Sp0E6DKFLZjx7B+Uge8Gbu8E2IU09CxIhP7T9uIHXpmdoRiew NObXzsPdjMN2a9qzmbHj4kyETeF/0e0wQHG6N5jmu5HtGjTpmJS3egxkpn39mclrjO5s 0GIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=gOTOSimzRInzIF9tRyR7wLEvlpNDEpWviLzVhGKpvgs=; b=IxBDouLNndU9IIxtDGBOhaMOGk6IlU462eawakOe7/dIc80QKiHSJn1f1V79l4W/5I umHfst+ycSCs5pQsq6HbzuYq0jLZk+lqhBkU1QEQc1eYqkoC1B3dJuwbFQ4/H7/muiBA 1HoN51vopu+bW7y4DmUurc43fhUNABj3jGPim94ZIF8pIGPx2oFV60lv9iE8P5ZWDpWE ycS4oFMlz37IjBULAk9gvThz1CJwfld0Ezf7lQRxb6mX2xQgT/aKRLcQ5rdGdYE//TgS YF4TQEVrB6VzJ8fHD99V9v2E7GuK7MrxvaFKtwiSEXJa+5W4E0/DhHOX4SS3tBusoYLV rWuQ== X-Gm-Message-State: ACgBeo1ySwvbNxIPshGDIm6CFYaR1LrKyJ0C0L1jSe/HqJlhOMMnOOUO +i/oz6HXmZMx4b74M3K0thhOYgsRVICuLA== X-Google-Smtp-Source: AA6agR6P7ElV4nXCTIaBHrH8KRLneoCsGKc20E9YjNNkU13UpJdntmJ71RwZSeWCFQtAb7zJsZNqMA== X-Received: by 2002:a63:1624:0:b0:41a:9dea:1c80 with SMTP id w36-20020a631624000000b0041a9dea1c80mr2531645pgl.400.1660830772110; Thu, 18 Aug 2022 06:52:52 -0700 (PDT) Received: from C02G705SMD6V.bytedance.net ([139.177.225.242]) by smtp.gmail.com with ESMTPSA id k17-20020a170902ce1100b0016db0d877e4sm1385697plg.221.2022.08.18.06.52.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 06:52:51 -0700 (PDT) From: Jia Zhu To: dhowells@redhat.com, xiang@kernel.org, jefflexu@linux.alibaba.com Cc: linux-cachefs@redhat.com, linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, yinxin.x@bytedance.com, Jia Zhu Subject: [RFC PATCH 3/5] cachefiles: resend an open request if the read request's object is closed Date: Thu, 18 Aug 2022 21:52:02 +0800 Message-Id: <20220818135204.49878-4-zhujia.zj@bytedance.com> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220818135204.49878-1-zhujia.zj@bytedance.com> References: <20220818135204.49878-1-zhujia.zj@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" When an anonymous fd is closed by user daemon, if there is a new read request for this file comes up, the anonymous fd should be re-opened to handle that read request rather than fail it directly. 1. Introduce reopening state for objects that are closed but have inflight/subsequent read requests. 2. No longer flush READ requests but only CLOSE requests when anonymous fd is closed. 3. Enqueue the reopen work to workqueue, thus user daemon could get rid of daemon_read context and handle that request smoothly. Otherwise, the user daemon will send a reopen request and wait for itself to process the request. Signed-off-by: Jia Zhu Reviewed-by: Xin Yin --- fs/cachefiles/internal.h | 3 ++ fs/cachefiles/ondemand.c | 79 +++++++++++++++++++++++++++------------- 2 files changed, 56 insertions(+), 26 deletions(-) diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h index cdf4ec781933..66bbd4f1d22a 100644 --- a/fs/cachefiles/internal.h +++ b/fs/cachefiles/internal.h @@ -48,9 +48,11 @@ struct cachefiles_volume { enum cachefiles_object_state { CACHEFILES_ONDEMAND_OBJSTATE_close, /* Anonymous fd closed by daemon or i= nitial state */ CACHEFILES_ONDEMAND_OBJSTATE_open, /* Anonymous fd associated with object= is available */ + CACHEFILES_ONDEMAND_OBJSTATE_reopening, /* Object that was closed and is = being reopened. */ }; =20 struct cachefiles_ondemand_info { + struct work_struct work; int ondemand_id; enum cachefiles_object_state state; struct cachefiles_object *object; @@ -341,6 +343,7 @@ cachefiles_ondemand_set_object_##_state(struct cachefil= es_object *object) \ =20 CACHEFILES_OBJECT_STATE_FUNCS(open); CACHEFILES_OBJECT_STATE_FUNCS(close); +CACHEFILES_OBJECT_STATE_FUNCS(reopening); #else #define CACHEFILES_ONDEMAND_OBJINFO(object) NULL =20 diff --git a/fs/cachefiles/ondemand.c b/fs/cachefiles/ondemand.c index f51266554e4d..79ffb19380cd 100644 --- a/fs/cachefiles/ondemand.c +++ b/fs/cachefiles/ondemand.c @@ -18,14 +18,10 @@ static int cachefiles_ondemand_fd_release(struct inode = *inode, info->ondemand_id =3D CACHEFILES_ONDEMAND_ID_CLOSED; cachefiles_ondemand_set_object_close(object); =20 - /* - * Flush all pending READ requests since their completion depends on - * anon_fd. - */ - xas_for_each(&xas, req, ULONG_MAX) { + /* Only flush CACHEFILES_REQ_NEW marked req to avoid race with daemon_rea= d */ + xas_for_each_marked(&xas, req, ULONG_MAX, CACHEFILES_REQ_NEW) { if (req->msg.object_id =3D=3D object_id && - req->msg.opcode =3D=3D CACHEFILES_OP_READ) { - req->error =3D -EIO; + req->msg.opcode =3D=3D CACHEFILES_OP_CLOSE) { complete(&req->done); xas_store(&xas, NULL); } @@ -175,6 +171,7 @@ int cachefiles_ondemand_copen(struct cachefiles_cache *= cache, char *args) trace_cachefiles_ondemand_copen(req->object, id, size); =20 cachefiles_ondemand_set_object_open(req->object); + wake_up_all(&cache->daemon_pollwq); =20 out: complete(&req->done); @@ -234,6 +231,14 @@ static int cachefiles_ondemand_get_fd(struct cachefile= s_req *req) return ret; } =20 +static void ondemand_object_worker(struct work_struct *work) +{ + struct cachefiles_object *object =3D + ((struct cachefiles_ondemand_info *)work)->object; + + cachefiles_ondemand_init_object(object); +} + ssize_t cachefiles_ondemand_daemon_read(struct cachefiles_cache *cache, char __user *_buffer, size_t buflen) { @@ -249,7 +254,27 @@ ssize_t cachefiles_ondemand_daemon_read(struct cachefi= les_cache *cache, * requests from being processed repeatedly. */ xa_lock(&cache->reqs); - req =3D xas_find_marked(&xas, UINT_MAX, CACHEFILES_REQ_NEW); + xas_for_each_marked(&xas, req, UINT_MAX, CACHEFILES_REQ_NEW) { + /* + * Reopen the closed object with associated read request. + * Skip read requests whose related object are reopening. + */ + if (req->msg.opcode =3D=3D CACHEFILES_OP_READ) { + ret =3D cmpxchg(&CACHEFILES_ONDEMAND_OBJINFO(req->object)->state, + CACHEFILES_ONDEMAND_OBJSTATE_close, + CACHEFILES_ONDEMAND_OBJSTATE_reopening); + if (ret =3D=3D CACHEFILES_ONDEMAND_OBJSTATE_close) { + INIT_WORK(&CACHEFILES_ONDEMAND_OBJINFO(req->object)->work, + ondemand_object_worker); + queue_work(fscache_wq, + &CACHEFILES_ONDEMAND_OBJINFO(req->object)->work); + continue; + } else if (ret =3D=3D CACHEFILES_ONDEMAND_OBJSTATE_reopening) { + continue; + } + } + break; + } if (!req) { xa_unlock(&cache->reqs); return 0; @@ -267,14 +292,18 @@ ssize_t cachefiles_ondemand_daemon_read(struct cachef= iles_cache *cache, xa_unlock(&cache->reqs); =20 id =3D xas.xa_index; - msg->msg_id =3D id; =20 if (msg->opcode =3D=3D CACHEFILES_OP_OPEN) { ret =3D cachefiles_ondemand_get_fd(req); - if (ret) + if (ret) { + cachefiles_ondemand_set_object_close(req->object); goto error; + } } =20 + msg->msg_id =3D id; + msg->object_id =3D CACHEFILES_ONDEMAND_OBJINFO(req->object)->ondemand_id; + if (copy_to_user(_buffer, msg, n) !=3D 0) { ret =3D -EFAULT; goto err_put_fd; @@ -307,19 +336,23 @@ static int cachefiles_ondemand_send_req(struct cachef= iles_object *object, void *private) { struct cachefiles_cache *cache =3D object->volume->cache; - struct cachefiles_req *req; + struct cachefiles_req *req =3D NULL; XA_STATE(xas, &cache->reqs, 0); int ret; =20 if (!test_bit(CACHEFILES_ONDEMAND_MODE, &cache->flags)) return 0; =20 - if (test_bit(CACHEFILES_DEAD, &cache->flags)) - return -EIO; + if (test_bit(CACHEFILES_DEAD, &cache->flags)) { + ret =3D -EIO; + goto out; + } =20 req =3D kzalloc(sizeof(*req) + data_len, GFP_KERNEL); - if (!req) - return -ENOMEM; + if (!req) { + ret =3D -ENOMEM; + goto out; + } =20 req->object =3D object; init_completion(&req->done); @@ -357,7 +390,7 @@ static int cachefiles_ondemand_send_req(struct cachefil= es_object *object, /* coupled with the barrier in cachefiles_flush_reqs() */ smp_mb(); =20 - if (opcode !=3D CACHEFILES_OP_OPEN && + if (opcode =3D=3D CACHEFILES_OP_CLOSE && !cachefiles_ondemand_object_is_open(object)) { WARN_ON_ONCE(CACHEFILES_ONDEMAND_OBJINFO(object)->ondemand_id =3D=3D 0); xas_unlock(&xas); @@ -382,8 +415,12 @@ static int cachefiles_ondemand_send_req(struct cachefi= les_object *object, wake_up_all(&cache->daemon_pollwq); wait_for_completion(&req->done); ret =3D req->error; + kfree(req); + return ret; out: kfree(req); + if (opcode =3D=3D CACHEFILES_OP_OPEN) + cachefiles_ondemand_set_object_close(req->object); return ret; } =20 @@ -435,7 +472,6 @@ static int cachefiles_ondemand_init_close_req(struct ca= chefiles_req *req, if (!cachefiles_ondemand_object_is_open(object)) return -ENOENT; =20 - req->msg.object_id =3D CACHEFILES_ONDEMAND_OBJINFO(object)->ondemand_id; trace_cachefiles_ondemand_close(object, &req->msg); return 0; } @@ -451,16 +487,7 @@ static int cachefiles_ondemand_init_read_req(struct ca= chefiles_req *req, struct cachefiles_object *object =3D req->object; struct cachefiles_read *load =3D (void *)req->msg.data; struct cachefiles_read_ctx *read_ctx =3D private; - int object_id =3D CACHEFILES_ONDEMAND_OBJINFO(object)->ondemand_id; =20 - /* Stop enqueuing requests when daemon has closed anon_fd. */ - if (!cachefiles_ondemand_object_is_open(object)) { - WARN_ON_ONCE(object_id =3D=3D 0); - pr_info_once("READ: anonymous fd closed prematurely.\n"); - return -EIO; - } - - req->msg.object_id =3D object_id; load->off =3D read_ctx->off; load->len =3D read_ctx->len; trace_cachefiles_ondemand_read(object, &req->msg, load); --=20 2.20.1 From nobody Fri Apr 10 23:25:36 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51F8BC00140 for ; Thu, 18 Aug 2022 13:53:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244760AbiHRNxh (ORCPT ); Thu, 18 Aug 2022 09:53:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245355AbiHRNxI (ORCPT ); Thu, 18 Aug 2022 09:53:08 -0400 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 273816557B for ; Thu, 18 Aug 2022 06:52:56 -0700 (PDT) Received: by mail-pl1-x629.google.com with SMTP id 2so1595955pll.0 for ; Thu, 18 Aug 2022 06:52:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=gH5/oCi30DEBEz19XNsVtoVzaMHu/eBGPrlN2e1Y2h0=; b=rGllJ5qfUKtgRcE6ph85inw6yJ/YbZxn/wFWsyQ7ROH2rCs31NiBACpx7H7Muz3lqH Rnh0DAKL15v0O+ccWZpbJgGIoZQN2nMg1XB2xV6pf/bt03k6ttpgkkYmwEDuXdV8IDJi DmhJb88Y/BaK9TFk9JopbxPHtjay1COsouFWqklIWkkwoDzbENOLtz5/DxckQOR4vG4u k/2RcaJXCAvLPIRplAk8Jq6jPowhJeG/CyWiUddUwlcmUnQAwsFcL09hDtd5Zn4U0Td4 dRv0RWiDimE8V3nV39YGAEZZc41wDRLqyJQQW6ARLX5RIQQz7RhFnbKp1Knw12QHDHB7 ZMMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=gH5/oCi30DEBEz19XNsVtoVzaMHu/eBGPrlN2e1Y2h0=; b=bMHtzEXiYHLc0SLrSx/uZXSWP7Ju3iyjF+CfzjIju02f9n8/F9Poxme/IWdxx++Bu3 tcxeLD+PzL1ut6SmxfQPXIGXhN6rdW8aOTJt8O6YjfCN/wjxy/ycUGtszTwjwWvbUQkW 0eqZmE74nGvJz/9KBUFT7Su/N55uCN4ghFIz48cQdJx2mbJeM/VtkOkbjYsmJ44yQMip HtuYfL80AozP/AlVN3H6pb/0ruN3iOvhV2Rh5ZrzqYXlT5yipCZnAWJuRNoCC+vTBoVr aSKehmW5QtTO5ynUSoN4NpJww52OpvNJHcDpHSp+GZiST3sHx9Py1yVlVRB88ZFvdNfU 65Qw== X-Gm-Message-State: ACgBeo18fiCoQ0Pw1o1Bub/955voPDgyLMqJ9m3XeSh00jzHcRCuCV9Q +1+uChuCBjLkbP6pow0v2EZYTA== X-Google-Smtp-Source: AA6agR4vq2EHchwptoVCg1mL3pnZdHv9shuA3Z4UdpvUSOc05rSXrUr55WTmmTrNbpL0lo6Pne9Iow== X-Received: by 2002:a17:90b:3a85:b0:1fa:bf98:5e3e with SMTP id om5-20020a17090b3a8500b001fabf985e3emr3183373pjb.102.1660830776207; Thu, 18 Aug 2022 06:52:56 -0700 (PDT) Received: from C02G705SMD6V.bytedance.net ([139.177.225.242]) by smtp.gmail.com with ESMTPSA id k17-20020a170902ce1100b0016db0d877e4sm1385697plg.221.2022.08.18.06.52.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 06:52:55 -0700 (PDT) From: Jia Zhu To: dhowells@redhat.com, xiang@kernel.org, jefflexu@linux.alibaba.com Cc: linux-cachefs@redhat.com, linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, yinxin.x@bytedance.com, Jia Zhu Subject: [RFC PATCH 4/5] cachefiles: narrow the scope of triggering EPOLLIN events in ondemand mode Date: Thu, 18 Aug 2022 21:52:03 +0800 Message-Id: <20220818135204.49878-5-zhujia.zj@bytedance.com> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220818135204.49878-1-zhujia.zj@bytedance.com> References: <20220818135204.49878-1-zhujia.zj@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Don't trigger EPOLLIN when there are only reopening read requests in xarray. Suggested-by: Xin Yin Signed-off-by: Jia Zhu --- fs/cachefiles/daemon.c | 13 +++++++++++-- fs/cachefiles/internal.h | 12 ++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c index aa4efcabb5e3..c74bd1f4ecf5 100644 --- a/fs/cachefiles/daemon.c +++ b/fs/cachefiles/daemon.c @@ -355,14 +355,23 @@ static __poll_t cachefiles_daemon_poll(struct file *f= ile, struct poll_table_struct *poll) { struct cachefiles_cache *cache =3D file->private_data; + struct xarray *xa =3D &cache->reqs; + struct cachefiles_req *req; + unsigned long index; __poll_t mask; =20 poll_wait(file, &cache->daemon_pollwq, poll); mask =3D 0; =20 if (cachefiles_in_ondemand_mode(cache)) { - if (!xa_empty(&cache->reqs)) - mask |=3D EPOLLIN; + if (!xa_empty(xa)) { + xa_for_each_marked(xa, index, req, CACHEFILES_REQ_NEW) { + if (!cachefiles_ondemand_is_reopening_read(req)) { + mask |=3D EPOLLIN; + break; + } + } + } } else { if (test_bit(CACHEFILES_STATE_CHANGED, &cache->flags)) mask |=3D EPOLLIN; diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h index 66bbd4f1d22a..b4af67f1cbd6 100644 --- a/fs/cachefiles/internal.h +++ b/fs/cachefiles/internal.h @@ -344,6 +344,13 @@ cachefiles_ondemand_set_object_##_state(struct cachefi= les_object *object) \ CACHEFILES_OBJECT_STATE_FUNCS(open); CACHEFILES_OBJECT_STATE_FUNCS(close); CACHEFILES_OBJECT_STATE_FUNCS(reopening); + +static inline bool cachefiles_ondemand_is_reopening_read(struct cachefiles= _req *req) +{ + return cachefiles_ondemand_object_is_reopening(req->object) && + req->msg.opcode =3D=3D CACHEFILES_OP_READ; +} + #else #define CACHEFILES_ONDEMAND_OBJINFO(object) NULL =20 @@ -373,6 +380,11 @@ static inline int cachefiles_ondemand_init_obj_info(st= ruct cachefiles_object *ob { return 0; } + +static inline bool cachefiles_ondemand_is_reopening_read(struct cachefiles= _req *req) +{ + return false; +} #endif =20 /* --=20 2.20.1 From nobody Fri Apr 10 23:25:36 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD2E6C00140 for ; Thu, 18 Aug 2022 13:53:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245370AbiHRNxn (ORCPT ); Thu, 18 Aug 2022 09:53:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245358AbiHRNxJ (ORCPT ); Thu, 18 Aug 2022 09:53:09 -0400 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 454EE659E3 for ; Thu, 18 Aug 2022 06:53:01 -0700 (PDT) Received: by mail-pl1-x634.google.com with SMTP id d10so1558751plr.6 for ; Thu, 18 Aug 2022 06:53:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=Q3+sIJxzAESYgoNj/gGe5uNrnE6V3K6wR3w/d3iHqFA=; b=S891HZY7IwVovb2S3pGJmF1I/jxpC/Cx58Dz4VCcrS4LeuU4B38PvPKR5jL412EoTx aDDFzA13FGGTTUEj58LsCYckux/M88Dkv0kW7w/z0s5j/pdNOwqjM+1qussJde2Fq8qF XPZ+Xawp1IkhHX2GzDtxavXary6tCvassvl+reP9Yr/wYd384decJjrLBVHLyBI+jgEl wXH12rGaBVfnLd+NjWklNxO8uD9ZXocT7byuy1ngo2Q2EKF9bgMnMUYM3f3JX5Lf4fnT K9R2w+nQ6t1taVE6456VKK5iV/7/PmPbYzULchJNYuAlckTsA1segPi+0CmmXvY5T92q 15/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=Q3+sIJxzAESYgoNj/gGe5uNrnE6V3K6wR3w/d3iHqFA=; b=I1iUb96G15ArZyj5k+1jbIbEYHvoJK3qy8cFtz4ea1DD91Zkm25AGr3xRYxTcL8npR MrKeWUCPyJbXvoH6MpqUxjNlgtGqDRRZeYXfejQ+w0hJhm0KFev8dltHk0+rjsGjfH8a Ih19fyUj5jacDdC2tV7cE6e5NR+BV1Yzq/SknIOFlfsXrd2eADkdIZELiPrFljtCm7Ky V+EHAMUp492MOxl4PHdN/ZaL2OgJ/kgL8vee+TYAMs93ijaJ/ek3A6IV+CIwwWIWU+IE HbyiPqazkWmFFcM2R9QZvDirT+81PGWv1Piowjx6MqReovj35X5TAEB3pc8Rmzwi5kYO 2QDg== X-Gm-Message-State: ACgBeo0rEFe4GB6X/utAmSwaSdKfKSGFZ3/bZyjTENBNrwdO2s9+1Y7p GKrIfoYeuZdoDQqnsBSbUHa8WQ== X-Google-Smtp-Source: AA6agR5vruAaYauuniDR7hv2XcV4ouNLjLvo+7M8xNDwBLLOR4XyoMvqf+cSfddJh/MTqflxloa2LA== X-Received: by 2002:a17:90b:3952:b0:1fa:7f18:110f with SMTP id oe18-20020a17090b395200b001fa7f18110fmr3237446pjb.19.1660830780916; Thu, 18 Aug 2022 06:53:00 -0700 (PDT) Received: from C02G705SMD6V.bytedance.net ([139.177.225.242]) by smtp.gmail.com with ESMTPSA id k17-20020a170902ce1100b0016db0d877e4sm1385697plg.221.2022.08.18.06.52.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 06:53:00 -0700 (PDT) From: Jia Zhu To: dhowells@redhat.com, xiang@kernel.org, jefflexu@linux.alibaba.com Cc: linux-cachefs@redhat.com, linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, yinxin.x@bytedance.com, Jia Zhu , Gao Xiang Subject: [RFC PATCH 5/5] cachefiles: add restore command to recover inflight ondemand read requests Date: Thu, 18 Aug 2022 21:52:04 +0800 Message-Id: <20220818135204.49878-6-zhujia.zj@bytedance.com> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220818135204.49878-1-zhujia.zj@bytedance.com> References: <20220818135204.49878-1-zhujia.zj@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Previously, in ondemand read scenario, if the anonymous fd was closed by user daemon, inflight and subsequent read requests would return EIO. As long as the device connection is not released, user daemon can hold and restore inflight requests by setting the request flag to CACHEFILES_REQ_NEW. Suggested-by: Gao Xiang Signed-off-by: Jia Zhu Signed-off-by: Xin Yin --- fs/cachefiles/daemon.c | 1 + fs/cachefiles/internal.h | 3 +++ fs/cachefiles/ondemand.c | 23 +++++++++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c index c74bd1f4ecf5..014369266cb2 100644 --- a/fs/cachefiles/daemon.c +++ b/fs/cachefiles/daemon.c @@ -77,6 +77,7 @@ static const struct cachefiles_daemon_cmd cachefiles_daem= on_cmds[] =3D { { "tag", cachefiles_daemon_tag }, #ifdef CONFIG_CACHEFILES_ONDEMAND { "copen", cachefiles_ondemand_copen }, + { "restore", cachefiles_ondemand_restore }, #endif { "", NULL } }; diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h index b4af67f1cbd6..d504c61a5f03 100644 --- a/fs/cachefiles/internal.h +++ b/fs/cachefiles/internal.h @@ -303,6 +303,9 @@ extern ssize_t cachefiles_ondemand_daemon_read(struct c= achefiles_cache *cache, extern int cachefiles_ondemand_copen(struct cachefiles_cache *cache, char *args); =20 +extern int cachefiles_ondemand_restore(struct cachefiles_cache *cache, + char *args); + extern int cachefiles_ondemand_init_object(struct cachefiles_object *objec= t); extern void cachefiles_ondemand_clean_object(struct cachefiles_object *obj= ect); =20 diff --git a/fs/cachefiles/ondemand.c b/fs/cachefiles/ondemand.c index 79ffb19380cd..5b1c447da976 100644 --- a/fs/cachefiles/ondemand.c +++ b/fs/cachefiles/ondemand.c @@ -178,6 +178,29 @@ int cachefiles_ondemand_copen(struct cachefiles_cache = *cache, char *args) return ret; } =20 +int cachefiles_ondemand_restore(struct cachefiles_cache *cache, char *args) +{ + struct cachefiles_req *req; + + XA_STATE(xas, &cache->reqs, 0); + + if (!test_bit(CACHEFILES_ONDEMAND_MODE, &cache->flags)) + return -EOPNOTSUPP; + + /* + * Search the requests which being processed before + * the user daemon crashed. + * Set the CACHEFILES_REQ_NEW flag and user daemon will reprocess it. + */ + xas_lock(&xas); + xas_for_each(&xas, req, ULONG_MAX) + xas_set_mark(&xas, CACHEFILES_REQ_NEW); + xas_unlock(&xas); + + wake_up_all(&cache->daemon_pollwq); + return 0; +} + static int cachefiles_ondemand_get_fd(struct cachefiles_req *req) { struct cachefiles_object *object; --=20 2.20.1