From patchwork Thu Jul 12 17:29:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Weiner X-Patchwork-Id: 10522045 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D7B68602C8 for ; Thu, 12 Jul 2018 17:27:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA49C29AC1 for ; Thu, 12 Jul 2018 17:27:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE99329AD2; Thu, 12 Jul 2018 17:27:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57C1329AC1 for ; Thu, 12 Jul 2018 17:27:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6648A6B026D; Thu, 12 Jul 2018 13:27:42 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 612E66B026E; Thu, 12 Jul 2018 13:27:42 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 48E0F6B0270; Thu, 12 Jul 2018 13:27:42 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by kanga.kvack.org (Postfix) with ESMTP id DF2D66B026D for ; Thu, 12 Jul 2018 13:27:41 -0400 (EDT) Received: by mail-ed1-f70.google.com with SMTP id t11-v6so11619479edq.1 for ; Thu, 12 Jul 2018 10:27:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=EOH4yuXU61UFUoCxssnGS0E9pmyAjCBzpOCJhmVNCYY=; b=kqoM2klA3Mvf3U/bdEZQoDiDSr5TkUr6opV4aVc6czvj57/D3Ss5Zm9kmCPXiRisjC LpcsDCNXkqT/1i+Nf+8R5WdRfDcG9oZb2ZaYUCHtr6E7yEDNvWIGMiJ3DXzHu/v/vTGD VdgR7GtXlMTGeeyQxT8x2fWq5WgNjRlmRHsNl/fTEPoPFzRi20GYG6tdoBbxDYe58dxk mCI3/IjQ2Dnc3jauc9/IS4J28B0HhzSaW5tkBPEmFhiSlTcAANx8Lzs285jI70YHZixe 1Mrg1MFXspqe7hO2jFETRmwIyTAqhM4OPjkmQAEiefiZaWB3Fd7gcPgwFBY62nmftPBn ig/A== X-Gm-Message-State: AOUpUlF6xe+/r6NVxDO+H6tpOVXYm1APkz8dLVC7BAW9heuNUot+u2MU U3hcFRol1aBSmly1WekjQjuXYyL7WLKw2omFKgXAiTiGv+dRG5N4chMUR2ugFLlbhMQ1SahXHTR e7anKlv5+L9QEiUKFtJTiyH1Uh/nqkOy/iV01mX6XGJtKMg4Oo6Cqb+9+GKTNLe6zFg== X-Received: by 2002:a50:94c4:: with SMTP id t4-v6mr3450270eda.128.1531416461502; Thu, 12 Jul 2018 10:27:41 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdYKSLI/3lMVTWJ/wlW7ofIC4DACClV4Q9RnPCuaWvWscoAbuCQVScj3ZUNSeR5sAci0/lu X-Received: by 2002:a50:94c4:: with SMTP id t4-v6mr3450233eda.128.1531416460854; Thu, 12 Jul 2018 10:27:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531416460; cv=none; d=google.com; s=arc-20160816; b=IrRJNX8qe9RQsp7ud/tCByz2pRszBWmdWtUVw2wyHFd7KDnYLYElxuYiQH3DWZ0YXD XW0zWcwWDCQsQj1meviTquCHhGbZz09ARdGh4Mt5FaWtQKCoA1DC7e4GG7FhDp4DFSeG rKahHVBNZVMkjOC2apPILJiKPNELQZW82yAd3wkBpz0p3cM/ilB1n5wU/BpAO1+41Y3j NMMiLTd6aJ6bShwZC4QzmszxOnSctS0ce6x3dA9zxNvYnPxoVIvJeXCrGRE0LyIoV8uw BUJKiISL0XYA5DU73wK85VRauVin+5h7G09yTEZn7v/Sbc1bitH0l2voZsIJtFKcbCNV jw0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=EOH4yuXU61UFUoCxssnGS0E9pmyAjCBzpOCJhmVNCYY=; b=qx9D6xvX09D/jfL0nU6iaLuNBsjIogE/NZK31/HS+t0hRnNmS0rPurDM7BEp4xyf2x ohdVTSMQRJFhtqRPO7SMmD0wW3ZRz2I2+9cOGMCrPwspgw5sHk0Dhw1h+D1rUIzn/Qkt 6MTGfFnsQW1kBOPc6wu7dBWa2y/r2YLqkSn/Rk/Rq0AX41DrLy/MQjb5PKzgmFmAv36n 2MOIKOYlEy39xhA4q3f9jmHSXR2/9wOiLHVERRfutVOcTrcwrG0rTBvrrH9cS0nK6jt+ lmHTjW9+QSZDw4XBwBGyAvSxjmy1E/hyIXGkx5gHavYkmxvhAjnNWVIN0yMZBDRn0iQ6 8rQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cmpxchg.org header.s=x header.b=fuoAJg+A; spf=pass (google.com: domain of hannes@cmpxchg.org designates 85.214.110.215 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cmpxchg.org Received: from gum.cmpxchg.org (gum.cmpxchg.org. [85.214.110.215]) by mx.google.com with ESMTPS id u8-v6si307459edq.297.2018.07.12.10.27.40 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Jul 2018 10:27:40 -0700 (PDT) Received-SPF: pass (google.com: domain of hannes@cmpxchg.org designates 85.214.110.215 as permitted sender) client-ip=85.214.110.215; Authentication-Results: mx.google.com; dkim=pass header.i=@cmpxchg.org header.s=x header.b=fuoAJg+A; spf=pass (google.com: domain of hannes@cmpxchg.org designates 85.214.110.215 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cmpxchg.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=cmpxchg.org ; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender: Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=EOH4yuXU61UFUoCxssnGS0E9pmyAjCBzpOCJhmVNCYY=; b=fuoAJg+ANQDWbpN68BmdzpDcro EFO7eTln+95KuyO3oawXhDEnMCsE65lDhQIFTlHTiS4GnbXJyEi+FKi0fIqqBikXI5kPVLekION2m YZQlgEjJgGr+Fk0GqfvNDmtjJ58Lr1WVJZ64VvntC0ZczlhMvDhCNUvP/LSxcUcH4N9w=; From: Johannes Weiner To: Ingo Molnar , Peter Zijlstra , Andrew Morton , Linus Torvalds Cc: Tejun Heo , Suren Baghdasaryan , Vinayak Menon , Christopher Lameter , Mike Galbraith , Shakeel Butt , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 07/10] sched: introduce this_rq_lock_irq() Date: Thu, 12 Jul 2018 13:29:39 -0400 Message-Id: <20180712172942.10094-8-hannes@cmpxchg.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180712172942.10094-1-hannes@cmpxchg.org> References: <20180712172942.10094-1-hannes@cmpxchg.org> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP 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. Signed-off-by: Johannes Weiner --- 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 211890edf37e..9586a8141f16 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -4960,9 +4960,7 @@ static void do_sched_yield(void) 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 b8f038497240..bc798c7cb4d4 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1119,6 +1119,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,