From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0DD4AC04A94 for ; Tue, 1 Aug 2023 02:11:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A603C10E2F7; Tue, 1 Aug 2023 02:11:34 +0000 (UTC) Received: from mgamail.intel.com (unknown [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id E6D1010E2F4; Tue, 1 Aug 2023 02:11:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690855891; x=1722391891; h=date:from:to:cc:subject:message-id:reply-to:references: in-reply-to:mime-version; bh=a/Llph8Rur2jb0HkCtcvZF09kv4xphc4vbuX9o4avMY=; b=NvesvMa0G/kiabY0klYkaqdppcObmbsSSUkuVgXOrukKt88tV6wMQ+Q4 lk2S/cSxN+rXk2Tg5dZlwzQaSpuaYdUVE59ABv0NP6nZ9s429oo1THB5u S5hQKPmSDhPoIoJm1tlGAbaWexn1eV0sEwzURhKxa0goujuCpTxH07Wml cXPzZG/Xba/1tCYWU1FABCOp+UKH93TP24yiIq+00Dp7iYYjBPDv9WjRn bUg0V+iZVSW6rVK2WksyN8T7zVrii5HHV3tFG6KXcUnJnJN8hWymAZehv N5SL9ChOJABIx0Jh8dNizY/mn+JAaetGnTvfI0wRdKQnBbnMnXB9a6Dze w==; X-IronPort-AV: E=McAfee;i="6600,9927,10788"; a="435498473" X-IronPort-AV: E=Sophos;i="6.01,246,1684825200"; d="scan'208";a="435498473" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Jul 2023 19:11:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10788"; a="798470811" X-IronPort-AV: E=Sophos;i="6.01,246,1684825200"; d="scan'208";a="798470811" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga004.fm.intel.com with ESMTP; 31 Jul 2023 19:11:01 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Mon, 31 Jul 2023 19:10:56 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27 via Frontend Transport; Mon, 31 Jul 2023 19:10:56 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.169) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.27; Mon, 31 Jul 2023 19:10:56 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bmKdzcK0WCowRv+aN7KaydNgU5LzIvDsv/NT8rEl2uLwwdDtx+5gm/rL182mQNX6NrVewik4L/O+t0qYoyESC2DiVEhyiWP688ZLmmRU6LOcEOwvGJ9D3vmo757FOp7fNuO/C3xZaVUikbZLBcOdnHqz0oClxZoey4Ry3KVuT8rO6UfDE+LdIAzUgSITTC/exd2cL2IV7mk2vfoF/q+IQGS7zz17N1WBzsNJ2L7KaDHkp/JcL+auhAog7Kepo4xZbFMisTpw5Y2atqw7y4A5pqDHhKGVAc0DpttvZeQgl4uZ4al5mpOp6E4JhzJhsWaQp/V1HjjKt8+qG2XgSt0XkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=O/FRcvbkOzYE/K0RDN0crn420rWJhM3OtcTAOoJzC4Q=; b=RFo6i7Zx+rPiCFHV1yr7L+74ZGAWV28peIVQnI7ByjjJnOL0v21kDKxj8uBUVrMdGApK0DMYodHcqqglIjBWrukCHwaCJ031ig6H/IwebRFB1YbKELLDvHaJ88Gyyo3vl3tH/MVFqFAcVNDH23keJBDMCA7ugwyypjZYHPbaCG9lZ94GjELXOYKLba05nZ9CKvPZVOfL/sObuvldhThZfMZA5wnnU+syMcWdftaIsi0wnA5BTbwMIlP+l/hPUCqc5kG77xvEm3EJXRpHOnoIl+7ZHjGjqV4UCaCS0GbUGLFT0xuiplvIJXEkLwXj88dQzzd2OY81x64Iq3MYoSZ2RQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DS7PR11MB5966.namprd11.prod.outlook.com (2603:10b6:8:71::6) by MN2PR11MB4536.namprd11.prod.outlook.com (2603:10b6:208:26a::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.43; Tue, 1 Aug 2023 02:10:54 +0000 Received: from DS7PR11MB5966.namprd11.prod.outlook.com ([fe80::1b1a:af8e:7514:6f63]) by DS7PR11MB5966.namprd11.prod.outlook.com ([fe80::1b1a:af8e:7514:6f63%2]) with mapi id 15.20.6631.043; Tue, 1 Aug 2023 02:10:54 +0000 Date: Tue, 1 Aug 2023 09:44:02 +0800 From: Yan Zhao To: Sean Christopherson Message-ID: References: <20230729013535.1070024-1-seanjc@google.com> <20230729013535.1070024-7-seanjc@google.com> Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20230729013535.1070024-7-seanjc@google.com> X-ClientProxiedBy: SI2PR02CA0011.apcprd02.prod.outlook.com (2603:1096:4:194::20) To DS7PR11MB5966.namprd11.prod.outlook.com (2603:10b6:8:71::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS7PR11MB5966:EE_|MN2PR11MB4536:EE_ X-MS-Office365-Filtering-Correlation-Id: d08d1dd0-0722-4b85-002c-08db9234895f X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1VXMtAsZNygroiEUOUlV4dNG0c3tg/njUNh68n6tDyUpmWFL06xk+BrjWUqW8mFkx7x3jndd1EaTtAwIX+nfNQNNYa7Yl41II01aRloXF2JSt3VflFypoG4VB3DGtSJ9PqtzKQAnllHhBfKJFtWx6rVZwtIwITLaLk1pBp82fYwdQoh8sKuxK/oGEVYx69qYemZbd/MzD17zfcV7EZXyKYKiaUhBiXt9hfSOd4ZwTyHgU8fwq/J/GTSxqegtV7SK2NptHid5D1L613ZByIZmxEr/4TM87cpVV4gIXFnOLX287EReOjU/3ZGFWvzSjDrAL8ebSB1FI8hIyyXDXNJFUyUuiTSRE1BWcVQlpWUuXo1v1w1TBHOdqurHiAQv7yxIRBAQFpip0CTlyIyK2JTyUcz4sJMGx+Y6EdRdKjdTyNtWG9g6ZcQLlrcGy6Htwk6BRcazCaE8nbjjKqOsE6rn2AQ3CyRepyCLNH9vLQs8f4hmwhedNfRkyFybnD6EE6IvNOb0bqNFtTk0z/lI0WUuFsiCEhpgbpb7gVfRLfC+BqD/DX7UdrZaC2pCBkmjLGhO X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DS7PR11MB5966.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(346002)(366004)(39860400002)(376002)(136003)(396003)(451199021)(6512007)(6486002)(6506007)(26005)(83380400001)(186003)(66946007)(66556008)(54906003)(82960400001)(41300700001)(38100700002)(86362001)(66476007)(316002)(5660300002)(6916009)(4326008)(8676002)(8936002)(2906002)(3450700001)(6666004)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vMm2Upu5QccygyO0aD3xIncuBBktiUYXArisAmEaPZ65mykrMszXwD9N1Ks2?= =?us-ascii?Q?T89vVjadSstdojRoldQhlfvjNyVXe8vx2ZMTUzOXEuBDXlCuiN/QSqZFjlWp?= =?us-ascii?Q?PvMQNsDtb397EL7cqCYSfI0pz4rZUObk15E9eF4HEjiEpM5B+QsIc2cBV2E4?= =?us-ascii?Q?1AUOJd9hGksMSp2Ge2/fErsmHoTSZS+0D7FwjEnZB19kBZ9OhlemCaJkScsI?= =?us-ascii?Q?tfSEFhE6sVw8L3Y0UDGBCNkogCnwLAscowYwbt7y7Gwtk6Md28t0kaEms8HG?= =?us-ascii?Q?xvAJRq+gDQeecgTI1DzmgoeUWQqYrCW52xpcp/C3Ma38CEIslTQLlEvTXOiB?= =?us-ascii?Q?/LwJicFsFMdwQA7rZ790EpmnEGJrdtlp9hY7NRqgFaM4W5R2sd4zYSjXWb9t?= =?us-ascii?Q?IdeK2XoyQfLf9z6FsDPAnQAYCibRzYF4zClCOWOn8wiyOjNDkOLpyWwak7jl?= =?us-ascii?Q?HUiO1IZiQJZGF8AC+sV78UbkcdpRaPkRdXh7a9X+2F70HBPpchezAG5+NN1M?= =?us-ascii?Q?fIRnUI6yXUrK0aBdCQpn6D3fMzGkBCXwkD8ZbwuoZwzLVI4oK0tEys3Qj34U?= =?us-ascii?Q?wfJkXn8au1CzM5Nb8dvwon8g90OaMELbGt/LUQfqcnxxzT5IcDWWM8n6z7ht?= =?us-ascii?Q?DDsQVZ7WvWMQtuLuLT17OY+Kr88xPpeIKWWp/D6rFJzSfWC8fDQc5MXeoeCM?= =?us-ascii?Q?ClgANFTpOVyr5jlT30QUbdUMrvOXyYk1sKQcnsRJw9mcvjdtJv0CaQNVW1wv?= =?us-ascii?Q?ACGuAc04zYeQLaVXftl06YxnS7uMrtkjCMvDvI6PA6Qf3BYCgb5h1ZRuUtKq?= =?us-ascii?Q?2Lu1yw6NDz/ZrUYKitcSyRCCvsMxNgLMTeD6VIXr4v4RKqZQvziQ6aOQ/AP8?= =?us-ascii?Q?XqgZnCJbv4K6ZMrZtgOvRSak7FmVdTYGKqdJDCmHQh7Ln7EMLNV18YlJEVbU?= =?us-ascii?Q?mFDz/mK25xskmHJtgKoVXQG6yexxu1Wx/LfvwA0A0IpivsJhaI3W2iO3dTpE?= =?us-ascii?Q?mFyuBjxicaJGcazKFjxBYoMlFIRS+y2EEvbQBPf27CQPh6Ef1Jti9gj/MTf2?= =?us-ascii?Q?43Z9uosopCC7KpgtcDee5qJ27UDEEBlyYTS8ulKdIcprb9pEyL8hmn3Xp4cS?= =?us-ascii?Q?SiH0+JMqc6PmUqxkFi/8V9ghol62pyL5JppeV8+qf00GkEcYbmPsAWsVeYiS?= =?us-ascii?Q?leLHMyYPwT2MPFPZQr50wNBnp91hzfFJO9OuoJgeylabQ/qHyP/VB79B4cXx?= =?us-ascii?Q?PuxIo974MqZBCob/girjWPAZvf6V6tlOyokqV3GYmH8P0JlzVNbc6+0GDSlB?= =?us-ascii?Q?QNiOqoaOLTAkEkf7p36pcRYMYKcALiCYNKlDoQLxj7KnJw2ADxPeqFPiK+nn?= =?us-ascii?Q?muKIkg2+WDx3QwXRjC+72OOL+GAzDnVB9ePEr0le9HRGwD6xLQmkwgN+kWoJ?= =?us-ascii?Q?IiHpmgpMstBHHhUirbFLChHfDl71cCHaZLBrSwPwkeuL/RNb0NCxRK9KlzdJ?= =?us-ascii?Q?gCzn76mcLGnbSLsZoDifVk596/Zwvf0w8iTVXxhyzQlqcfDUpFA4O/YtZAPG?= =?us-ascii?Q?4owdvsj9LSL6CB7ONRulaEza3YAeWrmJruJaMMP7?= X-MS-Exchange-CrossTenant-Network-Message-Id: d08d1dd0-0722-4b85-002c-08db9234895f X-MS-Exchange-CrossTenant-AuthSource: DS7PR11MB5966.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2023 02:10:54.5658 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 8Fu8TNIe7NuuAfGxnk46cHmUcF8pU06O+OE++qQQThWgn47pvRujIu3usI/dpqkV+fCkAfy1lLklsdrAbT/ckw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4536 X-OriginatorOrg: intel.com Subject: Re: [Intel-gfx] [PATCH v4 06/29] drm/i915/gvt: Explicitly check that vGPU is attached before shadowing X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Yan Zhao Cc: kvm@vger.kernel.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Yongwei Ma , Ben Gardon , Paolo Bonzini , intel-gvt-dev@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, Jul 28, 2023 at 06:35:12PM -0700, Sean Christopherson wrote: > Move the check that a vGPU is attacked from is_2MB_gtt_possible() all the typo: "attacked" --> "attached" > way up to shadow_ppgtt_mm() to avoid unnecessary work, and to make it more This commit message does not match to what the patch does. The check in the patch is in ppgtt_populate_shadow_entry(). What you want is like below? @@ -1796,6 +1797,9 @@ static int shadow_ppgtt_mm(struct intel_vgpu_mm *mm) if (mm->ppgtt_mm.shadowed) return 0; + if (!test_bit(INTEL_VGPU_STATUS_ATTACHED, vgpu->status)) + return -EINVAL; + mm->ppgtt_mm.shadowed = true; for (index = 0; index < ARRAY_SIZE(mm->ppgtt_mm.guest_pdps); index++) { > obvious that a future cleanup of is_2MB_gtt_possible() isn't introducing a > bug. > > is_2MB_gtt_possible() has only one caller, ppgtt_populate_shadow_entry(), > and all paths in ppgtt_populate_shadow_entry() eventually check for > attachment by way of intel_gvt_dma_map_guest_page(). > > And of the paths that lead to ppgtt_populate_shadow_entry(), > shadow_ppgtt_mm() is the only one that doesn't already check for > INTEL_VGPU_STATUS_ACTIVE or INTEL_VGPU_STATUS_ATTACHED. ... > diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c > index 5426a27c1b71..2aed31b497c9 100644 > --- a/drivers/gpu/drm/i915/gvt/gtt.c > +++ b/drivers/gpu/drm/i915/gvt/gtt.c > @@ -1163,8 +1163,6 @@ static int is_2MB_gtt_possible(struct intel_vgpu *vgpu, > if (!HAS_PAGE_SIZES(vgpu->gvt->gt->i915, I915_GTT_PAGE_SIZE_2M)) > return 0; > > - if (!test_bit(INTEL_VGPU_STATUS_ATTACHED, vgpu->status)) > - return -EINVAL; > pfn = gfn_to_pfn(vgpu->vfio_device.kvm, ops->get_pfn(entry)); > if (is_error_noslot_pfn(pfn)) > return -EINVAL; > @@ -1277,6 +1275,9 @@ static int ppgtt_populate_shadow_entry(struct intel_vgpu *vgpu, > if (!pte_ops->test_present(ge)) > return 0; > > + if (!test_bit(INTEL_VGPU_STATUS_ATTACHED, vgpu->status)) > + return -EINVAL; > + > gfn = pte_ops->get_pfn(ge); > > switch (ge->type) { > -- > 2.41.0.487.g6d72f3e995-goog >