From patchwork Wed Aug 1 15:13:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Weiner X-Patchwork-Id: 10552435 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CCE2113B8 for ; Wed, 1 Aug 2018 15:10:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BBB522B7A5 for ; Wed, 1 Aug 2018 15:10:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B95682B84F; Wed, 1 Aug 2018 15:10:55 +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 166B72B7A5 for ; Wed, 1 Aug 2018 15:10:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 25D116B000E; Wed, 1 Aug 2018 11:10:41 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1E75D6B0010; Wed, 1 Aug 2018 11:10:41 -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 05EEC6B0269; Wed, 1 Aug 2018 11:10:40 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk0-f198.google.com (mail-qk0-f198.google.com [209.85.220.198]) by kanga.kvack.org (Postfix) with ESMTP id CB2BE6B000E for ; Wed, 1 Aug 2018 11:10:40 -0400 (EDT) Received: by mail-qk0-f198.google.com with SMTP id 17-v6so17207512qkz.15 for ; Wed, 01 Aug 2018 08:10:40 -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:reply-to; bh=NnxyiouhvZnUSydapW5h/V7JQgsuHd8XHvJ9oMKS3Xk=; b=Tezqvb85SHjXWf0bcvw4BbV1KfTCFhJ3L07eu1KkLgKhJ20IkeicFM43lRDi6Aalpl p90U8ya++noqIjZU9hmlidNHS58DQOqjW9aG1e9Wvm5s3KvM/MRAZIDkavs/lSwpOVu0 ym+qQSmM7SAHIGyB1/YBte57kXmzgBsHogEMLMhOwjhqJaT8i7vBcYWtDssAUvQFOiIA 2HvSmqEuWdxEbH3zmz2vFf2P/RNNRL/aPQFZMdr5A46BZWy+62uwI0VzCioSPd9V7hi/ pUKVX1bWm2vbhH0OIaaKTXZ54qyfAUVGdEm5wX38OPpj2c1WYJwgH2bGQEp1mp5OlSwA eKqQ== X-Gm-Message-State: AOUpUlHcQqHpF8pXhVmUZiWZrO6MUY/3nLdMv0JFiROW+Ld/lIDYOz69 eCqPr4s15GIOMovSAGHBERC43sGOkhhPQBL2WWG1oVvbnrvNb7Lc1J+WEwzQlQPOfL60y7gfus7 157Vt00zKzEDBO6r0Sx2ZkDYEaqIiSdhz5zWmfomz3Uptiby2/fZvZBYhk2e8jCSNJBiBpUa6jR 0sb5EXolKgaGG5J9oVi4cltnRVJaT2nZimbIi77hVY+TOhYmyr4wB9nJhRle0HxnqAnbKu+qxmK U2e0bgqhK3zRcVDbIn6VisIGZNs1zmY/CgfP9eEb19BEv1z/k6RHmylqW90itGuw7wIL6v6rtwb Bfo+C9znZEW1hO1qG+p/jYu9fn3sVuYU20/YoCOKv3+VVF68214Ivjagrrj5sRm3NpcO6ZUoQYR 6 X-Received: by 2002:a37:7445:: with SMTP id p66-v6mr23937764qkc.368.1533136240594; Wed, 01 Aug 2018 08:10:40 -0700 (PDT) X-Received: by 2002:a37:7445:: with SMTP id p66-v6mr23937705qkc.368.1533136239843; Wed, 01 Aug 2018 08:10:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533136239; cv=none; d=google.com; s=arc-20160816; b=anECR8BTo83PwCJj86+2oyx+4vz0LclGF+wUsnLEZ+wy8Q9ueyoK2rF0LCk3dcx8Op hyNpOYZH6PV5qDe5QCZGCUWPUtmOUZ0+0hayFydyRPQDt1ETOgxVHxkJECFBJepnPYuj u7s54Fnz0nHkq9WlnxZcbHJ3d0I+t1lyucOSDP/8c9+CqOo56CKOgzrzGrHG9DayxpqI VJQwRM1sryy/e1IGnClWTpv9F3zrp8lfMDXmg6xe84Nik3ful/p4AV0pjeGx/og583pQ n6tEhoXiPyh1XBuSdFLo70iMNKujZku8sDfABhbOv34XkZ2b4HYio+oeFqf2CIocdkdg L9ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=reply-to:references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=NnxyiouhvZnUSydapW5h/V7JQgsuHd8XHvJ9oMKS3Xk=; b=VyLNFZ+XZcUFNgZpmBDBhhGxElK1bZEW3HfYQedDQY67zW3pmQP2x0qR2ltcsm81vL EI0aaSTOpv34tiCgunFAqTmXhF+22wI50H45uD2EW1mPOp7m8h/7Ig97WRhN9DOnztus LOF3SIYmvARddtJcpM0LZLGtIV2GHvVZjcqIpVP3VCP2/KiKgRn+Nk0v2A5o0ZvxLYYE YzU4jr97+m73Iybvo6pbcwrDeyDioqz4iLbIHko1j43qcmPTJyvhHer1Salzdn3DrY7i BZHnBEJABVW5pt4vCp30z2g+PvFu5ZacKyJZhypNnbpDdlGx3r/aYQxGTX5sQC5DD6Nd XkQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cmpxchg-org.20150623.gappssmtp.com header.s=20150623 header.b=1t3mlZoI; spf=pass (google.com: domain of hannes@cmpxchg.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cmpxchg.org Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id e10-v6sor7874858qvd.60.2018.08.01.08.10.39 for (Google Transport Security); Wed, 01 Aug 2018 08:10:39 -0700 (PDT) Received-SPF: pass (google.com: domain of hannes@cmpxchg.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@cmpxchg-org.20150623.gappssmtp.com header.s=20150623 header.b=1t3mlZoI; spf=pass (google.com: domain of hannes@cmpxchg.org designates 209.85.220.65 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; c=relaxed/relaxed; d=cmpxchg-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to; bh=NnxyiouhvZnUSydapW5h/V7JQgsuHd8XHvJ9oMKS3Xk=; b=1t3mlZoICxHRzXm+f4eEWTheE+PY6y8grsCgJAntuM3MXe0fNx8dvu+SqOoEa9wwbl pi/fCBBaZYU06BwHE1H6zaMAuhODWUbLVoRBlMW2KfdU+g4AmTWygqO57uZyhZhVXzB2 JFRkNJZLn8g8Droft3BB1vHxzdfHDhVL7UW08VXpd7YKpYmh7WhuhiRJ1SJQWXM5/M+S I6ATf90nozwKjFTjy5MgWarFLFwzBy/Kp2wUrouciDAcz76dDsy4T/BzJ59MfBiV7FTR we5Pgp3F/jZbQJWM0BD4GZ98ofq1b1rQPQNvFJDuxppXZBrAvDeIyfDBOKQZ0RWVUxtJ YbIw== X-Google-Smtp-Source: AAOMgpcbLY6F10/OZmRFeGXCzILLgMkvRboSXbtPYPJ1jMc1cb14H7e20NDTDsi5HXdz3LqxftOavQ== X-Received: by 2002:a0c:a162:: with SMTP id d89-v6mr23660686qva.198.1533136239487; Wed, 01 Aug 2018 08:10:39 -0700 (PDT) Received: from localhost (216.49.36.201.res-cmts.bus.ptd.net. [216.49.36.201]) by smtp.gmail.com with ESMTPSA id q195-v6sm10879028qke.13.2018.08.01.08.10.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Aug 2018 08:10:38 -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 , Mike Galbraith , Shakeel Butt , Peter Enderborg , 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: Wed, 1 Aug 2018 11:13:05 -0400 Message-Id: <20180801151308.32234-7-hannes@cmpxchg.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180801151308.32234-1-hannes@cmpxchg.org> References: <20180801151308.32234-1-hannes@cmpxchg.org> Reply-To: "[PATCH 0/9]"@kvack.org, "psi:pressure"@kvack.org, stall@kvack.org, information@kvack.org, for@kvack.org, CPU@kvack.org, memory@kvack.org, and@kvack.org, IO@kvack.org, v3@kvack.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 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 cb467c221b15..b8f038497240 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -919,6 +919,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); @@ -1037,6 +1039,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, @@ -1670,8 +1752,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); @@ -1752,86 +1832,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