From patchwork Wed May 15 22:05:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qais Yousef X-Patchwork-Id: 13665573 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5065C25B75 for ; Wed, 15 May 2024 22:05:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 215D06B0363; Wed, 15 May 2024 18:05:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 19FBB6B03A0; Wed, 15 May 2024 18:05:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0196D6B03A2; Wed, 15 May 2024 18:05:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D43586B0363 for ; Wed, 15 May 2024 18:05:48 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 5BDEA1202C2 for ; Wed, 15 May 2024 22:05:48 +0000 (UTC) X-FDA: 82122013176.05.1BCA803 Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by imf06.hostedemail.com (Postfix) with ESMTP id 539D8180014 for ; Wed, 15 May 2024 22:05:46 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=layalina-io.20230601.gappssmtp.com header.s=20230601 header.b="B1LE4Ox/"; spf=pass (imf06.hostedemail.com: domain of qyousef@layalina.io designates 209.85.208.172 as permitted sender) smtp.mailfrom=qyousef@layalina.io; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715810746; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=IggtN+LqajgQVRobU6djrydCltSCxtRwqVbS9moNbWE=; b=HErF8JFqbwXi1HjLtNWxiFP9yEnZuuaQmExWfBnAWmIA+vcpQkvAwMCXoy9xGSWYzmVfmL i5WzQR9+NaK9Bq0lLIKsVDT1ABHL6qoJSwDG6Zfez7XJ2Jv8d78HFPK1jm9+O4SvJdxod6 OsBXrOwDcfR4x1WMCz2UmE8eBdyaOLo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715810746; a=rsa-sha256; cv=none; b=nOY9jtWLPwOMaWnSpnMLVfNfbRDH+plIAzYzsaU4zk94sDNN99NRp1y6X6UQF/IvUMbekU Ov2u1UvFJiI9ulMPGjmek5MRWEyZWDAuYMk0gWp1Cxh4ck1wA253sPbKTq6uoZZVXlpBUr uS8QsVuB4fN4H/4W+M6DXSL8silDpNk= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=layalina-io.20230601.gappssmtp.com header.s=20230601 header.b="B1LE4Ox/"; spf=pass (imf06.hostedemail.com: domain of qyousef@layalina.io designates 209.85.208.172 as permitted sender) smtp.mailfrom=qyousef@layalina.io; dmarc=none Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2e538a264e0so1039251fa.1 for ; Wed, 15 May 2024 15:05:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=layalina-io.20230601.gappssmtp.com; s=20230601; t=1715810744; x=1716415544; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=IggtN+LqajgQVRobU6djrydCltSCxtRwqVbS9moNbWE=; b=B1LE4Ox/VxICl+daivc7q073tkqt3G+435QBx7ADu6Dgrres0Rs3ZPvoUq0KLj37Y8 32BR3BoMqustq6QSsdRzQBhxzanwVip1ImkA1QIbbbIOmk+THGzJ52ziaAJfHSiDybwG 08KkMwPcIG2xU6dnCJ7IAnXowq301Hms2bUgMsPK5NAMuDxPZHLl+GKVJaqgPcYjOgo3 mfeQ6Z71PSmP3cxGnCZYPB2fiD80ueJcV5Sv52hN5OTDnbK/LoEszkUndLOsYNIFPTt/ qGYHMuTkdOGorDQljjT8s1ZAVQ/AZKJpiBKbbnq0fWktDHOwuD+80ZY+gUJShVqkDgWk GuWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715810744; x=1716415544; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IggtN+LqajgQVRobU6djrydCltSCxtRwqVbS9moNbWE=; b=lj6+CZCPoEB0XP98k0bDgC6E8QA+SVDyE1M2Q6j9Xjs8DFf3yWeupzKEP0Hb8yn421 puH2S+g/lSx/BibUMJzbUZfPcdUQ0lMhTouz0DyJbEm2GBO4drH+Uf5Z5OWXU8ackKYe Ep8c84OGiS318bL1+JNyrJjJv2bgQcPNV3V8cj2zc3y+4g5aweVDHoGWWeqHrEp6fUMG cDerOQ2WKMcSqnkc4bc39p97cR6nfqfjDPWaJTdppPyE9F/mkLhNLUwv0HKydCqorfVU iCgss4VK+7eDknvUFfFhdzJuHqzjSiJu4FB3shTuHTOu+eF2maUh22t+tb8zubZVBQks GtPQ== X-Forwarded-Encrypted: i=1; AJvYcCWQhWupsYf8h+gRZtDl39PfeZSFc6n2Anaq1ReZrok25+gBMr3FtUPtL/Ors7BQt9/9ZINF75wKgmesp+3zu+ksxZ4= X-Gm-Message-State: AOJu0YytbgObJVoIKrUvSX5KaxPFVj/2mZmgKQdUnTyu8JNLRukD7Dd+ vhPeshCFWtirZKlK+Adjmn1u5obKSrIXkK5ZXTcMX44wH96DWOHPR3bv45M8y//KM4R3XfyklOT 6 X-Google-Smtp-Source: AGHT+IERpw1CehaeB/NiaGpoFOIOzRzZV8pU0VkHln+/exou1DemAXNW3jfKq7uNpuJSa1Lz8up6Yg== X-Received: by 2002:a2e:7205:0:b0:2e0:5d7:a39b with SMTP id 38308e7fff4ca-2e5203b43c8mr141718081fa.33.1715810743731; Wed, 15 May 2024 15:05:43 -0700 (PDT) Received: from airbuntu.. (host81-157-90-255.range81-157.btcentralplus.com. [81.157.90.255]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41facbd295fsm266135965e9.36.2024.05.15.15.05.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 May 2024 15:05:43 -0700 (PDT) From: Qais Yousef To: Ingo Molnar , Peter Zijlstra , Juri Lelli , Steven Rostedt Cc: Vincent Guittot , Daniel Bristot de Oliveira , Thomas Gleixner , Sebastian Andrzej Siewior , Alexander Viro , Christian Brauner , Andrew Morton , Jens Axboe , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-mm@kvack.org, Qais Yousef , Phil Auld Subject: [PATCH v2] sched/rt: Clean up usage of rt_task() Date: Wed, 15 May 2024 23:05:36 +0100 Message-Id: <20240515220536.823145-1-qyousef@layalina.io> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 539D8180014 X-Rspam-User: X-Stat-Signature: yozt6d77tj5yxqas1zt3smwck6frm45k X-HE-Tag: 1715810746-405441 X-HE-Meta: U2FsdGVkX1+o8gQBe/NnYJ5+SKkvAI64yGr5dBprIPWqWJevV/94hLJsx7Yjj/oW0WdvO0HlVdq2eakabK5dNv7u/SZRWDG4UY6kvcH9nrICFj9W9eps9UUZ2F0nDu46NIpB4AsZxNi8YLluzk+totBJR69U+7qNSu5f+ia5QBC86MMkdQPa+ttdxO69ys16CsrBmmbCMAcYmlMTxQ8r/BwDk9qdVOPCAbbrkhfQBYjK6el+bZ7nCCwMMW4Q7S4fAlCOXNgJL5AD4CuLkZRiLYJb+LBJDA13qnayhELbpMUpgY7k+ejB9lvjDJqx9TF+dU+cJZTI4MAoZI7JZedCI/YyFL9K7hmP4vw5X1v6F/Y6d3p8ubpq2O6wqYzmPihzryfeTyFhYY13QAbSB/CxFZawHCS3HOFwJnrIVPcVo/AjNhxOfhCHlDCSbI7EM/dk9dEawjPO+YfPZXIIoIUvqUT+4AHSdSe9at4dpVBSr+wsSgNgfGsJrXjAB78kmFvRpOELuTnhfVHyFs9SkARbxPXV8Us4IK1h7Gb4As45Z6m10wHk9RnkTZkiZyTxKt1NiMAuBXomPzy2AwnkceRTeqW1l/n3d8vP1pzCsVk4VsVVIiNIbNX+dG4F8Brh6IPTL2ac6NDKHC8/mtwQe0jHlQHEhlLg8GoQCODALaUxxEs8Al2Zypk3+f+eNhfzzlvnceWTIxujX+LAEjhDFxeMEYCSzg5IraLPgcQ+OKX8NrGcTpPbK9IUSnEcK0ob9NNq6frbjmdgZo9ALzxRm+3E8Qv5gO86woHixyKFda0LzVlLEKC2f/R79ldnTgntmyG58ufbZZA89Bt9KrkK/h5P6kzsVNTEiAbgFBPJD3XwCVFffNYJ738p5N+migHPQq1xDBqOaXiVCJ0gxb+PxMgzoBEairL22NZsYbTQ3bKsSROSJQfqQJSTKhIcPGb3r9DA0qA2n0IE4Wxzkawkdaf C76FQbFD jJEFZpiBPK7ViJQG+mRGXBrXwu4pTRrq5yIBE2VX1nBUp6fmHN0GDBGY343rU0k3GVREppCbvSllhJTNuicc/NagHMm/Rngg3g9OBdve5IU3wyDh6g6XRz7051EvLcrUhcxI4KgVhBtiJC4IzOyhuvYXHq1zTp6P1iAzAu4AXsd3t/SRnY3MwhQSiPuYBg/zXRn4UXNcrKdpPccL2ERCo841UZKgjyWH/nNPsCYdkXOsOkduL/yPjPPa2U3ABNo9peWIIaGmhoD+wVqkX8WDHTs0ZlLSQGsTC9Gi8Wn78As5ThZJ52FRaYWGPcvikoUUMvvoNgNS/o+tWzVo3km9DYdJBN9mpO4plXS37mRdf6/qp8cCRkygs4H1SLSzxRQ7w8mon5FtggjYozFSTeuJOR/felz4C3DjK5MVXKF4M2LiskicoRmYOdnMGFEBOEiGJsnmwNQp+n/4CnU/gkkr2SyHsmPeIS3GPkpReRc5MnxdclcwmEDanIACppcepAqYlthydNsfGSrHe/m74VXrb5Efhj21HHGTPCe2KUZb+RtD5WIw5Wk468zr5hag7RChO4F// 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: List-Subscribe: List-Unsubscribe: rt_task() checks if a task has RT priority. But depends on your dictionary, this could mean it belongs to RT class, or is a 'realtime' task, which includes RT and DL classes. Since this has caused some confusion already on discussion [1], it seemed a clean up is due. I define the usage of rt_task() to be tasks that belong to RT class. Make sure that it returns true only for RT class and audit the users and replace the ones required the old behavior with the new realtime_task() which returns true for RT and DL classes. Introduce similar realtime_prio() to create similar distinction to rt_prio() and update the users that required the old behavior to use the new function. Move MAX_DL_PRIO to prio.h so it can be used in the new definitions. Document the functions to make it more obvious what is the difference between them. PI-boosted tasks is a factor that must be taken into account when choosing which function to use. Rename task_is_realtime() to realtime_task_policy() as the old name is confusing against the new realtime_task(). No functional changes were intended. [1] https://lore.kernel.org/lkml/20240506100509.GL40213@noisy.programming.kicks-ass.net/ Reviewed-by: Phil Auld Signed-off-by: Qais Yousef Reviewed-by: Steven Rostedt (Google) --- Changes since v1: * Use realtime_task_policy() instead task_has_realtime_policy() (Peter) * Improve commit message readability about replace some rt_task() users. v1 discussion: https://lore.kernel.org/lkml/20240514234112.792989-1-qyousef@layalina.io/ fs/select.c | 2 +- include/linux/ioprio.h | 2 +- include/linux/sched/deadline.h | 6 ++++-- include/linux/sched/prio.h | 1 + include/linux/sched/rt.h | 27 ++++++++++++++++++++++++++- kernel/locking/rtmutex.c | 4 ++-- kernel/locking/rwsem.c | 4 ++-- kernel/locking/ww_mutex.h | 2 +- kernel/sched/core.c | 6 +++--- kernel/time/hrtimer.c | 6 +++--- kernel/trace/trace_sched_wakeup.c | 2 +- mm/page-writeback.c | 4 ++-- mm/page_alloc.c | 2 +- 13 files changed, 48 insertions(+), 20 deletions(-) diff --git a/fs/select.c b/fs/select.c index 9515c3fa1a03..8d5c1419416c 100644 --- a/fs/select.c +++ b/fs/select.c @@ -82,7 +82,7 @@ u64 select_estimate_accuracy(struct timespec64 *tv) * Realtime tasks get a slack of 0 for obvious reasons. */ - if (rt_task(current)) + if (realtime_task(current)) return 0; ktime_get_ts64(&now); diff --git a/include/linux/ioprio.h b/include/linux/ioprio.h index db1249cd9692..75859b78d540 100644 --- a/include/linux/ioprio.h +++ b/include/linux/ioprio.h @@ -40,7 +40,7 @@ static inline int task_nice_ioclass(struct task_struct *task) { if (task->policy == SCHED_IDLE) return IOPRIO_CLASS_IDLE; - else if (task_is_realtime(task)) + else if (realtime_task_policy(task)) return IOPRIO_CLASS_RT; else return IOPRIO_CLASS_BE; diff --git a/include/linux/sched/deadline.h b/include/linux/sched/deadline.h index df3aca89d4f5..5cb88b748ad6 100644 --- a/include/linux/sched/deadline.h +++ b/include/linux/sched/deadline.h @@ -10,8 +10,6 @@ #include -#define MAX_DL_PRIO 0 - static inline int dl_prio(int prio) { if (unlikely(prio < MAX_DL_PRIO)) @@ -19,6 +17,10 @@ static inline int dl_prio(int prio) return 0; } +/* + * Returns true if a task has a priority that belongs to DL class. PI-boosted + * tasks will return true. Use dl_policy() to ignore PI-boosted tasks. + */ static inline int dl_task(struct task_struct *p) { return dl_prio(p->prio); diff --git a/include/linux/sched/prio.h b/include/linux/sched/prio.h index ab83d85e1183..6ab43b4f72f9 100644 --- a/include/linux/sched/prio.h +++ b/include/linux/sched/prio.h @@ -14,6 +14,7 @@ */ #define MAX_RT_PRIO 100 +#define MAX_DL_PRIO 0 #define MAX_PRIO (MAX_RT_PRIO + NICE_WIDTH) #define DEFAULT_PRIO (MAX_RT_PRIO + NICE_WIDTH / 2) diff --git a/include/linux/sched/rt.h b/include/linux/sched/rt.h index b2b9e6eb9683..a055dd68a77c 100644 --- a/include/linux/sched/rt.h +++ b/include/linux/sched/rt.h @@ -7,18 +7,43 @@ struct task_struct; static inline int rt_prio(int prio) +{ + if (unlikely(prio < MAX_RT_PRIO && prio >= MAX_DL_PRIO)) + return 1; + return 0; +} + +static inline int realtime_prio(int prio) { if (unlikely(prio < MAX_RT_PRIO)) return 1; return 0; } +/* + * Returns true if a task has a priority that belongs to RT class. PI-boosted + * tasks will return true. Use rt_policy() to ignore PI-boosted tasks. + */ static inline int rt_task(struct task_struct *p) { return rt_prio(p->prio); } -static inline bool task_is_realtime(struct task_struct *tsk) +/* + * Returns true if a task has a priority that belongs to RT or DL classes. + * PI-boosted tasks will return true. Use realtime_task_policy() to ignore + * PI-boosted tasks. + */ +static inline int realtime_task(struct task_struct *p) +{ + return realtime_prio(p->prio); +} + +/* + * Returns true if a task has a policy that belongs to RT or DL classes. + * PI-boosted tasks will return false. + */ +static inline bool realtime_task_policy(struct task_struct *tsk) { int policy = tsk->policy; diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index 88d08eeb8bc0..55c9dab37f33 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -347,7 +347,7 @@ static __always_inline int __waiter_prio(struct task_struct *task) { int prio = task->prio; - if (!rt_prio(prio)) + if (!realtime_prio(prio)) return DEFAULT_PRIO; return prio; @@ -435,7 +435,7 @@ static inline bool rt_mutex_steal(struct rt_mutex_waiter *waiter, * Note that RT tasks are excluded from same priority (lateral) * steals to prevent the introduction of an unbounded latency. */ - if (rt_prio(waiter->tree.prio) || dl_prio(waiter->tree.prio)) + if (realtime_prio(waiter->tree.prio)) return false; return rt_waiter_node_equal(&waiter->tree, &top_waiter->tree); diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c index c6d17aee4209..ad8d4438bc91 100644 --- a/kernel/locking/rwsem.c +++ b/kernel/locking/rwsem.c @@ -631,7 +631,7 @@ static inline bool rwsem_try_write_lock(struct rw_semaphore *sem, * if it is an RT task or wait in the wait queue * for too long. */ - if (has_handoff || (!rt_task(waiter->task) && + if (has_handoff || (!realtime_task(waiter->task) && !time_after(jiffies, waiter->timeout))) return false; @@ -914,7 +914,7 @@ static bool rwsem_optimistic_spin(struct rw_semaphore *sem) if (owner_state != OWNER_WRITER) { if (need_resched()) break; - if (rt_task(current) && + if (realtime_task(current) && (prev_owner_state != OWNER_WRITER)) break; } diff --git a/kernel/locking/ww_mutex.h b/kernel/locking/ww_mutex.h index 3ad2cc4823e5..fa4b416a1f62 100644 --- a/kernel/locking/ww_mutex.h +++ b/kernel/locking/ww_mutex.h @@ -237,7 +237,7 @@ __ww_ctx_less(struct ww_acquire_ctx *a, struct ww_acquire_ctx *b) int a_prio = a->task->prio; int b_prio = b->task->prio; - if (rt_prio(a_prio) || rt_prio(b_prio)) { + if (realtime_prio(a_prio) || realtime_prio(b_prio)) { if (a_prio > b_prio) return true; diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 1a914388144a..27f15de3d099 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -162,7 +162,7 @@ static inline int __task_prio(const struct task_struct *p) if (p->sched_class == &stop_sched_class) /* trumps deadline */ return -2; - if (rt_prio(p->prio)) /* includes deadline */ + if (realtime_prio(p->prio)) /* includes deadline */ return p->prio; /* [-1, 99] */ if (p->sched_class == &idle_sched_class) @@ -2198,7 +2198,7 @@ static int effective_prio(struct task_struct *p) * keep the priority unchanged. Otherwise, update priority * to the normal priority: */ - if (!rt_prio(p->prio)) + if (!realtime_prio(p->prio)) return p->normal_prio; return p->prio; } @@ -10282,7 +10282,7 @@ void normalize_rt_tasks(void) schedstat_set(p->stats.sleep_start, 0); schedstat_set(p->stats.block_start, 0); - if (!dl_task(p) && !rt_task(p)) { + if (!realtime_task(p)) { /* * Renice negative nice level userspace * tasks back to 0: diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index 70625dff62ce..08b95e0a41ab 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -1996,7 +1996,7 @@ static void __hrtimer_init_sleeper(struct hrtimer_sleeper *sl, * expiry. */ if (IS_ENABLED(CONFIG_PREEMPT_RT)) { - if (task_is_realtime(current) && !(mode & HRTIMER_MODE_SOFT)) + if (realtime_task_policy(current) && !(mode & HRTIMER_MODE_SOFT)) mode |= HRTIMER_MODE_HARD; } @@ -2096,7 +2096,7 @@ long hrtimer_nanosleep(ktime_t rqtp, const enum hrtimer_mode mode, u64 slack; slack = current->timer_slack_ns; - if (rt_task(current)) + if (realtime_task(current)) slack = 0; hrtimer_init_sleeper_on_stack(&t, clockid, mode); @@ -2301,7 +2301,7 @@ schedule_hrtimeout_range_clock(ktime_t *expires, u64 delta, * Override any slack passed by the user if under * rt contraints. */ - if (rt_task(current)) + if (realtime_task(current)) delta = 0; hrtimer_init_sleeper_on_stack(&t, clock_id, mode); diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c index 0469a04a355f..19d737742e29 100644 --- a/kernel/trace/trace_sched_wakeup.c +++ b/kernel/trace/trace_sched_wakeup.c @@ -545,7 +545,7 @@ probe_wakeup(void *ignore, struct task_struct *p) * - wakeup_dl handles tasks belonging to sched_dl class only. */ if (tracing_dl || (wakeup_dl && !dl_task(p)) || - (wakeup_rt && !dl_task(p) && !rt_task(p)) || + (wakeup_rt && !realtime_task(p)) || (!dl_task(p) && (p->prio >= wakeup_prio || p->prio >= current->prio))) return; diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 3e19b87049db..7372e40f225d 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -418,7 +418,7 @@ static void domain_dirty_limits(struct dirty_throttle_control *dtc) if (bg_thresh >= thresh) bg_thresh = thresh / 2; tsk = current; - if (rt_task(tsk)) { + if (realtime_task(tsk)) { bg_thresh += bg_thresh / 4 + global_wb_domain.dirty_limit / 32; thresh += thresh / 4 + global_wb_domain.dirty_limit / 32; } @@ -468,7 +468,7 @@ static unsigned long node_dirty_limit(struct pglist_data *pgdat) else dirty = vm_dirty_ratio * node_memory / 100; - if (rt_task(tsk)) + if (realtime_task(tsk)) dirty += dirty / 4; return dirty; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 14d39f34d336..0af24a60ade0 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3877,7 +3877,7 @@ gfp_to_alloc_flags(gfp_t gfp_mask, unsigned int order) */ if (alloc_flags & ALLOC_MIN_RESERVE) alloc_flags &= ~ALLOC_CPUSET; - } else if (unlikely(rt_task(current)) && in_task()) + } else if (unlikely(realtime_task(current)) && in_task()) alloc_flags |= ALLOC_MIN_RESERVE; alloc_flags = gfp_to_alloc_flags_cma(gfp_mask, alloc_flags);