From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (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 B49992E3379 for ; Fri, 23 May 2025 01:01:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747962103; cv=none; b=AJ6enWhzlnCkj+wmo64zm8BMuC4uFqswgR6buQHKLQCrcNpTu/sEl9VGqqFVXwyw7M9LyOCdXfXjj6mVytRayvx4ACD2pM8tYhdj8y2kKqi+WSq25uN45DQzN6UaeKerbwAYsVxSua1dgGkwY9JhxFjY+3QV7wvZZ1SU/Ua1Mow= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747962103; c=relaxed/simple; bh=afVOpJ4NkdTCnGlO7BZombLV0TeNOaBswisvqbRPcJo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Ve3nBubXmVBnfWiboJTxA77/u/Xq66Nq+bJqT96XZRF3udf+Qu5+SJFcfBo1d4JljDrr0UyTOGRup9EXyKxJxl2MIqfOI6xlHPptKIb1n35mI/Yrka2qBuxSQBTuYxIvqtg1MgL8DnQR/De1Gr2zk0/QKBMnf9nBEZ+YGWGbtYo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=wU6zbP0H; arc=none smtp.client-ip=209.85.215.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="wU6zbP0H" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b26e0fee541so5211618a12.1 for ; Thu, 22 May 2025 18:01:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747962101; x=1748566901; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=IHC46AiM3qnXIL3uFh2RBrG63I23lKwAO4ZOidIFzK0=; b=wU6zbP0HvJgvgMiD/cVj9HUDIpgHg4HcFK2tsc9vN4kNkYSQIN9JqpAE3NINNqna2l 72pvsIpEHOWnMax6z7UIGqit0C0nFDoRSRRBTsyyvgYjWZU37Ijjwyqey9EDoyTEnrhk vDx5CcS/hitOUbMa+d3+y4D/OTLLAtX1GvDq6B5kIQFzzyWNb5NGIw1OOe+KBcExVXG7 cuoY06/FOOZuqT0f6UX59cPLv3HHxFxmEcPgCO+R5e9U60eDUWZhcXTci0w+sV4ORn6D cXKOjrHVWV9WT9j1K8KqydT+DpQJ5tMchLeq/j2gPLxONtQ0e7SJIln78rSQ84lIssaQ rX3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747962101; x=1748566901; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IHC46AiM3qnXIL3uFh2RBrG63I23lKwAO4ZOidIFzK0=; b=cXKshH8QsrAngUKKGzsBGMlBvt4PBqKrwqGXyJv5S/CqOU/kQWpq8dHgyAD20I2IYj LuJ5Z91nKuTIG5fyYJuYSqXbHEXnOhBQw+/uIzzBe0qF3ql0FqB9CM4ZYnjrXnL+iwER x2nXhqKUXXX9d571LEDvLxIRTVD3UW7/GUa4AeqsIjyyu7aHquEiaE9kIAPlE5/aw/Mv zNq2LdWTcsglXYpCz/p+NqazRBIy6jJgA03hF0j72vdrU07qNzWGHqON2BLWm67K41/r B3eMBLbDdjhBE1br9HzLWiVWY6YnKyI+ryXAginLAnZqHd3z3RLmBpEdwNyjCxtDueFZ Zdjg== X-Forwarded-Encrypted: i=1; AJvYcCUKm7N5OagLmBYEKF8Cv4T3kCTdLifME1zR89cXJjCbgTiVkeP2xr7/KWY65+GfpnFhuEQ5xA==@lists.linux.dev X-Gm-Message-State: AOJu0YyOhbhBvZ8yYte1tosINcwTF8FUjsgczl6vTglDiwIAxA6+0zU+ NQbnvY8KV8rAtygOaLgmVtgjA6tfozP4K2w0N8uLomPleAwc9zhBfG4aNI2WBxMknEKifSPTC4E BrV1bew== X-Google-Smtp-Source: AGHT+IFKx4toGdoUHBPdA+oUHyZ0aWvYYcvHAK1ugv08dOHNkGrE3/X+OpJV9alJPESRVigE+cn0CzzRfh4= X-Received: from pfbhd3.prod.google.com ([2002:a05:6a00:6583:b0:742:a60b:3336]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6300:8b0f:b0:215:eb6b:8714 with SMTP id adf61e73a8af0-2170cdf1503mr41735775637.30.1747962101096; Thu, 22 May 2025 18:01:41 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 22 May 2025 17:59:59 -0700 In-Reply-To: <20250523010004.3240643-1-seanjc@google.com> Precedence: bulk X-Mailing-List: iommu@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250523010004.3240643-1-seanjc@google.com> X-Mailer: git-send-email 2.49.0.1151.ga128411c76-goog Message-ID: <20250523010004.3240643-55-seanjc@google.com> Subject: [PATCH v2 54/59] iommu/amd: WARN if KVM calls GA IRTE helpers without virtual APIC support From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Joerg Roedel , David Woodhouse , Lu Baolu Cc: kvm@vger.kernel.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Sairaj Kodilkar , Vasant Hegde , Maxim Levitsky , Joao Martins , Francesco Lavra , David Matlack Content-Type: text/plain; charset="UTF-8" WARN if KVM attempts to update IRTE entries when virtual APIC isn't fully supported, as KVM should guard all such calls on IRQ posting being enabled. Signed-off-by: Sean Christopherson --- drivers/iommu/amd/iommu.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c index becef69a306d..926dcdfe08c8 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -3836,8 +3836,10 @@ int amd_iommu_update_ga(int cpu, void *data) struct amd_ir_data *ir_data = (struct amd_ir_data *)data; struct irte_ga *entry = (struct irte_ga *) ir_data->entry; - if (!AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir) || - !entry || !entry->lo.fields_vapic.guest_mode) + if (WARN_ON_ONCE(!AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir))) + return -EINVAL; + + if (!entry || !entry->lo.fields_vapic.guest_mode) return 0; if (!ir_data->iommu) @@ -3856,7 +3858,10 @@ int amd_iommu_activate_guest_mode(void *data, int cpu) struct irte_ga *entry = (struct irte_ga *) ir_data->entry; u64 valid; - if (!AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir) || !entry) + if (WARN_ON_ONCE(!AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir))) + return -EINVAL; + + if (!entry) return 0; valid = entry->lo.fields_vapic.valid; @@ -3885,8 +3890,10 @@ int amd_iommu_deactivate_guest_mode(void *data) struct irq_cfg *cfg = ir_data->cfg; u64 valid; - if (!AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir) || - !entry || !entry->lo.fields_vapic.guest_mode) + if (WARN_ON_ONCE(!AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir))) + return -EINVAL; + + if (!entry || !entry->lo.fields_vapic.guest_mode) return 0; valid = entry->lo.fields_remap.valid; -- 2.49.0.1151.ga128411c76-goog