Received: by 10.223.176.5 with SMTP id f5csp845983wra; Fri, 9 Feb 2018 08:08:12 -0800 (PST) X-Google-Smtp-Source: AH8x2279+27jX0G65SCPUvFHv1Q9m9UcIT/pX8AiTok1pIhCGxJQAYbr+WMLaqAux5qfLCO0ubKC X-Received: by 2002:a17:902:2803:: with SMTP id e3-v6mr2982758plb.447.1518192492262; Fri, 09 Feb 2018 08:08:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518192492; cv=none; d=google.com; s=arc-20160816; b=SmTMC6uNk7MuRDlsthcV0pJ8fj5kRyJqOWjx318uplaQsszrtIkyGYze16DC0WdCkj GrRJEccwq2Hpn/gMK2arr+Hfw4yyx/YZFFCGZOlImh4YT5mzVHR/a7q7FsNETA1cQJu2 DHZP5WMjUpdv3u7WDFWXU8t3swSZHXlIedryNpeUMOo0jG0D7HV/RfQR3nz7MBSDoL0+ UJSKuW3w9c8PsyFvw5CkEsL5ro7vVdkss74NdlgRvY+RcgGMKPnH15DxWUU82WHxi891 ltty3khFbt9JMqGyV7V+qM4x7RKyfayopAlN1fPUCR7lyij02v10j/T+cMZ889z4CRFc +9tA== 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 :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature :arc-authentication-results; bh=rrtqWVmZ0wniyTkJ4fkDzUjfyU4TsXFIjT37ssrvtMg=; b=C8JYuEcPYtza1v7bQPEgtwQsUoFBYg05mKNGMzqVNT137cKHSiOHN7Rv7sMotsWcKb cA1ueAPLiK0GccnrZtlfhbx3TveS7lTdtZSgSxOSLCIO9/LqALEABqiA6buXRjwgLMu2 RhzeVhpX6UkhXZNPD2kPFdl5Uco168dx6bm2kWqu/WagnktJdR2wzmitQLSc+C1dc2Q+ Uiei6cXGXUKDwPlhn4FbsZ1w7ySInpm/3DN6LCnCjWsQ6+iWuubqSaV4PVus0AA7GGvg 0essqQWCnVs0aEzwOdjTIXsurIbjYbaTGlgO9/+P5Kv+cFk9h+eWbLbgZqdonvZ5neNJ RsMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=JOIi72fr; 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=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k193si346615pge.377.2018.02.09.08.07.58; Fri, 09 Feb 2018 08:08:12 -0800 (PST) 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=@gmail.com header.s=20161025 header.b=JOIi72fr; 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=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752116AbeBIQHB (ORCPT + 99 others); Fri, 9 Feb 2018 11:07:01 -0500 Received: from mail-io0-f195.google.com ([209.85.223.195]:38390 "EHLO mail-io0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751053AbeBIQHA (ORCPT ); Fri, 9 Feb 2018 11:07:00 -0500 Received: by mail-io0-f195.google.com with SMTP id d13so10158608iog.5 for ; Fri, 09 Feb 2018 08:06:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=rrtqWVmZ0wniyTkJ4fkDzUjfyU4TsXFIjT37ssrvtMg=; b=JOIi72frQeNESf8HPhweaNWDiI4ri/P79O9T95GPwamkXlKUPiYpui4UtLmh1Aw/BP hn9qHLFUkEn2CBUSZ04/WDRi4hqQndM/2+sBCacuvu5laq6fGaByoralVVvf1KJtFTt1 hl3RMvcuYKbwFjwCFOFWFpvnBwUHR6jAfyuJsPv82DfRb7KKxJ1svJ+8tbwmekFotQua o0eKkJAOtAn4icIb1ijLFx1g7PTNy4ZaJZ1umjCtpoUmWZj6ojWXdeE2VBTYI/IWhZ8q fwKW+yH6W/8tAXs0mZfdaH5zxDYLYC9CvGr6d9Ur4WOsilzN8oJ9BcLTWM5761NZa6dv 5yow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=rrtqWVmZ0wniyTkJ4fkDzUjfyU4TsXFIjT37ssrvtMg=; b=JGtYhuU0NHK2qvHe+ff54gZT4Gnw4Mv81qmFnZUX9smfSY24lQtbXuSmLNiWJ11Zo3 mCBOD2ZOuDf+A4qQQj0aNi8h6XyzQ3oqEE8Z41bipxpm2HZutM7QCT6LJsTrK3wyEt1i suJEASaD8D+TgvB8uiqZQpLCNilbwqmglwBODuC2PQdmADD7vot2vP3gaE9/tyZlL5Cd Zw2nUzlSBkGz3NDrHcfEnvojeR7YZXTeZ6d3uqtR+EwxK7AMye810NAc1vttkJoVsTlo y8/RxJiEO8nBFACQb22rYtAH2V1ggQhhK56lw9qQfkjrRqRjMRx1R7ZGPx7srGMnlfJ2 HMRQ== X-Gm-Message-State: APf1xPDJbvJKTGIZRBy2E5fgUY39UvgaZ4cjYRq6HukgmXrE88Iwj7bO xekZ7j7vYxDCF/AXWYDRzKc= X-Received: by 10.107.88.12 with SMTP id m12mr3382204iob.136.1518192419532; Fri, 09 Feb 2018 08:06:59 -0800 (PST) Received: from [192.168.11.4] (KD106167171201.ppp-bb.dion.ne.jp. [106.167.171.201]) by smtp.gmail.com with ESMTPSA id a13sm3430460itj.13.2018.02.09.08.06.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Feb 2018 08:06:58 -0800 (PST) Subject: [PATCH] tools/memory-model: Restore compat with herd7 7.47 ("-" -> "_") To: paulmck@linux.vnet.ibm.com, linux-kernel@vger.kernel.org Cc: mingo@kernel.org, stern@rowland.harvard.edu, parri.andrea@gmail.com, will.deacon@arm.com, peterz@infradead.org, boqun.feng@gmail.com, npiggin@gmail.com, dhowells@redhat.com, j.alglave@ucl.ac.uk, luc.maranget@inria.fr, Akira Yokosawa , Patrick Bellasi References: <20180209141832.GA17505@linux.vnet.ibm.com> From: Akira Yokosawa Message-ID: <71d58dec-b76f-8458-1c61-b7d6237634a1@gmail.com> Date: Sat, 10 Feb 2018 01:06:53 +0900 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From 9a0de4d75e18ef8e25a1096f88c7a970d9d693f5 Mon Sep 17 00:00:00 2001 From: Akira Yokosawa Date: Sat, 10 Feb 2018 00:45:25 +0900 Subject: [PATCH] tools/memory-model: Restore compat with herd7 7.47 ("-" -> "_") As of herd7 7.47, these '-'s are not permitted and end up in an error: File "./linux-kernel.def", line 44, characters 29-30: unexpected '-' (in macros) Partial revert of commit 2d5fba7782d6 ("linux-kernel*: Make RCU identifiers match ASPLOS paper") in the repository at https://github.com/aparri/memory-model can restore the compatibility with herd7 7.47. Reported-by: Patrick Bellasi Suggested-by: Andrea Parri Signed-off-by: Akira Yokosawa --- tools/memory-model/linux-kernel.bell | 20 ++++++++++---------- tools/memory-model/linux-kernel.cat | 8 ++++---- tools/memory-model/linux-kernel.def | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tools/memory-model/linux-kernel.bell b/tools/memory-model/linux-kernel.bell index 18885ad..436791b 100644 --- a/tools/memory-model/linux-kernel.bell +++ b/tools/memory-model/linux-kernel.bell @@ -25,18 +25,18 @@ enum Barriers = 'wmb (*smp_wmb*) || 'rmb (*smp_rmb*) || 'mb (*smp_mb*) || 'rb_dep (*smp_read_barrier_depends*) || - 'rcu-lock (*rcu_read_lock*) || - 'rcu-unlock (*rcu_read_unlock*) || - 'sync-rcu (*synchronize_rcu*) || - 'before-atomic (*smp_mb__before_atomic*) || - 'after-atomic (*smp_mb__after_atomic*) || - 'after-spinlock (*smp_mb__after_spinlock*) + 'rcu_lock (*rcu_read_lock*) || + 'rcu_unlock (*rcu_read_unlock*) || + 'sync_rcu (*synchronize_rcu*) || + 'before_atomic (*smp_mb__before_atomic*) || + 'after_atomic (*smp_mb__after_atomic*) || + 'after_spinlock (*smp_mb__after_spinlock*) instructions F[Barriers] (* Compute matching pairs of nested Rcu-lock and Rcu-unlock *) let matched = let rec - unmatched-locks = Rcu-lock \ domain(matched) - and unmatched-unlocks = Rcu-unlock \ range(matched) + unmatched-locks = Rcu_lock \ domain(matched) + and unmatched-unlocks = Rcu_unlock \ range(matched) and unmatched = unmatched-locks | unmatched-unlocks and unmatched-po = [unmatched] ; po ; [unmatched] and unmatched-locks-to-unlocks = @@ -46,8 +46,8 @@ let matched = let rec in matched (* Validate nesting *) -flag ~empty Rcu-lock \ domain(matched) as unbalanced-rcu-locking -flag ~empty Rcu-unlock \ range(matched) as unbalanced-rcu-locking +flag ~empty Rcu_lock \ domain(matched) as unbalanced-rcu-locking +flag ~empty Rcu_unlock \ range(matched) as unbalanced-rcu-locking (* Outermost level of nesting only *) let crit = matched \ (po^-1 ; matched ; po^-1) diff --git a/tools/memory-model/linux-kernel.cat b/tools/memory-model/linux-kernel.cat index f0d27f8..d0085d5 100644 --- a/tools/memory-model/linux-kernel.cat +++ b/tools/memory-model/linux-kernel.cat @@ -29,10 +29,10 @@ let rb-dep = [R] ; fencerel(Rb_dep) ; [R] let rmb = [R \ Noreturn] ; fencerel(Rmb) ; [R \ Noreturn] let wmb = [W] ; fencerel(Wmb) ; [W] let mb = ([M] ; fencerel(Mb) ; [M]) | - ([M] ; fencerel(Before-atomic) ; [RMW] ; po? ; [M]) | - ([M] ; po? ; [RMW] ; fencerel(After-atomic) ; [M]) | - ([M] ; po? ; [LKW] ; fencerel(After-spinlock) ; [M]) -let gp = po ; [Sync-rcu] ; po? + ([M] ; fencerel(Before_atomic) ; [RMW] ; po? ; [M]) | + ([M] ; po? ; [RMW] ; fencerel(After_atomic) ; [M]) | + ([M] ; po? ; [LKW] ; fencerel(After_spinlock) ; [M]) +let gp = po ; [Sync_rcu] ; po? let strong-fence = mb | gp diff --git a/tools/memory-model/linux-kernel.def b/tools/memory-model/linux-kernel.def index f5a1eb0..fc08371 100644 --- a/tools/memory-model/linux-kernel.def +++ b/tools/memory-model/linux-kernel.def @@ -21,9 +21,9 @@ smp_mb() { __fence{mb} ; } smp_rmb() { __fence{rmb} ; } smp_wmb() { __fence{wmb} ; } smp_read_barrier_depends() { __fence{rb_dep}; } -smp_mb__before_atomic() { __fence{before-atomic} ; } -smp_mb__after_atomic() { __fence{after-atomic} ; } -smp_mb__after_spinlock() { __fence{after-spinlock} ; } +smp_mb__before_atomic() { __fence{before_atomic} ; } +smp_mb__after_atomic() { __fence{after_atomic} ; } +smp_mb__after_spinlock() { __fence{after_spinlock} ; } // Exchange xchg(X,V) __xchg{mb}(X,V) @@ -41,10 +41,10 @@ spin_unlock(X) { __unlock(X) ; } spin_trylock(X) __trylock(X) // RCU -rcu_read_lock() { __fence{rcu-lock}; } -rcu_read_unlock() { __fence{rcu-unlock};} -synchronize_rcu() { __fence{sync-rcu}; } -synchronize_rcu_expedited() { __fence{sync-rcu}; } +rcu_read_lock() { __fence{rcu_lock}; } +rcu_read_unlock() { __fence{rcu_unlock};} +synchronize_rcu() { __fence{sync_rcu}; } +synchronize_rcu_expedited() { __fence{sync_rcu}; } // Atomic atomic_read(X) READ_ONCE(*X) -- 2.7.4