From patchwork Tue Apr 30 17:05:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 163139 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp3487216ill; Tue, 30 Apr 2019 10:05:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqyYOOgX6LCjohQcbmtFYvluJZg8LGMT7xwShahjm6LpiMRLKVMzEK0x6Jz0YbFLPIP/ygaw X-Received: by 2002:a65:5206:: with SMTP id o6mr51425508pgp.341.1556643939333; Tue, 30 Apr 2019 10:05:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556643939; cv=none; d=google.com; s=arc-20160816; b=HHkd+YuQAuRHFGGTBE6iVc9O8YABZpXHs+qB9BhU+P3BfbAkjMa3fbjEz0N53l1HWz QXFtY5cKkqduOG7vyGbqydhN8c2ij3d02QvVQTqEs1xbZP1oh+VRn/KV3ZXzaGgD82XL 8lKh1y5tfYgafk+Upaex/LnxWUZvOPcLqOa2XQP3/BcNBp8E7/0jeIPDjg4irjNWH9NM fg7rqklVM8WSO6waJQoHEM2cgoKt3G0KF3SQUNhRvDvISO8MA/klv0rHlKaYLz0Tb8Ts oDn1+B/QUq6M0gkU3/5XfPg/gVrlOeIsIvuqMXPr78Ta0RMIiPqXFAisCYZuKJmnNGRh DdNw== 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=yPaeZdXLz9brTXUdkwRVDLCsR7gf433vc3nHCoFeZ2A=; b=l9vtSeMUBQYpgcJT289GH6WWqgMY3hGSujShV1OMUojaeoeYDQAfjemDCqkscWzPsT NYRbuzav51Zerd+3aLyLlXiyz9EGhKs7SoKtGKYlZe6TpEsPICqxMLycSJFBEqzcwLqM mBLgSU1QwQ5Z+WhIKQSifU/V0q8WRKgioNsbWvbAH/TnFyI+FIqq629h10o9FQgAVlRb AAv4bSDjLEVRdG8oLpYgnmkSAT82lF6T48rDTtegAcAVns2Zlb0UfTlKttylHP2juf97 nSy2rxUL1O4/xcRqAKX7pCHdnQMzCg+X4gs86LuzB0qVXp/JSmkZd12akJ3b/M2BWIdc RkBQ== 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.38; Tue, 30 Apr 2019 10:05:39 -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 S1726900AbfD3RFi (ORCPT + 30 others); Tue, 30 Apr 2019 13:05:38 -0400 Received: from foss.arm.com ([217.140.101.70]:50430 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725930AbfD3RFg (ORCPT ); Tue, 30 Apr 2019 13:05:36 -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 1CF5B374; Tue, 30 Apr 2019 10:05:35 -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 54B483F5C1; Tue, 30 Apr 2019 10:05:32 -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 , Thomas Gleixner , Ingo Molnar , Borislav Petkov Subject: [PATCH v3 2/4] x86: simplify _TIF_SYSCALL_EMU handling Date: Tue, 30 Apr 2019 18:05:18 +0100 Message-Id: <20190430170520.29470-3-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 The usage of emulated/_TIF_SYSCALL_EMU flags in syscall_trace_enter seems to be bit overcomplicated than required. Let's simplify it. Cc: Andy Lutomirski Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Signed-off-by: Sudeep Holla --- arch/x86/entry/common.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) -- 2.17.1 Signed-off-by: Oleg Nesterov diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c index 7bc105f47d21..c647ddfd5579 100644 --- a/arch/x86/entry/common.c +++ b/arch/x86/entry/common.c @@ -70,23 +70,18 @@ static long syscall_trace_enter(struct pt_regs *regs) struct thread_info *ti = current_thread_info(); unsigned long ret = 0; - bool emulated = false; u32 work; if (IS_ENABLED(CONFIG_DEBUG_ENTRY)) BUG_ON(regs != task_pt_regs(current)); - work = READ_ONCE(ti->flags) & _TIF_WORK_SYSCALL_ENTRY; + work = READ_ONCE(ti->flags); - if (unlikely(work & _TIF_SYSCALL_EMU)) - emulated = true; - - if ((emulated || (work & _TIF_SYSCALL_TRACE)) && - tracehook_report_syscall_entry(regs)) - return -1L; - - if (emulated) - return -1L; + if (work & (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU)) { + ret = tracehook_report_syscall_entry(regs); + if (ret || (work & _TIF_SYSCALL_EMU)) + return -1L; + } #ifdef CONFIG_SECCOMP /*