From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CCA8725949E for ; Mon, 30 Dec 2024 13:50:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735566643; cv=none; b=YAghIyfCmH72ulZvbVggaMZT1AA+5TXKSJ8caCitmwDzQuod3lPshgYfgBmcTYUhty2spD4dqg1prFrHNCbaHMQbwyxrbN1tFzKCxqsiCs6tgVfeBY1eztRcfgn2xmc3XJECZeXct93UkOFof6fj/4OGrH2DM9voL55rqZhdlUE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735566643; c=relaxed/simple; bh=xt2etZz6UZu71EKgDFup7C6g3drsuwWNkIERC4vc7gs=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=uhUc4sgBp70A2AjOZ3gSW5gLU4/H3B4tEh8IIIWD1qDSdqQ7EErAbiZcGyCrdrqIFDmkkIWjERQV6GRpfBkubyJ96txt9nbS9LUPOzZd2iFOC+xtgwXa5HBbn6vzHOHfu6j4oqBN39TAVpUGpX52o1JHiHpvTVIoyjKYbR7V4CM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bLOeUoMY; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bLOeUoMY" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4361e89b6daso62053065e9.3 for ; Mon, 30 Dec 2024 05:50:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735566640; x=1736171440; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=4DgF2SA/IyRcgaWoHJqrd5kIkePaeZQ5QyDTWY7U+Yc=; b=bLOeUoMYhoKdJ2Qhs4w3ZWB4oz5Yhny1yU+Mnj8ORW191A6Z1t8C0oXK6/6Sd3eAvi lC/YTQ5HTh3MvWCMaYuqLWO/jVDG6VjXbvEXJnnQ5y3V/eEm2FAzvXWs+mPyQZcHGXnV bIOw0qe/Hiv+yF5aSkwF/f3/setP9/jtkppfYKLwPyGdwYlQt9fTWsAoUf3KcX5ZCDsX ysEQ2vHGQfY9fPajqKz0PYAWPFNzT99EHIBKwKwd9H685blfUu+f++pz5c30ZdowkPG0 uLQTKwOM3jXZxcvnwXqZZ7lEru686tQpJpH3AzsXp1Yc5x76ClA9C7T1NW9JUln3w7IP J6CQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735566640; x=1736171440; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4DgF2SA/IyRcgaWoHJqrd5kIkePaeZQ5QyDTWY7U+Yc=; b=rPCKxgjcQmhLooUfbrDYnejfCgWELAGC4B+GbfZa8/F4RmdV5Em2eBAmi4ElNSeALO Iqo+/i0gJg4D8LmH/fifeku0QEulk19x2P7izGkh1QndA38b0h7yRSJ3g731Er7myvL6 T13/BvXb7ykswxPGA13hmY2WZ0QwnZqtBRLaVmJVQG+W8nH5kagSd+1nGbGDIvfgCFab KV2IUBATRK6A1SPkOwp69O18fZYEtWiJGvCX5ylAHCKet7rJXhb80KFLjbZoMVpkxDCS jHxtwpjOLJHQHU3B+WBLh+1M6xA1SHe45qHzpY6QOtKAEZTcY08DKKoi14YLtdcTskSu C5kQ== X-Forwarded-Encrypted: i=1; AJvYcCXRnN8hXuhTdzuPOqce5HUBta2bvSOBJvd6pBEA83N+m/r8qFOMGzI3wq1ZPmF+k4/5cXzDcdrLTkstKiw=@vger.kernel.org X-Gm-Message-State: AOJu0YwBTsNsU9Sbj8whnXWDWbC3raGNUfejC/yTdYZoWx9wbPCet3oT ISnmLbuH4NxLXGG7t6A/D+1INICVA/dAotE2B14zNuJyi5pvZIfB X-Gm-Gg: ASbGncslnwwP9OWFik0dmu8ZP6X57qkYdhH1jRrNx+pSiZZq871S0AZP6+TvpnOpsDw 9Pj8ZQrTTmZhTEVxwk7em6BJjRAQdlwqnKhUdnKlM1AicisNDDNVSbbzYHD0tMqnYeXf1CpO9M7 ikaakn/82XzYl7qoX0CuwYkCmI87soeSJlgoVPL0gJmTMgtuBCEjFw9VI4p36zjUSCPRN5ub7+t Qet4EK1FF4WBAcLr9+IZXIPI95DHZU1xelh7vLKrgGCOmSh/LUewUaARSCPICnGceNZqAYHddnr 6Xg2qmNvhcAoRGhEjnA0QADTj+mL49N1ub5t+9C/SPtwe5MEXLlBfpAaKOt4Gcw= X-Google-Smtp-Source: AGHT+IEyU/tmo4WZi2HkdrDtS62hRQGtVv28tjC6+vv4I/+FRAFbKJOyN/CKEVOY08inn7tKBUBGpg== X-Received: by 2002:a05:600c:1f85:b0:434:9936:c823 with SMTP id 5b1f17b1804b1-43668646741mr324023365e9.18.1735566639836; Mon, 30 Dec 2024 05:50:39 -0800 (PST) Received: from dev-dsk-krckatom-1b-7b393aa4.eu-west-1.amazon.com (54-240-197-239.amazon.com. [54.240.197.239]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43656b417afsm394190875e9.36.2024.12.30.05.50.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Dec 2024 05:50:39 -0800 (PST) From: Tomas Krcka X-Google-Original-From: Tomas Krcka To: linux-arm-kernel@lists.infradead.org Cc: nh-open-source@amazon.com, Tomas Krcka , Marc Zyngier , Thomas Gleixner , Hagar Hemdan , linux-kernel@vger.kernel.org Subject: [PATCH] irqchip/gic-v3-its: fix raw_local_irq_restore() called with IRQs enabled Date: Mon, 30 Dec 2024 13:49:03 +0000 Message-Id: <20241230134903.84613-1-krckatom@amazon.de> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The following call-chain leads to misuse of spinlock_irq when spinlock_irqsave was hold. irq_set_vcpu_affinity -> irq_get_desc_lock (spinlock_irqsave) -> its_irq_set_vcpu_affinity -> guard(raw_spin_lock_irq) <--- this enables interrupts -> irq_put_desc_unlock // <--- WARN IRQs enabled Fix the issue by using guard(raw_spinlock), since the function is already called with irqsave and raw_spin_lock was used before the commit b97e8a2f7130 ("irqchip/gic-v3-its: Fix potential race condition in its_vlpi_prop_update()") introducing the guard as well. This was discovered through the lock debugging, and the corresponding log is as follows: raw_local_irq_restore() called with IRQs enabled WARNING: CPU: 38 PID: 444 at kernel/locking/irqflag-debug.c:10 warn_bogus_irq_restore+0x2c/0x38 Call trace: warn_bogus_irq_restore+0x2c/0x38 _raw_spin_unlock_irqrestore+0x68/0x88 __irq_put_desc_unlock+0x1c/0x48 irq_set_vcpu_affinity+0x74/0xc0 its_map_vlpi+0x44/0x88 kvm_vgic_v4_set_forwarding+0x148/0x230 kvm_arch_irq_bypass_add_producer+0x20/0x28 __connect+0x98/0xb8 irq_bypass_register_consumer+0x150/0x178 kvm_irqfd+0x6dc/0x744 kvm_vm_ioctl+0xe44/0x16b0 Fixes: b97e8a2f7130 ("irqchip/gic-v3-its: Fix potential race condition in its_vlpi_prop_update()") Signed-off-by: Tomas Krcka --- drivers/irqchip/irq-gic-v3-its.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 92244cfa0464..8c3ec5734f1e 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -2045,7 +2045,7 @@ static int its_irq_set_vcpu_affinity(struct irq_data *d, void *vcpu_info) if (!is_v4(its_dev->its)) return -EINVAL; - guard(raw_spinlock_irq)(&its_dev->event_map.vlpi_lock); + guard(raw_spinlock)(&its_dev->event_map.vlpi_lock); /* Unmap request? */ if (!info) -- 2.40.1