Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp324739imm; Thu, 11 Oct 2018 21:48:01 -0700 (PDT) X-Google-Smtp-Source: ACcGV62bepBb6XVUzwjNiGYStwes5MI1TF81YeQCmxvvhQQgrWLi61MnHtxkWhaH/SHQ9iV8rtSs X-Received: by 2002:a17:902:101:: with SMTP id 1-v6mr4365543plb.15.1539319681169; Thu, 11 Oct 2018 21:48:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539319681; cv=none; d=google.com; s=arc-20160816; b=HKQRh0MSHj19Ki5HvjSmcT+XgMeQq3bKwVpyWs/lHQ2eT5QV4XiggDmMJYmAIbe47x 1vESD0eJrvnHMdxDP3+heQ91Ajd3uv/tj6s47Yf1771YxKSbvPreISm4nK2e6fvgQgvD xL+XxoMEHI9tOVvgglOUXrE96PxMM9Di3izOpvRERqXKXCZU47uli3BkxRRjm/5sNHqY uch6+RMlvnTq8fgUr0uK33lDDVPMdVOBTrqOzF8LYQIZOlvJiS9We/NUibOUPjG9H7qM VktQJoUOXfqfRXJqatwPSnXRY2udUq02je2pSAcLcVN9dB//kWEjxROn8EcxjFIV6301 X/MA== 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; bh=tl4NxZRUGPXisNLhJ9A6S5U72a/pyyeTCuRMxg0sVF4=; b=f+86kSLtz+gUEOb0wMaG5P8Juk0vi/T37+3W2OR1D65czAudlPV/ICy59O1MI2qAGG DrlLfNfR5iuiuxR7jZYs3F/0W+rBTtNOO9p+9Yg+AyGw/V3vyKqjeqEWhHXaiYSw1sTl R++ewGTPbin7fOAGDv+M5M0yDreH0GO64mMFy4xujB8M+TqR+d1h4hJE19dkZqH1Ike5 L9JhiwBnlhvhpC7Te/UjESKZ0M0jHJb1ieovraN+hjQtAlFy5pRrG8WCHMYO9l7xp49h mbB+8k9wD5VcjaMsICKpX9fHxv9AkS13zwOgb321MY4+x/JH0djS0kMBJPmQVsrIIIU+ rzbQ== 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 f1-v6si42431pln.317.2018.10.11.21.47.46; Thu, 11 Oct 2018 21:48:01 -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 S1727427AbeJLMRs (ORCPT + 99 others); Fri, 12 Oct 2018 08:17:48 -0400 Received: from smtp2200-217.mail.aliyun.com ([121.197.200.217]:43063 "EHLO smtp2200-217.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727361AbeJLMRs (ORCPT ); Fri, 12 Oct 2018 08:17:48 -0400 X-Alimail-AntiSpam: AC=CONTINUE;BC=0.07437321|-1;CH=green;FP=0|0|0|0|0|-1|-1|-1;HT=e02c03297;MF=ren_guo@c-sky.com;NM=1;PH=DS;RN=17;RT=17;SR=0;TI=SMTPD_---.D0w4FDp_1539319624; Received: from localhost(mailfrom:ren_guo@c-sky.com fp:SMTPD_---.D0w4FDp_1539319624) by smtp.aliyun-inc.com(10.147.41.231); Fri, 12 Oct 2018 12:47:04 +0800 From: Guo Ren To: akpm@linux-foundation.org, arnd@arndb.de, daniel.lezcano@linaro.org, davem@davemloft.net, gregkh@linuxfoundation.org, hch@infradead.org, marc.zyngier@arm.com, mark.rutland@arm.com, peterz@infradead.org, robh@kernel.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, devicetree@vger.kernel.org, robh+dt@kernel.org, c-sky_gcc_upstream@c-sky.com, Guo Ren Subject: [PATCH V8 09/21] csky: VDSO and rt_sigreturn Date: Fri, 12 Oct 2018 12:42:44 +0800 Message-Id: <9f8264bd92aceca78d2a95a45710908905421a47.1539315391.git.ren_guo@c-sky.com> 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 This patch adds files related to VDSO and our VDSO only support rt_sigreturn. Signed-off-by: Guo Ren --- arch/csky/abiv1/inc/abi/vdso.h | 17 +++++++++ arch/csky/abiv2/inc/abi/vdso.h | 23 +++++++++++ arch/csky/include/asm/vdso.h | 12 ++++++ arch/csky/kernel/vdso.c | 86 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 138 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..14352f5 --- /dev/null +++ b/arch/csky/abiv1/inc/abi/vdso.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#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..b60d4a0 --- /dev/null +++ b/arch/csky/abiv2/inc/abi/vdso.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ABI_CSKY_VDSO_H +#define __ABI_CSKY_VDSO_H + +#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; +} + +#endif /* __ABI_CSKY_STRING_H */ diff --git a/arch/csky/include/asm/vdso.h b/arch/csky/include/asm/vdso.h new file mode 100644 index 0000000..d963d69 --- /dev/null +++ b/arch/csky/include/asm/vdso.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#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..60ff7ad --- /dev/null +++ b/arch/csky/kernel/vdso.c @@ -0,0 +1,86 @@ +// 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); + + 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