Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp3057120ybi; Tue, 2 Jul 2019 01:17:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqyNkm8+cDw+2qhrJyg+8me7ICGutpLVNuTLeEsl4qvy+hExYY3zaDfXF/64nP8YSnLEmqus X-Received: by 2002:a17:90a:9b88:: with SMTP id g8mr4198342pjp.100.1562055457958; Tue, 02 Jul 2019 01:17:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562055457; cv=none; d=google.com; s=arc-20160816; b=xNwQ8LKuJ3jL84/Q7dAGj2Znl68Llisj2MX2hZelw2/iPWtZ1P/g5UPc19vsrlRkt+ FoE0Kio5+5XApAA7tOwC2JE2vdmRB1FCru8j0vhtnPdN6ea5a6ZzLrF3gQJIFzuxKHoR jBWgEFRRzdo5/C3W6eEmC0cRBmA4iIrsupPly+KqMjJ4PdUQleYr4cELe9r18FrC5zjd 0Jlci+5Si3ElBaRhAaAbCcftqjlrmt68xTAHWv3e+PI6U8SFvZMQDyzSCvc/as0RmUcF VDh/cEOhaJZFtwTg5nTCUnPmUQF80SCNoiMbYTjDb1zKjFv0cZxhWxzl6tbTRLKLioNo pLmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=SDxShUAzhLq+hJ+F4wpejls5BCpWWW1yRxIdY0pctUk=; b=BvT/bBULdSgXNMiIJxvF4VO+VKXBK89JuwnOVyT6pN1numzyWc6X175DUgovfGrR7g geDZBPMcqwl3DCudSg23WVJaSwuj2Q1PKXUEhw9W2fKlQvuRJPgKOtOda0LYy9llj0ET aSEvPEv0/dudSGAPsVPx4qkVx9I0nkkMggX480hCmpjIQUE3bsnO6A6q0KyDiEL5qwpU 35nvoRjc7S76VFkgsc9EGLmSdKmJY3C5grfszMh5pieZblCTofoXUtFXszu5g34I7IJ5 1y9Ze4Vr9A3BAU4rSkTXfxIxKF5Hxso3JBGp53rZc/C8syb3nUbjRf2LugVqMIFKXWXt LRIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VGd+A8pO; 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 cx20si1659249pjb.97.2019.07.02.01.17.23; Tue, 02 Jul 2019 01:17:37 -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; dkim=pass header.i=@kernel.org header.s=default header.b=VGd+A8pO; 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 S1727295AbfGBIDF (ORCPT + 99 others); Tue, 2 Jul 2019 04:03:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:47852 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727035AbfGBIDE (ORCPT ); Tue, 2 Jul 2019 04:03:04 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3086821850; Tue, 2 Jul 2019 08:03:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562054583; bh=pilKMYlTiwamuYx57A5kVWVrG8sar5JjJhKOHSt7ncM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VGd+A8pOT4FEjFW1ruBjW/mau5C/e5rkVfnJfrJ1cQmXdAvXQpexaxj/NcZHrHos9 lzE6L41M/n+sy51H8v1DhfsUgW74B8hTyiAyk0sIQgptPWcXiFrYmmy0l3w8n+5nti x6wO5oub6qL7qQUGcTMrYwgQJQbImpAQ+sQy4eFQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sasha Levin Subject: [PATCH 5.1 02/55] Revert "x86/uaccess, ftrace: Fix ftrace_likely_update() vs. SMAP" Date: Tue, 2 Jul 2019 10:01:10 +0200 Message-Id: <20190702080124.204331150@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190702080124.103022729@linuxfoundation.org> References: <20190702080124.103022729@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This reverts commit b65b70ba068b7cdbfeb65eee87cce84a74618603, which was upstream commit 4a6c91fbdef846ec7250b82f2eeeb87ac5f18cf9. On Tue, Jun 25, 2019 at 09:39:45AM +0200, Sebastian Andrzej Siewior wrote: >Please backport commit e74deb11931ff682b59d5b9d387f7115f689698e to >stable _or_ revert the backport of commit 4a6c91fbdef84 ("x86/uaccess, >ftrace: Fix ftrace_likely_update() vs. SMAP"). It uses >user_access_{save|restore}() which has been introduced in the following >commit. Signed-off-by: Sasha Levin --- kernel/trace/trace_branch.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c index 3ea65cdff30d..4ad967453b6f 100644 --- a/kernel/trace/trace_branch.c +++ b/kernel/trace/trace_branch.c @@ -205,8 +205,6 @@ void trace_likely_condition(struct ftrace_likely_data *f, int val, int expect) void ftrace_likely_update(struct ftrace_likely_data *f, int val, int expect, int is_constant) { - unsigned long flags = user_access_save(); - /* A constant is always correct */ if (is_constant) { f->constant++; @@ -225,8 +223,6 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, f->data.correct++; else f->data.incorrect++; - - user_access_restore(flags); } EXPORT_SYMBOL(ftrace_likely_update); -- 2.20.1