From patchwork Fri Dec 14 17:15:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 10731483 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 18DF1746 for ; Fri, 14 Dec 2018 17:16:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 68FF62C807 for ; Fri, 14 Dec 2018 17:16:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C5042D8F5; Fri, 14 Dec 2018 17:16:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 241422C807 for ; Fri, 14 Dec 2018 17:16:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2FC578E01F5; Fri, 14 Dec 2018 12:16:14 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2AE548E01DC; Fri, 14 Dec 2018 12:16:14 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C3078E01F5; Fri, 14 Dec 2018 12:16:14 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by kanga.kvack.org (Postfix) with ESMTP id D10C48E01DC for ; Fri, 14 Dec 2018 12:16:13 -0500 (EST) Received: by mail-pf1-f200.google.com with SMTP id l22so4893493pfb.2 for ; Fri, 14 Dec 2018 09:16:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=yD7OmIaga8bq3vgrhrUeca0ttxxjagifsHLQHNzU5W8=; b=gvaeasxpZIK+Y1XO35GteebPmPHWnHKvNQTdUWJVJM7EkAi3SB1UUFWnAf+nJX5yfG onYcxWhXNyXTgHhlZO3RCadvYmspLuNKG1zNm/Bw+LH+39EgPDQ0Sls5Hs0zZGMN8DPb VOKxEswnTc0v89Rb4OFutEhsRQG1wDm5Gnfwd+EeKVQxm7oqiS661vprk4fEH2mFKHTx 3wy9ldAnXbattSYqDBr4bms4DNJ1PjV5bT07oSkbtJn/k9b6rJbLAxlY6AA5LKxqoc6t G73AngBMy9umaOzh11Yy9gC+soinkbYd1PvlLYebonqbGVulTPObxDWW4OdnuRnP9wpP yjSA== X-Gm-Message-State: AA+aEWZkS6/a3lx63434BNe4BrHFhdVe2kwXxlsJeXpsiAsnQ+OkrOoo fqcsvPvR41rdCaJA8MaSiCrjMZ+jUMW1ekcf3XZrAuqRo9aNLzWAUtEep2Pw0SHujXYC+BaG9pX uXaxZJnXtvJsUBVu4oULrXuGuryAdEb4yaA7f6S75AlLK9doDdjBDQDxLYNt2y0mFtgM8MbECSY L1ZyLHjW3F9BYR03OtaRtThN9Ud5K401wFqcQumdv5FT9Qq6WMlPxSkEqleZV/ccYn0GEWw5ANR bNYng6gkUdMvpYMlVJCi4S2bXHcMjvze5Q1FJKDucqN4mSDaXhyinCMc/5IgAe2rnXq9kEHD8x2 QI8YNconoCtjSOrgjPHZI+Wiayyy6Rm75Z6k+U0d1WDyV5WE3SEashSPPvNw6+QD9YpluqXQHYz 0 X-Received: by 2002:a62:3a04:: with SMTP id h4mr3545429pfa.119.1544807773506; Fri, 14 Dec 2018 09:16:13 -0800 (PST) X-Received: by 2002:a62:3a04:: with SMTP id h4mr3545362pfa.119.1544807772664; Fri, 14 Dec 2018 09:16:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544807772; cv=none; d=google.com; s=arc-20160816; b=r/F/ysQMEMDHrUewRuzQEVUsNY+vMjjbJjL4WTlrTaZFHbcg5tt0JrhNe/vazl1w46 k5giVwOjTSPBp9Qga/IO0nrIic4tBUnhn2Jl5LUT1jsvoCg8wh1i7Bi1TI5O44w95Li9 3GG29l8ybUa+PXvmSYjn9HfCz1nNbUkc1EDwWSzddNTBnvTXLrhmXEDwBY152ITUJhdv yOzGkATJLfFBfGaIRAr/ttdw0z3BljA4e41B9+iD/xfGc+RD9utVmyZw5MkP8iWQCXIj NmQqm/f+w6hMwpRs7lY6WZ5A23NJPpIGCi/MM2Jo1N6lYH9Sl0kwRspGK7HCZgBgX3rI 1uFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=yD7OmIaga8bq3vgrhrUeca0ttxxjagifsHLQHNzU5W8=; b=XZRzx+u+HWXbr9U928tD16aMv6/Tf9qJbWjd/bD5cr4w7pNKbpJtsPx0753IOuUKiD i2eyd0WGTovixQhGCIdF9x9L08C1y9kypXQobWE9eJ1wWp3YBMuG/s9FuIJWHaVMhSCl KD4UrLH2kJ/moDk4owuYCt6dYaz4zp2BqCZKXGIKq1sMlb31pO+q+DKm5iMMDSVuzNtR pbMt+Cc9Zv48te3ww0BuLNThlprgylpCZUSKNIp2wpO7DDpJcc/h1HPzX1WEEOXGoh+p LOVYaNK5n2AJAmI97G4ZQ0fzww62mru8H2VlS/Hndw6tiGVrkQkLQjGT8jOiWioX/Bz1 J7FA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="q3/CpAxD"; spf=pass (google.com: domain of surenb@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=surenb@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id y23sor8848733pga.35.2018.12.14.09.16.12 for (Google Transport Security); Fri, 14 Dec 2018 09:16:12 -0800 (PST) Received-SPF: pass (google.com: domain of surenb@google.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="q3/CpAxD"; spf=pass (google.com: domain of surenb@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=surenb@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yD7OmIaga8bq3vgrhrUeca0ttxxjagifsHLQHNzU5W8=; b=q3/CpAxD8RTwSJRxe5o3byeeJqR4Ch9hUc+/pjXFAQHyESWPfGmuc9y016j2l0B/Xi iS5TEYe/572UOGk6qTUy/EBPF5sohGdF2ZNPjZmHrmtC0RB9p4UAxKf/aEWSyQjYkJGS hiJuNCETCQGWMg6FZL37p47irAMo33zWPoArR1izOd4yzgD00jCUyzX+wnNwImOMELMX JIRZs26qd+A29xirIw3kZtAjP9sNrkRt48cnoTU9mlzvu0BN1GCQ8n+bJvxcYe9LENjh X1AM1EtQrgCaXc+FeG4GR8Bl/R+fbTGdnOAhDXmJyi6z7OK0fAzRpGYZ97xlWT3jUPrL jT4Q== X-Google-Smtp-Source: AFSGD/VXkMTwawtJFy5GzNnm00dKDRrt8F4j6Io6OBC/4OXzLeoNlmGpk0vqxx2kzPbz3iJXYDAwIw== X-Received: by 2002:a63:4c4e:: with SMTP id m14mr3433828pgl.173.1544807772132; Fri, 14 Dec 2018 09:16:12 -0800 (PST) Received: from surenb0.mtv.corp.google.com ([2620:0:1000:1612:3320:4357:47df:276b]) by smtp.googlemail.com with ESMTPSA id g185sm7605761pfc.174.2018.12.14.09.16.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Dec 2018 09:16:09 -0800 (PST) From: Suren Baghdasaryan To: gregkh@linuxfoundation.org Cc: tj@kernel.org, lizefan@huawei.com, hannes@cmpxchg.org, axboe@kernel.dk, dennis@kernel.org, dennisszhou@gmail.com, mingo@redhat.com, peterz@infradead.org, akpm@linux-foundation.org, corbet@lwn.net, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@android.com, Suren Baghdasaryan Subject: [PATCH 1/6] fs: kernfs: add poll file operation Date: Fri, 14 Dec 2018 09:15:03 -0800 Message-Id: <20181214171508.7791-2-surenb@google.com> X-Mailer: git-send-email 2.20.0.405.gbc1bbc6f85-goog In-Reply-To: <20181214171508.7791-1-surenb@google.com> References: <20181214171508.7791-1-surenb@google.com> MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Weiner Kernfs has a standardized poll/notification mechanism for waking all pollers on all fds when a filesystem node changes. To allow polling for custom events, add a .poll callback that can override the default. This is in preparation for pollable cgroup pressure files which have per-fd trigger configurations. Signed-off-by: Johannes Weiner Signed-off-by: Suren Baghdasaryan --- fs/kernfs/file.c | 31 ++++++++++++++++++++----------- include/linux/kernfs.h | 6 ++++++ 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c index dbf5bc250bfd..2d8b91f4475d 100644 --- a/fs/kernfs/file.c +++ b/fs/kernfs/file.c @@ -832,26 +832,35 @@ void kernfs_drain_open_files(struct kernfs_node *kn) * to see if it supports poll (Neither 'poll' nor 'select' return * an appropriate error code). When in doubt, set a suitable timeout value. */ +__poll_t kernfs_generic_poll(struct kernfs_open_file *of, poll_table *wait) +{ + struct kernfs_node *kn = kernfs_dentry_node(of->file->f_path.dentry); + struct kernfs_open_node *on = kn->attr.open; + + poll_wait(of->file, &on->poll, wait); + + if (of->event != atomic_read(&on->event)) + return DEFAULT_POLLMASK|EPOLLERR|EPOLLPRI; + + return DEFAULT_POLLMASK; +} + static __poll_t kernfs_fop_poll(struct file *filp, poll_table *wait) { struct kernfs_open_file *of = kernfs_of(filp); struct kernfs_node *kn = kernfs_dentry_node(filp->f_path.dentry); - struct kernfs_open_node *on = kn->attr.open; + __poll_t ret; if (!kernfs_get_active(kn)) - goto trigger; + return DEFAULT_POLLMASK|EPOLLERR|EPOLLPRI; - poll_wait(filp, &on->poll, wait); + if (kn->attr.ops->poll) + ret = kn->attr.ops->poll(of, wait); + else + ret = kernfs_generic_poll(of, wait); kernfs_put_active(kn); - - if (of->event != atomic_read(&on->event)) - goto trigger; - - return DEFAULT_POLLMASK; - - trigger: - return DEFAULT_POLLMASK|EPOLLERR|EPOLLPRI; + return ret; } static void kernfs_notify_workfn(struct work_struct *work) diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h index 5b36b1287a5a..0cac1207bb00 100644 --- a/include/linux/kernfs.h +++ b/include/linux/kernfs.h @@ -25,6 +25,7 @@ struct seq_file; struct vm_area_struct; struct super_block; struct file_system_type; +struct poll_table_struct; struct kernfs_open_node; struct kernfs_iattrs; @@ -261,6 +262,9 @@ struct kernfs_ops { ssize_t (*write)(struct kernfs_open_file *of, char *buf, size_t bytes, loff_t off); + __poll_t (*poll)(struct kernfs_open_file *of, + struct poll_table_struct *pt); + int (*mmap)(struct kernfs_open_file *of, struct vm_area_struct *vma); #ifdef CONFIG_DEBUG_LOCK_ALLOC @@ -350,6 +354,8 @@ int kernfs_remove_by_name_ns(struct kernfs_node *parent, const char *name, int kernfs_rename_ns(struct kernfs_node *kn, struct kernfs_node *new_parent, const char *new_name, const void *new_ns); int kernfs_setattr(struct kernfs_node *kn, const struct iattr *iattr); +__poll_t kernfs_generic_poll(struct kernfs_open_file *of, + struct poll_table_struct *pt); void kernfs_notify(struct kernfs_node *kn); const void *kernfs_super_ns(struct super_block *sb);