Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp28954ybh; Mon, 20 Jul 2020 09:33:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwBDR87ACaOPDGGpikjV21SmtUxLXnnTTTSl3TCjOg5SnNBbq1bba8l1hTdQ1Sc81ms9npX X-Received: by 2002:a17:906:6dd7:: with SMTP id j23mr20835389ejt.529.1595262783245; Mon, 20 Jul 2020 09:33:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595262783; cv=none; d=google.com; s=arc-20160816; b=POcxNcVxNJtfRFskOPACuUtHyYEwJxN/gbezNy5w1OCssSermtKaIGQrCynR5WyNL5 H5G6VOcMpci/V/9dRtMpHHCdur6xJ0j3D76SW9zQOGO2GFMmScXuBH8NJ3FFHOo0w1te /TPNozPF7Xb1Wcjkixe7Ob7O6OGyrBiErM0wWPzyrlGzMm+qGK7Z+jxjJYBDtcgjss6M VU3xrmo8x+dvASwcIqKK0/YQK+BGRsx5VEIE/N/F8OaOJvt2b6G3VEHE43i84PImNL6t vFQsRdUHy/SvGQFA4w6sftjPCbARtIjrwtSDE5ITnBujvKcKQ1sqRt4/F00DzJwmx8mV jUCw== 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:mime-version :references:in-reply-to:message-id:date:subject:cc:to:dkim-signature :dkim-signature:from; bh=0pgkphRaGEy8Yhqq7odaGRHYOVQX84dVuNSHLC82kuU=; b=sNaNjL66lM66CjFcLAzYABKY5bS1KdrfSfBew9uLqI7Lmum1EbzKBFf0WT22HYPfkI xqxRpf5f8LbfLC5kwTHYqlXWDu3LoERCSJQoEKe+LwoAawV9e2DeBHvKhKufUMj6vNEF P8Vuxw3xXl8tGHtrHUsCC0wUFJF4VphtYGughVGqz6HgNLdCMIRAmN4uYcCv3Lj/QPeo BvV4bhO3IqG3e++7ViqOGCZGhxmYyldw9/QBNyiJQgzd/ldIygiJ5X32LtG6xhb1eU3M Ejw5TGLv1O1b9fQOXJjuGAKSm9JLgZj69NC78uoizck55Kx48FAaryGiZX7n5MJaKZnD ZTWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=v87q1Ys6; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=Q7sRFJYD; 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=pass (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 mh8si11047955ejb.245.2020.07.20.09.32.39; Mon, 20 Jul 2020 09:33:03 -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=pass header.i=@linutronix.de header.s=2020 header.b=v87q1Ys6; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=Q7sRFJYD; 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=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388367AbgGTQbN (ORCPT + 99 others); Mon, 20 Jul 2020 12:31:13 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:59004 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731400AbgGTP5Y (ORCPT ); Mon, 20 Jul 2020 11:57:24 -0400 From: "Ahmed S. Darwish" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1595260642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0pgkphRaGEy8Yhqq7odaGRHYOVQX84dVuNSHLC82kuU=; b=v87q1Ys6Tq/CpghmT0FHAuaOzY3Idd5yG0LvZA8Kti/HWmGZMmhlceMkNsg+HGqX+TMsI7 7g3l5aZWyHHnPTpGDIeznazbC+hoOXyFvF/+3LZa4S8c2/B20Meda6K5SB0RR4W8dtPN5o JJNSmeVZTpbaojfg3nh4aGxAA+C0HANRfKMhj0orvLbh2Mfz7TsjyKLptfvCdtkIWKBcX/ /pLdCaG+NnXavTRUaAh/nNyTEkz1I1nUSTp+vomn4CGfdLXtup60Kya4a9TTJxpUjuO5su KIC2dVAs8rbk3qrfSr2jJV97dafZGbxOW4Zsw95a4mG/kwv1gaiYZBhs4T0qsA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1595260642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0pgkphRaGEy8Yhqq7odaGRHYOVQX84dVuNSHLC82kuU=; b=Q7sRFJYDhBBaDIblOeZZRtKWP+/nZyjoWA5mvhVmVKsu3G7dvS1dZzwfG96QG5334YNxB7 /i7A60i5BQ2oetAg== To: Peter Zijlstra , Ingo Molnar , Will Deacon Cc: Thomas Gleixner , "Paul E. McKenney" , "Sebastian A. Siewior" , Steven Rostedt , LKML , "Ahmed S. Darwish" , Paolo Bonzini Subject: [PATCH v4 23/24] kvm/eventfd: Use sequence counter with associated spinlock Date: Mon, 20 Jul 2020 17:55:29 +0200 Message-Id: <20200720155530.1173732-24-a.darwish@linutronix.de> In-Reply-To: <20200720155530.1173732-1-a.darwish@linutronix.de> References: <20200519214547.352050-1-a.darwish@linutronix.de> <20200720155530.1173732-1-a.darwish@linutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Acked-by: Paolo Bonzini --- include/linux/kvm_irqfd.h | 2 +- virt/kvm/eventfd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/kvm_irqfd.h b/include/linux/kvm_irqfd.h index dc1da020305b..dac047abdba7 100644 --- a/include/linux/kvm_irqfd.h +++ b/include/linux/kvm_irqfd.h @@ -42,7 +42,7 @@ struct kvm_kernel_irqfd { wait_queue_entry_t wait; /* Update side is protected by irqfds.lock */ struct kvm_kernel_irq_routing_entry irq_entry; - seqcount_t irq_entry_sc; + seqcount_spinlock_t irq_entry_sc; /* Used for level IRQ fast-path */ int gsi; struct work_struct inject; diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index ef7ed916ad4a..d6408bb497dc 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c @@ -303,7 +303,7 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args) INIT_LIST_HEAD(&irqfd->list); INIT_WORK(&irqfd->inject, irqfd_inject); INIT_WORK(&irqfd->shutdown, irqfd_shutdown); - seqcount_init(&irqfd->irq_entry_sc); + seqcount_spinlock_init(&irqfd->irq_entry_sc, &kvm->irqfds.lock); f = fdget(args->fd); if (!f.file) { -- 2.20.1