From patchwork Mon Jun 15 06:46:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11603889 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 240CB913 for ; Mon, 15 Jun 2020 06:49:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 031FD2078E for ; Mon, 15 Jun 2020 06:49:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592203771; bh=PW9Q9Rza1Ft5d+Y1Xvp+VMcPsWF+aTDSQqNL4AP5hME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HYQGiiHVe/lhkyUyw2m3exAcigPRnzl5dcMw/d2lsZtXuv9rRd3a14m61dOfRTcz/ /jFagYQWVtiX6aDRG2IkGGLQ5fdE+JEaVt9sShjwA1y0OVPM/x3A4auaaQ8q4xyAQt 1mIIgoLfJ5NCeFzE6xwAsH0D3QiBg+H0bsC2iEAw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728773AbgFOGtS (ORCPT ); Mon, 15 Jun 2020 02:49:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:59804 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728414AbgFOGrN (ORCPT ); Mon, 15 Jun 2020 02:47:13 -0400 Received: from mail.kernel.org (ip5f5ad5c5.dynamic.kabel-deutschland.de [95.90.213.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BBEDF207D4; Mon, 15 Jun 2020 06:47:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592203632; bh=PW9Q9Rza1Ft5d+Y1Xvp+VMcPsWF+aTDSQqNL4AP5hME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u6fYrewWRmselqLG9JODA72OGGQjbGxxp8ZbLZyegyMElYHPqyGjvqufdf///qz+e uCIzSXfz3k1Hzp+T+k6ESVtG5rl9wzh3f8HtPPYy78gE5m3Lm4ftfqZQqH0RYZRhEA r5626n7m50PHZaUhlBHxBj+Qd6D33YDVosaEXEEQ= Received: from mchehab by mail.kernel.org with local (Exim 4.93) (envelope-from ) id 1jkith-009nmP-IX; Mon, 15 Jun 2020 08:47:09 +0200 From: Mauro Carvalho Chehab To: Linux Doc Mailing List Cc: Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, Jonathan Corbet , Alexander Viro , Andrew Morton , Jan Kara , Jeff Layton , Stephen Rothwell , linux-fsdevel@vger.kernel.org Subject: [PATCH 07/29] fs: fs.h: fix a kernel-doc parameter description Date: Mon, 15 Jun 2020 08:46:46 +0200 Message-Id: X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Changeset 3b0311e7ca71 ("vfs: track per-sb writeback errors and report them to syncfs") added a variant of filemap_sample_wb_err(), but it forgot to rename the arguments at the kernel-doc markup. Fix it. Fix those warnings: ./include/linux/fs.h:2845: warning: Function parameter or member 'file' not described in 'file_sample_sb_err' ./include/linux/fs.h:2845: warning: Excess function parameter 'mapping' description in 'file_sample_sb_err' Fixes: 3b0311e7ca71 ("vfs: track per-sb writeback errors and report them to syncfs") Signed-off-by: Mauro Carvalho Chehab Reviewed-by: Jan Kara --- include/linux/fs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index 6c4ab4dc1cd7..7e17ecc461d5 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2829,7 +2829,7 @@ static inline errseq_t filemap_sample_wb_err(struct address_space *mapping) /** * file_sample_sb_err - sample the current errseq_t to test for later errors - * @mapping: mapping to be sampled + * @file: file pointer to be sampled * * Grab the most current superblock-level errseq_t value for the given * struct file. From patchwork Mon Jun 15 06:47:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11603855 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6F37913B1 for ; Mon, 15 Jun 2020 06:47:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4AD8920739 for ; Mon, 15 Jun 2020 06:47:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592203667; bh=UimGleFre7cAJ8h9wRRa31WiMBn6i+AWxCHOyITNml4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=q2sVv9mQC7uMlOmVuymcmcmdP+7G3yXm1axF7Jtl5VTdFcI6CvphocaqhvG/y2hym SF3aIEE8yZiKOAMm9c3iHgBj31shUJibFGo+nsygS5+AUMbVOfnQYFKeLLiSB98W4F ntXE7if2woesCCFWy3/Zj9ZHnHQqJA1aEJuEV/5Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728574AbgFOGrp (ORCPT ); Mon, 15 Jun 2020 02:47:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:59948 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728480AbgFOGrP (ORCPT ); Mon, 15 Jun 2020 02:47:15 -0400 Received: from mail.kernel.org (ip5f5ad5c5.dynamic.kabel-deutschland.de [95.90.213.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8349121548; Mon, 15 Jun 2020 06:47:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592203632; bh=UimGleFre7cAJ8h9wRRa31WiMBn6i+AWxCHOyITNml4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DNvqCAHssrA7jviCYFrWSIirS4eSzhv3WwvKT47LLBz6xHs5C1llthxE/kTtJG99k JXft7cXR3NVFnIphATg3qYJFv96dNcPQYCROayWhuU+vY5HCIuSOQ5uMrmCg7Nc7uz iadIKHtvkalT6HI0nYwFAN8CHj9WP/pJR2YTahNI= Received: from mchehab by mail.kernel.org with local (Exim 4.93) (envelope-from ) id 1jkiti-009no3-A3; Mon, 15 Jun 2020 08:47:10 +0200 From: Mauro Carvalho Chehab To: Linux Doc Mailing List Cc: Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, Jonathan Corbet , Alexey Dobriyan , Kees Cook , Daniel Kiss , Mark Brown , Catalin Marinas , linux-fsdevel@vger.kernel.org Subject: [PATCH 28/29] docs: fs: proc.rst: fix a warning due to a merge conflict Date: Mon, 15 Jun 2020 08:47:07 +0200 Message-Id: <7d46aec2cb7a5328d260c7c815b9be9737b43ee1.1592203542.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Changeset 424037b77519 ("mm: smaps: Report arm64 guarded pages in smaps") added a new parameter to a table. This causes Sphinx warnings, because there's now an extra "-" at the wrong place: /devel/v4l/docs/Documentation/filesystems/proc.rst:548: WARNING: Malformed table. Text in column margin in table line 29. == ======================================= rd readable ... bt - arm64 BTI guarded page == ======================================= Fixes: 424037b77519 ("mm: smaps: Report arm64 guarded pages in smaps") Fixes: c33e97efa9d9 ("docs: filesystems: convert proc.txt to ReST") Signed-off-by: Mauro Carvalho Chehab Reviewed-by: Kees Cook --- Documentation/filesystems/proc.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index 996f3cfe7030..53a0230a08e2 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -545,7 +545,7 @@ encoded manner. The codes are the following: hg huge page advise flag nh no huge page advise flag mg mergable advise flag - bt - arm64 BTI guarded page + bt arm64 BTI guarded page == ======================================= Note that there is no guarantee that every flag and associated mnemonic will From patchwork Mon Jun 15 06:47:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11603865 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7EF0613B1 for ; Mon, 15 Jun 2020 06:48:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6527520776 for ; Mon, 15 Jun 2020 06:48:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592203689; bh=Qapr2rbVocORKg4SiqEijr3TbDgc8abdVjfPsyD3fF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=H6mHLP7Kl1ZICR/ZPTMCW0TacRvm/VqLQihutOE27nj+7MQUEBAHoacxWEdWfZKzq A/fxeWs2B+1V36HvTzp5jAgBFJeEpX+nMoY0D+itTSVKBMCEoOXPQR3V509wfC6ihs M6yLZdlV0UI510B8RgiUBHemZpdMZXZHZzkCkbII= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728562AbgFOGro (ORCPT ); Mon, 15 Jun 2020 02:47:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:59944 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728483AbgFOGrP (ORCPT ); Mon, 15 Jun 2020 02:47:15 -0400 Received: from mail.kernel.org (ip5f5ad5c5.dynamic.kabel-deutschland.de [95.90.213.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 80D4421534; Mon, 15 Jun 2020 06:47:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592203632; bh=Qapr2rbVocORKg4SiqEijr3TbDgc8abdVjfPsyD3fF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V2/bS2iwr/BmvtRvHW6Vu987yYoLKE1eL/dLQXyzGbvtVgfYFRqBqMWSnSsY0lHsY UPp+C/kJBtrt/yFcIbsjlatw9RFHbQiKi90cspGalWhHjmktrQdXTZeSPHsYNHVesr zH+Bgq7KbPu4HPrbyh7MIlMFjZtd7H8g27895IJ4= Received: from mchehab by mail.kernel.org with local (Exim 4.93) (envelope-from ) id 1jkiti-009no8-BK; Mon, 15 Jun 2020 08:47:10 +0200 From: Mauro Carvalho Chehab To: Linux Doc Mailing List Cc: Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, Jonathan Corbet , Alexey Dobriyan , Kees Cook , Alexey Gladkov , "Eric W. Biederman" , linux-fsdevel@vger.kernel.org Subject: [PATCH 29/29] docs: fs: proc.rst: convert a new chapter to ReST Date: Mon, 15 Jun 2020 08:47:08 +0200 Message-Id: X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org A new chapter was added to proc.rst. Adjust the markups to avoid this warning: Documentation/filesystems/proc.rst:2194: WARNING: Inconsistent literal block quoting. And to properly mark the code-blocks there. Fixes: 37e7647a7212 ("docs: proc: add documentation for "hidepid=4" and "subset=pid" options and new mount behavior") Signed-off-by: Mauro Carvalho Chehab Reviewed-by: Kees Cook --- Documentation/filesystems/proc.rst | 44 ++++++++++++++---------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index 53a0230a08e2..cc0fd2685562 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -2179,46 +2179,44 @@ subset=pid hides all top level files and directories in the procfs that are not related to tasks. 5 Filesystem behavior ----------------------------- +--------------------------- Originally, before the advent of pid namepsace, procfs was a global file system. It means that there was only one procfs instance in the system. When pid namespace was added, a separate procfs instance was mounted in each pid namespace. So, procfs mount options are global among all -mountpoints within the same namespace. +mountpoints within the same namespace:: -:: + # grep ^proc /proc/mounts + proc /proc proc rw,relatime,hidepid=2 0 0 -# grep ^proc /proc/mounts -proc /proc proc rw,relatime,hidepid=2 0 0 + # strace -e mount mount -o hidepid=1 -t proc proc /tmp/proc + mount("proc", "/tmp/proc", "proc", 0, "hidepid=1") = 0 + +++ exited with 0 +++ -# strace -e mount mount -o hidepid=1 -t proc proc /tmp/proc -mount("proc", "/tmp/proc", "proc", 0, "hidepid=1") = 0 -+++ exited with 0 +++ - -# grep ^proc /proc/mounts -proc /proc proc rw,relatime,hidepid=2 0 0 -proc /tmp/proc proc rw,relatime,hidepid=2 0 0 + # grep ^proc /proc/mounts + proc /proc proc rw,relatime,hidepid=2 0 0 + proc /tmp/proc proc rw,relatime,hidepid=2 0 0 and only after remounting procfs mount options will change at all -mountpoints. +mountpoints:: -# mount -o remount,hidepid=1 -t proc proc /tmp/proc + # mount -o remount,hidepid=1 -t proc proc /tmp/proc -# grep ^proc /proc/mounts -proc /proc proc rw,relatime,hidepid=1 0 0 -proc /tmp/proc proc rw,relatime,hidepid=1 0 0 + # grep ^proc /proc/mounts + proc /proc proc rw,relatime,hidepid=1 0 0 + proc /tmp/proc proc rw,relatime,hidepid=1 0 0 This behavior is different from the behavior of other filesystems. The new procfs behavior is more like other filesystems. Each procfs mount creates a new procfs instance. Mount options affect own procfs instance. It means that it became possible to have several procfs instances -displaying tasks with different filtering options in one pid namespace. +displaying tasks with different filtering options in one pid namespace:: -# mount -o hidepid=invisible -t proc proc /proc -# mount -o hidepid=noaccess -t proc proc /tmp/proc -# grep ^proc /proc/mounts -proc /proc proc rw,relatime,hidepid=invisible 0 0 -proc /tmp/proc proc rw,relatime,hidepid=noaccess 0 0 + # mount -o hidepid=invisible -t proc proc /proc + # mount -o hidepid=noaccess -t proc proc /tmp/proc + # grep ^proc /proc/mounts + proc /proc proc rw,relatime,hidepid=invisible 0 0 + proc /tmp/proc proc rw,relatime,hidepid=noaccess 0 0