From patchwork Tue Sep 29 22:14:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 54268 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by patches.linaro.org (Postfix) with ESMTPS id A513D22B1E for ; Tue, 29 Sep 2015 22:17:59 +0000 (UTC) Received: by labjk1 with SMTP id jk1sf11792730lab.0 for ; Tue, 29 Sep 2015 15:17:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type :spamdiagnosticoutput:spamdiagnosticmetadata:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=Mz/baEoIvtNJMc4/g0/Sx+kE7xTT+Dhu3LTWyjNl490=; b=YFXQBbrHYuY4Fhk+w/n26KFKt1eA0jAxYSdl3ZH2gSgSRvv2563OmdtfOmSwvZXt8e VRVovqRM/g+V20v0A5DDIo+jVY1slhvzswoZfjJt6BenANYZ+3llAhBqTCwf6IjSz0K/ upDu4LHU8Qa3V/mf6mmJy3hkpqNJo2KKDByI2+VcHVVUe1BmAbAtj1ymTUnWHPYzxPAf u8hzVSz3DrJlIb6rGNSdYpf+XztUKuHq6OXKWdv8nF6SsoWFls/9oYCVs2VthvXCnV+Y Yw89ufHsN5/DBb6dQycX/Q+kRzi1pq8Zcth6oUU4GopruRg6Ke5/WaHyX3fvttTLOPuB hG5g== X-Gm-Message-State: ALoCoQlBRgWqRFwYaToOcusKt5I/nle3/iSP1YrhNfEK+KK1Rq92o/kGUshdS+EewGf9EcyyPrW8 X-Received: by 10.152.9.65 with SMTP id x1mr43507laa.7.1443565078186; Tue, 29 Sep 2015 15:17:58 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.152.83 with SMTP id a80ls5324lfe.96.gmail; Tue, 29 Sep 2015 15:17:58 -0700 (PDT) X-Received: by 10.112.169.98 with SMTP id ad2mr108507lbc.2.1443565078040; Tue, 29 Sep 2015 15:17:58 -0700 (PDT) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id ld7si11975873lab.108.2015.09.29.15.17.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2015 15:17:57 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by laclj5 with SMTP id lj5so25401820lac.3 for ; Tue, 29 Sep 2015 15:17:57 -0700 (PDT) X-Received: by 10.112.146.104 with SMTP id tb8mr103316lbb.35.1443565077840; Tue, 29 Sep 2015 15:17:57 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp2397637lbq; Tue, 29 Sep 2015 15:17:56 -0700 (PDT) X-Received: by 10.68.135.69 with SMTP id pq5mr469339pbb.162.1443565076719; Tue, 29 Sep 2015 15:17:56 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id px6si33245048pbc.254.2015.09.29.15.17.56; Tue, 29 Sep 2015 15:17:56 -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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756826AbbI2WRx (ORCPT + 30 others); Tue, 29 Sep 2015 18:17:53 -0400 Received: from mail-bn1on0066.outbound.protection.outlook.com ([157.56.110.66]:51376 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754540AbbI2WQ6 (ORCPT ); Tue, 29 Sep 2015 18:16:58 -0400 Received: from localhost (91.78.158.8) by CO2PR07MB619.namprd07.prod.outlook.com (10.141.228.151) with Microsoft SMTP Server (TLS) id 15.1.274.16; Tue, 29 Sep 2015 22:16:54 +0000 From: Yury Norov To: , , , , , CC: , , , , , Yury Norov Subject: [PATCH v5 10/23] arm64: introduce is_a32_task and is_a32_thread (for AArch32 compat) Date: Wed, 30 Sep 2015 01:14:07 +0300 Message-ID: <1443564860-31208-11-git-send-email-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1443564860-31208-1-git-send-email-ynorov@caviumnetworks.com> References: <1443564860-31208-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [91.78.158.8] X-ClientProxiedBy: AM3PR07CA0011.eurprd07.prod.outlook.com (10.141.45.139) To CO2PR07MB619.namprd07.prod.outlook.com (10.141.228.151) X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB619; 2:wQO1XqTlj9UPUqUp+15TyNid0vXg8r7mQwoYyfrALXNr3MZ9D3jlKJrXeOO60Z6OjD1rTRUqeAY5t2eHmE5Pw0mhUOedJ97Op2NoaBoLdOBzN+poYTaiSBdwePAxw7QWkTvgfA0k+0cWa6cNtd6+ecXc/s9n9y/RGTmze42rwgg=; 3:u+hbO5ftH+D/Dl0Ed6MpJ9E7t1t+hnyWxDCqjJLwxF6N0ueBuMXr/9P58JtGBrNYTYWajCDBq1RrQiS2ellc3+xLb+mWibUz3mtub2TH7qA6XdnCjbijSFTiEehuPbZu/xGkftu7CUr0ghm3CZw7+A==; 25:hzo6LPQlpCGExq/jJPHgsh3QLQkb8WkuIogxXlnK378LarP5oQEuGwbWEZ/nmgF5/Y+xfwRHou1ii9AmCeh+1jEurupwEV+svHzcwcYTKYT5PqiT7iVtv5LROl6AG75grJHGZkvvReEyBruuuHCMnGD626fX5j81l+LFpo0Mf6/x+lQJ1It01trEqpTDsQdVDFHEYNU7AxdGBX/yT/vZ9Sa4cug2C8WJpmsPa4Ut5JyNHiJcYdkwmIA6NR6LgOs/ X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CO2PR07MB619; X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB619; 20:WW7TBFv8zzve3WHYIf9XyG1wt21L63QB9hZqM3F/M5w9kzN9xwUZtUTTAXlpLMWnAN+DHK4LVDZFWpbWOXczg3AYoIWN4EqSBA7LoG614NUEUGhFnv316LlPvQFWIeoj8ITyrasivBwQQ1gWv8Sr5yUiVpw1Tpw83IcHJTk5/jh9U8lpHfDHw6jmyi6ihG3XpBE5lKupgI7U8jgPd3iLOk7juW52cTB6m2JxdBb/c4NhXkLJ7A331PytWCJ3v89315rvjA4kgCPOYHqpk8yVCyLlSK9JE3eboocMYqIvjbJSpOmA9KZyftkgS0DgIgCz968Sn4MOsL2RK1rIgKZTAJgzIAiaj5U2TXdWfRGJxQmrTF9wyb08/8HjSbwgTPKyD8WpBOOofqjcoMNTi0W0fbk/yx7RMRxfW3D+kEKf8OR/Jlp5zDPXEgFpYevEf5oPjsmzKM4HPrUmVbnBsAnQPbTkqa7dD5TQKaDXQX3cr9k2KFLa1wazEsyGf+TsghZ9CWe2gM9m4iN83XUodxPewiLkU02Pi1vFgvzd4I7YwT8wQMtJkz8resSiHb+8jy0sWGAQJUGzROdY1pItX+RTtEVqOfhTjggOyTNWjxPAp1U= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(3002001); SRVR:CO2PR07MB619; BCL:0; PCL:0; RULEID:; SRVR:CO2PR07MB619; X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB619; 4:7+PyGqhZmWzi8RsZP+mekk4LYShhHD/QNgESzdRuLOXJ4v4NLN1e0MFBWcW3q4oOYxKdQHTtWUN1WP2Ze6S75yHTcbJ4WnYooWFwWmvLGXvK9/7e8clFmYGkcYaclFq74/E/JveNbXwbYVUfYsqPWoke8dLGWp5Zfq2ObtLN8cETNj6LQuYpZhBJK0i2UHeT9acV0AqY2XkWoJOmUxtn+CWa+i5nprng5ab8JDr+MWHNhe4HZXedYdDFn5WBGn+oCcDgckELqifthmMtdh7Dv5k3khgfiQbO1szU7G+rvYZbWLk/KdqvmTgGrmiBtR7ox59pMJCddHeB1T7maQeBTk7Q9pm+lqw07sH/1Lgj6S0= X-Forefront-PRVS: 0714841678 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(6069001)(189002)(199003)(42186005)(66066001)(50466002)(64706001)(122386002)(2950100001)(575784001)(48376002)(47776003)(5008740100001)(77156002)(46102003)(33646002)(68736005)(97736004)(5001770100001)(62966003)(92566002)(5001860100001)(50986999)(189998001)(5001920100001)(4001540100001)(101416001)(5007970100001)(40100003)(5001960100002)(2201001)(105586002)(5003940100001)(5001830100001)(76506005)(87976001)(81156007)(229853001)(106356001)(19580395003)(19580405001)(5004730100002)(76176999)(107886002)(50226001)(77096005)(36756003)(4001430100001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR07MB619; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: caviumnetworks.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR07MB619; 23:+nPi8fhlz/+n7Wq2WNtEEQyu3FcOuRVltz7Oo2TW6A?= =?us-ascii?Q?Nb75M/F9rYoGNf9r3bqBvicBw+WI46UcEQbnmKKM0I3jbZijz4tStNdkxYeJ?= =?us-ascii?Q?JSkjw2SwMWYIFEP+Kj/dzmCaFdHJBQI9A8VKcvwGmloWnW5K/NXpbsB87GVu?= =?us-ascii?Q?6sWQ6pkhHXJllNepqdeNrTAVHEVzkIlUOSwqVPuULS/OUbp01h4e3QteAubJ?= =?us-ascii?Q?qaw4OztR8t7v3mpFVWeELjamxSRczfujku90KYMlnxzvdMyvebFEEOW0LoQS?= =?us-ascii?Q?4fa8vk92Vj4ft2mk6+Zx8nRgjVEmRqevGN1wpibvnl83YNtG6i70upteiigk?= =?us-ascii?Q?VqIMY6hxU1h2rSrcNEOTmdbRNwPN1LTd7JcQm5NWFX76Xhfb6Ky01JVq5SvO?= =?us-ascii?Q?iBrNPWV1bGfRUlx3LDRwawNEk3qyO1eTgmwPniUgKnXfBaw1dHi6WBiRUeYy?= =?us-ascii?Q?+4Zf9oPWUm+L0rPkZMC3h3S/aYMtLvYDfgyGVctxDZP+7veELOoCpGXirns5?= =?us-ascii?Q?a4x708w7Bozz4SrPsvWjbAY1HdRYl5zvBZczzuJKU3XE+r0BFMG6Hx4xZl5E?= =?us-ascii?Q?elUFJQBqOewJEsz7Doigeg/og0GUK3hyIyZeP+nkz8U/D5qeczsXSyuQpLsN?= =?us-ascii?Q?cYFcJxUAZk2Fxwb72puPYDHataGONpVAzFKh97CvTl4MYAuEu8BEoOQwXcxs?= =?us-ascii?Q?7HrtH0h61HfKPZT7CTsmRjpEriWD1Soq4fxeJi5NJv7OYf2U8bbPvxKRkDD7?= =?us-ascii?Q?gMxn5dH6iFlU9dfQCwI6jn1lFC58RnisDEFwauH0mMicGqoh4ar9ZVyvSBE5?= =?us-ascii?Q?7LVbgJtheIiKBfG4FS8489b+2j0f0kF87li3Us3xkmZuYQ3rmw5PyrzOxIDt?= =?us-ascii?Q?ruj9nuNxJqd3x3fQDLFYxJ9M3MUGqJPfH+ANr/esC8J4zgia/cYeMlI046g/?= =?us-ascii?Q?XLbGrmAgOyVmajToNOt0IsD/AXCiLhXQACib9pdY982s+uLtx0765PmqQm2S?= =?us-ascii?Q?57V45BjHPz5Pig0kd/Yv2Qimc3hODz6fO35wX9pdDED/UfuXPVwZ8r8XExR2?= =?us-ascii?Q?FvBS0XjM3iOnOfOqFZyVlfo9p6CRu8ixt3WDiiimhJtlmHSpK5vsFMeb4a2q?= =?us-ascii?Q?0kEvOchW/lxOcDt+Q2pBF+mIbnfyoIvL9umH9OGqR0DgPq+TX9a/cN5+pPLu?= =?us-ascii?Q?B3Gsnkb5OsP5G7h6g3+0LP0p2dEJ5A38I2qjHuzB1OHkSt0r11e10zvtkIix?= =?us-ascii?Q?Ns9jxWLyyFuUG/t311kd0mPIngkCxBF8l2QpJnUPH9AJK7RrWF0trhR3BEVs?= =?us-ascii?Q?fqi7DVJiTpJokHdeEQKKKRODRER5lHN2VIkStLIjmcm38YE4xxZY19Kv5+rO?= =?us-ascii?Q?ZOzw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB619; 5:eAlHMhVUAGyvcIxETgVztyl7yk32GGzpSloWjIrECtK8AwApEFo9alzYIVnBn6aTC6ytn5qJ6hgK8/m12GHBe/F01snHyT/a508Ms7ZvckK9JTg9XdaPOJfH5jUfxBWLUzLV3MoBCayLcyF+tQn8Uw==; 24:Q3+Qu4WcUM/nBzCM2V7rhw7MasAlppQmN+8qAw2YcIG2zrSFm5yekD/eqzdcyzRFAvO2BiXG/K55Ba2JPT5HyATW8Q1dn3Ib+LgYrlc+XKM=; 20:J8BkQnEP9FFSN1I9F1GHwvhTLu3FpmMttk6sazQaNCf3F4+uP33aJnmYoLA2aSZy0SJWn3pLj9NdWGOBwWZwdg== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2015 22:16:54.6730 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR07MB619 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linux-kernel-owner@vger.kernel.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Andrew Pinski This patch introduces is_a32_compat_task and is_a32_thread so it is easier to say this is a a32 specific thread or a generic compat thread/task. Signed-off-by: Philipp Tomsich Signed-off-by: Christoph Muellner Signed-off-by: Yury Norov diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index 7fbed69..3a2976d 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -299,15 +299,25 @@ struct compat_shmid64_ds { compat_ulong_t __unused5; }; -static inline int is_compat_task(void) +#ifdef CONFIG_AARCH32_EL0 +static inline int is_a32_compat_task(void) { return test_thread_flag(TIF_32BIT); } - -static inline int is_compat_thread(struct thread_info *thread) +static inline int is_a32_compat_thread(struct thread_info *thread) { return test_ti_thread_flag(thread, TIF_32BIT); } +#else +static inline int is_a32_compat_task(void) +{ + return 0; +} +static inline int is_a32_compat_thread(struct thread_info *thread) +{ + return 0; +} +#endif #else /* !CONFIG_COMPAT */ @@ -316,6 +326,21 @@ static inline int is_compat_thread(struct thread_info *thread) return 0; } +static inline int is_a32_compat_task(void) +{ + return 0; +} + #endif /* CONFIG_COMPAT */ + +static inline int is_compat_task(void) +{ + return is_a32_compat_task(); +} + +static inline int is_compat_thread(struct thread_info *thread) +{ + return is_a32_compat_thread(thread); +} #endif /* __KERNEL__ */ #endif /* __ASM_COMPAT_H */ diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index f40c51b..9ecbaf2 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -149,7 +149,7 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm, /* 1GB of VA */ #ifdef CONFIG_COMPAT -#define STACK_RND_MASK (test_thread_flag(TIF_32BIT) ? \ +#define STACK_RND_MASK (is_compat_task() ? \ 0x7ff >> (PAGE_SHIFT - 12) : \ 0x3ffff >> (PAGE_SHIFT - 12)) #else diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 6b4c3ad..337f8e1 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -58,7 +58,7 @@ #ifdef CONFIG_COMPAT #define TASK_SIZE_32 UL(0x100000000) -#define TASK_SIZE (test_thread_flag(TIF_32BIT) ? \ +#define TASK_SIZE (is_compat_task() ? \ TASK_SIZE_32 : TASK_SIZE_64) #define TASK_SIZE_OF(tsk) (test_tsk_thread_flag(tsk, TIF_32BIT) ? \ TASK_SIZE_32 : TASK_SIZE_64) diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index 98f3235..f1bba0c 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -39,7 +39,7 @@ #define STACK_TOP_MAX TASK_SIZE_64 #ifdef CONFIG_COMPAT #define AARCH32_VECTORS_BASE 0xffff0000 -#define STACK_TOP (test_thread_flag(TIF_32BIT) ? \ +#define STACK_TOP (is_compat_task() ? \ AARCH32_VECTORS_BASE : STACK_TOP_MAX) #else #define STACK_TOP STACK_TOP_MAX diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h index dcd06d1..7d03565 100644 --- a/arch/arm64/include/asm/thread_info.h +++ b/arch/arm64/include/asm/thread_info.h @@ -110,7 +110,7 @@ static inline struct thread_info *current_thread_info(void) #define TIF_FREEZE 19 #define TIF_RESTORE_SIGMASK 20 #define TIF_SINGLESTEP 21 -#define TIF_32BIT 22 /* 32bit process */ +#define TIF_32BIT 22 /* AARCH32 process */ #define TIF_SWITCH_MM 23 /* deferred switch_mm */ #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c index bba85c8..917f6e1 100644 --- a/arch/arm64/kernel/hw_breakpoint.c +++ b/arch/arm64/kernel/hw_breakpoint.c @@ -420,7 +420,7 @@ static int arch_build_bp_info(struct perf_event *bp) * Watchpoints can be of length 1, 2, 4 or 8 bytes. */ if (info->ctrl.type == ARM_BREAKPOINT_EXECUTE) { - if (is_compat_task()) { + if (is_a32_compat_task()) { if (info->ctrl.len != ARM_BREAKPOINT_LEN_2 && info->ctrl.len != ARM_BREAKPOINT_LEN_4) return -EINVAL; @@ -477,7 +477,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp) * AArch32 tasks expect some simple alignment fixups, so emulate * that here. */ - if (is_compat_task()) { + if (is_a32_compat_task()) { if (info->ctrl.len == ARM_BREAKPOINT_LEN_8) alignment_mask = 0x7; else @@ -664,7 +664,7 @@ static int watchpoint_handler(unsigned long addr, unsigned int esr, info = counter_arch_bp(wp); /* AArch32 watchpoints are either 4 or 8 bytes aligned. */ - if (is_compat_task()) { + if (is_a32_compat_task()) { if (info->ctrl.len == ARM_BREAKPOINT_LEN_8) alignment_mask = 0x7; else diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 223b093..a6b0251 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -259,7 +259,7 @@ int copy_thread(unsigned long clone_flags, unsigned long stack_start, asm("mrs %0, tpidr_el0" : "=r" (*task_user_tls(p))); if (stack_start) { - if (is_compat_thread(task_thread_info(p))) + if (is_a32_compat_thread(task_thread_info(p))) childregs->compat_sp = stack_start; /* 16-byte aligned stack mandatory on AArch64 */ else if (stack_start & 15) @@ -296,7 +296,7 @@ static void tls_thread_switch(struct task_struct *next) *task_user_tls(current) = tpidr; tpidr = *task_user_tls(next); - tpidrro = is_compat_thread(task_thread_info(next)) ? + tpidrro = is_a32_compat_thread(task_thread_info(next)) ? next->thread.tp_value : 0; asm( diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index 04b4972..8cd1eb7 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -79,7 +79,7 @@ static void ptrace_hbptriggered(struct perf_event *bp, #ifdef CONFIG_AARCH32_EL0 int i; - if (!is_compat_task()) + if (!is_a32_compat_task()) goto send_sig; for (i = 0; i < ARM_MAX_BRP; ++i) { @@ -1198,7 +1198,7 @@ long compat_a32_arch_ptrace(struct task_struct *child, compat_long_t request, long compat_arch_ptrace(struct task_struct *child, compat_long_t request, compat_ulong_t caddr, compat_ulong_t cdata) { - if (is_compat_task()) + if (is_a32_compat_task()) return compat_a32_arch_ptrace(child, request, caddr, cdata); return compat_ptrace_request(child, request, caddr, cdata); } @@ -1214,9 +1214,9 @@ const struct user_regset_view *task_user_regset_view(struct task_struct *task) * 32-bit children use an extended user_aarch32_ptrace_view to allow * access to the TLS register. */ - if (is_compat_task()) + if (is_a32_compat_task()) return &user_aarch32_view; - else if (is_compat_thread(task_thread_info(task))) + else if (is_a32_compat_thread(task_thread_info(task))) return &user_aarch32_ptrace_view; #endif return &user_aarch64_view; @@ -1243,7 +1243,7 @@ static void tracehook_report_syscall(struct pt_regs *regs, * A scratch register (ip(r12) on AArch32, x7 on AArch64) is * used to denote syscall entry/exit: */ - regno = (is_compat_task() ? 12 : 7); + regno = (is_a32_compat_task() ? 12 : 7); saved_reg = regs->regs[regno]; regs->regs[regno] = dir; diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index 964a2a4..2e00531 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -276,7 +276,7 @@ static int setup_rt_frame(int usig, struct ksignal *ksig, sigset_t *set, static void setup_restart_syscall(struct pt_regs *regs) { - if (is_compat_task()) + if (is_a32_compat_task()) compat_setup_restart_syscall(regs); else regs->regs[8] = __NR_restart_syscall; @@ -295,7 +295,7 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs) /* * Set up the stack frame */ - if (is_compat_task()) { + if (is_a32_compat_task()) { if (ksig->ka.sa.sa_flags & SA_SIGINFO) ret = compat_setup_rt_frame(usig, ksig, oldset, regs); else diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 9ce9894..bc973d0 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -365,7 +365,7 @@ asmlinkage long do_ni_syscall(struct pt_regs *regs) { #ifdef CONFIG_AARCH32_EL0 long ret; - if (is_compat_task()) { + if (is_a32_compat_task()) { ret = compat_arm_syscall(regs); if (ret != -ENOSYS) return ret;