From patchwork Tue Apr 30 17:05:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 163138 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp3487155ill; Tue, 30 Apr 2019 10:05:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqzOcLez7rtqYuBibzZKrxUSA04tdoMnr5gshbr+dkbyjf/T93x/2a3f+2qe03xB2WM0HhN0 X-Received: by 2002:a17:902:8f84:: with SMTP id z4mr15911356plo.124.1556643935980; Tue, 30 Apr 2019 10:05:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556643935; cv=none; d=google.com; s=arc-20160816; b=utVnVm50LxKCTl6MYpsOqxqNgZUQGO65CCdlo2T0jK1OUf3fylXlhYG6s3rrn2FxBu IZfx43cv3paYXOtecd2+9fxgI9vQLXDBQ76f8RoL23t1GglMPi2oaIo+s2Z50D9NLAPP 95xB2ld6ucem6387pBq2luFHH5NeSEtom0v6ZPQ2tGOV6YbRJE0+UtBuxcSAkVo4WpYr h7efcAJoyu3Z+DBJDxn2PdzOHWN/dRxfpNLgZXXBpsgvTW4KIsEghcCexJISKy5GpTP6 ygHF6eIG8Yw5QGcgLxoF3Alpo8mfNoGGce3EgfwSolKNfUs4PpF95m0DvRZ4xrpK+WNB /FMA== 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=xqGrD+NOgpxpd6fEPIHP0xHgCycEfO67Ink/1/rCAV0=; b=LaxEcWXb+432CI8nZwxyU91msgolgUJdAJbfYs5UlfaOOR2rHFNiNOx/ffbv0g2525 vsiFKQnq5f/gVAYCfCf4H6rgeP4atRjKUroExgb5Ekl6z9tBUkhXbKijnLRkvXY62vxN FPxy1iOoGFNrkdW3NlnamY4LrAoTr/WZ95ZVXoWZ14lrIbEfaAE8NaDVSq1OLSGqXjdy A4SuW6hIgOTyRACYZCBMKORQIbBNHyZ1hfQxlvXs2cJ19nLA6xNSGZ3UDJuI88kuGuP7 jhYK/8gypKyGPyK+pN36blqxERVEQxzRQ5O0iHl0Ner8fgF83eW/iDik7a5fDpr+2ub/ 4C9A== 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 t61si996955plb.93.2019.04.30.10.05.34; Tue, 30 Apr 2019 10:05:35 -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 S1726882AbfD3RFe (ORCPT + 30 others); Tue, 30 Apr 2019 13:05:34 -0400 Received: from foss.arm.com ([217.140.101.70]:50408 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725930AbfD3RFc (ORCPT ); Tue, 30 Apr 2019 13:05:32 -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 1272515A2; Tue, 30 Apr 2019 10:05:32 -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 224E43F5C1; Tue, 30 Apr 2019 10:05:28 -0700 (PDT) From: Sudeep Holla To: x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Sudeep Holla , Catalin Marinas , Will Deacon , Oleg Nesterov , Richard Weinberger , jdike@addtoit.com, Steve Capper , Haibo Xu , Bin Lu , Andy Lutomirski , Paul Mackerras , Michael Ellerman , Thomas Gleixner , Ingo Molnar Subject: [PATCH v3 1/4] ptrace: move clearing of TIF_SYSCALL_EMU flag to core Date: Tue, 30 Apr 2019 18:05:17 +0100 Message-Id: <20190430170520.29470-2-sudeep.holla@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190430170520.29470-1-sudeep.holla@arm.com> References: <20190430170520.29470-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_unlink which gets executed from ptrace_detach and also keep it along with or close to clearing of TIF_SYSCALL_TRACE. 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 | 3 +++ 3 files changed, 3 insertions(+), 4 deletions(-) -- 2.17.1 Acked-by: Oleg Nesterov 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 6f357f4fc859..16c7fc1eabcf 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -117,6 +117,9 @@ void __ptrace_unlink(struct task_struct *child) BUG_ON(!child->ptrace); clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); +#ifdef TIF_SYSCALL_EMU + clear_tsk_thread_flag(child, TIF_SYSCALL_EMU); +#endif child->parent = child->real_parent; list_del_init(&child->ptrace_entry);