From patchwork Tue Sep 4 10:48:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 145901 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp3506140ljw; Tue, 4 Sep 2018 03:48:42 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbGH01gUCXWmXLSJa51HvYxOJF9lwKOlXBhYkflFmKG4YKp108/cEnlMXF1Rcl+RdiquwCW X-Received: by 2002:a17:902:28eb:: with SMTP id f98-v6mr32722754plb.149.1536058122844; Tue, 04 Sep 2018 03:48:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536058122; cv=none; d=google.com; s=arc-20160816; b=sJnNG8uiYy2ZCHnr+91PZchy7qvOqvLr2qLMKAVFrTnbA3wkiVx/NciZA0C+D0X0f2 2rSGoMIvkN9JRtvrKC/SUa98qzznzQdGoQ3M8G4ACt84abR/HQez+qV7PKchsg2ae/mN Iebtji11/2jbccjtmhKh4KmT2h/yLzNWGIgPJ+79ac5PmobGxEy+BRBExrwB/3WILtY0 G3uluwXhvhiDRMbMkTl63A2S1NUOg+mGiynnl+KURSAcFoybfX2d6ipAVGI8UVNPzijf AhwMV4XAyxzb3ceSV/0TAD/drO9wAGQNP4zwAtsx7lKpz6muJnprNcLWtjUnIwxtYfdP NG7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=WFjmbdjoiGVKnd+CDaWDXoFgYtqqV1bHucDuY4wcCRU=; b=V3ojWKol7VqFOxzH2jdaydqhvQSb+yQGdQcNddj1uKzWir3TTyIv2jS0SMisejCUZM fVgVtgIDXtAiLoLd1MYax5XRCRvqzLl7T+eGMUJO4OBXpE0OZ3JRL6gw7D4EXalLN9KQ WdVFQqUX9+igG9tr+pTP11fsV0MZR7w1+DM6ibzKphArAnoyt46Xoq7CRGXMkfFHQ+kG v+xnNHSuIJwDVc7dfbLb655rxDUiym98R51zqAk/bfJCkU9xloqY1ijhtw49ERVrIOCo f2qDX2L54s2g/Z7i9ZSHGRQSFbUTvs33T/KZDa3k2b6v2IHlPI6kQHF4r1yhVYEDHxO1 dHUw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b34-v6si21188797pla.84.2018.09.04.03.48.42; Tue, 04 Sep 2018 03:48:42 -0700 (PDT) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727531AbeIDPNO (ORCPT + 32 others); Tue, 4 Sep 2018 11:13:14 -0400 Received: from foss.arm.com ([217.140.101.70]:40260 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726376AbeIDPNN (ORCPT ); Tue, 4 Sep 2018 11:13:13 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C97BA7A9; Tue, 4 Sep 2018 03:48:39 -0700 (PDT) Received: from lakrids.Emea.Arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 93B863F5BC; Tue, 4 Sep 2018 03:48:37 -0700 (PDT) From: Mark Rutland To: mingo@kernel.org Cc: arnd@arndb.de, aryabinin@virtuozzo.com, boqun.feng@gmail.com, catalin.marinas@arm.com, dvyukov@google.com, glider@google.com, linuxdrivers@attotech.com, linux-kernel@vger.kernel.org, mark.rutland@arm.com, peterz@infradead.org, will.deacon@arm.com, linux-arm-kernel@lists.infradead.org Subject: [PATCHv3 0/6] atomics: generate atomic headers / instrument arm64 Date: Tue, 4 Sep 2018 11:48:24 +0100 Message-Id: <20180904104830.2975-1-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Ingo, As previously requested, this is a (trivial) rebase of the remaining generated atomic patches atop of v4.19-rc2, avoiding any potential conflict with Peter's ldsem atomic cleanup patch that got taken through the tty tree. Are you still happy to pick this up? Full blurb below. This series scripts the generation of the various atomic headers, to ensure that the various atomic APIs remain consistent, reducing the risk of human error, and simplifying future rework. This fleshes out the instrumented atomics such that arm64 can be migrated over to them. Since v1 [1]: * Use 'p' instead of 'I' for pointer to base int type * Use Peter's patch for ldsem * Rename atomic acquire/release barriers * Handle xchg/cmpxchg variants * Typo fixes * Migrate arm64 to instrumented atomics Since v2 [4]: * rebase to v4.19-rc2 to solve potential conflicts with ldsem patch The series is based on my atomic API cleanup patches [2], which have been queued in the tip locking/core branch. The first six patches clean up some issues with the existing atomic instrumentation, with patch six introducing the header generation infrastructure. The subsequent three patches migrate to each generated header in turn, with the final patch moving arm64 over to the instrumented atomics. The scripts themselves are mostly POSIX sh (modulo local), without bashisms, and work in dash and bash. Per Linus request that it is possible to use git grep to inspect the atomic headers [3], the headers are committed (and not generated by kbuild). Since we now expand the fallback definitions inline, each *should* be easier to find with grep. Each header also has a comment at the top with a path to the script used to generate it. That scripting comes to ~900 lines, and replaces ~1700 lines of hand-written boilerplate with ~4700 lines of generated code. Some of that increase in line count is due to filling in missing portions of the API (e.g. adding all the ordering variants to the instrumented atomics), while some of that is due to expanding fallbacks in place, and consistently spreading these across multiple lines. I've build-tested this for x86_64 and arm64 (with and without LSE), and given this some basic boot testing. I've pushed the series out to my atomics/generated branch [3], based atop of v4.19-rc2. Thanks, Mark. [1] https://lkml.kernel.org/r/20180529180746.29684-1-mark.rutland@arm.com [2] https://lkml.kernel.org/r/20180621121321.4761-1-mark.rutland@arm.com [3] git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux.git atomics/generated [4] https://lkml.kernel.org/r/20180625105952.3756-1-mark.rutland@arm.com Mark Rutland (6): atomics: add common header generation files atomics: switch to generated fallbacks atomics: switch to generated atomic-long atomics: switch to generated instrumentation atomics: check generated headers are up-to-date arm64: use instrumented atomics Kbuild | 18 +- MAINTAINERS | 1 + arch/arm64/include/asm/atomic.h | 237 +-- arch/arm64/include/asm/atomic_ll_sc.h | 28 +- arch/arm64/include/asm/atomic_lse.h | 38 +- arch/arm64/include/asm/cmpxchg.h | 60 +- arch/arm64/include/asm/sync_bitops.h | 16 +- include/asm-generic/atomic-instrumented.h | 1688 ++++++++++++++++--- include/asm-generic/atomic-long.h | 1173 ++++++++++--- include/linux/atomic-fallback.h | 2294 ++++++++++++++++++++++++++ include/linux/atomic.h | 1241 +------------- scripts/atomic/atomic-tbl.sh | 186 +++ scripts/atomic/atomics.tbl | 41 + scripts/atomic/check-atomics.sh | 19 + scripts/atomic/fallbacks/acquire | 9 + scripts/atomic/fallbacks/add_negative | 16 + scripts/atomic/fallbacks/add_unless | 16 + scripts/atomic/fallbacks/andnot | 7 + scripts/atomic/fallbacks/dec | 7 + scripts/atomic/fallbacks/dec_and_test | 15 + scripts/atomic/fallbacks/dec_if_positive | 15 + scripts/atomic/fallbacks/dec_unless_positive | 14 + scripts/atomic/fallbacks/fence | 11 + scripts/atomic/fallbacks/fetch_add_unless | 23 + scripts/atomic/fallbacks/inc | 7 + scripts/atomic/fallbacks/inc_and_test | 15 + scripts/atomic/fallbacks/inc_not_zero | 14 + scripts/atomic/fallbacks/inc_unless_negative | 14 + scripts/atomic/fallbacks/read_acquire | 7 + scripts/atomic/fallbacks/release | 8 + scripts/atomic/fallbacks/set_release | 7 + scripts/atomic/fallbacks/sub_and_test | 16 + scripts/atomic/fallbacks/try_cmpxchg | 11 + scripts/atomic/gen-atomic-fallback.sh | 181 ++ scripts/atomic/gen-atomic-instrumented.sh | 182 ++ scripts/atomic/gen-atomic-long.sh | 101 ++ 36 files changed, 5909 insertions(+), 1827 deletions(-) create mode 100644 include/linux/atomic-fallback.h create mode 100755 scripts/atomic/atomic-tbl.sh create mode 100644 scripts/atomic/atomics.tbl create mode 100755 scripts/atomic/check-atomics.sh create mode 100644 scripts/atomic/fallbacks/acquire create mode 100644 scripts/atomic/fallbacks/add_negative create mode 100644 scripts/atomic/fallbacks/add_unless create mode 100644 scripts/atomic/fallbacks/andnot create mode 100644 scripts/atomic/fallbacks/dec create mode 100644 scripts/atomic/fallbacks/dec_and_test create mode 100644 scripts/atomic/fallbacks/dec_if_positive create mode 100644 scripts/atomic/fallbacks/dec_unless_positive create mode 100644 scripts/atomic/fallbacks/fence create mode 100644 scripts/atomic/fallbacks/fetch_add_unless create mode 100644 scripts/atomic/fallbacks/inc create mode 100644 scripts/atomic/fallbacks/inc_and_test create mode 100644 scripts/atomic/fallbacks/inc_not_zero create mode 100644 scripts/atomic/fallbacks/inc_unless_negative create mode 100644 scripts/atomic/fallbacks/read_acquire create mode 100644 scripts/atomic/fallbacks/release create mode 100644 scripts/atomic/fallbacks/set_release create mode 100644 scripts/atomic/fallbacks/sub_and_test create mode 100644 scripts/atomic/fallbacks/try_cmpxchg create mode 100755 scripts/atomic/gen-atomic-fallback.sh create mode 100755 scripts/atomic/gen-atomic-instrumented.sh create mode 100755 scripts/atomic/gen-atomic-long.sh -- 2.11.0