From patchwork Sat Mar 11 00:22:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 67883 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp47498wrd; Fri, 10 Mar 2023 16:37:27 -0800 (PST) X-Google-Smtp-Source: AK7set83iexXcw/FtmVUAr9+fbYGR0Sl+gKet4CGBX6leMiABJMaqryzuIE/r/vKnH+PlN9mP0OZ X-Received: by 2002:a05:6a20:3d0b:b0:c9:9312:5f1d with SMTP id y11-20020a056a203d0b00b000c993125f1dmr35959562pzi.4.1678495046978; Fri, 10 Mar 2023 16:37:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678495046; cv=none; d=google.com; s=arc-20160816; b=tkbpgzx19f//RaMgXVSnP8TKdZzBW1JB90/13LjGNycjBJi4roiWfmkc0RxsKGcsVh 7J8oOVjDgFWoSVzSjtFmMMYq2MpAYX6t2OwAaqkXl12aZpbCfQiJkmHeODkdsZw83Elc S2+SdOn+fTzUx2iGSSDgtyqGroka6lDrahVJmDm9DH+UkXJPTqXKPxdxJLB/GrtXD9Mr PPL7Wq5Nr0pqMEJHQ+R/cFeYPjioNLxMhjf94lwYygjidxvzcolNVLjLsQM0sSDX6Hmi SZkRS3rVlqIv7BwnDeWMvmAZ+l9Z/lrXc8tb98wrXoijhN+87a9VGhLFkK8ejLBna2Ai Ueqg== 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=x2tVYLFtu4+/4LAPARn3E33zkHftYTv9vOX58pVkWHM=; b=PaioeoQAv/rxn18+UElq1yYyCVsLNWN9tJc9gwdgcce5XgPo5ilqCM196ZFEvoCI82 +mW/FWseJy2GFPEZP15WBiv+B6H8mEHGhCPyqsWZkXjn7MIM/eigqDINYQm1iV1UDWzT Who8FWL+SX+vCakzBDpfllrVbd7X5MWv8qUChGEEBQU61+m90EZmjqV2CdzhWpZUjLaE VjQXlbttPOCN2rAma9Kb3XOsGLHJ0cuGlrj2HywcdH3IEmjbIsgmSmi8VbyGkd1eGnMn USliTdS/6kvYJL/TCp/A5C+Lt3BbKurC99XTdPZeVv+ZPTDd1Q+XleZ8nFWWHxhtgKX6 t8GQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=eCTAn9KE; 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 i16-20020aa796f0000000b005e37ee6d9c1si844483pfq.281.2023.03.10.16.37.14; Fri, 10 Mar 2023 16:37:26 -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=eCTAn9KE; 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 S231646AbjCKA02 (ORCPT + 99 others); Fri, 10 Mar 2023 19:26:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231522AbjCKAZl (ORCPT ); Fri, 10 Mar 2023 19:25:41 -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 1BA7522CAA for ; Fri, 10 Mar 2023 16:24:22 -0800 (PST) Received: by mail-pg1-x549.google.com with SMTP id d22-20020a63d716000000b00502e3fb8ff3so1649485pgg.10 for ; Fri, 10 Mar 2023 16:24:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678494237; 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=x2tVYLFtu4+/4LAPARn3E33zkHftYTv9vOX58pVkWHM=; b=eCTAn9KE2O9xKHWOxj1VUE/UZXTx6Y1mDDTMlkwbdR0Y57s9PpUrM5h9i2cHbxsnki t0637AV0rExfo48KvvrqnyadfUnxBMwpuXsf8bzU9+CnuuH5alcmDXRXkCkOTywDKJEk XcU2Ssqaps8aM9ojs9FjhyBohQxSawze04pO8kWuerEOURvl7R99eb/R/ZcwEpa5D8mU TLGucsOnbjVeWTw9U9PMc6v0xVNdb3bFtznClK5hKBNddFaRNaHEDwN47WSFEGxmM3iV bkMq0Bn8TSiu6JuJ5U2kGO4Zf7ybt6AJeJqWZFsgqPjAfErV+ulDY+iqxXYTBp35bmjn a4Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678494237; 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=x2tVYLFtu4+/4LAPARn3E33zkHftYTv9vOX58pVkWHM=; b=fKaQ3/afSKuwDoYBCd1GMQHt6vTB+mcZ57hrO1pwBJvtVxXdIUVdo1CjW+imYZsfUf KCVcYkrKhlLjtYyjbJNkaKDGTT3v4dWH631ZibSDtypL/1qVFikSTDeVyNz/CDFTgCNR Pjv9GbsoO26Hhng9iyHaAyFgyiMAALft/dEV9gGd+uUFL8/HcX5Qt6HfrobxLotglaBY 6N+Ub724Sb3qs1wjrWSpzFnWbQBNV7Ys2OA2WVjz0zVcjPW50aAOBfyHshPpWwtIvWaB XqWQWIiwkh/siCpcqT8bb88KwnQWCJ3fr+neNoFjOKuwgoxkJ0AJv/zS0mlCu2RqVuaW GnjQ== X-Gm-Message-State: AO0yUKUb5aGB3BEmLjvM7aNCjE52zkjDHIF0LwBuydbM3lZFzBO+SdNK 622Dfm4X7+Cy4ZjY9YyICjKNSz7MIKg= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90a:7783:b0:237:9029:c29b with SMTP id v3-20020a17090a778300b002379029c29bmr10323383pjk.0.1678494237678; Fri, 10 Mar 2023 16:23:57 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 10 Mar 2023 16:22:58 -0800 In-Reply-To: <20230311002258.852397-1-seanjc@google.com> Mime-Version: 1.0 References: <20230311002258.852397-1-seanjc@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Message-ID: <20230311002258.852397-28-seanjc@google.com> Subject: [PATCH v2 27/27] 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,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?1760029622481303723?= X-GMAIL-MSGID: =?utf-8?q?1760029622481303723?= 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. Signed-off-by: Sean Christopherson Reviewed-by: Yan Zhao --- 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 d16aced134b4..798d04481f03 100644 --- a/drivers/gpu/drm/i915/gvt/kvmgt.c +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c @@ -1599,7 +1599,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);