Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp2661068imm; Mon, 24 Sep 2018 08:00:55 -0700 (PDT) X-Google-Smtp-Source: ACcGV60MXFXLxggYzxUPsIAj9dCcWOP5m09VM8O8mC2y1NGBgXbtAtXFrEVHxYxgRUt9Z8MrDgAt X-Received: by 2002:a65:6143:: with SMTP id o3-v6mr10124340pgv.52.1537801255904; Mon, 24 Sep 2018 08:00:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537801255; cv=none; d=google.com; s=arc-20160816; b=d9iw81T5NKzn5BwJyDtwg6na48yrQsOKCxRtgObG2yUl67HOpdotoTBnPqfAEoYl5e C33IOZ1Y131sYMdxq4RIG3Y4l9Hv7xRmipinT3yOaZvTYXrLUmPioZNoDRwN9R3F0tZK oCwS/Z5gOWV4/9VWJRRFNspwn85OpExzVvt+q9/hJRyLTd7+kCePd69Zps6N2UVUAsOH uTt9gUPGqJfjBDFfTsW6+C7KPl9bCSlhmMpmB7XYtHVXnKbnsyj6v/Xnalsbj4T8CRUp BCGRfWOgUu6SBafdn90dHk09AAvrmcbjgpGCmwnRqeBRAmoW2bCfcgh83ZB6xq6VOaTH EC5w== 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=RcucofAfJqznk5SZpHFmiN+4HdBaAPqdF/gJ0THo9OQ=; b=cN64fC1Q1/VTmxy7pwNuQEAytfdbqBIbGgNs/8cWSuPYmIC6KHCbExlbHNoVoQ9Gu6 wq6bCNg8OIdDlkFDDG/59LH9kuwphVhoLDXhz6Qt4zYdRHrBbc2ZbodZdGz9756q/Bm9 XcdsXSrc+F7ho2B9gNWviIQY7ux2eGJ6pp7kWwrJhzbaxGhhlhBN/xGVM/FvXB46GMs0 eVCvvbUF8dI8ukmEOahhZnXRY8n5timejNXnr0zZcIROYLZ9pfENSph/BQUXc4bItIkv kZ3lyV1mrK2HvhTtm0/Z/B7sExYHZQSlKbjPF3liSGcDrRWfy/kxK6eTsOdQ4pdVTeZS zjrg== 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 q2-v6si34757580pgd.303.2018.09.24.08.00.40; Mon, 24 Sep 2018 08:00:55 -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 S1732529AbeIXUkp (ORCPT + 99 others); Mon, 24 Sep 2018 16:40:45 -0400 Received: from smtp2200-217.mail.aliyun.com ([121.197.200.217]:46474 "EHLO smtp2200-217.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729224AbeIXUko (ORCPT ); Mon, 24 Sep 2018 16:40:44 -0400 X-Alimail-AntiSpam: AC=CONTINUE;BC=0.07437523|-1;CH=green;FP=0|0|0|0|0|-1|-1|-1;HT=e02c03305;MF=ren_guo@c-sky.com;NM=1;PH=DS;RN=21;RT=21;SR=0;TI=SMTPD_---.CvBzRWO_1537799861; Received: from localhost(mailfrom:ren_guo@c-sky.com fp:SMTPD_---.CvBzRWO_1537799861) by smtp.aliyun-inc.com(10.147.43.95); Mon, 24 Sep 2018 22:37:41 +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: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, devicetree@vger.kernel.org, c-sky_gcc_upstream@c-sky.com, gnu-csky@mentor.com, green.hu@gmail.com, palmer@sifive.com, Guo Ren Subject: [PATCH V5 09/30] csky: VDSO and rt_sigreturn Date: Mon, 24 Sep 2018 22:36:25 +0800 Message-Id: <60367116cc11358de7485b5daf81d2e8790846ff.1537789737.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 | 18 +++++++++ arch/csky/abiv2/inc/abi/vdso.h | 24 ++++++++++++ arch/csky/include/asm/vdso.h | 13 +++++++ arch/csky/kernel/vdso.c | 85 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 140 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..7b3dbde --- /dev/null +++ b/arch/csky/abiv1/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 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..2b5f43b --- /dev/null +++ b/arch/csky/abiv2/inc/abi/vdso.h @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd. + +#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..0345b0d --- /dev/null +++ b/arch/csky/include/asm/vdso.h @@ -0,0 +1,13 @@ +// 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..55ed68b --- /dev/null +++ b/arch/csky/kernel/vdso.c @@ -0,0 +1,85 @@ +// 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