Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp3028816imm; Sun, 1 Jul 2018 10:37:03 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIOCMDligWAjguFx7GT6xuHPCzKXlBOgsqAtSBYT/kMuftsdlM+a7ku72DAZFiNNkjiDBrY X-Received: by 2002:a17:902:2006:: with SMTP id n6-v6mr22722424pla.125.1530466623668; Sun, 01 Jul 2018 10:37:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530466623; cv=none; d=google.com; s=arc-20160816; b=oK1Pxq1Pw5O8Z2P+j6uSMV/Ud1G3AANu8DZsu8ZZe6cCSCHQJOjvDDy7RBpERSOnb3 WMRAJo3FjGHJxnOgxnvA5OKFeCm6idz1gxkM25QpiG1VZvOPCxTbjfRXBLjI9STH5EZA hqQWxO41oPF9hyLW1OGo569Wyx4duFGF3yJT+u+5drCRRbnxwlf4jXlgzHI/yjZcHuGI 0uOjoIr9z8ZGu1B0LhXxoQmFg76SfOSUNgaAE1lLTB0dmLnNssXtYWwmkyACeEz08BV8 uCDSn+avV0YKQMsVqf3A+Tsczauj+tUmuqkEHfo5/wsjak7sqjV1zj9S+lFTVjmydHZJ GXcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=s5dOZ25eiiQpHrSX5jENirpXafg+aN3IwG1i9Rj29QY=; b=tyRdbzeRhRVs/k8OfRd5Gq0DFfNwjL8iP94u2MGoSoirNqORLPE+dcJV45zOerEU7e CA9vNZgGQ4yoL/CjsEjmYWG8NafNUxnPdUCp9X4rLUf0ahBWj4aRLwk/g3AXtjM42wBp 7xWSzJCpW++oVTwvNj5Ev8zpGkp7RQKcbpXYFP9/JfeGxUJ84BHLR/7m4mYqKUv9vK5n wgLBIUcYjrw8fM4S9TIXIjjRvf76ZywzIGHGyV+v0tBm3RD40kQS3oMb1ArsdgyAzLX0 RHQVOD+PctGdGO+3NLGX0mlpbbemAj9qp3FvUDfVbgOppf9KLk7M/C9v59/270Ve2zqL sP3A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h2-v6si9315048pfg.126.2018.07.01.10.36.49; Sun, 01 Jul 2018 10:37:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031011AbeGARbt (ORCPT + 99 others); Sun, 1 Jul 2018 13:31:49 -0400 Received: from smtp2200-217.mail.aliyun.com ([121.197.200.217]:51296 "EHLO smtp2200-217.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965963AbeGARbn (ORCPT ); Sun, 1 Jul 2018 13:31:43 -0400 X-Alimail-AntiSpam: AC=CONTINUE;BC=0.0744162|-1;CH=green;FP=0|0|0|0|0|-1|-1|-1;HT=e01e04486;MF=ren_guo@c-sky.com;NM=1;PH=DS;RN=12;RT=12;SR=0;TI=SMTPD_---.CKwkw0._1530466294; Received: from localhost(mailfrom:ren_guo@c-sky.com fp:SMTPD_---.CKwkw0._1530466294) by smtp.aliyun-inc.com(10.147.40.233); Mon, 02 Jul 2018 01:31:35 +0800 From: Guo Ren To: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, daniel.lezcano@linaro.org, jason@lakedaemon.net, arnd@arndb.de Cc: c-sky_gcc_upstream@c-sky.com, gnu-csky@mentor.com, thomas.petazzoni@bootlin.com, wbx@uclibc-ng.org, ren_guo@c-sky.com, green.hu@gmail.com Subject: [PATCH V2 09/19] csky: VDSO and rt_sigreturn Date: Mon, 2 Jul 2018 01:30:12 +0800 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Guo Ren --- arch/csky/abiv1/inc/abi/vdso.h | 17 ++++++++ arch/csky/abiv2/inc/abi/vdso.h | 18 +++++++++ arch/csky/include/asm/vdso.h | 12 ++++++ arch/csky/kernel/vdso.c | 89 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 136 insertions(+) create mode 100644 arch/csky/abiv1/inc/abi/vdso.h create mode 100644 arch/csky/abiv2/inc/abi/vdso.h create mode 100644 arch/csky/include/asm/vdso.h create mode 100644 arch/csky/kernel/vdso.c diff --git a/arch/csky/abiv1/inc/abi/vdso.h b/arch/csky/abiv1/inc/abi/vdso.h new file mode 100644 index 0000000..a99f0e4 --- /dev/null +++ b/arch/csky/abiv1/inc/abi/vdso.h @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd. +#include + +static inline int setup_vdso_page(unsigned short *ptr) +{ + int err = 0; + + /* movi r1, 127 */ + err |= __put_user(0x67f1, ptr + 0); + /* addi r1, (139 - 127) */ + err |= __put_user(0x20b1, ptr + 1); + /* trap 0 */ + err |= __put_user(0x0008, ptr + 2); + + return err; +} diff --git a/arch/csky/abiv2/inc/abi/vdso.h b/arch/csky/abiv2/inc/abi/vdso.h new file mode 100644 index 0000000..aa2d489 --- /dev/null +++ b/arch/csky/abiv2/inc/abi/vdso.h @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd. +#include + +static inline int setup_vdso_page(unsigned short *ptr) +{ + int err = 0; + + /* movi r7, 173 */ + err |= __put_user(0xea07, ptr); + err |= __put_user(0x008b, ptr+1); + + /* trap 0 */ + err |= __put_user(0xc000, ptr+2); + err |= __put_user(0x2020, ptr+3); + + return err; +} diff --git a/arch/csky/include/asm/vdso.h b/arch/csky/include/asm/vdso.h new file mode 100644 index 0000000..b275440 --- /dev/null +++ b/arch/csky/include/asm/vdso.h @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd. +#ifndef __ASM_CSKY_VDSO_H +#define __ASM_CSKY_VDSO_H + +#include + +struct csky_vdso { + unsigned short rt_signal_retcode[4]; +}; + +#endif /* __ASM_CSKY_VDSO_H */ diff --git a/arch/csky/kernel/vdso.c b/arch/csky/kernel/vdso.c new file mode 100644 index 0000000..dd59aae --- /dev/null +++ b/arch/csky/kernel/vdso.c @@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd. +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +static struct page *vdso_page; + +static int __init init_vdso(void) +{ + struct csky_vdso *vdso; + int err = 0; + + vdso_page = alloc_page(GFP_KERNEL); + if (!vdso_page) + panic("Cannot allocate vdso"); + + vdso = vmap(&vdso_page, 1, 0, PAGE_KERNEL); + if (!vdso) + panic("Cannot map vdso"); + + clear_page(vdso); + + /* + * __NR_rt_sigreturn must be 173 + * Because gcc/config/csky/linux-unwind.h use hard code to parse rt_sigframe. + */ + err = setup_vdso_page(vdso->rt_signal_retcode); + if (err) panic("Cannot set signal return code, err: %x.", err); + + dcache_wb_range((unsigned long)vdso, (unsigned long)vdso + 16); + + vunmap(vdso); + + return 0; +} +subsys_initcall(init_vdso); + +int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) +{ + int ret; + unsigned long addr; + struct mm_struct *mm = current->mm; + + down_write(&mm->mmap_sem); + + addr = get_unmapped_area(NULL, STACK_TOP, PAGE_SIZE, 0, 0); + if (IS_ERR_VALUE(addr)) { + ret = addr; + goto up_fail; + } + + ret = install_special_mapping( + mm, + addr, + PAGE_SIZE, + VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC, + &vdso_page); + if (ret) + goto up_fail; + + mm->context.vdso = (void *)addr; + +up_fail: + up_write(&mm->mmap_sem); + return ret; +} + +const char *arch_vma_name(struct vm_area_struct *vma) +{ + if (vma->vm_mm == NULL) + return NULL; + + if (vma->vm_start == (long)vma->vm_mm->context.vdso) + return "[vdso]"; + else + return NULL; +} + -- 2.7.4