From patchwork Mon Nov 19 18:55:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waiman Long X-Patchwork-Id: 10689309 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F00DB5A4 for ; Mon, 19 Nov 2018 18:57:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E23022A470 for ; Mon, 19 Nov 2018 18:57:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D60BD2A46A; Mon, 19 Nov 2018 18:57:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F2072A46C for ; Mon, 19 Nov 2018 18:57:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EF3466B1B90; Mon, 19 Nov 2018 13:56:58 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E561E6B1B92; Mon, 19 Nov 2018 13:56:58 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CCD996B1B93; Mon, 19 Nov 2018 13:56:58 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by kanga.kvack.org (Postfix) with ESMTP id 94F526B1B90 for ; Mon, 19 Nov 2018 13:56:58 -0500 (EST) Received: by mail-qk1-f197.google.com with SMTP id s70so71781123qks.4 for ; Mon, 19 Nov 2018 10:56:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=6XDZ2ln/gR3ohqeRdUDrEhPq3uOa3/v4RpHArz8esP0=; b=aSjCyc+G1hWEvHxnsPs6o5feMqfevadZkvK8G0NXmpM1/n3K9NCGjL3jpAjZfbAAm7 JsHQREjySrOB9GYlbFP3ylQZq7u4Ah0dORar+OXOuZsbKsE1LLyhfqXWnRK7EieCKiiq /1+DQ0MyrnNeIrMngir20J1JJFs8a/e8ExFRghtBTtEOOGlzXx9DKiu2qs2sCekA/8V+ evm5VEqPBMzRiDHMpWcgp0n1DBwuqqPD9zzVePUzXK65UE4YvM+al/8dsOY8w8R+ZwQ6 hPOTN4F/ygW3l0xBRFiEiB5h7ArYWkMyqJJaHVeVNUx3yEsrKZk5gubcydh7itZGCakB +daQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of longman@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=longman@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: AGRZ1gK+9psuayQ9+v8Az2zmKXQyCW4595/ucMCsyVDl0ffsQVSGcoTV 7bsxXiap5iP3chdFVGrGplGDcuyhuHmZO1kx9rWX1webh2IMHeQoJ7i0rmqOJ6GqpsdvMKM/N1F jK75daff3IWqUlgmf8Jk/Xt6QyqP45GPRjGxETxkK24tCyD9DoMgmQjMhInQjj/Tjcg== X-Received: by 2002:a37:18e5:: with SMTP id 98mr22261325qky.333.1542653818360; Mon, 19 Nov 2018 10:56:58 -0800 (PST) X-Google-Smtp-Source: AJdET5cQvXaasSNOrJjoTe4B4p+CPMH/RRfjONnXqBGIcVbDe7eagDjPgCaspy270mkgVkGrXHyA X-Received: by 2002:a37:18e5:: with SMTP id 98mr22261302qky.333.1542653817740; Mon, 19 Nov 2018 10:56:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542653817; cv=none; d=google.com; s=arc-20160816; b=P+rZgyhA2tsMzOxMvXVToucZw2/Hz0IygjouoJPwknkRZEEy1fVX7fzDAV/89/3PyZ 16PcNtc7decjNEpp0T93g6/mv3prqXpQNhfN+8jNzow1uTMh0+fZ429Wuk3Lr+4OEWxF u624fbNZ51NXzgc+0YtiWvLwbh7tuLTNLVB3IOpvAhUQiz9JjBh+gGmTqJoZyYx+q3mH EMUKjeybHC6J4HzBSzFcQ8xD3UJBPAP36+DGuODxFGNH3fDuSrWvVP5izbRveYyis6+k w00+CI5Lxq+gnEsMVIcgadrZdwtIcpdvMErvUUVWqCyX6sHjjhsH0vGUHkByn+aM12iJ loVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=6XDZ2ln/gR3ohqeRdUDrEhPq3uOa3/v4RpHArz8esP0=; b=orWcNmCKMe35Pj5TdraEKAjX1FcsmrZaARGV0CMd3K7WtD5e0mFA5B8N8aQPxiVGBt 48Z3cHA0CIseWQvNfOxuRGtFqxlQd1kiMfKZSGKh7txGCwZ0yQFWpPz7VBXvnPhmIwk8 FFmJtqUlBz7Gs0LeWnBY4ssZPubESkrvfahcAjX/XP1BqPJ2PWMpSVjY2MojFM5dZtHk Wtn5VXmAkVSViya8Y/3bm9doiw8iv44E2uz3WjmQoqOkCRDL1MBNJXBeLqnBhOzOjzvg /W25roVQhRtkDOBjRTMYRUSC+ebxj6ZdXDaFV6M34RLyp9B7elOGGzEXDJvnU8wzaLBf Ri5A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of longman@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=longman@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id m37si12246403qtc.111.2018.11.19.10.56.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Nov 2018 10:56:57 -0800 (PST) Received-SPF: pass (google.com: domain of longman@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of longman@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=longman@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 821D34E902; Mon, 19 Nov 2018 18:56:56 +0000 (UTC) Received: from llong.com (dhcp-17-55.bos.redhat.com [10.18.17.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0BF5E608E7; Mon, 19 Nov 2018 18:56:54 +0000 (UTC) From: Waiman Long To: Peter Zijlstra , Ingo Molnar , Will Deacon , Thomas Gleixner Cc: linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, iommu@lists.linux-foundation.org, Petr Mladek , Sergey Senozhatsky , Andrey Ryabinin , Tejun Heo , Andrew Morton , Waiman Long Subject: [PATCH v2 04/17] locking/lockdep: Add DEFINE_TERMINAL_SPINLOCK() and related macros Date: Mon, 19 Nov 2018 13:55:13 -0500 Message-Id: <1542653726-5655-5-git-send-email-longman@redhat.com> In-Reply-To: <1542653726-5655-1-git-send-email-longman@redhat.com> References: <1542653726-5655-1-git-send-email-longman@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 19 Nov 2018 18:56:56 +0000 (UTC) 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: X-Virus-Scanned: ClamAV using ClamSMTP Add new DEFINE_RAW_TERMINAL_SPINLOCK() and DEFINE_TERMINAL_SPINLOCK() macro to define a raw terminal spinlock and a terminal spinlock. Signed-off-by: Waiman Long --- include/linux/spinlock_types.h | 34 +++++++++++++++++++++++----------- kernel/printk/printk_safe.c | 2 +- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/include/linux/spinlock_types.h b/include/linux/spinlock_types.h index 24b4e6f..6a8086e 100644 --- a/include/linux/spinlock_types.h +++ b/include/linux/spinlock_types.h @@ -33,9 +33,10 @@ #define SPINLOCK_OWNER_INIT ((void *)-1L) #ifdef CONFIG_DEBUG_LOCK_ALLOC -# define SPIN_DEP_MAP_INIT(lockname) .dep_map = { .name = #lockname } +# define SPIN_DEP_MAP_INIT(lockname, f) .dep_map = { .name = #lockname, \ + .flags = f } #else -# define SPIN_DEP_MAP_INIT(lockname) +# define SPIN_DEP_MAP_INIT(lockname, f) #endif #ifdef CONFIG_DEBUG_SPINLOCK @@ -47,16 +48,22 @@ # define SPIN_DEBUG_INIT(lockname) #endif -#define __RAW_SPIN_LOCK_INITIALIZER(lockname) \ - { \ - .raw_lock = __ARCH_SPIN_LOCK_UNLOCKED, \ - SPIN_DEBUG_INIT(lockname) \ - SPIN_DEP_MAP_INIT(lockname) } +#define __RAW_SPIN_LOCK_INITIALIZER(lockname, f) \ + { \ + .raw_lock = __ARCH_SPIN_LOCK_UNLOCKED, \ + SPIN_DEBUG_INIT(lockname) \ + SPIN_DEP_MAP_INIT(lockname, f) } #define __RAW_SPIN_LOCK_UNLOCKED(lockname) \ - (raw_spinlock_t) __RAW_SPIN_LOCK_INITIALIZER(lockname) + (raw_spinlock_t) __RAW_SPIN_LOCK_INITIALIZER(lockname, 0) + +#define __RAW_TERMINAL_SPIN_LOCK_UNLOCKED(lockname) \ + (raw_spinlock_t) __RAW_SPIN_LOCK_INITIALIZER(lockname, \ + LOCKDEP_FLAG_TERMINAL) #define DEFINE_RAW_SPINLOCK(x) raw_spinlock_t x = __RAW_SPIN_LOCK_UNLOCKED(x) +#define DEFINE_RAW_TERMINAL_SPINLOCK(x) \ + raw_spinlock_t x = __RAW_TERMINAL_SPIN_LOCK_UNLOCKED(x) typedef struct spinlock { union { @@ -72,13 +79,18 @@ }; } spinlock_t; -#define __SPIN_LOCK_INITIALIZER(lockname) \ - { { .rlock = __RAW_SPIN_LOCK_INITIALIZER(lockname) } } +#define __SPIN_LOCK_INITIALIZER(lockname, f) \ + { { .rlock = __RAW_SPIN_LOCK_INITIALIZER(lockname, f) } } #define __SPIN_LOCK_UNLOCKED(lockname) \ - (spinlock_t ) __SPIN_LOCK_INITIALIZER(lockname) + (spinlock_t) __SPIN_LOCK_INITIALIZER(lockname, 0) + +#define __TERMINAL_SPIN_LOCK_UNLOCKED(lockname) \ + (spinlock_t) __SPIN_LOCK_INITIALIZER(lockname, LOCKDEP_FLAG_TERMINAL) #define DEFINE_SPINLOCK(x) spinlock_t x = __SPIN_LOCK_UNLOCKED(x) +#define DEFINE_TERMINAL_SPINLOCK(x) \ + spinlock_t x = __TERMINAL_SPIN_LOCK_UNLOCKED(x) #include diff --git a/kernel/printk/printk_safe.c b/kernel/printk/printk_safe.c index 0913b4d..8ff1033 100644 --- a/kernel/printk/printk_safe.c +++ b/kernel/printk/printk_safe.c @@ -192,7 +192,7 @@ static void report_message_lost(struct printk_safe_seq_buf *s) static void __printk_safe_flush(struct irq_work *work) { static raw_spinlock_t read_lock = - __RAW_SPIN_LOCK_INITIALIZER(read_lock); + __RAW_SPIN_LOCK_UNLOCKED(read_lock); struct printk_safe_seq_buf *s = container_of(work, struct printk_safe_seq_buf, work); unsigned long flags;