From patchwork Thu Sep 21 20:33:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 143032 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5230460vqi; Thu, 21 Sep 2023 17:28:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF+7lbTBVu58yB76ddQ5pvs+KSe8uamvb16jDg5Sb7iu6FFqTh5ZtVKwDn4KnJLOU/QZU7v X-Received: by 2002:a05:6a00:2d16:b0:68f:d036:9bc5 with SMTP id fa22-20020a056a002d1600b0068fd0369bc5mr8208066pfb.2.1695342486504; Thu, 21 Sep 2023 17:28:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695342486; cv=none; d=google.com; s=arc-20160816; b=pJih6vvrkoz4BnYm9iTZtk4862orebaZwj1ytEB4gQ6SkSm4l8gse4wANqVnP1aoKi v7yExBL/BEw+F1uLQaAOirli/3jotODB0lQJWENgKnsDGjYkAwngws8pFU+8mb0ne1Jr 8rIgRNCXJEoIQMRNFdQrU3Yr6Y6yg7ZwyJgjbGGX5VuA77J5t2ntqXpMCsBU0To+Gck8 Z30/RjjRNQe8y92zGeGJSXitNDHjgKrGvqjgWZzRSRaI7vL80hQK+k5V/MnlIS18SkXW My8Ht0J8sxJgqQXvhCvkT02CfSnPbj7dN74hzizdg3KiwMDmAw3/C9Ja3Vzt0qEyHA/s wvLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=MoKhLmBudHFsqVub0iZnr0qo3mrdYvg37SqAKaFM83k=; fh=wic1xWUcCfivNDoGhaOGRT3zShU41cz7kO9KD9kCHzs=; b=XkNB5QJIDCadMr73f2aOFvJibdNZNUP+s60rItp2/LLW4GR6Hv3ux5RAhsuFwgoFD4 V7sc6WI8vzmeSpFGKrvL92o9FVNhQ7ZtJBoxZx9mtAoM1eDx+Ahs+I/QqmiTknEFULsu HhcG5z/wQwyeI2q+bZ+wvoXMQTNWJ/+OoG3zMlIaWqf5LM4Tgtq8i8//A1c/UMSLXT9I cAuoGkhc/FKRlL4144b5Wi/QOv/bbuI1KsCqmy5vccojqISTOKKE9crZ9K/4dRJ+Z1uw m0XxrAEmQ8A3uFTY7iucUp4SJ5REKwq7YC5gtFZ726sJl6DjgxMtN/zHpeyBZfZnGc9M 5LWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=wacm37VV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id f20-20020a056a00229400b0068ffe38c5ddsi2706942pfe.223.2023.09.21.17.28.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 17:28:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=wacm37VV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id BEE5E8054ED9; Thu, 21 Sep 2023 14:43:44 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231898AbjIUVng (ORCPT + 29 others); Thu, 21 Sep 2023 17:43:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232603AbjIUVnK (ORCPT ); Thu, 21 Sep 2023 17:43:10 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9419176812 for ; Thu, 21 Sep 2023 13:33:40 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-59c240e637aso20501107b3.3 for ; Thu, 21 Sep 2023 13:33:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1695328420; x=1695933220; darn=vger.kernel.org; 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=MoKhLmBudHFsqVub0iZnr0qo3mrdYvg37SqAKaFM83k=; b=wacm37VVEAoOBFG9ghqEMvSqQOsqj2uX+efwm1Kt9mu4xfpI4eBbzRd28dN6+kwnbx gbjMsrKrA/az3kHsFFv75Pnpvq8QZeVN+1hPcWnI8aftMXlfGumWnzs8egptFzpeL6xd 6SkuW6gB4bTQJ0laoVIAFd/0TWq5uT4ohszUAQ63ON2mjLUp222i2rIb9wA6X7sqOfwx YPhXb5y9pnZ5l21FdyrmLMZcX6kQAa0zo5Hesdi2jATItiQQG9JTUbTm3Uc0RB7DgQIb WUdsxwgaUGmn+EcCIjRcL6WkWkWN77/Nz3uOuYld23IMCYG+6Pr6WO7aNbbQ8RcYycsm hxAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695328420; x=1695933220; 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=MoKhLmBudHFsqVub0iZnr0qo3mrdYvg37SqAKaFM83k=; b=Rsm7OzFW+N2NOpIV0yscT+EVbr/GNKv1dAErsiiqKlZEEIKMztOUub+G/5IEtq11wN Am+HcU9zG4bs3hyVayINp5CJcHl2RxKns2b4rUXLI5PbzHZ3VP5iZqudnvFHBLd+D1lD 8FzaNf410L2mq68Gv/4wfQGcEkVfJMoJ2+F77qeEPOtCHzinkQWKWOj3+kJa6JdZsCSG fjO19O2MZyXn4FxDj0Ar35uonNjMsam8Tf6I6v9rXHiZ9er4IpJECGzcVMCuE+czhRGb uFrKmdq3Y7XMUEEsqmnzzkbMmSb1vGenxpmRNKg7lcZxJG34sdLK6Ri5NdrlfNWhS2xo 1iAg== X-Gm-Message-State: AOJu0Yys4YVVfDdoOSE9sOQx2NR6vMmrCWTTg9HsqFY5T5jtRzTnvq8S 1/jOmwzioVNjqQg57hUD6AuT82sYh/k= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:b726:0:b0:59b:ccba:124f with SMTP id v38-20020a81b726000000b0059bccba124fmr93086ywh.9.1695328419949; Thu, 21 Sep 2023 13:33:39 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 21 Sep 2023 13:33:20 -0700 In-Reply-To: <20230921203331.3746712-1-seanjc@google.com> Mime-Version: 1.0 References: <20230921203331.3746712-1-seanjc@google.com> X-Mailer: git-send-email 2.42.0.515.g380fc7ccd1-goog Message-ID: <20230921203331.3746712-4-seanjc@google.com> Subject: [PATCH 03/13] KVM: WARN if *any* MMU invalidation sequence doesn't add a range From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Roth , Binbin Wu X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Thu, 21 Sep 2023 14:43:44 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777695442714171240 X-GMAIL-MSGID: 1777695442714171240 Tweak the assertion in kvm_mmu_invalidate_end() to unconditionally require a range to be added between start() and end(). Asserting if and only if kvm->mmu_invalidate_in_progress is non-zero makes the assertion all but useless as it would fire only when there are multiple invalidations in flight, which is not common and would also get a false negative if one or more sequences, but not all, added a range. Reported-by: Binbin Wu Fixes: 145725d1542a ("KVM: Use gfn instead of hva for mmu_notifier_retry") Signed-off-by: Sean Christopherson --- virt/kvm/kvm_main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 30708e460568..54480655bcce 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -873,11 +873,10 @@ void kvm_mmu_invalidate_end(struct kvm *kvm) KVM_BUG_ON(kvm->mmu_invalidate_in_progress < 0, kvm); /* - * Assert that at least one range must be added between start() and - * end(). Not adding a range isn't fatal, but it is a KVM bug. + * Assert that at least one range was added between start() and end(). + * Not adding a range isn't fatal, but it is a KVM bug. */ - WARN_ON_ONCE(kvm->mmu_invalidate_in_progress && - kvm->mmu_invalidate_range_start == INVALID_GPA); + WARN_ON_ONCE(kvm->mmu_invalidate_range_start == INVALID_GPA); } static void kvm_mmu_notifier_invalidate_range_end(struct mmu_notifier *mn,