From patchwork Mon Mar 18 10:49:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 160482 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp2500366jad; Mon, 18 Mar 2019 03:49:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqyoiiriLDngmHbFkF5GyX1ScUEcqV94hUI+mJJwcCkWgL25G5K1AVGLtf0/MRqY2CRqG+yi X-Received: by 2002:a63:6a48:: with SMTP id f69mr16788484pgc.7.1552906182405; Mon, 18 Mar 2019 03:49:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552906182; cv=none; d=google.com; s=arc-20160816; b=tGnUcLnzzRGRyDFI2vX9L6TTFGce1fzEt8rIjUlLftIf7L6vFxz3/3LjfYv3UJ2P6E kS0pPTqHCg4WimWYOf0bkXM0kvYEtJNT5B+xLuGdX1JFZlnUnqE2GCIuhU4BKRk0ocff OgztAXZNvNLRtK/AxYv2YdwUXiEZuNMTtTyNUG1uy9k6eGaBdGK7HbwelWLESRMw0i+D bHguUU8LYB30uIneZPnMTdOUEaPLJPxhZuQ72exq7znJ2DjBw+Z0mfisFl1vxICZdCtw QSqWwGdEuiEvHyFU3r9UyhF1x//wuhyib+vRLnjZh/iesYbu1TGe/w0LbMjk9hKeL58y q/qQ== 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:message-id:date :subject:cc:to:from; bh=mvwKMhJAJI0pCAq9tT8lkpuCe/fhPu6IAst08dWaY08=; b=Y5C+M4xj5GaZvfuR9FtnL1fdqnPMyosQIPayXICf/aANuMlRdWyIA0zrL7Uaa+XnuU sNYHNR/Dx8s+1GYNb1gJng8xSQp3NCDoX1P8RP/U3Z/DlchuWvUxljlqxSj4bz1z+Ubb i2PZPiB7/RNnFQZAt2VGAZprmdFK2mGcGncdWtW5ZOhNS6aA5pzAyW/kSe/ejTr2Vwtd 82P8h3cybNXTbhoAUYHIufVQngZJKVtl86GUMf1OyyaWgLYJTB/T8j/e4pbmZxT7DkUI nZckNnuWWtCG696SHKXuwWvg3TJRwWIgfReSEdfQHDaPtOEl+yu9odmnwxF3f44W7teE a+qw== 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 n66si9295314pfb.62.2019.03.18.03.49.42; Mon, 18 Mar 2019 03:49:42 -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 S1727600AbfCRKtl (ORCPT + 31 others); Mon, 18 Mar 2019 06:49:41 -0400 Received: from foss.arm.com ([217.140.101.70]:59666 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726449AbfCRKtj (ORCPT ); Mon, 18 Mar 2019 06:49:39 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B5E17165C; Mon, 18 Mar 2019 03:49:38 -0700 (PDT) Received: from usa.arm.com (e107155-lin.cambridge.arm.com [10.1.196.42]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C31143F614; Mon, 18 Mar 2019 03:49:35 -0700 (PDT) From: Sudeep Holla To: x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Cc: Sudeep Holla , Catalin Marinas , Will Deacon , Oleg Nesterov , Paul Mackerras , Michael Ellerman , Thomas Gleixner , Ingo Molnar , Richard Weinberger , jdike@addtoit.com, Steve Capper , Haibo Xu , Bin Lu , Andy Lutomirski Subject: [PATCH v2 1/6] ptrace: move clearing of TIF_SYSCALL_EMU flag to core Date: Mon, 18 Mar 2019 10:49:20 +0000 Message-Id: <20190318104925.16600-2-sudeep.holla@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190318104925.16600-1-sudeep.holla@arm.com> References: <20190318104925.16600-1-sudeep.holla@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org While the TIF_SYSCALL_EMU is set in ptrace_resume independent of any architecture, currently only powerpc and x86 unset the TIF_SYSCALL_EMU flag in ptrace_disable which gets called from ptrace_detach. Let's move the clearing of TIF_SYSCALL_EMU flag to ptrace_detach after we return from ptrace_disable to ensure there's no change in the flow. Cc: Oleg Nesterov Cc: Paul Mackerras Cc: Michael Ellerman Cc: Thomas Gleixner Cc: Ingo Molnar Signed-off-by: Sudeep Holla --- arch/powerpc/kernel/ptrace.c | 1 - arch/x86/kernel/ptrace.c | 3 --- kernel/ptrace.c | 4 ++++ 3 files changed, 4 insertions(+), 4 deletions(-) -- 2.17.1 diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c index d9ac7d94656e..2e2183b800a8 100644 --- a/arch/powerpc/kernel/ptrace.c +++ b/arch/powerpc/kernel/ptrace.c @@ -2520,7 +2520,6 @@ void ptrace_disable(struct task_struct *child) { /* make sure the single step bit is not set. */ user_disable_single_step(child); - clear_tsk_thread_flag(child, TIF_SYSCALL_EMU); } #ifdef CONFIG_PPC_ADV_DEBUG_REGS diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index 4b8ee05dd6ad..45792dbd2443 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c @@ -746,9 +746,6 @@ static int ioperm_get(struct task_struct *target, void ptrace_disable(struct task_struct *child) { user_disable_single_step(child); -#ifdef TIF_SYSCALL_EMU - clear_tsk_thread_flag(child, TIF_SYSCALL_EMU); -#endif } #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 771e93f9c43f..4fa3b7f4c3c7 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -534,6 +534,10 @@ static int ptrace_detach(struct task_struct *child, unsigned int data) /* Architecture-specific hardware disable .. */ ptrace_disable(child); +#ifdef TIF_SYSCALL_EMU + clear_tsk_thread_flag(child, TIF_SYSCALL_EMU); +#endif + write_lock_irq(&tasklist_lock); /* * We rely on ptrace_freeze_traced(). It can't be killed and