From patchwork Thu Oct 13 21:12:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 84 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp483882wrs; Thu, 13 Oct 2022 14:14:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5lzKbmS52JizAGk2jiA1brBPI7Wi1q6RG8Z3drFV0xGwJr087dBTW37zj8kHvQ+sUNz7a0 X-Received: by 2002:a17:907:1c8a:b0:782:1a0d:3373 with SMTP id nb10-20020a1709071c8a00b007821a0d3373mr1194575ejc.135.1665695676986; Thu, 13 Oct 2022 14:14:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665695676; cv=none; d=google.com; s=arc-20160816; b=UQYNn/GgTMk6uY87KbcgHCOSCGBRJzT/B+YEbUTgcEirho6WCLyMQxhQXfnAbr9PYm MLyZDACzN4p9pLJAqP5wOGbnV/SECNWr1HZ5LFUUWwlr5SaHL03093tKDu3zYoGn1rN+ +usqNS2qSeIU5B4tk0Dniq+/GYCVYmSGyFBS9dyBVgU3Uw87fBAGqsehDr0qcSnfq8Tl iCMuNi/mNmdWLLObvni7FKzQ6nrYMCsnZwvSa7Wygzw2vGTiQ6uaP4oQMt2dbUqOArTG CcB3xK3lX9ULs0dNQE69ZYkt5tMk+MyKzhsULu/WwyGsBKeyTqwsDTwfMIy8jDfjlkM0 3uGA== 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:mime-version:date :reply-to:dkim-signature; bh=uc8kmmFZoUXqBTWy4jGsXZWgvRttVIt6U3EgjEmEwRI=; b=UE5NzlpTHLVcH6D7Z1+tAqkmZscG46k1hy0559bi+h2C7NghLleqA/OFGS5KraXsqG 9JlPFc91a0apwvYlmgtmOsZmR4eatuQUHm9Ujo0fMXsR18Ox0DBz2DFSa4wUIZjp3BOM QEELh9axFeRD+5STMTL3/hH1KjOGeqQaMcpbpO5qDeCvWWAEJTdEJ1aFr/4iFMtOn5su Tn7cqfjEJOfGbo0txxQW6cyLIvrL/LpR3wmyd6fI3aejZsaCXT09DdIfGCNKGYFV+rUJ kHXpeSMEy9FdEo/hEaZIB/mamrL27TDZbY1Fsq3ai6yWIGfhdl1TSw6HfJmdyU9vvUpj NHsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="G/kNW6cL"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hz5-20020a1709072ce500b0078a9b8764besi534446ejc.951.2022.10.13.14.14.11; Thu, 13 Oct 2022 14:14:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="G/kNW6cL"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230075AbiJMVNX (ORCPT + 99 others); Thu, 13 Oct 2022 17:13:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229969AbiJMVNM (ORCPT ); Thu, 13 Oct 2022 17:13:12 -0400 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30459192B99 for ; Thu, 13 Oct 2022 14:12:52 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id u9-20020a17090341c900b0017f8514cf61so1966956ple.16 for ; Thu, 13 Oct 2022 14:12:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:reply-to:from:to:cc :subject:date:message-id:reply-to; bh=uc8kmmFZoUXqBTWy4jGsXZWgvRttVIt6U3EgjEmEwRI=; b=G/kNW6cLiqJ/v9Od1bnKW68lrKo88d/zdCSp6txQE7w/+YvpLfpj6f9TCnNHIYWph+ TaPXLjRugOqs4htlRkaN1cJ0T3TwMZpkb079IXz/ysiXBOCciuMdQ5L0LFxbKzeEVdA+ 2WJwiWCFD/CI8QvPvbSbX6oLKhoFz073GMOB0bZrS8zik0+XRLhvix4nj89uVMjEYKmv J9Lh9rcHypVfUzL+7Npa3bqEWkzo0rkEI1e20AKt5EDK5OZeCHQRLO6IXg7AWxTP6fNP Xw/GTONzLvgCZSInFFAsctUYIFeDRH3mrv07KKGP2rbBmzaw7SHOFRuPJXJk7bzLC4du ZQgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:reply-to :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uc8kmmFZoUXqBTWy4jGsXZWgvRttVIt6U3EgjEmEwRI=; b=qSe4S6wYwmbivhiP8nUC/GO7wVyRvLpSXgT/8jHJ0U0m7X1ykUHdcZD0xVZ/gjuNCk epNoNpLiY1MVelRA3yll/Bz6EFN97mruIJ3l2XreQBZITJl44BpSnrQ5ukgSbsPCR2xa 47pXL6+82Zft/eEOZhIVoAiHBITJA1u2+sfi369FltcIhgvqiwAwX+eKg0zyqLmhBmMr VZUkVuYvHlAXavXyCkP2vCp7B0nkw0J0HIDY9WacjhMBxEHKeU9AfEbwKVTTkG/sfodX 2q+8tPU7JJeNKklJiRD+jFopJb2fXFnH3HlZ28pFmkzGCwvgjccVBnifYCwyHIGMA8aB C3qg== X-Gm-Message-State: ACrzQf2YNqEBaUxuOnLFaxZJ5DUv2zrx28HgCTZUucVF6B0iyEA+ro3V M954H9Ie4N/TdEdGrQqTyTA5t4alIDU= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90b:4c4f:b0:20d:4f5d:6b7c with SMTP id np15-20020a17090b4c4f00b0020d4f5d6b7cmr13508911pjb.77.1665695559312; Thu, 13 Oct 2022 14:12:39 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 13 Oct 2022 21:12:18 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.38.0.413.g74048e4d9e-goog Message-ID: <20221013211234.1318131-1-seanjc@google.com> Subject: [PATCH v2 00/16] KVM: x86: gfn_to_pfn_cache fixes and cleanups From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Michal Luczaj , David Woodhouse X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, 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 lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746608510496143989?= X-GMAIL-MSGID: =?utf-8?q?1746608510496143989?= The highlights are two fixes for bugs where "destroying" and "initializing" a gfn=>pfn cache while it is being accessed results in various forms of badness, e.g. re-initialization of an in-use lock, consuming a NULL pointer, potential memory corruption, etc... Everything else is cleanup to make the gpc APIs easier to use and harder to use incorrectly. David, patch 3 (KVM: x86: Always use non-compat vcpu_runstate_info size...) in particular needs your eyeballs. I'm pretty sure it's ok, but confirmation from someone that actually uses KVM XEN would be nice. v2: - Fix active vs. valid race by rejecting refresh() if the cache is currently invalid. - Tweak shortlogs to be "KVM" only. Even though x86 is the only user of the caches, I think it makes sense to tag the changes as "full" KVM for future readers. - Add back the selftest (from the RFC) that triggers the race conditions. - Always use non-compat size for checking+refreshing runstate_info and make @len truly immutable. - Drop unmap() for the moment. I started adding code to prevent "bad" usage, but without any user I couldn't figure out exactly what restrictions need to be in place. - Do more cleanup. v1: https://lore.kernel.org/all/20220921020140.3240092-1-mhal@rbox.co Michal Luczaj (9): KVM: Initialize gfn_to_pfn_cache locks in dedicated helper KVM: Shorten gfn_to_pfn_cache function names KVM: x86: Remove unused argument in gpc_unmap_khva() KVM: Store immutable gfn_to_pfn_cache properties KVM: Store gfn_to_pfn_cache length as an immutable property KVM: Use gfn_to_pfn_cache's immutable "kvm" in kvm_gpc_check() KVM: Clean up hva_to_pfn_retry() KVM: Use gfn_to_pfn_cache's immutable "kvm" in kvm_gpc_refresh() KVM: selftests: Add tests in xen_shinfo_test to detect lock races Sean Christopherson (7): KVM: Reject attempts to consume or refresh inactive gfn_to_pfn_cache KVM: x86: Always use non-compat vcpu_runstate_info size for gfn=>pfn cache KVM: Drop KVM's API to allow temprorarily unmapping gfn=>pfn cache KVM: Do not partially reinitialize gfn=>pfn cache during activation KVM: Drop @gpa from exported gfn=>pfn cache check() and refresh() helpers KVM: Skip unnecessary "unmap" if gpc is already valid during refresh KVM: selftests: Mark "guest_saw_irq" as volatile in xen_shinfo_test arch/x86/kvm/x86.c | 24 +-- arch/x86/kvm/xen.c | 84 ++++----- include/linux/kvm_host.h | 73 ++++---- include/linux/kvm_types.h | 2 + .../selftests/kvm/x86_64/xen_shinfo_test.c | 142 ++++++++++++++- virt/kvm/pfncache.c | 170 ++++++++++-------- 6 files changed, 320 insertions(+), 175 deletions(-) base-commit: e18d6152ff0f41b7f01f9817372022df04e0d354