Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp3726807imm; Wed, 5 Sep 2018 05:10:07 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda2gveakdzrnxmjWhndZNISbJbnTOZzm+LwRKYATu1gYNR7guVTGwXxSZvFokXvaOEGril1 X-Received: by 2002:a63:344b:: with SMTP id b72-v6mr36197669pga.184.1536149407831; Wed, 05 Sep 2018 05:10:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536149407; cv=none; d=google.com; s=arc-20160816; b=y7UEQAd9SrXdomSArrE8BLlOm20T3w29+Hrwatz5HGgEXDVP6PghHtCkP8iiQUldHm EgwcgNDGFbS6yJFobrev0JKMu6U20JIRUJtexdmgsI6eoOU9fi5H8ZetaTDIzxcMP5NF I+pAY/HKqZdu7cjTCnY1jQJupXcvApJEbE56RiJ62jCmfi43783nZb3hUO1LXKvKxdUq ggv7UulVdSAXFjVQfpmHoZpUEikGU9/xPXV1KRPxIOznZ7/3Od3yvbC/+jgHWnNkEnWL KGgNijNcugDxzVCxz2CuzX/5M+3l/Snd1us9xGM/FqQ6mKd1VAwNMJH/X6S5bkqoxj10 F0+w== 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=8Gk95CDR8EZw2sh93kOObFyU66u2aM4Ps+dR/45iGgU=; b=epEl0Ac9faEPJldB/3CCRQJXuZQXxG/oWytVE+gxatdX/Rn1Z1csLuQkWz10O4hVP/ uH9WzcKo3OlKS08vMFm+e4KY0emfX1+fUwkEi4DEBH88x6IbeMUbK824BLvMIrcwtvS0 Zcrh/lSohRkGySvsQW84x1S/Bf1/aDB0RmCY5g0oB9zIdlxpwC2WojNw6aeUwAuq95X3 wCAOjqv+L0eS4Kb3s6VaT+7id3dYhj0zIhU1LiPbEFUh7n9WueOF0/vfrZi9/uQH0EXY w6S+6aTYdjLXWxEIeQ3ebnFUDiIdQo7SyhfaGevC6mnvO0hzIZnfWCxQ02Ra4yiFqqst RDrQ== 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 y8-v6si1504975pll.74.2018.09.05.05.09.52; Wed, 05 Sep 2018 05:10: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 S1727751AbeIEQia (ORCPT + 99 others); Wed, 5 Sep 2018 12:38:30 -0400 Received: from smtp2200-217.mail.aliyun.com ([121.197.200.217]:49403 "EHLO smtp2200-217.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727714AbeIEQi3 (ORCPT ); Wed, 5 Sep 2018 12:38:29 -0400 X-Alimail-AntiSpam: AC=CONTINUE;BC=0.07437673|-1;CH=green;FP=0|0|0|0|0|-1|-1|-1;HT=e02c03273;MF=ren_guo@c-sky.com;NM=1;PH=DS;RN=12;RT=12;SR=0;TI=SMTPD_---.CmtIhO2_1536149301; Received: from localhost(mailfrom:ren_guo@c-sky.com fp:SMTPD_---.CmtIhO2_1536149301) by smtp.aliyun-inc.com(10.147.42.135); Wed, 05 Sep 2018 20:08:21 +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 V3 09/26] csky: VDSO and rt_sigreturn Date: Wed, 5 Sep 2018 20:07:48 +0800 Message-Id: <0f6a6aa2e458df2c3734cf60a68e6f69f0eb1e68.1536138304.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 Signed-off-by: Guo Ren --- arch/csky/abiv1/inc/abi/vdso.h | 17 ++++++++ arch/csky/abiv2/inc/abi/vdso.h | 24 ++++++++++++ arch/csky/include/asm/vdso.h | 12 ++++++ arch/csky/kernel/vdso.c | 88 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 141 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..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..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..9090f12 --- /dev/null +++ b/arch/csky/kernel/vdso.c @@ -0,0 +1,88 @@ +// 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