From nobody Sat Apr 11 00:51:32 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