Received: by 2002:ac0:da4c:0:0:0:0:0 with SMTP id a12csp1586621imi; Sat, 23 Jul 2022 10:17:27 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u/ma6nH89rLIutuFSljkD0tV7fi3XJfHH79XS0TWejxbZecMCeq5dqyK33YM+gcW2EAo1b X-Received: by 2002:a05:6402:4516:b0:43b:c806:6346 with SMTP id ez22-20020a056402451600b0043bc8066346mr5241200edb.52.1658596647674; Sat, 23 Jul 2022 10:17:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658596647; cv=none; d=google.com; s=arc-20160816; b=ghh8x2TGLEqWFZ9NNy6WlQnE7G9W1qlcGqRoIPxou59RfYdvUcc9MOoCpVKmu7YOLN Ih4l9q6E8vZJbJK+cB/7iYpLjGDwKdXGZI9xWxDHD5z3h1DaA1jmc99dwpr0j9lEKVFr I1ruynGY94al7nTnLD2DHb0AzLDwOZT67TyasKQiymOoI96p3OAeev0IJxmMGkTfdJyM Zz/SemX7NIRh1F2Px/PzVtitEPVU4hbIAhNyOgcCuBQ3wj3sUxtDMsz8zwyN6YTkcLmw IrbD9ZXEjHasbvszsp+NTph6Kzr16SJfKKEIokStZQbG9LvCrW3qzdTVvikRpObQ4OLp 2tMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=Y7ZqwMVhk6uhW6xJIvqgyOPbhPMnvmuRvGWiz4Y3kyE=; b=J3xcRQCl/ErDt+NjtGwQ4L2kPMSnBCfb+595fxKOLzZglTB2kWN7ncM+FPE69D4EA4 I2SUo+y4xty+a/sBne/aaFLUYDQQQb13UhNGhEX81u5dPoUUkuYDL3AbIHwsSw7Mbh99 hD7i/snHilh5v9ZWe03H91jwdu44uX1BvmZO+ZsXW8PdRKI2i+tWll5GqzvMmx7869pa JvDIR8Hyyd1pOTOdB+eSh9xmUSdWEDyRIOCQKNUoTe7KcKAQnYu8M+eJtF8IjeJUvs6V E9JdXOmXyUo3NJHRutgM391YnA0H8wzLRC0G4XxzNp/YCLHqMAuSsZ3xi0p7/zBTAlWC F+hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=cMnIoDG0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nd30-20020a170907629e00b0072677faec75si9417946ejc.872.2022.07.23.10.17.02; Sat, 23 Jul 2022 10:17:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=cMnIoDG0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233301AbiGWRJP (ORCPT + 99 others); Sat, 23 Jul 2022 13:09:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230005AbiGWRJM (ORCPT ); Sat, 23 Jul 2022 13:09:12 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 870FA1AF3B for ; Sat, 23 Jul 2022 10:09:11 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id j29-20020a05600c1c1d00b003a2fdafdefbso4058389wms.2 for ; Sat, 23 Jul 2022 10:09:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:mime-version:content-disposition; bh=Y7ZqwMVhk6uhW6xJIvqgyOPbhPMnvmuRvGWiz4Y3kyE=; b=cMnIoDG06+wr21BHRR9LmOAUyInY91X/pcfEbWeEU8+HvAxZjYiKfAcDfLMgY700mA 8teXBw+R2hcylhRD/DvieQ/sPg/YBeezCoIfvWnzAGC3hWJvUGHqH1bEzf4U6OUg9mZh PbbPRJ/nRKtxIYu5mVgDwJaH7D1vyw35cG66+3hKrXvH2lPWOi2KZSDD6YD5ykONDMWQ IhbhMyN6Soof11F/UCXYrLGcU2V1r14T/jO2vUWDlRXOc28JS5tklAMfXyA025pYbujS FleQMeHs7hbWQY4HuNT4kn/yu30c4nBX9HLtfB9o+h1RCm13fdGWr2sc+DSJhgssr3o7 4EAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=Y7ZqwMVhk6uhW6xJIvqgyOPbhPMnvmuRvGWiz4Y3kyE=; b=Uff0lydX0EhxO5aRUFzwI2jCO99zI8IONO188aQS3txbokHFBJv6bq2jlbwN2+naLg zqsGs06IyoIk64J1F8o80o+rZz6ITr5PiSKnUPCcB66WUOoOq5zxIs6YRDRVWFkLJZTY hp2zkvK3JDWjU+ZzXWkJsVIAjEE4qfVMZTYZAvkQG/f8gatq01fv8N0TTClUd7afw8Q5 V64dhazdQ22crMdwyiVJ/zoWb8Ko2JkurCH55z0K/HZnq0kVHkjKI31WOFB4B/8VOo7m W3/QiW4C3AhEW0B7+IOCisbr7NocNgZMYUVExnZJbdDtP5qx3nsvf7E9m/M0eMFvoivV taZw== X-Gm-Message-State: AJIora+gYuAOzkggk4yz8LqN4Am3kUeBukuELSAJDaSAHXSE1MbvrSow kJm2e3xvmyschXqv8++IzMIG+h2FLQ== X-Received: by 2002:a05:600c:1da2:b0:3a3:10ed:43ce with SMTP id p34-20020a05600c1da200b003a310ed43cemr3399539wms.136.1658596149890; Sat, 23 Jul 2022 10:09:09 -0700 (PDT) Received: from localhost.localdomain ([46.53.248.166]) by smtp.gmail.com with ESMTPSA id u16-20020a05600c00d000b003a31c4f6f74sm14686083wmm.32.2022.07.23.10.09.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Jul 2022 10:09:09 -0700 (PDT) Date: Sat, 23 Jul 2022 20:09:07 +0300 From: Alexey Dobriyan To: akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH] proc: add some (hopefully) insightful comments Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * /proc/${pid}/net status * removing PDE vs last close stuff (again!) * random small stuff Signed-off-by: Alexey Dobriyan --- fs/proc/array.c | 4 ++++ fs/proc/inode.c | 17 ++++++++++++----- fs/proc/proc_net.c | 6 ++++++ fs/proc/root.c | 5 +++++ 4 files changed, 27 insertions(+), 5 deletions(-) --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -99,6 +99,10 @@ void proc_task_name(struct seq_file *m, struct task_struct *p, bool escape) { char tcomm[64]; + /* + * Test before PF_KTHREAD because all workqueue worker threads are + * kernel threads. + */ if (p->flags & PF_WQ_WORKER) wq_worker_comm(tcomm, sizeof(tcomm), p); else if (p->flags & PF_KTHREAD) --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -212,7 +212,15 @@ static void unuse_pde(struct proc_dir_entry *pde) complete(pde->pde_unload_completion); } -/* pde is locked on entry, unlocked on exit */ +/* + * At most 2 contexts can enter this function: the one doing the last + * close on the descriptor and whoever is deleting PDE itself. + * + * First to enter calls ->proc_release hook and signals its completion + * to the second one which waits and then does nothing. + * + * PDE is locked on entry, unlocked on exit. + */ static void close_pdeo(struct proc_dir_entry *pde, struct pde_opener *pdeo) __releases(&pde->pde_unload_lock) { @@ -222,9 +230,6 @@ static void close_pdeo(struct proc_dir_entry *pde, struct pde_opener *pdeo) * * rmmod (remove_proc_entry() et al) can't delete an entry and proceed: * "struct file" needs to be available at the right moment. - * - * Therefore, first process to enter this function does ->release() and - * signals its completion to the other process which does nothing. */ if (pdeo->closing) { /* somebody else is doing that, just wait */ @@ -238,10 +243,12 @@ static void close_pdeo(struct proc_dir_entry *pde, struct pde_opener *pdeo) pdeo->closing = true; spin_unlock(&pde->pde_unload_lock); + file = pdeo->file; pde->proc_ops->proc_release(file_inode(file), file); + spin_lock(&pde->pde_unload_lock); - /* After ->release. */ + /* Strictly after ->proc_release, see above. */ list_del(&pdeo->lh); c = pdeo->c; spin_unlock(&pde->pde_unload_lock); --- a/fs/proc/proc_net.c +++ b/fs/proc/proc_net.c @@ -350,6 +350,12 @@ static __net_init int proc_net_ns_init(struct net *net) kgid_t gid; int err; + /* + * This PDE acts only as an anchor for /proc/${pid}/net hierarchy. + * Corresponding inode (PDE(inode) == net->proc_net) is never + * instantiated therefore blanket zeroing is fine. + * net->proc_net_stat inode is instantiated normally. + */ err = -ENOMEM; netd = kmem_cache_zalloc(proc_dir_entry_cache, GFP_KERNEL); if (!netd) --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -302,6 +302,11 @@ void __init proc_root_init(void) proc_mkdir("bus", NULL); proc_sys_init(); + /* + * Last things last. It is not like userspace processes eager + * to open /proc files exist at this point but register last + * anyway. + */ register_filesystem(&proc_fs_type); }