From patchwork Wed Oct 28 01:39:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 7506111 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 04572BEEA4 for ; Wed, 28 Oct 2015 01:41:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 34A0C2061F for ; Wed, 28 Oct 2015 01:41:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4B41C20618 for ; Wed, 28 Oct 2015 01:41:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755102AbbJ1BkQ (ORCPT ); Tue, 27 Oct 2015 21:40:16 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:37115 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752365AbbJ1BkN (ORCPT ); Tue, 27 Oct 2015 21:40:13 -0400 Received: by wicfv8 with SMTP id fv8so185574514wic.0; Tue, 27 Oct 2015 18:40:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=HJgtPhSmiZD5UcsfDYEyIXRmGjapfpnHKykdV1wAzfI=; b=bhwBAXneoUqDObU7nL4Tr6B34J6yIHFbDAc+PNVGV1TU3KAzuAyNR/TAjSvQMJTMLs KIZYIxxpyIKxbwDaNUGzeBTMNf3usjS3oh/HYrZTfZFV1b2vGPKnvV+EI7oPGw9cPekj 4OpkNPH1MgtcZrNm2UEqeA2hbYq4BqMf62FYe3HHx4H1lIbr9AeLioT977jwNK+mkCFt KRSA2UO2dAkrn95wGX3qQfrBxcmqbygwerNXjdFCM2IyfgCBwbBTl1snrPnVv+pNjWMs vah/BuZFEPBrDiHgpv1/mLefNQrJrV/oQSi80SzCNfNSdtTGAQ7HbCINrFtvHPxUwILO outQ== X-Received: by 10.180.188.97 with SMTP id fz1mr221980wic.28.1445996411807; Tue, 27 Oct 2015 18:40:11 -0700 (PDT) Received: from donizetti.redhat.com ([58.123.138.250]) by smtp.gmail.com with ESMTPSA id pi5sm19666087wic.3.2015.10.27.18.40.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Oct 2015 18:40:11 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Andy Lutomirski , Frederic Weisbecker , Rik van Riel , Paul McKenney Subject: [PATCH 1/3] context_tracking: remove duplicate enabled check Date: Wed, 28 Oct 2015 02:39:55 +0100 Message-Id: <1445996397-32703-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1445996397-32703-1-git-send-email-pbonzini@redhat.com> References: <1445996397-32703-1-git-send-email-pbonzini@redhat.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP All calls to context_tracking_enter and context_tracking_exit are already checking context_tracking_is_enabled, except the context_tracking_user_enter and context_tracking_user_exit functions left in for the benefit of assembly calls. Pull the check up to those functions, by making them simple wrappers around the user_enter and user_exit inline functions. Cc: Andy Lutomirski Cc: Frederic Weisbecker Cc: Rik van Riel Cc: Paul McKenney Signed-off-by: Paolo Bonzini Acked-by: Andy Lutomirski Reviewed-by: Rik van Riel Tested-by: Rik van Riel --- include/linux/context_tracking.h | 4 ++-- kernel/context_tracking.c | 16 ++-------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h index 008fc67d0d96..6ef136ff0897 100644 --- a/include/linux/context_tracking.h +++ b/include/linux/context_tracking.h @@ -18,13 +18,13 @@ extern void context_tracking_user_exit(void); static inline void user_enter(void) { if (context_tracking_is_enabled()) - context_tracking_user_enter(); + context_tracking_enter(CONTEXT_USER); } static inline void user_exit(void) { if (context_tracking_is_enabled()) - context_tracking_user_exit(); + context_tracking_exit(CONTEXT_USER); } static inline enum ctx_state exception_enter(void) diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c index 0a495ab35bc7..6d4c6ce21275 100644 --- a/kernel/context_tracking.c +++ b/kernel/context_tracking.c @@ -63,15 +63,6 @@ void context_tracking_enter(enum ctx_state state) unsigned long flags; /* - * Repeat the user_enter() check here because some archs may be calling - * this from asm and if no CPU needs context tracking, they shouldn't - * go further. Repeat the check here until they support the inline static - * key check. - */ - if (!context_tracking_is_enabled()) - return; - - /* * Some contexts may involve an exception occuring in an irq, * leading to that nesting: * rcu_irq_enter() rcu_user_exit() rcu_user_exit() rcu_irq_exit() @@ -128,7 +119,7 @@ EXPORT_SYMBOL_GPL(context_tracking_enter); void context_tracking_user_enter(void) { - context_tracking_enter(CONTEXT_USER); + user_enter(); } NOKPROBE_SYMBOL(context_tracking_user_enter); @@ -148,9 +139,6 @@ void context_tracking_exit(enum ctx_state state) { unsigned long flags; - if (!context_tracking_is_enabled()) - return; - if (in_interrupt()) return; @@ -181,7 +169,7 @@ EXPORT_SYMBOL_GPL(context_tracking_exit); void context_tracking_user_exit(void) { - context_tracking_exit(CONTEXT_USER); + user_exit(); } NOKPROBE_SYMBOL(context_tracking_user_exit);