From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6A81C43381 for ; Mon, 18 Mar 2019 13:12:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A9FD20863 for ; Mon, 18 Mar 2019 13:12:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="P3PdHQt7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727507AbfCRNMC (ORCPT ); Mon, 18 Mar 2019 09:12:02 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:41494 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726691AbfCRNMB (ORCPT ); Mon, 18 Mar 2019 09:12:01 -0400 Received: by mail-pg1-f194.google.com with SMTP id k11so11344517pgb.8 for ; Mon, 18 Mar 2019 06:12:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=epSZyqBe4Y/OKKkFIQZrTHU48PlN6fQS/KXlKAwvNCI=; b=P3PdHQt7xFqZZ3OrRYOWBumt+a10yvZZMe1ahnZ2OGcnXfGyJJFIc2Nb8lvZ1eqff4 2Pf3/a37IMdsjTJvg8yZIdYlXXtA+u9R1nUXlnqxgvTcan5dBu3bKAFJ12vFUq8LYM69 rXxz45yqcaFS2CRPQ3W1ojfgDx8Sa0oilfDVLK6Yxc/nGYKhB1oOWK505pPCwQSxpwaR EFKBroNNEWD6Oe94kwuZEJMakVgDICxInMsHhkEnvuZnJUNaYMUcJsseebsl58Kr62PY r4/L9fjQ615HRjni091pU8NN0zsXcHSGyGGzPKRhhr27ZgOiVu1plt9p95gldYBxHQdQ /jIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=epSZyqBe4Y/OKKkFIQZrTHU48PlN6fQS/KXlKAwvNCI=; b=im5/JIXXMkQwx0idXRMs8F4zevvi0MrN17bszYoFDLncivRsyqKIFDCldOOyesVMOD 61fC7GonJ1u5zYBorULLdQkm+dWseqlE+dNGeUr+Zx+Wr4qPQYZ3Kw2dssvw5Cocj8c0 TBG5TXiPE4u6BOxnc/P54D4lcfEadHrFPmGCpC9UAXnqODvfek22VS4+/VA6BRb5R9u2 CBbpjpBFMKAc4y8/w0l1EVjoaI3i0ppbVcsPzswvCnpEbYPesdGv/mp3Hf/H/CmkbVqA LKP7tiRHP5oiaFp0E+pb0ePunxj7kprm5DnjOeqaZWmHEZGHD7CweKwu34wNYOLEQWSW 3Y1A== X-Gm-Message-State: APjAAAWb2kW7nsmTF6Jhnz+KI2G+kVn4V68XLmKYY+ec4eBBHfLrjGcB 0pr7Pl3h7dERHdFKTgf/EmZbf4Wi0TfSzObV4OHfSA== X-Google-Smtp-Source: APXvYqxkDF5fYpEH3Vs9ly9eilzCAQ4eFXUJCbCmr4F2nw4zNTdJM2I6GFk4D2mim2UUO7TV8sZWRVg+GwdnMP3xaNA= X-Received: by 2002:a65:6651:: with SMTP id z17mr16746057pgv.95.1552914720458; Mon, 18 Mar 2019 06:12:00 -0700 (PDT) MIME-Version: 1.0 References: <355e7c0dadaa2bb79d22e0b7aac7e4efc1114d49.1552679409.git.andreyknvl@google.com> <20190315161414.4b31fb03@gandalf.local.home> In-Reply-To: <20190315161414.4b31fb03@gandalf.local.home> From: Andrey Konovalov Date: Mon, 18 Mar 2019 14:11:48 +0100 Message-ID: Subject: Re: [PATCH v11 10/14] tracing, arm64: untag user pointers in seq_print_user_ip To: Steven Rostedt Cc: Catalin Marinas , Will Deacon , Mark Rutland , Robin Murphy , Kees Cook , Kate Stewart , Greg Kroah-Hartman , Andrew Morton , Ingo Molnar , "Kirill A . Shutemov" , Shuah Khan , Vincenzo Frascino , Eric Dumazet , "David S. Miller" , Alexei Starovoitov , Daniel Borkmann , Ingo Molnar , Peter Zijlstra , Arnaldo Carvalho de Melo , Linux ARM , "open list:DOCUMENTATION" , Linux Memory Management List , linux-arch , netdev , bpf@vger.kernel.org, "open list:KERNEL SELFTEST FRAMEWORK" , LKML , Dmitry Vyukov , Kostya Serebryany , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Chintan Pandya , Luc Van Oostenryck , Dave Martin , Kevin Brodsky , Szabolcs Nagy Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Mar 15, 2019 at 9:14 PM Steven Rostedt wrote: > > On Fri, 15 Mar 2019 20:51:34 +0100 > Andrey Konovalov wrote: > > > This patch is a part of a series that extends arm64 kernel ABI to allow to > > pass tagged user pointers (with the top byte set to something else other > > than 0x00) as syscall arguments. > > > > seq_print_user_ip() uses provided user pointers for vma lookups, which > > can only by done with untagged pointers. > > > > Untag user pointers in this function. > > > > Signed-off-by: Andrey Konovalov > > --- > > kernel/trace/trace_output.c | 5 +++-- > > p | 45 +++++++++++++++++++++++++++++++++++++ > > 2 files changed, 48 insertions(+), 2 deletions(-) > > create mode 100644 p > > > > diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c > > index 54373d93e251..6376bee93c84 100644 > > --- a/kernel/trace/trace_output.c > > +++ b/kernel/trace/trace_output.c > > @@ -370,6 +370,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > { > > struct file *file = NULL; > > unsigned long vmstart = 0; > > + unsigned long untagged_ip = untagged_addr(ip); > > int ret = 1; > > > > if (s->full) > > @@ -379,7 +380,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > const struct vm_area_struct *vma; > > > > down_read(&mm->mmap_sem); > > - vma = find_vma(mm, ip); > > + vma = find_vma(mm, untagged_ip); > > if (vma) { > > file = vma->vm_file; > > vmstart = vma->vm_start; > > @@ -388,7 +389,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > ret = trace_seq_path(s, &file->f_path); > > if (ret) > > trace_seq_printf(s, "[+0x%lx]", > > - ip - vmstart); > > + untagged_ip - vmstart); > > } > > up_read(&mm->mmap_sem); > > } > > diff --git a/p b/p > > new file mode 100644 > > index 000000000000..9d6fa5386e55 > > --- /dev/null > > +++ b/p > > @@ -0,0 +1,45 @@ > > +commit 1fa6fadf644859e8a6a8ecce258444b49be8c7ee > > +Author: Andrey Konovalov > > +Date: Mon Mar 4 17:20:32 2019 +0100 > > + > > + kasan: fix coccinelle warnings in kasan_p*_table > > + > > + kasan_p4d_table, kasan_pmd_table and kasan_pud_table are declared as > > + returning bool, but return 0 instead of false, which produces a coccinelle > > + warning. Fix it. > > + > > + Fixes: 0207df4fa1a8 ("kernel/memremap, kasan: make ZONE_DEVICE with work with KASAN") > > + Reported-by: kbuild test robot > > + Signed-off-by: Andrey Konovalov > > Did you mean to append this commit to this patch? No, did it by mistake. Will remove in v12, thanks for noticing! > > -- Steve > > > + > > +diff --git a/mm/kasan/init.c b/mm/kasan/init.c > > +index 45a1b5e38e1e..fcaa1ca03175 100644 > > +--- a/mm/kasan/init.c > > ++++ b/mm/kasan/init.c > > +@@ -42,7 +42,7 @@ static inline bool kasan_p4d_table(pgd_t pgd) > > + #else > > + static inline bool kasan_p4d_table(pgd_t pgd) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + #if CONFIG_PGTABLE_LEVELS > 3 > > +@@ -54,7 +54,7 @@ static inline bool kasan_pud_table(p4d_t p4d) > > + #else > > + static inline bool kasan_pud_table(p4d_t p4d) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + #if CONFIG_PGTABLE_LEVELS > 2 > > +@@ -66,7 +66,7 @@ static inline bool kasan_pmd_table(pud_t pud) > > + #else > > + static inline bool kasan_pmd_table(pud_t pud) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + pte_t kasan_early_shadow_pte[PTRS_PER_PTE] __page_aligned_bss; > From mboxrd@z Thu Jan 1 00:00:00 1970 From: andreyknvl at google.com (Andrey Konovalov) Date: Mon, 18 Mar 2019 14:11:48 +0100 Subject: [PATCH v11 10/14] tracing, arm64: untag user pointers in seq_print_user_ip In-Reply-To: <20190315161414.4b31fb03@gandalf.local.home> References: <355e7c0dadaa2bb79d22e0b7aac7e4efc1114d49.1552679409.git.andreyknvl@google.com> <20190315161414.4b31fb03@gandalf.local.home> Message-ID: On Fri, Mar 15, 2019 at 9:14 PM Steven Rostedt wrote: > > On Fri, 15 Mar 2019 20:51:34 +0100 > Andrey Konovalov wrote: > > > This patch is a part of a series that extends arm64 kernel ABI to allow to > > pass tagged user pointers (with the top byte set to something else other > > than 0x00) as syscall arguments. > > > > seq_print_user_ip() uses provided user pointers for vma lookups, which > > can only by done with untagged pointers. > > > > Untag user pointers in this function. > > > > Signed-off-by: Andrey Konovalov > > --- > > kernel/trace/trace_output.c | 5 +++-- > > p | 45 +++++++++++++++++++++++++++++++++++++ > > 2 files changed, 48 insertions(+), 2 deletions(-) > > create mode 100644 p > > > > diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c > > index 54373d93e251..6376bee93c84 100644 > > --- a/kernel/trace/trace_output.c > > +++ b/kernel/trace/trace_output.c > > @@ -370,6 +370,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > { > > struct file *file = NULL; > > unsigned long vmstart = 0; > > + unsigned long untagged_ip = untagged_addr(ip); > > int ret = 1; > > > > if (s->full) > > @@ -379,7 +380,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > const struct vm_area_struct *vma; > > > > down_read(&mm->mmap_sem); > > - vma = find_vma(mm, ip); > > + vma = find_vma(mm, untagged_ip); > > if (vma) { > > file = vma->vm_file; > > vmstart = vma->vm_start; > > @@ -388,7 +389,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > ret = trace_seq_path(s, &file->f_path); > > if (ret) > > trace_seq_printf(s, "[+0x%lx]", > > - ip - vmstart); > > + untagged_ip - vmstart); > > } > > up_read(&mm->mmap_sem); > > } > > diff --git a/p b/p > > new file mode 100644 > > index 000000000000..9d6fa5386e55 > > --- /dev/null > > +++ b/p > > @@ -0,0 +1,45 @@ > > +commit 1fa6fadf644859e8a6a8ecce258444b49be8c7ee > > +Author: Andrey Konovalov > > +Date: Mon Mar 4 17:20:32 2019 +0100 > > + > > + kasan: fix coccinelle warnings in kasan_p*_table > > + > > + kasan_p4d_table, kasan_pmd_table and kasan_pud_table are declared as > > + returning bool, but return 0 instead of false, which produces a coccinelle > > + warning. Fix it. > > + > > + Fixes: 0207df4fa1a8 ("kernel/memremap, kasan: make ZONE_DEVICE with work with KASAN") > > + Reported-by: kbuild test robot > > + Signed-off-by: Andrey Konovalov > > Did you mean to append this commit to this patch? No, did it by mistake. Will remove in v12, thanks for noticing! > > -- Steve > > > + > > +diff --git a/mm/kasan/init.c b/mm/kasan/init.c > > +index 45a1b5e38e1e..fcaa1ca03175 100644 > > +--- a/mm/kasan/init.c > > ++++ b/mm/kasan/init.c > > +@@ -42,7 +42,7 @@ static inline bool kasan_p4d_table(pgd_t pgd) > > + #else > > + static inline bool kasan_p4d_table(pgd_t pgd) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + #if CONFIG_PGTABLE_LEVELS > 3 > > +@@ -54,7 +54,7 @@ static inline bool kasan_pud_table(p4d_t p4d) > > + #else > > + static inline bool kasan_pud_table(p4d_t p4d) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + #if CONFIG_PGTABLE_LEVELS > 2 > > +@@ -66,7 +66,7 @@ static inline bool kasan_pmd_table(pud_t pud) > > + #else > > + static inline bool kasan_pmd_table(pud_t pud) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + pte_t kasan_early_shadow_pte[PTRS_PER_PTE] __page_aligned_bss; > From mboxrd@z Thu Jan 1 00:00:00 1970 From: andreyknvl@google.com (Andrey Konovalov) Date: Mon, 18 Mar 2019 14:11:48 +0100 Subject: [PATCH v11 10/14] tracing, arm64: untag user pointers in seq_print_user_ip In-Reply-To: <20190315161414.4b31fb03@gandalf.local.home> References: <355e7c0dadaa2bb79d22e0b7aac7e4efc1114d49.1552679409.git.andreyknvl@google.com> <20190315161414.4b31fb03@gandalf.local.home> Message-ID: Content-Type: text/plain; charset="UTF-8" Message-ID: <20190318131148.LZpdsjzBlQMdus3JV_M-TPz0Fq5CO-TzNET2O0S72xA@z> On Fri, Mar 15, 2019@9:14 PM Steven Rostedt wrote: > > On Fri, 15 Mar 2019 20:51:34 +0100 > Andrey Konovalov wrote: > > > This patch is a part of a series that extends arm64 kernel ABI to allow to > > pass tagged user pointers (with the top byte set to something else other > > than 0x00) as syscall arguments. > > > > seq_print_user_ip() uses provided user pointers for vma lookups, which > > can only by done with untagged pointers. > > > > Untag user pointers in this function. > > > > Signed-off-by: Andrey Konovalov > > --- > > kernel/trace/trace_output.c | 5 +++-- > > p | 45 +++++++++++++++++++++++++++++++++++++ > > 2 files changed, 48 insertions(+), 2 deletions(-) > > create mode 100644 p > > > > diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c > > index 54373d93e251..6376bee93c84 100644 > > --- a/kernel/trace/trace_output.c > > +++ b/kernel/trace/trace_output.c > > @@ -370,6 +370,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > { > > struct file *file = NULL; > > unsigned long vmstart = 0; > > + unsigned long untagged_ip = untagged_addr(ip); > > int ret = 1; > > > > if (s->full) > > @@ -379,7 +380,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > const struct vm_area_struct *vma; > > > > down_read(&mm->mmap_sem); > > - vma = find_vma(mm, ip); > > + vma = find_vma(mm, untagged_ip); > > if (vma) { > > file = vma->vm_file; > > vmstart = vma->vm_start; > > @@ -388,7 +389,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > ret = trace_seq_path(s, &file->f_path); > > if (ret) > > trace_seq_printf(s, "[+0x%lx]", > > - ip - vmstart); > > + untagged_ip - vmstart); > > } > > up_read(&mm->mmap_sem); > > } > > diff --git a/p b/p > > new file mode 100644 > > index 000000000000..9d6fa5386e55 > > --- /dev/null > > +++ b/p > > @@ -0,0 +1,45 @@ > > +commit 1fa6fadf644859e8a6a8ecce258444b49be8c7ee > > +Author: Andrey Konovalov > > +Date: Mon Mar 4 17:20:32 2019 +0100 > > + > > + kasan: fix coccinelle warnings in kasan_p*_table > > + > > + kasan_p4d_table, kasan_pmd_table and kasan_pud_table are declared as > > + returning bool, but return 0 instead of false, which produces a coccinelle > > + warning. Fix it. > > + > > + Fixes: 0207df4fa1a8 ("kernel/memremap, kasan: make ZONE_DEVICE with work with KASAN") > > + Reported-by: kbuild test robot > > + Signed-off-by: Andrey Konovalov > > Did you mean to append this commit to this patch? No, did it by mistake. Will remove in v12, thanks for noticing! > > -- Steve > > > + > > +diff --git a/mm/kasan/init.c b/mm/kasan/init.c > > +index 45a1b5e38e1e..fcaa1ca03175 100644 > > +--- a/mm/kasan/init.c > > ++++ b/mm/kasan/init.c > > +@@ -42,7 +42,7 @@ static inline bool kasan_p4d_table(pgd_t pgd) > > + #else > > + static inline bool kasan_p4d_table(pgd_t pgd) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + #if CONFIG_PGTABLE_LEVELS > 3 > > +@@ -54,7 +54,7 @@ static inline bool kasan_pud_table(p4d_t p4d) > > + #else > > + static inline bool kasan_pud_table(p4d_t p4d) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + #if CONFIG_PGTABLE_LEVELS > 2 > > +@@ -66,7 +66,7 @@ static inline bool kasan_pmd_table(pud_t pud) > > + #else > > + static inline bool kasan_pmd_table(pud_t pud) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + pte_t kasan_early_shadow_pte[PTRS_PER_PTE] __page_aligned_bss; > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrey Konovalov Subject: Re: [PATCH v11 10/14] tracing, arm64: untag user pointers in seq_print_user_ip Date: Mon, 18 Mar 2019 14:11:48 +0100 Message-ID: References: <355e7c0dadaa2bb79d22e0b7aac7e4efc1114d49.1552679409.git.andreyknvl@google.com> <20190315161414.4b31fb03@gandalf.local.home> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Return-path: In-Reply-To: <20190315161414.4b31fb03@gandalf.local.home> Sender: linux-kernel-owner@vger.kernel.org To: Steven Rostedt Cc: Catalin Marinas , Will Deacon , Mark Rutland , Robin Murphy , Kees Cook , Kate Stewart , Greg Kroah-Hartman , Andrew Morton , Ingo Molnar , "Kirill A . Shutemov" , Shuah Khan , Vincenzo Frascino , Eric Dumazet , "David S. Miller" , Alexei Starovoitov , Daniel Borkmann , Ingo Molnar , Peter Zijlstra , Arnaldo Carvalho de Melo List-Id: linux-arch.vger.kernel.org On Fri, Mar 15, 2019 at 9:14 PM Steven Rostedt wrote: > > On Fri, 15 Mar 2019 20:51:34 +0100 > Andrey Konovalov wrote: > > > This patch is a part of a series that extends arm64 kernel ABI to allow to > > pass tagged user pointers (with the top byte set to something else other > > than 0x00) as syscall arguments. > > > > seq_print_user_ip() uses provided user pointers for vma lookups, which > > can only by done with untagged pointers. > > > > Untag user pointers in this function. > > > > Signed-off-by: Andrey Konovalov > > --- > > kernel/trace/trace_output.c | 5 +++-- > > p | 45 +++++++++++++++++++++++++++++++++++++ > > 2 files changed, 48 insertions(+), 2 deletions(-) > > create mode 100644 p > > > > diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c > > index 54373d93e251..6376bee93c84 100644 > > --- a/kernel/trace/trace_output.c > > +++ b/kernel/trace/trace_output.c > > @@ -370,6 +370,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > { > > struct file *file = NULL; > > unsigned long vmstart = 0; > > + unsigned long untagged_ip = untagged_addr(ip); > > int ret = 1; > > > > if (s->full) > > @@ -379,7 +380,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > const struct vm_area_struct *vma; > > > > down_read(&mm->mmap_sem); > > - vma = find_vma(mm, ip); > > + vma = find_vma(mm, untagged_ip); > > if (vma) { > > file = vma->vm_file; > > vmstart = vma->vm_start; > > @@ -388,7 +389,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > ret = trace_seq_path(s, &file->f_path); > > if (ret) > > trace_seq_printf(s, "[+0x%lx]", > > - ip - vmstart); > > + untagged_ip - vmstart); > > } > > up_read(&mm->mmap_sem); > > } > > diff --git a/p b/p > > new file mode 100644 > > index 000000000000..9d6fa5386e55 > > --- /dev/null > > +++ b/p > > @@ -0,0 +1,45 @@ > > +commit 1fa6fadf644859e8a6a8ecce258444b49be8c7ee > > +Author: Andrey Konovalov > > +Date: Mon Mar 4 17:20:32 2019 +0100 > > + > > + kasan: fix coccinelle warnings in kasan_p*_table > > + > > + kasan_p4d_table, kasan_pmd_table and kasan_pud_table are declared as > > + returning bool, but return 0 instead of false, which produces a coccinelle > > + warning. Fix it. > > + > > + Fixes: 0207df4fa1a8 ("kernel/memremap, kasan: make ZONE_DEVICE with work with KASAN") > > + Reported-by: kbuild test robot > > + Signed-off-by: Andrey Konovalov > > Did you mean to append this commit to this patch? No, did it by mistake. Will remove in v12, thanks for noticing! > > -- Steve > > > + > > +diff --git a/mm/kasan/init.c b/mm/kasan/init.c > > +index 45a1b5e38e1e..fcaa1ca03175 100644 > > +--- a/mm/kasan/init.c > > ++++ b/mm/kasan/init.c > > +@@ -42,7 +42,7 @@ static inline bool kasan_p4d_table(pgd_t pgd) > > + #else > > + static inline bool kasan_p4d_table(pgd_t pgd) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + #if CONFIG_PGTABLE_LEVELS > 3 > > +@@ -54,7 +54,7 @@ static inline bool kasan_pud_table(p4d_t p4d) > > + #else > > + static inline bool kasan_pud_table(p4d_t p4d) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + #if CONFIG_PGTABLE_LEVELS > 2 > > +@@ -66,7 +66,7 @@ static inline bool kasan_pmd_table(pud_t pud) > > + #else > > + static inline bool kasan_pmd_table(pud_t pud) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + pte_t kasan_early_shadow_pte[PTRS_PER_PTE] __page_aligned_bss; > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-f194.google.com ([209.85.215.194]:35070 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726704AbfCRNMB (ORCPT ); Mon, 18 Mar 2019 09:12:01 -0400 Received: by mail-pg1-f194.google.com with SMTP id g8so697184pgf.2 for ; Mon, 18 Mar 2019 06:12:01 -0700 (PDT) MIME-Version: 1.0 References: <355e7c0dadaa2bb79d22e0b7aac7e4efc1114d49.1552679409.git.andreyknvl@google.com> <20190315161414.4b31fb03@gandalf.local.home> In-Reply-To: <20190315161414.4b31fb03@gandalf.local.home> From: Andrey Konovalov Date: Mon, 18 Mar 2019 14:11:48 +0100 Message-ID: Subject: Re: [PATCH v11 10/14] tracing, arm64: untag user pointers in seq_print_user_ip Content-Type: text/plain; charset="UTF-8" Sender: linux-arch-owner@vger.kernel.org List-ID: To: Steven Rostedt Cc: Catalin Marinas , Will Deacon , Mark Rutland , Robin Murphy , Kees Cook , Kate Stewart , Greg Kroah-Hartman , Andrew Morton , Ingo Molnar , "Kirill A . Shutemov" , Shuah Khan , Vincenzo Frascino , Eric Dumazet , "David S. Miller" , Alexei Starovoitov , Daniel Borkmann , Ingo Molnar , Peter Zijlstra , Arnaldo Carvalho de Melo , Linux ARM , "open list:DOCUMENTATION" , Linux Memory Management List , linux-arch , netdev , bpf@vger.kernel.org, "open list:KERNEL SELFTEST FRAMEWORK" , LKML , Dmitry Vyukov , Kostya Serebryany , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Chintan Pandya , Luc Van Oostenryck , Dave Martin , Kevin Brodsky , Szabolcs Nagy Message-ID: <20190318131148.PEGxU5rorhLTsNpByp3CPswQeE4Nv_QktwOxOutHmIE@z> On Fri, Mar 15, 2019 at 9:14 PM Steven Rostedt wrote: > > On Fri, 15 Mar 2019 20:51:34 +0100 > Andrey Konovalov wrote: > > > This patch is a part of a series that extends arm64 kernel ABI to allow to > > pass tagged user pointers (with the top byte set to something else other > > than 0x00) as syscall arguments. > > > > seq_print_user_ip() uses provided user pointers for vma lookups, which > > can only by done with untagged pointers. > > > > Untag user pointers in this function. > > > > Signed-off-by: Andrey Konovalov > > --- > > kernel/trace/trace_output.c | 5 +++-- > > p | 45 +++++++++++++++++++++++++++++++++++++ > > 2 files changed, 48 insertions(+), 2 deletions(-) > > create mode 100644 p > > > > diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c > > index 54373d93e251..6376bee93c84 100644 > > --- a/kernel/trace/trace_output.c > > +++ b/kernel/trace/trace_output.c > > @@ -370,6 +370,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > { > > struct file *file = NULL; > > unsigned long vmstart = 0; > > + unsigned long untagged_ip = untagged_addr(ip); > > int ret = 1; > > > > if (s->full) > > @@ -379,7 +380,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > const struct vm_area_struct *vma; > > > > down_read(&mm->mmap_sem); > > - vma = find_vma(mm, ip); > > + vma = find_vma(mm, untagged_ip); > > if (vma) { > > file = vma->vm_file; > > vmstart = vma->vm_start; > > @@ -388,7 +389,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > ret = trace_seq_path(s, &file->f_path); > > if (ret) > > trace_seq_printf(s, "[+0x%lx]", > > - ip - vmstart); > > + untagged_ip - vmstart); > > } > > up_read(&mm->mmap_sem); > > } > > diff --git a/p b/p > > new file mode 100644 > > index 000000000000..9d6fa5386e55 > > --- /dev/null > > +++ b/p > > @@ -0,0 +1,45 @@ > > +commit 1fa6fadf644859e8a6a8ecce258444b49be8c7ee > > +Author: Andrey Konovalov > > +Date: Mon Mar 4 17:20:32 2019 +0100 > > + > > + kasan: fix coccinelle warnings in kasan_p*_table > > + > > + kasan_p4d_table, kasan_pmd_table and kasan_pud_table are declared as > > + returning bool, but return 0 instead of false, which produces a coccinelle > > + warning. Fix it. > > + > > + Fixes: 0207df4fa1a8 ("kernel/memremap, kasan: make ZONE_DEVICE with work with KASAN") > > + Reported-by: kbuild test robot > > + Signed-off-by: Andrey Konovalov > > Did you mean to append this commit to this patch? No, did it by mistake. Will remove in v12, thanks for noticing! > > -- Steve > > > + > > +diff --git a/mm/kasan/init.c b/mm/kasan/init.c > > +index 45a1b5e38e1e..fcaa1ca03175 100644 > > +--- a/mm/kasan/init.c > > ++++ b/mm/kasan/init.c > > +@@ -42,7 +42,7 @@ static inline bool kasan_p4d_table(pgd_t pgd) > > + #else > > + static inline bool kasan_p4d_table(pgd_t pgd) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + #if CONFIG_PGTABLE_LEVELS > 3 > > +@@ -54,7 +54,7 @@ static inline bool kasan_pud_table(p4d_t p4d) > > + #else > > + static inline bool kasan_pud_table(p4d_t p4d) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + #if CONFIG_PGTABLE_LEVELS > 2 > > +@@ -66,7 +66,7 @@ static inline bool kasan_pmd_table(pud_t pud) > > + #else > > + static inline bool kasan_pmd_table(pud_t pud) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + pte_t kasan_early_shadow_pte[PTRS_PER_PTE] __page_aligned_bss; > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5955C10F00 for ; Mon, 18 Mar 2019 13:12:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 530B620850 for ; Mon, 18 Mar 2019 13:12:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="P3PdHQt7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 530B620850 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E6C056B0005; Mon, 18 Mar 2019 09:12:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E1A456B0006; Mon, 18 Mar 2019 09:12:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CE3116B0007; Mon, 18 Mar 2019 09:12:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by kanga.kvack.org (Postfix) with ESMTP id 8A7806B0005 for ; Mon, 18 Mar 2019 09:12:02 -0400 (EDT) Received: by mail-pg1-f199.google.com with SMTP id d10so18535040pgv.23 for ; Mon, 18 Mar 2019 06:12:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:mime-version:references :in-reply-to:from:date:message-id:subject:to:cc; bh=epSZyqBe4Y/OKKkFIQZrTHU48PlN6fQS/KXlKAwvNCI=; b=AlNh+4m3ShNQ21s+DRSgkYZpejtZjLU6Iqz6R7t+wXMt7ZteV5cWTgqNmHLkZOjmYK /udOV6nBmiZYdToNNAm9vaERNtrRdkiMme10HI2Lt6ljpa24pd20QFMDXfCe8Q3nLn7S oVf9OavmdE3er7LE0Hmh1CWdVKMo+xpr9IHOWRVwr0IvgLhFKShGz7ptF3Opf2wthrRs qzIuB6O5GMBFnfsB+qDsqnhHYuCiaGmt5Nb/RqCfFP56iR7OJlqocxVyZ+jaHDtc2b1J wYp+k3c5Ay8gQ700tiJi5R84uvl4FJ6klpQzMv+mFjoSNtPyNftBnCRAJnuggSiDqh76 6baw== X-Gm-Message-State: APjAAAU2tzmz2lqZtNfpq+ixWSPAwDtXjNkatVuEPuheEBbnMr+a8nE1 csTjcZe6sEJKSEtr7GTiWnWMzcPcfXqjMjGlyaLcf1z1Q5Wgh2UgwAClcZvAn6Ad5v4CEwYCF7J k5BBlt2u06N7G6EM63EFNwpdYzSHdy0kAok75P0BY0Cs231h20X2j9OrrDBRBRjTFAw== X-Received: by 2002:a17:902:ab95:: with SMTP id f21mr20084081plr.188.1552914722236; Mon, 18 Mar 2019 06:12:02 -0700 (PDT) X-Received: by 2002:a17:902:ab95:: with SMTP id f21mr20084004plr.188.1552914721033; Mon, 18 Mar 2019 06:12:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552914721; cv=none; d=google.com; s=arc-20160816; b=CnfTOpTxPDJCxBZTIpF2zKiXexKesY05d1mL467Bw95K0GZO+jCQnx6Z1a88BFlNLd BDxSfIlU24N17MIuKomghWpdvoyP6tv5SSu5d6TrJ5aSa6y4JQq0BGPzH+OGJpMBZrIJ o3NMUDt5w78okvlb8TgWl3XMd8h/fTmxxI0OB1P6nhxDFMPentHDjyoRvlmZbRTRzNC6 C6yawxmbj9fVAk87RGangMPVIn+G48dOde7/F2Ph4Nuv5esnc6TjGCzC49cacrfspsgO SsQwnilVhBlXp+ufhGhgUUCxGLStU7nZakALfBPyzZhBDoxga1mUNaCd2fRlHs0ijA/o 8XtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:dkim-signature; bh=epSZyqBe4Y/OKKkFIQZrTHU48PlN6fQS/KXlKAwvNCI=; b=rDDhd+nN/tVs3vTuY3FnwOqkDAZFJUv8zuE6ht9U+2uxc/IZA0VeLcPHxfQviwPuKA ekXVWbfcJ+BURqGbqZHzTAjN+Xpq71SkZFAoiB7GRpcUenZhOVySmtnqcWkhjoXU1gLH lmsLg/MVgG5KuEZB6zEmQX5Wbs9+coV/FkgWC7R56dGCL5HKOx5Em4xk1cXbLYzFu3ya QQUVZx+a02jTGbn0HuQV4QhBjnIBJnHlbvvM4s/WjaNOypIyjEKP5CfTyztynivF+eJQ P5huhnrGhBJdTSw7rGqWHBkzBbtYze/gijlyqzO7m1H35WWzM1iONoRPBXeksU1d6jdM 26Nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=P3PdHQt7; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@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 a10sor14396775pgt.24.2019.03.18.06.12.00 for (Google Transport Security); Mon, 18 Mar 2019 06:12:01 -0700 (PDT) Received-SPF: pass (google.com: domain of andreyknvl@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=P3PdHQt7; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@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=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=epSZyqBe4Y/OKKkFIQZrTHU48PlN6fQS/KXlKAwvNCI=; b=P3PdHQt7xFqZZ3OrRYOWBumt+a10yvZZMe1ahnZ2OGcnXfGyJJFIc2Nb8lvZ1eqff4 2Pf3/a37IMdsjTJvg8yZIdYlXXtA+u9R1nUXlnqxgvTcan5dBu3bKAFJ12vFUq8LYM69 rXxz45yqcaFS2CRPQ3W1ojfgDx8Sa0oilfDVLK6Yxc/nGYKhB1oOWK505pPCwQSxpwaR EFKBroNNEWD6Oe94kwuZEJMakVgDICxInMsHhkEnvuZnJUNaYMUcJsseebsl58Kr62PY r4/L9fjQ615HRjni091pU8NN0zsXcHSGyGGzPKRhhr27ZgOiVu1plt9p95gldYBxHQdQ /jIA== X-Google-Smtp-Source: APXvYqxkDF5fYpEH3Vs9ly9eilzCAQ4eFXUJCbCmr4F2nw4zNTdJM2I6GFk4D2mim2UUO7TV8sZWRVg+GwdnMP3xaNA= X-Received: by 2002:a65:6651:: with SMTP id z17mr16746057pgv.95.1552914720458; Mon, 18 Mar 2019 06:12:00 -0700 (PDT) MIME-Version: 1.0 References: <355e7c0dadaa2bb79d22e0b7aac7e4efc1114d49.1552679409.git.andreyknvl@google.com> <20190315161414.4b31fb03@gandalf.local.home> In-Reply-To: <20190315161414.4b31fb03@gandalf.local.home> From: Andrey Konovalov Date: Mon, 18 Mar 2019 14:11:48 +0100 Message-ID: Subject: Re: [PATCH v11 10/14] tracing, arm64: untag user pointers in seq_print_user_ip To: Steven Rostedt Cc: Catalin Marinas , Will Deacon , Mark Rutland , Robin Murphy , Kees Cook , Kate Stewart , Greg Kroah-Hartman , Andrew Morton , Ingo Molnar , "Kirill A . Shutemov" , Shuah Khan , Vincenzo Frascino , Eric Dumazet , "David S. Miller" , Alexei Starovoitov , Daniel Borkmann , Ingo Molnar , Peter Zijlstra , Arnaldo Carvalho de Melo , Linux ARM , "open list:DOCUMENTATION" , Linux Memory Management List , linux-arch , netdev , bpf@vger.kernel.org, "open list:KERNEL SELFTEST FRAMEWORK" , LKML , Dmitry Vyukov , Kostya Serebryany , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Chintan Pandya , Luc Van Oostenryck , Dave Martin , Kevin Brodsky , Szabolcs Nagy Content-Type: text/plain; charset="UTF-8" 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: On Fri, Mar 15, 2019 at 9:14 PM Steven Rostedt wrote: > > On Fri, 15 Mar 2019 20:51:34 +0100 > Andrey Konovalov wrote: > > > This patch is a part of a series that extends arm64 kernel ABI to allow to > > pass tagged user pointers (with the top byte set to something else other > > than 0x00) as syscall arguments. > > > > seq_print_user_ip() uses provided user pointers for vma lookups, which > > can only by done with untagged pointers. > > > > Untag user pointers in this function. > > > > Signed-off-by: Andrey Konovalov > > --- > > kernel/trace/trace_output.c | 5 +++-- > > p | 45 +++++++++++++++++++++++++++++++++++++ > > 2 files changed, 48 insertions(+), 2 deletions(-) > > create mode 100644 p > > > > diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c > > index 54373d93e251..6376bee93c84 100644 > > --- a/kernel/trace/trace_output.c > > +++ b/kernel/trace/trace_output.c > > @@ -370,6 +370,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > { > > struct file *file = NULL; > > unsigned long vmstart = 0; > > + unsigned long untagged_ip = untagged_addr(ip); > > int ret = 1; > > > > if (s->full) > > @@ -379,7 +380,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > const struct vm_area_struct *vma; > > > > down_read(&mm->mmap_sem); > > - vma = find_vma(mm, ip); > > + vma = find_vma(mm, untagged_ip); > > if (vma) { > > file = vma->vm_file; > > vmstart = vma->vm_start; > > @@ -388,7 +389,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > ret = trace_seq_path(s, &file->f_path); > > if (ret) > > trace_seq_printf(s, "[+0x%lx]", > > - ip - vmstart); > > + untagged_ip - vmstart); > > } > > up_read(&mm->mmap_sem); > > } > > diff --git a/p b/p > > new file mode 100644 > > index 000000000000..9d6fa5386e55 > > --- /dev/null > > +++ b/p > > @@ -0,0 +1,45 @@ > > +commit 1fa6fadf644859e8a6a8ecce258444b49be8c7ee > > +Author: Andrey Konovalov > > +Date: Mon Mar 4 17:20:32 2019 +0100 > > + > > + kasan: fix coccinelle warnings in kasan_p*_table > > + > > + kasan_p4d_table, kasan_pmd_table and kasan_pud_table are declared as > > + returning bool, but return 0 instead of false, which produces a coccinelle > > + warning. Fix it. > > + > > + Fixes: 0207df4fa1a8 ("kernel/memremap, kasan: make ZONE_DEVICE with work with KASAN") > > + Reported-by: kbuild test robot > > + Signed-off-by: Andrey Konovalov > > Did you mean to append this commit to this patch? No, did it by mistake. Will remove in v12, thanks for noticing! > > -- Steve > > > + > > +diff --git a/mm/kasan/init.c b/mm/kasan/init.c > > +index 45a1b5e38e1e..fcaa1ca03175 100644 > > +--- a/mm/kasan/init.c > > ++++ b/mm/kasan/init.c > > +@@ -42,7 +42,7 @@ static inline bool kasan_p4d_table(pgd_t pgd) > > + #else > > + static inline bool kasan_p4d_table(pgd_t pgd) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + #if CONFIG_PGTABLE_LEVELS > 3 > > +@@ -54,7 +54,7 @@ static inline bool kasan_pud_table(p4d_t p4d) > > + #else > > + static inline bool kasan_pud_table(p4d_t p4d) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + #if CONFIG_PGTABLE_LEVELS > 2 > > +@@ -66,7 +66,7 @@ static inline bool kasan_pmd_table(pud_t pud) > > + #else > > + static inline bool kasan_pmd_table(pud_t pud) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + pte_t kasan_early_shadow_pte[PTRS_PER_PTE] __page_aligned_bss; > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6CF04C43381 for ; Mon, 18 Mar 2019 13:12:19 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3DB9420850 for ; Mon, 18 Mar 2019 13:12:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="KicqTSVq"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="P3PdHQt7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3DB9420850 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=URYFJ1KxFjHV+sgTvFuotDDDJDsF2ejxT9BWPljOu3w=; b=KicqTSVqNb2Jvi BsR26AhSWkKrC0ydgQMoPSYLrFLS/zu8TTcVriKxPn64L/xMhNChW/9JSgQCQFBQFlouLgxdbwZTQ JlxADQ3rOfrh+NvuBT6oiIHRVHC/meOD/9gmOuKGOKq+HYeLVbDxGZNSQolobiNwxEYv/Nt08+2A7 WlsxMDJobacctbkNqhGEdJHjLqyY4MibtfVxG+//PkgYe12A/rRsB/sH01fHpFNQVunEzLgxIWqgf f10LKNc8e3RhO6diYuqibd1foZQnDfGSUYi0TXoCcSjNWMl9PGnpaOusXgeyR2h8mng37tT6jHoks gZRnj630ICPkT56+0jCg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5s3k-0006lE-1R; Mon, 18 Mar 2019 13:12:08 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5s3g-0006kP-A1 for linux-arm-kernel@lists.infradead.org; Mon, 18 Mar 2019 13:12:06 +0000 Received: by mail-pf1-x443.google.com with SMTP id n125so11228847pfn.5 for ; Mon, 18 Mar 2019 06:12:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=epSZyqBe4Y/OKKkFIQZrTHU48PlN6fQS/KXlKAwvNCI=; b=P3PdHQt7xFqZZ3OrRYOWBumt+a10yvZZMe1ahnZ2OGcnXfGyJJFIc2Nb8lvZ1eqff4 2Pf3/a37IMdsjTJvg8yZIdYlXXtA+u9R1nUXlnqxgvTcan5dBu3bKAFJ12vFUq8LYM69 rXxz45yqcaFS2CRPQ3W1ojfgDx8Sa0oilfDVLK6Yxc/nGYKhB1oOWK505pPCwQSxpwaR EFKBroNNEWD6Oe94kwuZEJMakVgDICxInMsHhkEnvuZnJUNaYMUcJsseebsl58Kr62PY r4/L9fjQ615HRjni091pU8NN0zsXcHSGyGGzPKRhhr27ZgOiVu1plt9p95gldYBxHQdQ /jIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=epSZyqBe4Y/OKKkFIQZrTHU48PlN6fQS/KXlKAwvNCI=; b=OadJxYbnrDpfqaBBqlWnlQS5/SMyg7QFEhodFjdHaTIf316WSwFyV2I2l7CAFJlMEF bFMUGgbRZv4iDvsipohwQodHcmvkowAW1Anz4Bajc8cWM8XvNFLD+2mPQD/MLa1PoF29 btNPE7GHvSvnm7HXyudTVZ7gyQ2vxGX85CQfw9+3eKznEUhY2l7/buqgmWO4BL4XgLV5 lhdjOaq0of1S/ovE46S42D1rRCWM36jAfazi/nav3ti1/ZxdBgpBQ44fQwkLdSei/h3C zGq09IpvGx/nQBB6HeJ6k3NGL13fKSwkbvXN6+rm13xMvrIYXxnKQfV4e+smqGIgaD8j 14Aw== X-Gm-Message-State: APjAAAU5PDHRrllGF6opDmO8gKkmWuhbt+rgKLwFt5BnCEMZral9Vd74 yIUbxw2NtF9AC2Vqfs8gEYL7oBcDJ8RPIZJ+PprInQ== X-Google-Smtp-Source: APXvYqxkDF5fYpEH3Vs9ly9eilzCAQ4eFXUJCbCmr4F2nw4zNTdJM2I6GFk4D2mim2UUO7TV8sZWRVg+GwdnMP3xaNA= X-Received: by 2002:a65:6651:: with SMTP id z17mr16746057pgv.95.1552914720458; Mon, 18 Mar 2019 06:12:00 -0700 (PDT) MIME-Version: 1.0 References: <355e7c0dadaa2bb79d22e0b7aac7e4efc1114d49.1552679409.git.andreyknvl@google.com> <20190315161414.4b31fb03@gandalf.local.home> In-Reply-To: <20190315161414.4b31fb03@gandalf.local.home> From: Andrey Konovalov Date: Mon, 18 Mar 2019 14:11:48 +0100 Message-ID: Subject: Re: [PATCH v11 10/14] tracing, arm64: untag user pointers in seq_print_user_ip To: Steven Rostedt X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190318_061204_347331_390C87AB X-CRM114-Status: GOOD ( 25.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Kate Stewart , "open list:DOCUMENTATION" , Peter Zijlstra , Catalin Marinas , Will Deacon , Alexei Starovoitov , Linux Memory Management List , Eric Dumazet , "open list:KERNEL SELFTEST FRAMEWORK" , Chintan Pandya , Vincenzo Frascino , Shuah Khan , Ingo Molnar , linux-arch , Jacob Bramley , Daniel Borkmann , Szabolcs Nagy , Ingo Molnar , Dmitry Vyukov , Ramana Radhakrishnan , Dave Martin , Evgeniy Stepanov , Kevin Brodsky , Kees Cook , Ruben Ayrapetyan , Lee Smith , Arnaldo Carvalho de Melo , bpf@vger.kernel.org, Linux ARM , Kostya Serebryany , Greg Kroah-Hartman , LKML , Luc Van Oostenryck , netdev , Andrew Morton , Robin Murphy , "David S. Miller" , "Kirill A . Shutemov" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Mar 15, 2019 at 9:14 PM Steven Rostedt wrote: > > On Fri, 15 Mar 2019 20:51:34 +0100 > Andrey Konovalov wrote: > > > This patch is a part of a series that extends arm64 kernel ABI to allow to > > pass tagged user pointers (with the top byte set to something else other > > than 0x00) as syscall arguments. > > > > seq_print_user_ip() uses provided user pointers for vma lookups, which > > can only by done with untagged pointers. > > > > Untag user pointers in this function. > > > > Signed-off-by: Andrey Konovalov > > --- > > kernel/trace/trace_output.c | 5 +++-- > > p | 45 +++++++++++++++++++++++++++++++++++++ > > 2 files changed, 48 insertions(+), 2 deletions(-) > > create mode 100644 p > > > > diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c > > index 54373d93e251..6376bee93c84 100644 > > --- a/kernel/trace/trace_output.c > > +++ b/kernel/trace/trace_output.c > > @@ -370,6 +370,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > { > > struct file *file = NULL; > > unsigned long vmstart = 0; > > + unsigned long untagged_ip = untagged_addr(ip); > > int ret = 1; > > > > if (s->full) > > @@ -379,7 +380,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > const struct vm_area_struct *vma; > > > > down_read(&mm->mmap_sem); > > - vma = find_vma(mm, ip); > > + vma = find_vma(mm, untagged_ip); > > if (vma) { > > file = vma->vm_file; > > vmstart = vma->vm_start; > > @@ -388,7 +389,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, > > ret = trace_seq_path(s, &file->f_path); > > if (ret) > > trace_seq_printf(s, "[+0x%lx]", > > - ip - vmstart); > > + untagged_ip - vmstart); > > } > > up_read(&mm->mmap_sem); > > } > > diff --git a/p b/p > > new file mode 100644 > > index 000000000000..9d6fa5386e55 > > --- /dev/null > > +++ b/p > > @@ -0,0 +1,45 @@ > > +commit 1fa6fadf644859e8a6a8ecce258444b49be8c7ee > > +Author: Andrey Konovalov > > +Date: Mon Mar 4 17:20:32 2019 +0100 > > + > > + kasan: fix coccinelle warnings in kasan_p*_table > > + > > + kasan_p4d_table, kasan_pmd_table and kasan_pud_table are declared as > > + returning bool, but return 0 instead of false, which produces a coccinelle > > + warning. Fix it. > > + > > + Fixes: 0207df4fa1a8 ("kernel/memremap, kasan: make ZONE_DEVICE with work with KASAN") > > + Reported-by: kbuild test robot > > + Signed-off-by: Andrey Konovalov > > Did you mean to append this commit to this patch? No, did it by mistake. Will remove in v12, thanks for noticing! > > -- Steve > > > + > > +diff --git a/mm/kasan/init.c b/mm/kasan/init.c > > +index 45a1b5e38e1e..fcaa1ca03175 100644 > > +--- a/mm/kasan/init.c > > ++++ b/mm/kasan/init.c > > +@@ -42,7 +42,7 @@ static inline bool kasan_p4d_table(pgd_t pgd) > > + #else > > + static inline bool kasan_p4d_table(pgd_t pgd) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + #if CONFIG_PGTABLE_LEVELS > 3 > > +@@ -54,7 +54,7 @@ static inline bool kasan_pud_table(p4d_t p4d) > > + #else > > + static inline bool kasan_pud_table(p4d_t p4d) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + #if CONFIG_PGTABLE_LEVELS > 2 > > +@@ -66,7 +66,7 @@ static inline bool kasan_pmd_table(pud_t pud) > > + #else > > + static inline bool kasan_pmd_table(pud_t pud) > > + { > > +- return 0; > > ++ return false; > > + } > > + #endif > > + pte_t kasan_early_shadow_pte[PTRS_PER_PTE] __page_aligned_bss; > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel