Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp7350031imm; Tue, 28 Aug 2018 10:25:29 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaonlfMuRP/82FIIRb//mwDuYZ9njaJDJoQS6N3kTEd8jMqU/TfWOPMq+8pbaToyvPPXvvM X-Received: by 2002:a17:902:bd4a:: with SMTP id b10-v6mr2448230plx.209.1535477129579; Tue, 28 Aug 2018 10:25:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535477129; cv=none; d=google.com; s=arc-20160816; b=Yt/nWUOdWAquAtK9jF7fJMZPSMAgnITe32leuunA75O5AF8PPX61q0eEurZzkFrWrW QnD1kIxWZ7Y4H9O+xPujfGCJEHB22+KPVntYNmPJ1cBJB9uGGL8ykE0FRM0nLE/TKoxr iHz5V2+d0hgQ2xDlrRtrRyFsb5Vfa6hNX8nL4KrZRPIpBuFiQSTQ+damzDZ0GtPHCNC0 LSKkfWz8JBbh9yeQOZPWI04zsJHxsC3fI1Twk/QcY0lr8F9G8OjOtT2iVji0VYEIqYxc qK07KF2vcf/pyC+9vPX9aYyup8dpEZiCduixlC5IGsuReBZJom5svXma8qkWhkl0Tqij 6rBg== 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:dkim-signature:arc-authentication-results; bh=YGVWOmKVI0Wip1CfuceBVSe8DJn5GeG7PCv8icT2Z0U=; b=wYGNqRlCUS1lhOd3Z1NlzIOpBTp1fCymnq01llX1myytdpBIukMIJHX3l8qrRaEzFK i1DRCKU5JSVll3j45P7RBf9bqom/7lZGawV6d8XySqihDDkI2Ce3TKW8QM5rKQiWB41j TbGlRetYjoyXOCHRYOv2NY1B0qUCIpq9T5nvvLksAXBkSi80EUe+W3xAtxF5VBL/rZXN PVozedRZNEuh/YsYq4jVQ03npnIid0teUxg3VSz7ZeGQONOhazymqt0yaIbATKXWZA6K GA93OR4jJOvm8trr6xgyQZTSG3aVD7ImJGYE8M8g6jSnAphd46v7uTpzq/VXWypz7wlR zeVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cmpxchg-org.20150623.gappssmtp.com header.s=20150623 header.b=AKT3sPmO; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=cmpxchg.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b8-v6si1419244pls.392.2018.08.28.10.25.14; Tue, 28 Aug 2018 10:25:29 -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=@cmpxchg-org.20150623.gappssmtp.com header.s=20150623 header.b=AKT3sPmO; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=cmpxchg.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727661AbeH1VQM (ORCPT + 99 others); Tue, 28 Aug 2018 17:16:12 -0400 Received: from mail-yb0-f196.google.com ([209.85.213.196]:38190 "EHLO mail-yb0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727468AbeH1VQL (ORCPT ); Tue, 28 Aug 2018 17:16:11 -0400 Received: by mail-yb0-f196.google.com with SMTP id c1-v6so900979ybq.5 for ; Tue, 28 Aug 2018 10:23:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YGVWOmKVI0Wip1CfuceBVSe8DJn5GeG7PCv8icT2Z0U=; b=AKT3sPmOEbg9Yg5eRaVaKJegsvlZJJBcHWwMpFiJtmIxeN7ansAN3icVfmfy3FahHC SD0UmVPp1D0fMVlwf+k2KcuBedR/njVCvvA72cV+0+X8HotOSnV/ckH193eYWk+rBWlN ayfwiIlXBVREQ6I34QvF21XoIjIQ6YMwa8MX5sUFGlxVQBtse6wmdVh5t1zdkb4MpaPt pdZCwebhjeyRfwcTuJvpb/IhnAiJQ/9JrU2FICmfrXa+m5mfeGfhiN22InLUkytxqk2z ZcE/gpyXgChPMTiPnMGUFbk8+IHjLxw0HsvV2qrldDxxq/489CHpZDAyRrqivMJ/oAcO Y8Aw== 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=YGVWOmKVI0Wip1CfuceBVSe8DJn5GeG7PCv8icT2Z0U=; b=fCRHV7Ds/AI80ayCgSx6EcTByPJxI5SwHua5jDau42c3wGyC88GPRH3XzK/34A3Pgx 5DzOf/9nmG3zI6hk+KIJOjPJw+HSfNbUjyzCI+1ziruxPjIf72JSqxPBisYW8eanoB2R jJQGZ0ew5jXbXJHwRU770IUHAk6ma0+W+phevC1cG4ZkFTsClg1AwXQIK1vNWwoXx2Cy X/iWgOqTIcw9Hh0f6KX4DQAIu4SxZ12Yd2VN+FhDpr1r8OG9GiFpoRFByOhT2HE859He rfZQgYVUEZVNoq4O0VG+6MVTnsT+m+TcpZutiQOVYBuGg5b+esKPL9VvIOdeAzWIMFFj i6iQ== X-Gm-Message-State: APzg51BXXcVQVc5avS04U8EEFIDxgrOHrGeUBN1GhVXzxyxeLa4njAOq WmslbsjEPm10uRvpYmS2E+8FXw== X-Received: by 2002:a25:c2c5:: with SMTP id s188-v6mr1351995ybf.176.1535477011271; Tue, 28 Aug 2018 10:23:31 -0700 (PDT) Received: from localhost ([2620:10d:c091:200::1:de86]) by smtp.gmail.com with ESMTPSA id s63-v6sm570764ywd.63.2018.08.28.10.23.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Aug 2018 10:23:30 -0700 (PDT) From: Johannes Weiner To: Ingo Molnar , Peter Zijlstra , Andrew Morton , Linus Torvalds Cc: Tejun Heo , Suren Baghdasaryan , Daniel Drake , Vinayak Menon , Christopher Lameter , Peter Enderborg , Shakeel Butt , Mike Galbraith , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 6/9] sched: sched.h: make rq locking and clock functions available in stats.h Date: Tue, 28 Aug 2018 13:22:55 -0400 Message-Id: <20180828172258.3185-7-hannes@cmpxchg.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180828172258.3185-1-hannes@cmpxchg.org> References: <20180828172258.3185-1-hannes@cmpxchg.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org kernel/sched/sched.h includes "stats.h" half-way through the file. The next patch introduces users of sched.h's rq locking functions and update_rq_clock() in kernel/sched/stats.h. Move those definitions up in the file so they are available in stats.h. Signed-off-by: Johannes Weiner --- kernel/sched/sched.h | 164 +++++++++++++++++++++---------------------- 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index c7742dcc136c..eb9b1326906c 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -926,6 +926,8 @@ DECLARE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues); #define cpu_curr(cpu) (cpu_rq(cpu)->curr) #define raw_rq() raw_cpu_ptr(&runqueues) +extern void update_rq_clock(struct rq *rq); + static inline u64 __rq_clock_broken(struct rq *rq) { return READ_ONCE(rq->clock); @@ -1044,6 +1046,86 @@ static inline void rq_repin_lock(struct rq *rq, struct rq_flags *rf) #endif } +struct rq *__task_rq_lock(struct task_struct *p, struct rq_flags *rf) + __acquires(rq->lock); + +struct rq *task_rq_lock(struct task_struct *p, struct rq_flags *rf) + __acquires(p->pi_lock) + __acquires(rq->lock); + +static inline void __task_rq_unlock(struct rq *rq, struct rq_flags *rf) + __releases(rq->lock) +{ + rq_unpin_lock(rq, rf); + raw_spin_unlock(&rq->lock); +} + +static inline void +task_rq_unlock(struct rq *rq, struct task_struct *p, struct rq_flags *rf) + __releases(rq->lock) + __releases(p->pi_lock) +{ + rq_unpin_lock(rq, rf); + raw_spin_unlock(&rq->lock); + raw_spin_unlock_irqrestore(&p->pi_lock, rf->flags); +} + +static inline void +rq_lock_irqsave(struct rq *rq, struct rq_flags *rf) + __acquires(rq->lock) +{ + raw_spin_lock_irqsave(&rq->lock, rf->flags); + rq_pin_lock(rq, rf); +} + +static inline void +rq_lock_irq(struct rq *rq, struct rq_flags *rf) + __acquires(rq->lock) +{ + raw_spin_lock_irq(&rq->lock); + rq_pin_lock(rq, rf); +} + +static inline void +rq_lock(struct rq *rq, struct rq_flags *rf) + __acquires(rq->lock) +{ + raw_spin_lock(&rq->lock); + rq_pin_lock(rq, rf); +} + +static inline void +rq_relock(struct rq *rq, struct rq_flags *rf) + __acquires(rq->lock) +{ + raw_spin_lock(&rq->lock); + rq_repin_lock(rq, rf); +} + +static inline void +rq_unlock_irqrestore(struct rq *rq, struct rq_flags *rf) + __releases(rq->lock) +{ + rq_unpin_lock(rq, rf); + raw_spin_unlock_irqrestore(&rq->lock, rf->flags); +} + +static inline void +rq_unlock_irq(struct rq *rq, struct rq_flags *rf) + __releases(rq->lock) +{ + rq_unpin_lock(rq, rf); + raw_spin_unlock_irq(&rq->lock); +} + +static inline void +rq_unlock(struct rq *rq, struct rq_flags *rf) + __releases(rq->lock) +{ + rq_unpin_lock(rq, rf); + raw_spin_unlock(&rq->lock); +} + #ifdef CONFIG_NUMA enum numa_topology_type { NUMA_DIRECT, @@ -1683,8 +1765,6 @@ static inline void sub_nr_running(struct rq *rq, unsigned count) sched_update_tick_dependency(rq); } -extern void update_rq_clock(struct rq *rq); - extern void activate_task(struct rq *rq, struct task_struct *p, int flags); extern void deactivate_task(struct rq *rq, struct task_struct *p, int flags); @@ -1765,86 +1845,6 @@ static inline void sched_rt_avg_update(struct rq *rq, u64 rt_delta) { } static inline void sched_avg_update(struct rq *rq) { } #endif -struct rq *__task_rq_lock(struct task_struct *p, struct rq_flags *rf) - __acquires(rq->lock); - -struct rq *task_rq_lock(struct task_struct *p, struct rq_flags *rf) - __acquires(p->pi_lock) - __acquires(rq->lock); - -static inline void __task_rq_unlock(struct rq *rq, struct rq_flags *rf) - __releases(rq->lock) -{ - rq_unpin_lock(rq, rf); - raw_spin_unlock(&rq->lock); -} - -static inline void -task_rq_unlock(struct rq *rq, struct task_struct *p, struct rq_flags *rf) - __releases(rq->lock) - __releases(p->pi_lock) -{ - rq_unpin_lock(rq, rf); - raw_spin_unlock(&rq->lock); - raw_spin_unlock_irqrestore(&p->pi_lock, rf->flags); -} - -static inline void -rq_lock_irqsave(struct rq *rq, struct rq_flags *rf) - __acquires(rq->lock) -{ - raw_spin_lock_irqsave(&rq->lock, rf->flags); - rq_pin_lock(rq, rf); -} - -static inline void -rq_lock_irq(struct rq *rq, struct rq_flags *rf) - __acquires(rq->lock) -{ - raw_spin_lock_irq(&rq->lock); - rq_pin_lock(rq, rf); -} - -static inline void -rq_lock(struct rq *rq, struct rq_flags *rf) - __acquires(rq->lock) -{ - raw_spin_lock(&rq->lock); - rq_pin_lock(rq, rf); -} - -static inline void -rq_relock(struct rq *rq, struct rq_flags *rf) - __acquires(rq->lock) -{ - raw_spin_lock(&rq->lock); - rq_repin_lock(rq, rf); -} - -static inline void -rq_unlock_irqrestore(struct rq *rq, struct rq_flags *rf) - __releases(rq->lock) -{ - rq_unpin_lock(rq, rf); - raw_spin_unlock_irqrestore(&rq->lock, rf->flags); -} - -static inline void -rq_unlock_irq(struct rq *rq, struct rq_flags *rf) - __releases(rq->lock) -{ - rq_unpin_lock(rq, rf); - raw_spin_unlock_irq(&rq->lock); -} - -static inline void -rq_unlock(struct rq *rq, struct rq_flags *rf) - __releases(rq->lock) -{ - rq_unpin_lock(rq, rf); - raw_spin_unlock(&rq->lock); -} - #ifdef CONFIG_SMP #ifdef CONFIG_PREEMPT -- 2.18.0