Received-SPF: pass (google.com: domain of linux-kernel+bounces-32537-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: "Tian, Kevin" <kevin.tian@intel.com>
To: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"iommu@lists.linux.dev" <iommu@lists.linux.dev>, "joro@8bytes.org"
	<joro@8bytes.org>, "jgg@nvidia.com" <jgg@nvidia.com>
CC: "Liu, Yi L" <yi.l.liu@intel.com>, "nicolinc@nvidia.com"
	<nicolinc@nvidia.com>, "eric.auger@redhat.com" <eric.auger@redhat.com>,
	"vasant.hegde@amd.com" <vasant.hegde@amd.com>, "jon.grimm@amd.com"
	<jon.grimm@amd.com>, "santosh.shukla@amd.com" <santosh.shukla@amd.com>,
	"Dhaval.Giani@amd.com" <Dhaval.Giani@amd.com>, "pandoh@google.com"
	<pandoh@google.com>, "loganodell@google.com" <loganodell@google.com>
Subject: RE: [RFCv2 PATCH 2/7] iommu/amd: Refactor set_dte_entry
Thread-Topic: [RFCv2 PATCH 2/7] iommu/amd: Refactor set_dte_entry
Thread-Index: AQHaROtPd1NH4nYkIUyUFZdUjqnIFrDlkmpA
Date: Mon, 22 Jan 2024 08:39:57 +0000
Message-ID: <BN9PR11MB527677A782FBDF13FBA1E0368C752@BN9PR11MB5276.namprd11.prod.outlook.com>
References: <20240112000646.98001-1-suravee.suthikulpanit@amd.com>
 <20240112000646.98001-3-suravee.suthikulpanit@amd.com>
In-Reply-To: <20240112000646.98001-3-suravee.suthikulpanit@amd.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?z9pcHw/jgvorOdxgH7x4n9pBaCLZmY5f0rPkYNccBfMfU/y9v2fLoIUjXyIp?=
 =?us-ascii?Q?olgQ9QhzNzgvw8YG14Uv4vWmh6UKIrMB1ArkL1Awmkr8ZzvsZBqKxdKuO1Xu?=
 =?us-ascii?Q?zr4tNV65PCMZabfk6KGCkcGyYDEX50YWIGeUvLheTzjZbzyzOdyZAg9zT3Kh?=
 =?us-ascii?Q?W8sT4O+QSvUSFTX6svFTy+aXb1TdQX9ykZRlVuR7vhiEAb7c+JfXDaZeI/gK?=
 =?us-ascii?Q?Y6ZoVb9LUHiS6sqWSYfnIqOvEIG+oY3jrTDsvZSZTAxqfCNLNmjYh5SFTsM+?=
 =?us-ascii?Q?gHc3TnqWGKISjkNsFXuQsq1VToOPydY5GuVIIWw4UKzAK1Q5kCQ5N3pTD4M9?=
 =?us-ascii?Q?d0ZXEQVybwoW2cO3jLsW0hBDLuYp+gwvT0bp50YK08YDeio34pvBc99QauPE?=
 =?us-ascii?Q?/TGbGGOf+OMd26lhysa2nPq5PHfmveVaQZGfOXRXkX7pKiTBdtZlaNVEkYSG?=
 =?us-ascii?Q?WSWbX0U9BrPyyNhjzcjTzjFdZZFvvV3p0KTwBdE/XXzmhsRAfemop6pyWjpi?=
 =?us-ascii?Q?rIkoP9pDwGSQfxr0+lMe2d/NINfK77XXIe5sUCwlhiitICKgGluhrQrXw+4I?=
 =?us-ascii?Q?zMoq6xVVdpJM5FVswMPv3kPI7OOi1SYXevjzvu2efDXhZ+5M1hGQGAPgo3er?=
 =?us-ascii?Q?exRAxswM4LbonX6bfOJKOygUseazNtL9h+5oD+L9KY4LERYUsWpXQXpBY04N?=
 =?us-ascii?Q?x4Wl97PwgGhu4gHbmNr25dyEvZ4JHSqFHX1q5SwYKtWGtoBRFQtxgDPuYnd6?=
 =?us-ascii?Q?znQkuocCyhmH99Hblk52feGF/BFEOAZ2Q1sDb7PQp40SApHhZh5wNVn6l8Nj?=
 =?us-ascii?Q?NmwEtl8jTREAK2+zQCkWHfAAJ+6bvUp20cjBCffQWKy1ppTB/iVzUrfZVu+h?=
 =?us-ascii?Q?kKDZanMdOzs2Xr9pM95sGhmZS8lv8hOaRL3xSZs9S0KBBSiIqC+NuaYO3aF4?=
 =?us-ascii?Q?E3m7e/jmByfQJKFfuSKR0BhY4LC5FUXGF6BBpYPBTiwpEvcI7uhcSl18bOhk?=
 =?us-ascii?Q?IapT9yiV+2jkjjL7D/5DOl+r3Rn+rgSgKfTOWJHOQ67SFA0vmtymeSshWAbw?=
 =?us-ascii?Q?JWeUmzjENx8KbVp72L8Lm4Rv3pcxT9MZjNcdXglhde/6wJLGH757goNBSW/1?=
 =?us-ascii?Q?+9lIXAjAdyTJYJVMu8l3CDX8QYR0ossp+8Lj+C48IEZcZcAgC4RmNSsHu2/h?=
 =?us-ascii?Q?a0BY7sWpjYXY1PH0yuBvXkWFlbnR58n9wrqMvveL1Mr0izhwghlL4WBhdU19?=
 =?us-ascii?Q?rb1JEERzBZ5zTlb7yy33jH7r1UoVswdGurRWicKSBQPD8dHJW8XGMV8rV1OM?=
 =?us-ascii?Q?34OempBBqA8Ct1RYVPM3DSyU8JKGytKRMCoD1QAqw7/mkSlxodcv1tXMIBfJ?=
 =?us-ascii?Q?jysM2mtU+uBLTHL11u2j+wOo1bzRoMZaAZyZWIUupqlVdJgD85m2FL8Of3Qn?=
 =?us-ascii?Q?dV+swCzZfhu9hon6HQvCBBlKwL4ZNNajtezy/GlTwgpgrr58ibxZABGu/mNE?=
 =?us-ascii?Q?JSbIdIgtR/VN6DjUyeegsAI22f4ivXUZi5ZyHMOWRnbDBY6D+CmCG+YyqazZ?=
 =?us-ascii?Q?WwXa0wGJJGP7pM3y1Swv6+nhrHtplCP15zpDFGYI?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BN9PR11MB5276.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6cf5897f-5f80-443d-ec34-08dc1b25b70d
X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jan 2024 08:39:57.8314
 (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: 70sbPHhutRx3PxEJPYHs8wjal2lLamnXAto1vt6/U2PPwA7h2xI/6E36f8u+iFGRrTSIqtS8lhK2hUrXSW/4yQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR11MB6912
X-OriginatorOrg: intel.com

> From: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
> Sent: Friday, January 12, 2024 8:07 AM
>=20
> +
> +	/* Use system default */
> +	tmp =3D amd_iommu_gpt_level;
> +
> +	/* Mask out old values for GuestPagingMode */
> +	target->data[2] &=3D ~(0x3ULL << DTE_GPT_LEVEL_SHIFT);
> +	target->data[2] |=3D (tmp << DTE_GPT_LEVEL_SHIFT);

Just directly use amd_iommu_gpt_level here.

btw this sounds like a functional change as the original code only does
this for 5level:

		if (amd_iommu_gpt_level =3D=3D PAGE_MODE_5_LEVEL) {
			dev_table[devid].data[2] |=3D
				((u64)GUEST_PGTABLE_5_LEVEL <<
DTE_GPT_LEVEL_SHIFT);
		}

If it's the desired change then better make it a separate fix.