From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 84A452D7DD0 for ; Thu, 18 Dec 2025 16:47:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.68 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766076467; cv=none; b=kes8zFci0otg837gNQVCelTmEdrcnNXcKOC9WhO/i9apg8HR88GgdKLzqzSfThbdTaoE+L1XZyX0rf7Esu8KE/1KW7X6AriH0Fz9d6H3SyeZ6AK6wC+5LybcKXbpWhrv9p7Ij+i3GaZUwPcB79Ankv4z74Mwluf0bZSx+l0YC40= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766076467; c=relaxed/simple; bh=gk+1cIVkTapO9VD0ARf7xDZpqBvkVnn702fQDxQmTCc=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=OipV2uS7u9V1aHpnqQq3YMpOqQ4X+oeVOrDFGdB31MxAtPLmn/lC5JipJlu3To3lUPxSTCnrNw0BF3dUN52y1AqTDUZ70nZTHgNn81qKThOi6mUcnV775P6s5uVzk0yOn+PtnqmYsUB1Tk5BWptFRg84PwrdCeywqCIDID5+4ok= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=A6K6sCLG; arc=none smtp.client-ip=209.85.128.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="A6K6sCLG" Received: by mail-wm1-f68.google.com with SMTP id 5b1f17b1804b1-47a95a96d42so59535e9.1 for ; Thu, 18 Dec 2025 08:47:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1766076463; x=1766681263; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=71/t+zukONFmhteBzEJIyiLt6qukZUCn3lZ8Jl+QJWQ=; b=A6K6sCLGjeoLdsDEUVsTxzo2hPXbUSJVlfgDLE94J1MWiA/UrLJHmj6QKRyudPxmnR ErTrkKEpj0/hZNcVm7xfvq//STkkXyUcWvZ5RYtua8AO5WQgqccVw6cCoXzzpB8s0t90 DiCQneiXqyllnMiKUj+XXS2wNQBBpdUNjZD9W2yp3AkrkfK4/nrIwXypdJ+GovWvNfPh xHe41LLiojCKtSspa4K7KDR2sxM0hnLS9fytifj24HxnDAnRZvpY2mluBvX3ljhpVa/j 4WZtsvEJbqFHUpsJDbkO+k/rbUooXXVzVihKWo35x9SXU55tRM0nt0/XtqRxivXnZiSU 0rOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766076463; x=1766681263; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=71/t+zukONFmhteBzEJIyiLt6qukZUCn3lZ8Jl+QJWQ=; b=NzFEWTRvpnOLRxwWIc8jHhE9lXUkDKXu0Q8jaqCCjZTsx8i6Hgwemjk4j5mxqzNPoV 8orLiF6N9uEiEdRO2bmz5Y1a4y3yt/Gb19b6CCA4seQczKgVzh05+3ystJdEhtuVVlWw skd6o7ZtUq+c+KA672ZMSVnVCiEnQ+wgY1AjWHTxqNje2vxVTU+lVTS1huN8IZ8uahVL fTcYL3E5kRdwc6Bqz4LjVVXjEbi6pYrPrtG1G6fFDFSZmFvpaRNlWgPipqDpBzNKOU12 JzCKOwYkv2SR7GK2ULj+RvuhLQ0Too1ZPXuJ20ZCV3reVKrEfJSqecTh28ZG9FDg7vyC I1pQ== X-Forwarded-Encrypted: i=1; AJvYcCXhb4csuoVu9uYBNifuXXmQyIYl/Dm6sQLT88McnZQ8dvSaB5ye8/YOgqWzto7DHzJg5qY5gpfz7mZPNoQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yz4cibpO2A7UHK68W6Kzyiqzk0F2YrVn02cYDU2qU0d/s1+GKCY bMXMgLcgPxqWCYPJMxmiAEM9SVG5p13yvClqnWOfoxAnVcL8Gv9/El/YGZwJR8RHhg== X-Gm-Gg: AY/fxX60CR4JqHqSgb/A/DziJWhvMcKTenkBWwD2KaZiu+I8qsHxLWjE5t69VtFPZX1 BIzpEBooGi5AT9hQxOGHoAUELlYkS9hWEf1lq7sXqARbGZnLtKi7EFBCOEDhvEME8pg8+QpHSEx twpOYr+ULWCa3x7EAEea0yTSmkAZWStBMAuNNVU8qAMXwJgHYe5GL6sWZ464NLF37MyMSdYUGm7 ytIjLdBGjruERDFS4s1TA0GqLKHJpHjxIPGUKtvCSCPOYA+C8jjiu4KQGB0bs1ziIMOJnhQpJms sMrHnKgGuQBwBiJ6/pr7ybaaHMEWmR3FXK2a4TX5MICBERwc7VK7hAiAxAcknx4TxzNo0kXYJlW tv3Rgr5BNvJAuCPvC63tT6fKInv+gz6Yz4PYNZUbd1WQr7Dr2NfMYfBQmJgO0/NIaCX9ebMwwbh H4PUIyEpX9iedqkSMb22eV7UqzrVVfORYVPd06KRHgXdv4/VZtREMgvBqO5T65mMQ= X-Google-Smtp-Source: AGHT+IEwA6XXBbBrnkNpDSyMMUjDvcXJmGq2sfYYfcaOAM4R5To9TrPd6uo2ODMIhod3ttVZXOF0Qw== X-Received: by 2002:a05:600c:8888:b0:45f:2940:d194 with SMTP id 5b1f17b1804b1-47c97d92b03mr513515e9.2.1766076462804; Thu, 18 Dec 2025 08:47:42 -0800 (PST) Received: from google.com (171.85.155.104.bc.googleusercontent.com. [104.155.85.171]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47be3ac4c1esm16379985e9.14.2025.12.18.08.47.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Dec 2025 08:47:41 -0800 (PST) Date: Thu, 18 Dec 2025 16:47:38 +0000 From: Mostafa Saleh To: Nicolin Chen Cc: jgg@nvidia.com, will@kernel.org, robin.murphy@arm.com, joro@8bytes.org, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, skolothumtho@nvidia.com, praan@google.com, xueshuai@linux.alibaba.com Subject: Re: [PATCH rc v4 4/4] iommu/arm-smmu-v3-test: Add nested s1bypass/s1dssbypass coverage Message-ID: References: <6fcdd663d62dcab4005401bac2d23d18dd28e0c4.1765945258.git.nicolinc@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6fcdd663d62dcab4005401bac2d23d18dd28e0c4.1765945258.git.nicolinc@nvidia.com> On Tue, Dec 16, 2025 at 08:26:02PM -0800, Nicolin Chen wrote: > STE in a nested case requires both S1 and S2 fields. And this makes the use > case different from the existing one. > > Add coverage for previously failed cases shifting between S2-only and S1+S2 > STEs. > > Reviewed-by: Shuai Xue > Signed-off-by: Nicolin Chen > --- > .../iommu/arm/arm-smmu-v3/arm-smmu-v3-test.c | 46 +++++++++++++++++++ > 1 file changed, 46 insertions(+) > > diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-test.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-test.c > index 5db14718fdd6..8255a02f4efa 100644 > --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-test.c > +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-test.c > @@ -33,8 +33,12 @@ static struct mm_struct sva_mm = { > enum arm_smmu_test_master_feat { > ARM_SMMU_MASTER_TEST_ATS = BIT(0), > ARM_SMMU_MASTER_TEST_STALL = BIT(1), > + ARM_SMMU_MASTER_TEST_NESTED = BIT(2), > }; > > +static void arm_smmu_test_make_s2_ste(struct arm_smmu_ste *ste, > + enum arm_smmu_test_master_feat feat); > + > static bool arm_smmu_entry_differs_in_used_bits(const __le64 *entry, > const __le64 *used_bits, > const __le64 *target, > @@ -197,6 +201,17 @@ static void arm_smmu_test_make_cdtable_ste(struct arm_smmu_ste *ste, > }; > > arm_smmu_make_cdtable_ste(ste, &master, ats_enabled, s1dss); > + if (feat & ARM_SMMU_MASTER_TEST_NESTED) { > + struct arm_smmu_ste s2ste; > + int i; > + > + arm_smmu_test_make_s2_ste(&s2ste, ARM_SMMU_MASTER_TEST_ATS); Shouldn't that be conditional on "ats_enabled", I see the callers of the new tests already set ARM_SMMU_MASTER_TEST_ATS. Thanks, Mostafa > + ste->data[0] |= cpu_to_le64( > + FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_NESTED)); > + ste->data[1] |= cpu_to_le64(STRTAB_STE_1_MEV); > + for (i = 2; i < NUM_ENTRY_QWORDS; i++) > + ste->data[i] = s2ste.data[i]; > + } > } > > static void arm_smmu_v3_write_ste_test_bypass_to_abort(struct kunit *test) > @@ -554,6 +569,35 @@ static void arm_smmu_v3_write_ste_test_s2_to_s1_stall(struct kunit *test) > NUM_EXPECTED_SYNCS(3)); > } > > +static void > +arm_smmu_v3_write_ste_test_nested_s1dssbypass_to_s1bypass(struct kunit *test) > +{ > + struct arm_smmu_ste s1_ste; > + struct arm_smmu_ste s2_ste; > + > + arm_smmu_test_make_cdtable_ste( > + &s1_ste, STRTAB_STE_1_S1DSS_BYPASS, fake_cdtab_dma_addr, > + ARM_SMMU_MASTER_TEST_ATS | ARM_SMMU_MASTER_TEST_NESTED); > + arm_smmu_test_make_s2_ste(&s2_ste, 0); > + /* Expect an additional sync to unset ignored bits: EATS and MEV */ > + arm_smmu_v3_test_ste_expect_hitless_transition(test, &s1_ste, &s2_ste, > + NUM_EXPECTED_SYNCS(3)); > +} > + > +static void > +arm_smmu_v3_write_ste_test_nested_s1bypass_to_s1dssbypass(struct kunit *test) > +{ > + struct arm_smmu_ste s1_ste; > + struct arm_smmu_ste s2_ste; > + > + arm_smmu_test_make_cdtable_ste( > + &s1_ste, STRTAB_STE_1_S1DSS_BYPASS, fake_cdtab_dma_addr, > + ARM_SMMU_MASTER_TEST_ATS | ARM_SMMU_MASTER_TEST_NESTED); > + arm_smmu_test_make_s2_ste(&s2_ste, 0); > + arm_smmu_v3_test_ste_expect_hitless_transition(test, &s2_ste, &s1_ste, > + NUM_EXPECTED_SYNCS(2)); > +} > + > static void arm_smmu_v3_write_cd_test_sva_clear(struct kunit *test) > { > struct arm_smmu_cd cd = {}; > @@ -600,6 +644,8 @@ static struct kunit_case arm_smmu_v3_test_cases[] = { > KUNIT_CASE(arm_smmu_v3_write_cd_test_s1_change_asid), > KUNIT_CASE(arm_smmu_v3_write_ste_test_s1_to_s2_stall), > KUNIT_CASE(arm_smmu_v3_write_ste_test_s2_to_s1_stall), > + KUNIT_CASE(arm_smmu_v3_write_ste_test_nested_s1dssbypass_to_s1bypass), > + KUNIT_CASE(arm_smmu_v3_write_ste_test_nested_s1bypass_to_s1dssbypass), > KUNIT_CASE(arm_smmu_v3_write_cd_test_sva_clear), > KUNIT_CASE(arm_smmu_v3_write_cd_test_sva_release), > {}, > -- > 2.43.0 >