From patchwork Fri Dec 23 00:57:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 36032 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp69393wrn; Thu, 22 Dec 2022 16:59:17 -0800 (PST) X-Google-Smtp-Source: AMrXdXv9JFLMfqdXMhthM+BWtMiWY2qnRXZD+rMmIMvgRw/wm7crDm/ECWwc6tvZWUnMmy7ACwFD X-Received: by 2002:a17:906:29cc:b0:7c1:727f:7c70 with SMTP id y12-20020a17090629cc00b007c1727f7c70mr5016147eje.46.1671757157115; Thu, 22 Dec 2022 16:59:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671757157; cv=none; d=google.com; s=arc-20160816; b=csB5+lNj72ZEOSfdcQUVbsC/wMxAzbxXZ7vlAeLl6dwGEKd9HlvQided+jDNMsQ8Wk on5wgNk+vkoYDAeetvMIvsDI+wsu7BRjDCMDZ0R4PSV7thuTwoAkuBNFIBCtUwkV8FJC ujzruVZ1Sf8Ihi5WInzubQ7qZKOEbJnSBqhm8m5efBm0UQO8Lm1DFEPFoO6Y1qM7CmBS 0CaSAVz1a3x5M30TNu6ls5AGgOiO0jYwATnwxEqsjNahd0wjRbCzjUrwBiPFfL5dZ7uB VyLbpxsMsHI/7zhS8U/+TYseIH0i2snqCK1WGwNlwaL9cQmb4wkPo65pvqY3N1Y0z0zZ OfsQ== 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=d+Q/YQeHZWJ0vREmMTQabuLJv/+4O5g7zAHpbuOFGTs=; b=VY56pHhqoarIRhCvR3Cq56x/8xR6OTb0XxoUNWTwY+f1MhHRHpTizAmueT/NFPqkVq vqayYM1X7wFV6vurfNd+kBWHZEDIxaE+hRYvUzjjPCBJl6G/gfTsfaeYYvgNFWYW7/Gu NxvTlMZZ6kFvtsK4aQRfci6K4ha+ExT3fma7QcDaAfl50zIaMXaKY/zbJwGbVGbXaOm5 BPdaK5K6Bq1bujG/CDBOmDWGF3LkhW4Y1TQ8GOrEm63/ivaBvW6vTYsCNVIvS8Wz3KSI uskYXoMlw4uFdvn6UPBeABROMpA3XZUOER2SqM15vam0+E3JQcsb5GgYAhOMIvlyopXM qjsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=cGB2Kk6w; 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 j13-20020a1709062a0d00b0073dcb2ec4d2si1033858eje.889.2022.12.22.16.58.53; Thu, 22 Dec 2022 16:59:17 -0800 (PST) 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=cGB2Kk6w; 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 S235639AbiLWA6G (ORCPT + 99 others); Thu, 22 Dec 2022 19:58:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231484AbiLWA5x (ORCPT ); Thu, 22 Dec 2022 19:57:53 -0500 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC6C021894 for ; Thu, 22 Dec 2022 16:57:52 -0800 (PST) Received: by mail-pg1-x549.google.com with SMTP id g32-20020a635660000000b00478c21b8095so1902932pgm.10 for ; Thu, 22 Dec 2022 16:57:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; 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=d+Q/YQeHZWJ0vREmMTQabuLJv/+4O5g7zAHpbuOFGTs=; b=cGB2Kk6wNWNAIq0pn/lG31LZ+jy1BxxG22XBitcS8CWDmp2z4Lhdnef0BGcAm+RvUh dJmcq7R+7SuGck4PuyUeyUCJkW65Lvfi9fboC8f7g9EVEpDN857mWJxXqLgFMLrQWGln Kjecvsk3TvvJ2gGLKH55SZwSxBxEOcPg0oFfMnU/R5GleViIAv1XjeCPLyU1wTWSJK2S +iS3t0vV/qEduOYgT/AES8Jul3ZiXXRXD3dl2cOxJsXpYTudq3EXtRTOFEi2bF+1egWF QP48ZSSaeO6lXbbjEfyK0KsD6kqL75R5X9rhhYcXTnDt3mgITCArhWecSITrbyBZ+xt2 3VTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=d+Q/YQeHZWJ0vREmMTQabuLJv/+4O5g7zAHpbuOFGTs=; b=t2aqIZuJc2A8absw4dtnO9hRADHubrWGtG/7RDVbw2DejxOp44vwvc1XMnAQ9RPL2O c9Dm7AWKrvwHXlhhZfsc03SveNI/yuQ3kZ+MagTymxn2cvDUtijweZ4yweDKvPTAnJY/ hQayolmmTP2H86ByqwpJ0GVKxUH6hyiL53vj8nyyUr/wOMHs8+U9PsgRAulSD7jEzCaz 0w0KWMDdIbaFTKAXdw7FHftwAvfa2Nh5dIvV5907vNhhs0cKcGWEwUenSnOXjzpmVJZI NJ75VCVi2nyNcEcErS+CDxE+7z/oa9capzCQhjmoJKhjq5Jt5+SJKeAStme3bIxElxm0 /OFw== X-Gm-Message-State: AFqh2kpGZ+vUQntto/x6s8kc/YxBP3M4fNbIyi1a59q0A9iZ21PYKlAo 286aShjxNC7ALPyFUgb0Rc+lqjEuj3s= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90b:701:b0:219:1d0a:34a6 with SMTP id s1-20020a17090b070100b002191d0a34a6mr180782pjz.1.1671757072021; Thu, 22 Dec 2022 16:57:52 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 23 Dec 2022 00:57:16 +0000 In-Reply-To: <20221223005739.1295925-1-seanjc@google.com> Mime-Version: 1.0 References: <20221223005739.1295925-1-seanjc@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20221223005739.1295925-5-seanjc@google.com> Subject: [PATCH 04/27] drm/i915/gvt: Verify VFIO-pinned page is THP when shadowing 2M gtt entry From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Zhenyu Wang , Zhi Wang Cc: kvm@vger.kernel.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Yan Zhao , Ben Gardon 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?1752964432881376444?= X-GMAIL-MSGID: =?utf-8?q?1752964432881376444?= When shadowing a GTT entry with a 2M page, explicitly verify that the first page pinned by VFIO is a transparent hugepage instead of assuming that page observed by is_2MB_gtt_possible() is the same page pinned by vfio_pin_pages(). E.g. if userspace is doing something funky with the guest's memslots, or if the page is demoted between is_2MB_gtt_possible() and vfio_pin_pages(). This is more of a performance optimization than a bug fix as the check for contiguous struct pages should guard against incorrect mapping (even though assuming struct pages are virtually contiguous is wrong). The real motivation for explicitly checking for a transparent hugepage after pinning is that it will reduce the risk of introducing a bug in a future fix for a page refcount leak (KVMGT doesn't put the reference acquired by gfn_to_pfn()), and eventually will allow KVMGT to stop using KVM's gfn_to_pfn() altogether. Signed-off-by: Sean Christopherson --- drivers/gpu/drm/i915/gvt/kvmgt.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c index 714221f9a131..6f358b4fe406 100644 --- a/drivers/gpu/drm/i915/gvt/kvmgt.c +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c @@ -159,11 +159,25 @@ static int gvt_pin_guest_page(struct intel_vgpu *vgpu, unsigned long gfn, goto err; } - if (npage == 0) - base_page = cur_page; + if (npage == 0) { + /* + * Bail immediately to avoid unnecessary pinning when + * trying to shadow a 2M page and the host page isn't + * a transparent hugepage. + * + * TODO: support other type hugepages, e.g. HugeTLB. + */ + if (size == I915_GTT_PAGE_SIZE_2M && + !PageTransHuge(cur_page)) + ret = -EIO; + else + base_page = cur_page; + } else if (base_page + npage != cur_page) { gvt_vgpu_err("The pages are not continuous\n"); ret = -EINVAL; + } + if (ret < 0) { npage++; goto err; }