From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752248AbdBFMTD (ORCPT <rfc822;w@1wt.eu>);
        Mon, 6 Feb 2017 07:19:03 -0500
Received: from mout.gmx.net ([212.227.17.21]:59877 "EHLO mout.gmx.net"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751775AbdBFMTA (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 6 Feb 2017 07:19:00 -0500
Message-ID: <1486383511.10462.43.camel@gmx.de>
Subject: Re: tip: demise of tsk_cpus_allowed() and tsk_nr_cpus_allowed()
From: Mike Galbraith <efault@gmx.de>
To: Ingo Molnar <mingo@kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
        Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
        LKML <linux-kernel@vger.kernel.org>,
        Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Mon, 06 Feb 2017 13:18:31 +0100
In-Reply-To: <20170206103156.GA18908@gmail.com>
References: <1486355037.10462.17.camel@gmx.de>
         <20170206103156.GA18908@gmail.com>
Content-Type: text/plain; charset="us-ascii"
X-Mailer: Evolution 3.16.5 
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Provags-ID: V03:K0:otSlldyM5i0wT3FNc5yubKypnHZUbMSPybmvI57d+w3pn+eggkt
 xJaE92fk/Cn+ggvHr2EwGLBh5nlPB2vSl6c57eDbZ9bKw7oHSEckiQuE4x/mLUNN0Fmsh1a
 ksXp/Ph8gTf+JcrV+IWb6kEf+pHq78DSnTOWZTZGcvM3e5nuFvZcRjZzYZvqgeosl2Jt+sz
 qv6dQmERf3g34b9ZIi/OQ==
X-UI-Out-Filterresults: notjunk:1;V01:K0:n9Lu8wNZJQ0=:MUT6ygSH/7Xj+o8vfLduZV
 Tx+WZYbM2Qo8YjYS5l3TH8oIS+Hbpw0SYqZ9eVbOW8WdzIwbypUUpKbz8jD9vpBybs08dXXFf
 EpLVC+abubRmrkf+dUtfeTfzEPkG5nzZhqfSYsi83NCExdeXhsWuCpXbVoQcgwI6DLW3yrmpg
 a+xMsCTCy4T3lOOSqmuY74sFPdtp6PAG88RIzS1d8hz99uLwCbUCGjOMg0pRcqmjmGV3CEP2M
 ZmKk5USeBjKp4WLJCCX6weVbSY8kpB3JsCo09vm6Xoao1O97W7G8DAk0KNW/HBO+KgonhZBQm
 wtZ3k6bl9Bgwmlx4atngTCMtTii0nA9TvgNTyqaFtlEXhIaH1/+ulRzTAmoKmqPHcmMn1dd6K
 GDNTc6Igp+EslNUeQUAhZAmCADLqXnpoVDdc6TWJfVPWzl+joVUNc0s83j2XEdXqPMFjnKvQQ
 qa+6xT2wNXEvqsVnAwyw9SSCCawTdHbZzK3hUZvLq3zWEAUo3JBO3Kx9e6wYpa935HVgvaiOQ
 FfBhZJrG1xMBDyVW5+Jd5vJb6aNNJsMk7ThvTJOz8Ma1xAK0jtgOJpOAQvOShLfhnNDdkgm4L
 UTrXa43IwSZZFDJ9bvD92lSZh7iwtvKmQp27MvMfI4EQimUP21pUWIoAw17WWw5EHDahB6C7u
 fyHfs6+LvAyNPhO1CobqnUaticCjRLK+RWqi2Yc7AXAJMnInNxgKT5GQEbjV4W15/eclkxSou
 ng75KGlTyM40dgdNerNFbr1K3lPQY3ZFYkmTnQS6Jn2YRJa0OpSlJE/N9TB+ixrEu7I8RStir
 G6Oz1rs4MOPcQkgjGoZAMA6bxP0A0EFDBXqctdzprVfZ/6xNDFEDNHmpnEEEeBijQXNbTUg6o
 OD4qog4jm2o/fSwVSJ0joa+lT+EgzVn94L3WUqrtVvOerOsufJjE59cnxmqIpTA4XV6AUnmRD
 rfqvbP5Abxkl/SysASpQqsU5iENrgnGCLTP+keQzTv0HhuA9iF2I2pYuPU3MlvSabn5+sG14q
 RKGRtz7EHAGrORQZDvOc+jvodNPkM4L927WLwOoshtWqBBCpdunDalIq6eeqvg8nIg==
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, 2017-02-06 at 11:31 +0100, Ingo Molnar wrote:
> * Mike Galbraith <efault@gmx.de> wrote:
> 
> > Hi Ingo,
> > 
> > Doing my ~daily tip merge of -rt, I couldn't help noticing $subject, as
> > they grow more functionality in -rt, which is allegedly slowly but
> > surely headed toward merge.  I don't suppose they could be left intact?
> >  I can easily restore them in my local tree, but it seems a bit of a
> > shame to whack these integration friendly bits.
> 
> Oh, I missed that. How is tsk_cpus_allowed() wrapped in -rt right now?

RT extends them to reflect whether migration is disabled or not.

+/* Future-safe accessor for struct task_struct's cpus_allowed. */
+static inline const struct cpumask *tsk_cpus_allowed(struct task_struct *p)
+{
+       if (__migrate_disabled(p))
+               return cpumask_of(task_cpu(p));
+
+       return &p->cpus_allowed;
+}
+
+static inline int tsk_nr_cpus_allowed(struct task_struct *p)
+{
+       if (__migrate_disabled(p))
+               return 1;
+       return p->nr_cpus_allowed;
+}