From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8412AC43381 for ; Tue, 12 Mar 2019 10:20:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 525A0214AE for ; Tue, 12 Mar 2019 10:20:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pZEOIK7c" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726396AbfCLKUP (ORCPT ); Tue, 12 Mar 2019 06:20:15 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:40663 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726330AbfCLKUP (ORCPT ); Tue, 12 Mar 2019 06:20:15 -0400 Received: by mail-ed1-f68.google.com with SMTP id r23so1776381edm.7 for ; Tue, 12 Mar 2019 03:20:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sgmMu4F7VsdemKqDz4gyGTuU2S69aBZ5FUOWwkPgZb0=; b=pZEOIK7cE75wFtQCsFkjgpYsK0TY/grjzcQhqJ+2rkoUgLVlwzwVtyEEiyNAaKa1nR otTR4xbM1rgtLcomnYKH+d6oxAm6auszGKQbSzt1TUY91LLDCVJvysTiq4x9pKy25qEK aj/k8Exdyr0IvXwZuf/dT1a9gQTe1LJ9rmOszIhFSZk/z0ohmKF+7EsavcDCFnoBgpxS iu404zjDE0mHzDOFhEKG5FrbT/n88sJSgcIuHXOReBGW82LPDOfEXBXGtDGRo9m5tXc1 P0/wMdmwYR18OMin7c9CjhuvANBOjrtNrVGCkukMv3wlItP0PKJpX/wQTf06CODnrQvb ObnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sgmMu4F7VsdemKqDz4gyGTuU2S69aBZ5FUOWwkPgZb0=; b=c9bHRCt2NcslXgqjIn5eaLcVznvRP5cxh/huPBK1QjWMFjRWYYVBJY8iWUEnFtrOLF 79sEAO103HGkGEdylWSHR2952kM7WGAAsD0ybUBo+hrDEr2SuvTU1CbL3etuKOEKdVmB sNSKzFDvrFSPSF7xjJS5ac9w14YXvOW+VkJLEgXVUKro6yshGUTBP8osQz/n6B8uWq5E 5AscVYVeE6Ot4zCRpulw/Fs+Tx4CXn7IRL+lXMg2JNxUeKNpbvUQsEHUHubAXX5fuHjT p93stQab+yBVmxFzQQw0m60HBdq+RV+L2xcguDWowDfv1cyp/01sZxWt0icKqPiINSYH V+2w== X-Gm-Message-State: APjAAAUXJlKKqnZt/LhDP1luIIo90Z8khptJkTORrBtYZiwj/rBZedRK PMw/eod2R9tUa0IfXS0H0x4= X-Google-Smtp-Source: APXvYqw/STlL2Orpaw7fUIfreDY9yPNxs3KTmQtywVLQFsSadJTF5aKfjEzty9/txjtuyLQVfZRxRA== X-Received: by 2002:aa7:c405:: with SMTP id j5mr2757768edq.254.1552386014214; Tue, 12 Mar 2019 03:20:14 -0700 (PDT) Received: from jwang-pc.pb.local ([2001:1438:4010:254c:1e6f:65ff:fed4:d10]) by smtp.gmail.com with ESMTPSA id q12sm408698edd.12.2019.03.12.03.20.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Mar 2019 03:20:13 -0700 (PDT) From: Jack Wang To: gregkh@linuxfoundation.org, stable@vger.kernel.org Cc: Johannes Weiner , Christopher Lameter , Ingo Molnar , Johannes Weiner , Mike Galbraith , Peter Enderborg , Randy Dunlap , Shakeel Butt , Tejun Heo , Vinayak Menon , Andrew Morton , Linus Torvalds , Jack Wang Subject: [stable-4.14 07/11] sched: introduce this_rq_lock_irq() Date: Tue, 12 Mar 2019 11:19:58 +0100 Message-Id: <20190312102002.31737-8-jinpuwang@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190312102002.31737-1-jinpuwang@gmail.com> References: <20190312102002.31737-1-jinpuwang@gmail.com> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Johannes Weiner do_sched_yield() disables IRQs, looks up this_rq() and locks it. The next patch is adding another site with the same pattern, so provide a convenience function for it. Link: http://lkml.kernel.org/r/20180828172258.3185-8-hannes@cmpxchg.org Signed-off-by: Johannes Weiner Acked-by: Peter Zijlstra (Intel) Tested-by: Suren Baghdasaryan Tested-by: Daniel Drake Cc: Christopher Lameter Cc: Ingo Molnar Cc: Johannes Weiner Cc: Mike Galbraith Cc: Peter Enderborg Cc: Randy Dunlap Cc: Shakeel Butt Cc: Tejun Heo Cc: Vinayak Menon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds (cherry picked from commit d7edeb7f6a545695f064ce3787689f85e1e8b6dd) Signed-off-by: Jack Wang --- kernel/sched/core.c | 4 +--- kernel/sched/sched.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 0552ddbb25e2..a0b7e66c7281 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -4817,9 +4817,7 @@ SYSCALL_DEFINE0(sched_yield) struct rq_flags rf; struct rq *rq; - local_irq_disable(); - rq = this_rq(); - rq_lock(rq, &rf); + rq = this_rq_lock_irq(&rf); schedstat_inc(rq->yld_count); current->sched_class->yield_task(rq); diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 5ea86c072c07..e73d5d68602d 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1041,6 +1041,18 @@ rq_unlock(struct rq *rq, struct rq_flags *rf) raw_spin_unlock(&rq->lock); } +static inline struct rq * +this_rq_lock_irq(struct rq_flags *rf) + __acquires(rq->lock) +{ + struct rq *rq; + + local_irq_disable(); + rq = this_rq(); + rq_lock(rq, rf); + return rq; +} + #ifdef CONFIG_NUMA enum numa_topology_type { NUMA_DIRECT, -- 2.17.1