Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp37353imm; Thu, 4 Oct 2018 22:46:07 -0700 (PDT) X-Google-Smtp-Source: ACcGV60i9mGNAaRTGKRVRcHHasEBnbKCjfcXfZMsMMe5rQ2neKt3l/RGQCBYZGFwqtxKgmxwRb8+ X-Received: by 2002:aa7:8715:: with SMTP id b21-v6mr10111359pfo.250.1538718367335; Thu, 04 Oct 2018 22:46:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538718367; cv=none; d=google.com; s=arc-20160816; b=rHIBWP2LSeEC/XDuT3kdN1dkhmbB81ThrYhzGqO5KwKEY0c15wAHYJZtKYqsmnHZY8 58p1j/V6uNnw8RT3EAG0+I6dfIVLevFaFDy5E+O87oHQB/L1MmWy0f18CRv+ywtXbWHm rSfebUZlRUlhcgolsy8Vg3gtbdNlVzvc556/8iG0BE6f++E0Pb3ycGF/wJYRU+iSP5vZ S+E13q9bJQxRZJyemjKKhvlyO1d+OAly1qsoyEyOx7cJZa+77Xv3GkCqlFvUOk8Ue57m 1xFEaulKdZs6yKJ0XnWVobz4mjoFrJH75un+8Ngdy3CJLs7iNt027u+tZaoOAxGmsRxJ K8xg== 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=pFHE/s/kEW9eFmLMtk4bwdmvWcWwpmx2PwGKG2GOYQF0Ui4KKq117PtFefQ2R8PfOp IorZUe5/nUxmKci5e2R7TIY4CmkIompROyJat1xWvuDbO1IUOp+uUxpkzGWGE7HIKjVv Tm5M78NuwGHAw1G1qWUmmBy1khUiSfukJ+A9zZh+5HBd3UiSXTBpJXuWNJ5PvBusd9wR Lm07KyqbgOk/wCvAGPqiY4gRKDMmTrYTYK17IrNUPK15cnjRnMsUAjZko5QHJac58n9b fVqCA7hVxx5aTgPL3l35Bq06KvyeuJ6eNDVA+hVWOQdrIyusf+bWGnqtx/a8jcBu3aea Xe4w== 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 l72-v6si8864456pfk.165.2018.10.04.22.45.51; Thu, 04 Oct 2018 22:46:07 -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 S1727805AbeJEMmm (ORCPT + 99 others); Fri, 5 Oct 2018 08:42:42 -0400 Received: from smtp2200-217.mail.aliyun.com ([121.197.200.217]:58731 "EHLO smtp2200-217.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727179AbeJEMml (ORCPT ); Fri, 5 Oct 2018 08:42:41 -0400 X-Alimail-AntiSpam: AC=CONTINUE;BC=0.07437523|-1;CH=green;FP=0|0|0|0|0|-1|-1|-1;HT=e02c03290;MF=ren_guo@c-sky.com;NM=1;PH=DS;RN=19;RT=19;SR=0;TI=SMTPD_---.CzcxFOM_1538718299; Received: from localhost(mailfrom:ren_guo@c-sky.com fp:SMTPD_---.CzcxFOM_1538718299) by smtp.aliyun-inc.com(10.147.40.233); Fri, 05 Oct 2018 13:44:59 +0800 From: Guo Ren To: akpm@linux-foundation.org, arnd@arndb.de, daniel.lezcano@linaro.org, davem@davemloft.net, gregkh@linuxfoundation.org, jason@lakedaemon.net, marc.zyngier@arm.com, mark.rutland@arm.com, mchehab+samsung@kernel.org, peterz@infradead.org, robh@kernel.org, robh+dt@kernel.org, tglx@linutronix.de Cc: green.hu@gmail.com, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, devicetree@vger.kernel.org, c-sky_gcc_upstream@c-sky.com, Guo Ren Subject: [PATCH V7 09/20] csky: VDSO and rt_sigreturn Date: Fri, 5 Oct 2018 13:41:51 +0800 Message-Id: <14bc5d01bfb0695175f9b1a8dc39a44f1e369feb.1538715563.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