From: Andrei Vagin <avagin@gmail.com>
To: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Andrei Vagin <avagin@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
Dmitry Safonov <dima@arista.com>
Subject: [PATCH 4/5] arm64/vdso: Handle faults on timens page
Date: Tue, 4 Feb 2020 09:59:12 -0800 [thread overview]
Message-ID: <20200204175913.74901-5-avagin@gmail.com> (raw)
In-Reply-To: <20200204175913.74901-1-avagin@gmail.com>
If a task belongs to a time namespace then the VVAR page which contains
the system wide VDSO data is replaced with a namespace specific page
which has the same layout as the VVAR page.
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
arch/arm64/kernel/vdso.c | 55 +++++++++++++++++++++++++++++++++++++---
1 file changed, 51 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c
index bc93e26ae485..2e553468b183 100644
--- a/arch/arm64/kernel/vdso.c
+++ b/arch/arm64/kernel/vdso.c
@@ -23,6 +23,7 @@
#include <vdso/datapage.h>
#include <vdso/helpers.h>
#include <vdso/vsyscall.h>
+#include <linux/time_namespace.h>
#include <asm/cacheflush.h>
#include <asm/signal32.h>
@@ -171,15 +172,61 @@ int vdso_join_timens(struct task_struct *task, struct time_namespace *ns)
up_write(&mm->mmap_sem);
return 0;
}
+
+static struct page *find_timens_vvar_page(struct vm_area_struct *vma)
+{
+ if (likely(vma->vm_mm == current->mm))
+ return current->nsproxy->time_ns->vvar_page;
+
+ /*
+ * VM_PFNMAP | VM_IO protect .fault() handler from being called
+ * through interfaces like /proc/$pid/mem or
+ * process_vm_{readv,writev}() as long as there's no .access()
+ * in special_mapping_vmops().
+ * For more details check_vma_flags() and __access_remote_vm()
+ */
+
+ WARN(1, "vvar_page accessed remotely");
+
+ return NULL;
+}
+#else
+static inline struct page *find_timens_vvar_page(struct vm_area_struct *vma)
+{
+ return NULL;
+}
#endif
static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,
struct vm_area_struct *vma, struct vm_fault *vmf)
{
- if (vmf->pgoff == 0)
- return vmf_insert_pfn(vma, vmf->address,
- sym_to_pfn(vdso_data));
- return VM_FAULT_SIGBUS;
+ struct page *timens_page = find_timens_vvar_page(vma);
+ unsigned long pfn;
+
+ switch (vmf->pgoff) {
+ case VVAR_DATA_PAGE_OFFSET:
+ if (timens_page)
+ pfn = page_to_pfn(timens_page);
+ else
+ pfn = sym_to_pfn(vdso_data);
+ break;
+ case VVAR_TIMENS_PAGE_OFFSET:
+ /*
+ * If a task belongs to a time namespace then a namespace
+ * specific VVAR is mapped with the VVAR_DATA_PAGE_OFFSET and
+ * the real VVAR page is mapped with the VVAR_TIMENS_PAGE_OFFSET
+ * offset.
+ * See also the comment near timens_setup_vdso_data().
+ */
+ if (!timens_page)
+ return VM_FAULT_SIGBUS;
+ pfn = sym_to_pfn(vdso_data);
+ break;
+ default:
+ return VM_FAULT_SIGBUS;
+ }
+
+ return vmf_insert_pfn(vma, vmf->address, pfn);
}
static int __setup_additional_pages(enum arch_vdso_type arch_index,
--
2.24.1
next prev parent reply other threads:[~2020-02-04 17:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-04 17:59 [PATCH 0/5] arm64: add the time namespace support Andrei Vagin
2020-02-04 17:59 ` [PATCH 1/5] arm64/vdso: use the fault callback to map vvar pages Andrei Vagin
2020-02-20 12:36 ` Vincenzo Frascino
2020-02-04 17:59 ` [PATCH 2/5] arm64/vdso: Zap vvar pages when switching to a time namespace Andrei Vagin
2020-02-04 17:59 ` [PATCH 3/5] arm64/vdso: Add time napespace page Andrei Vagin
2020-02-20 12:03 ` Vincenzo Frascino
2020-02-04 17:59 ` Andrei Vagin [this message]
2020-02-20 12:07 ` [PATCH 4/5] arm64/vdso: Handle faults on timens page Vincenzo Frascino
2020-02-04 17:59 ` [PATCH 5/5] arm64/vdso: Restrict splitting VVAR VMA Andrei Vagin
2020-02-20 12:22 ` Vincenzo Frascino
2020-02-23 23:30 ` Andrei Vagin
2020-02-24 10:08 ` Vincenzo Frascino
2020-02-17 15:34 ` [PATCH 0/5] arm64: add the time namespace support Andrei Vagin
2020-02-17 18:25 ` Vincenzo Frascino
2020-02-20 12:40 ` Vincenzo Frascino
2020-02-23 8:08 ` Andrei Vagin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200204175913.74901-5-avagin@gmail.com \
--to=avagin@gmail.com \
--cc=dima@arista.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=vincenzo.frascino@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).