From patchwork Sat May 13 00:36:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 93455 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5485378vqo; Fri, 12 May 2023 17:52:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4PQ8D2NEROSMUYzU5aVpTHovlk+ZeUWQ/6PdBJ0xC3zHoCUDxKupaJ1bqjECsc1bcKG42c X-Received: by 2002:a05:6a00:b49:b0:648:b185:efd9 with SMTP id p9-20020a056a000b4900b00648b185efd9mr14990901pfo.11.1683939159741; Fri, 12 May 2023 17:52:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683939159; cv=none; d=google.com; s=arc-20160816; b=txvvBPxNB2jd8TZonfHzqvphYZy32Ex/eYnQlhi9NXpT06G7e36pl1erU1zarbfoUp t7tcKPEJddv9paKaiSVQ0Mp/XZAg+CLmdbqFAf1+gOFMOV9C68PhI8Y5AHMOGXsvhmpl 7xBubQxd8F/qqlPV9ljWBSUFFPw/wdMBuo9cjJstEMF/9Cc+d6M9Js/xGSdA/JvZ/6dI cgkU0g8nA/dgBqWLqicEjbjGDgu3QQzs7MZHABL0PdWCdudb8lXpySZZouXASNHd0v9a NJjvmNqeGBi/tsOLZeIbpkSFsmpBjoZJLtARuH8ohaet3EPuHAADM/IamGG0sxE96uqe D2pA== 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=kZXl2d46AVzuxVL4wEArY8+PLpXkOpan9Ss3n2LOe+w=; b=wBcQkE7R/unXW3Y0dT3k9DxKjjU1iCmeS59ZYaXu8KFmMqRAZUm85paGFIcw4htner srMcF6m1uF+47i5Ba75W5nnDgm33X4gXdsTJAZeYTWG+FU+6kaNAL0oeVV8a6aT0kwxU 4lMuuEUv8mLuH+a6uX8GGBsz5V7f5kE6OU/KhrBIkx1wVP3jUOKTzid4EMx/SKuz5H7I Izs/czdi3N6MEQlXUiKz7GL2bAaT/z0AaKkr4rlAjpVF8fQ+MDu34wdkdgA7/cO1q7EM yDuowNUT1sGfzt9viH6gKkr5TH67UBLNRHn7OK1kpHYCaPZd1lw1kk94g567SZ991Wy3 12vQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=PJ5ujw7k; 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 v16-20020a63d550000000b00524f00fee68si10291662pgi.372.2023.05.12.17.52.25; Fri, 12 May 2023 17:52:39 -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=20221208 header.b=PJ5ujw7k; 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 S242065AbjEMAjf (ORCPT + 99 others); Fri, 12 May 2023 20:39:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241835AbjEMAjG (ORCPT ); Fri, 12 May 2023 20:39:06 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12A83106D9 for ; Fri, 12 May 2023 17:37:35 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-b8f6bef3d4aso20741833276.0 for ; Fri, 12 May 2023 17:37:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683938218; x=1686530218; 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=kZXl2d46AVzuxVL4wEArY8+PLpXkOpan9Ss3n2LOe+w=; b=PJ5ujw7k63/285aFZkaQIW9C8AITUzrBCxCkRLS/LiTK9rN7s/xhYfAhELQh3Xc0Dp qwHgb9Q+rR7cr9mg0FC2zMKRANFPFRynMfwOlg6sMHOcrz01TJa1ozCj4rJ22fB5EanQ plr70rxThmIu9VPuBvntxszlIAqp7P9+Cb0RXR9VYF1Tfha3i51cp7E02H+pfNU7gjwH Qsu0+cJSYB4yfMq46ZR7bCp/XTq4ITg86KKOK42YezbsuXPb5UA04cUNk5Wy9d7M4J4Z I6JBX6bi0Ec5M9URC0LcHCdWva32fRIe1s1LV8JbP2g40yLwGpBkoH9gr5riwEj5E2wV iXRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683938218; x=1686530218; 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=kZXl2d46AVzuxVL4wEArY8+PLpXkOpan9Ss3n2LOe+w=; b=KgV0ydr3dtyZJggXkKERuMUuSgXRMV/Z6WF+OI8PEVBi6woE9Yhbe9+10AU8VPld9u uNhW+fpVmQ2zCitucmYWvI3du1QBSRk7tEL4oAdNO9G99DgfNst+AYrU9wJEaLG51vaW zjXTDYxLCIhE3GtvoD6d+0zPGxzWxL3Z/hFwAE8PgG6ADAt6K6lHJihgw1AjRdASLaKb BhKA5jzfcFdzo43npV8b8ewiwvaYXVSnZBuVy2Y2BBcpM6Irw4/gGa+hon+W+Sm/mnZk hnBmq6uDlaIdn0ecU0kltRoTC7W08yV5+Kwze5rKaPq/iYr0EcsF8BpwEIK5mHvoxCl3 NhSA== X-Gm-Message-State: AC+VfDzXV6mJJ11YtHgXL6QY4/e5+PFRwooZv4eenis3W0lK0yMB1F7l LJfc89TyGTsrQC9cD8lFj57eYOoOLw0= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:1283:0:b0:b8f:6b3b:8a0a with SMTP id 125-20020a251283000000b00b8f6b3b8a0amr16018115ybs.6.1683938218722; Fri, 12 May 2023 17:36:58 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 12 May 2023 17:36:00 -0700 In-Reply-To: <20230513003600.818142-1-seanjc@google.com> Mime-Version: 1.0 References: <20230513003600.818142-1-seanjc@google.com> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog Message-ID: <20230513003600.818142-29-seanjc@google.com> Subject: [PATCH v3 28/28] drm/i915/gvt: Drop final dependencies on KVM internal details 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,T_SCC_BODY_TEXT_LINE,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?1765738188458932310?= X-GMAIL-MSGID: =?utf-8?q?1765738188458932310?= Open code gpa_to_gfn() in kvmgt_page_track_write() and drop KVMGT's dependency on kvm_host.h, i.e. include only kvm_page_track.h. KVMGT assumes "gfn == gpa >> PAGE_SHIFT" all over the place, including a few lines below in the same function with the same gpa, i.e. there's no reason to use KVM's helper for this one case. No functional change intended. Reviewed-by: Yan Zhao Signed-off-by: Sean Christopherson --- drivers/gpu/drm/i915/gvt/gvt.h | 3 ++- drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h index 2d65800d8e93..53a0a42a50db 100644 --- a/drivers/gpu/drm/i915/gvt/gvt.h +++ b/drivers/gpu/drm/i915/gvt/gvt.h @@ -34,10 +34,11 @@ #define _GVT_H_ #include -#include #include #include +#include + #include "i915_drv.h" #include "intel_gvt.h" diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c index 597ffc9d12fd..191b4484cc7e 100644 --- a/drivers/gpu/drm/i915/gvt/kvmgt.c +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c @@ -1584,7 +1584,7 @@ static void kvmgt_page_track_write(gpa_t gpa, const u8 *val, int len, mutex_lock(&info->vgpu_lock); - if (kvmgt_gfn_is_write_protected(info, gpa_to_gfn(gpa))) + if (kvmgt_gfn_is_write_protected(info, gpa >> PAGE_SHIFT)) intel_vgpu_page_track_handler(info, gpa, (void *)val, len);