Received: by 2002:a25:ca44:0:0:0:0:0 with SMTP id a65csp1173489ybg; Wed, 29 Jul 2020 07:37:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxd9eGZ8TiJl8FEi64/1Lniij2si70raZDFzN3frp5eCCDlLKf3gq+YAAH4zoMTfbVu9r7l X-Received: by 2002:a17:906:fac3:: with SMTP id lu3mr32205458ejb.374.1596033478239; Wed, 29 Jul 2020 07:37:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596033478; cv=none; d=google.com; s=arc-20160816; b=1GVqFFPOiONyDj0t50+PkL3xg7UrBFLynhDKzvBa1tlmmR8W9P81c5xM37YBE+dbYo qnYmSey8HM+nqeFk9LFwBioIH/CBwLFK4dF86poUezEUHB/RDXS/HHn977t3HuelOi1D z6VNWSxZGsqlhNf34muDa5YUeFHqFjFJkDO3oNbaW4DTflZoCmhnASI2cphRN1mY5o2J d3ws2CF3WPcwxPo1XTwyZ3WwdduBbdRrKSI31HuCkWzU7TsFePa6HB5gH2wvWWsrxTB2 KLcGGgiP0bl9NN8T1fBnNcXXNl4OQzkiOrsigriS62hmSdZqAhd+ahVyKqDk4xV4IYh0 2mIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :robot-unsubscribe:robot-id:message-id:mime-version:references :in-reply-to:cc:subject:to:reply-to:from:dkim-signature :dkim-signature:date; bh=2dRDorUfyV/KRIEq+O8dv02Q2snf8zdn1hjan/viXNg=; b=iDzI3+UyOK5e265n5n9fG4l8do3yRPqvIVXnTe38cXXfxnfM56KWPCNcVA64Jk0K+r MmMjBAk79EQhls8+8wHam3Mu/8D4gYN3wD83dZ0nnwmNuQJCSAkzVhkT47kQwzwOdG0a BLWE/y0DCa8IwAHo9MaZtzZPIfdCVHMlcPtOa51p56Ck5raBKrtjYDV3z2lyPYDVbmSY 4srLFBqFFV7TFSreVncetNLarnM/1XO7u6Xg6OFnN1b3dG9h8SByYHjikWCf6EK6ty1N 8TVhCLF4rtzYnhp9/OwAO7ITAA0CS3uyvsYDFj18v+7Iu8deWJbgQV2R6pEVKWn7NCJD EwtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linutronix.de header.s=2020 header.b=cSouXzg9; dkim=neutral (no key) header.i=@vger.kernel.org; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g20si1413117edh.258.2020.07.29.07.37.35; Wed, 29 Jul 2020 07:37:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@linutronix.de header.s=2020 header.b=cSouXzg9; dkim=neutral (no key) header.i=@vger.kernel.org; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727987AbgG2Oep (ORCPT + 99 others); Wed, 29 Jul 2020 10:34:45 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:42978 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727008AbgG2Odh (ORCPT ); Wed, 29 Jul 2020 10:33:37 -0400 Date: Wed, 29 Jul 2020 14:33:34 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1596033215; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2dRDorUfyV/KRIEq+O8dv02Q2snf8zdn1hjan/viXNg=; b=cSouXzg9GD6vG1QY7CALh6IIRvXP1MGhV68R63+JpmfCIRL43TloCHeFlFEiM4G0+98oZc fBOb+VY08EJDi+95ocrP0B/kIzPAWC85hWHPNZWCWcHfEgZ7LYM+E8lgtkVBKLDNSUYigF N14C03/locq0AoxCIyS32dlCeJR+30h5wsim7F9QJfc8MxbKRoZHnAm6VLP3d3zYDSqlS/ nCMWvJYP+KSYLOrx96y7XImD/a/7Yu+v+hGSGloCu7WO4hNlGPK2Vj5WitOL6YlxhmC92E 48VMqnK5K7/WsR8wDIikoMzLSjPN6u4ywAtZhHLPlzEi0gHXDMC939AfwuekNw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1596033215; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2dRDorUfyV/KRIEq+O8dv02Q2snf8zdn1hjan/viXNg=; b=NoK9eVhLNX89C6j0C9j3GYsOKqew45ZQM1JP60/lXOU8Pk3c85eiWLm15cz8TsfkB+zZrp d8SbfZsQ0AjgxKBw== From: "tip-bot2 for Ahmed S. Darwish" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/core] sched: tasks: Use sequence counter with associated spinlock Cc: "Ahmed S. Darwish" , "Peter Zijlstra (Intel)" , x86 , LKML In-Reply-To: <20200720155530.1173732-14-a.darwish@linutronix.de> References: <20200720155530.1173732-14-a.darwish@linutronix.de> MIME-Version: 1.0 Message-ID: <159603321449.4006.5978945704177028355.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the locking/core branch of tip: Commit-ID: b75058614fdd3140074a640b514f6a0b4d485a2d Gitweb: https://git.kernel.org/tip/b75058614fdd3140074a640b514f6a0b4d485a2d Author: Ahmed S. Darwish AuthorDate: Mon, 20 Jul 2020 17:55:19 +02:00 Committer: Peter Zijlstra CommitterDate: Wed, 29 Jul 2020 16:14:26 +02:00 sched: tasks: Use sequence counter with associated spinlock A sequence counter write side critical section must be protected by some form of locking to serialize writers. A plain seqcount_t does not contain the information of which lock must be held when entering a write side critical section. Use the new seqcount_spinlock_t data type, which allows to associate a spinlock with the sequence counter. This enables lockdep to verify that the spinlock used for writer serialization is held when the write side critical section is entered. If lockdep is disabled this lock association is compiled out and has neither storage size nor runtime overhead. Signed-off-by: Ahmed S. Darwish Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20200720155530.1173732-14-a.darwish@linutronix.de --- include/linux/sched.h | 2 +- init/init_task.c | 3 ++- kernel/fork.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 8d1de02..9a9d826 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1050,7 +1050,7 @@ struct task_struct { /* Protected by ->alloc_lock: */ nodemask_t mems_allowed; /* Seqence number to catch updates: */ - seqcount_t mems_allowed_seq; + seqcount_spinlock_t mems_allowed_seq; int cpuset_mem_spread_rotor; int cpuset_slab_spread_rotor; #endif diff --git a/init/init_task.c b/init/init_task.c index 15089d1..94fe3ba 100644 --- a/init/init_task.c +++ b/init/init_task.c @@ -154,7 +154,8 @@ struct task_struct init_task .trc_holdout_list = LIST_HEAD_INIT(init_task.trc_holdout_list), #endif #ifdef CONFIG_CPUSETS - .mems_allowed_seq = SEQCNT_ZERO(init_task.mems_allowed_seq), + .mems_allowed_seq = SEQCNT_SPINLOCK_ZERO(init_task.mems_allowed_seq, + &init_task.alloc_lock), #endif #ifdef CONFIG_RT_MUTEXES .pi_waiters = RB_ROOT_CACHED, diff --git a/kernel/fork.c b/kernel/fork.c index 70d9d0a..fc72f09 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -2032,7 +2032,7 @@ static __latent_entropy struct task_struct *copy_process( #ifdef CONFIG_CPUSETS p->cpuset_mem_spread_rotor = NUMA_NO_NODE; p->cpuset_slab_spread_rotor = NUMA_NO_NODE; - seqcount_init(&p->mems_allowed_seq); + seqcount_spinlock_init(&p->mems_allowed_seq, &p->alloc_lock); #endif #ifdef CONFIG_TRACE_IRQFLAGS p->irq_events = 0;