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;
Date:   Thu, 10 Aug 2023 14:32:07 -0300
From:   Jason Gunthorpe <jgg@nvidia.com>
To:     Michael Shavit <mshavit@google.com>
Cc:     Will Deacon <will@kernel.org>, iommu@lists.linux.dev,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        robin.murphy@arm.com, nicolinc@nvidia.com, jean-philippe@linaro.org
Subject: Re: [PATCH v5 2/9] iommu/arm-smmu-v3: Replace s1_cfg with cdtab_cfg
Message-ID: <ZNUfF1h5+SLlmwz/@nvidia.com>
References: <ZNObxeogswAYyDQ5@nvidia.com>
 <20230809145542.GB4472@willie-the-truck>
 <ZNOr0ggoO9kXHJWl@nvidia.com>
 <20230809162254.GB4591@willie-the-truck>
 <ZNO+QVkXcHG78KG3@nvidia.com>
 <20230809162749.GA4663@willie-the-truck>
 <CAKHBV27JAFb56VkHJO2ZBZt=25aVregeiMjO2YJrg_fW9HQbYg@mail.gmail.com>
 <20230810094323.GC5365@willie-the-truck>
 <ZNTSU1Jm6OsauygC@nvidia.com>
 <CAKHBV254QmO3iXyEL6w0PqvVofm_UCDd13LKmpbhU-cEORB5ww@mail.gmail.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAKHBV254QmO3iXyEL6w0PqvVofm_UCDd13LKmpbhU-cEORB5ww@mail.gmail.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?MJq6EoO9ro6mB/8KLhPlSxcUwrpSTA5n85F6ZzrbE2uGhXjIu07x/JHs5P1X?=
 =?us-ascii?Q?hKnJliD9V8QUk9z7yYH7lqBH651gli5xEFlcZdPeVc2UhuO28e4wW99C/DFJ?=
 =?us-ascii?Q?E3fbYxfxNvFdeqmGvc0UvAfPqUQRwimriYEqzaEZ0/srI7iGk+Sp2yFIeeVX?=
 =?us-ascii?Q?qIBkveLKWaypELM5mTlFrJgAGYitEHl6YfJPyk9scLW5i4vhUpsrlCyc2zLc?=
 =?us-ascii?Q?6FXbMhJrGpAMe0+SQlunBJs0et42SOnAFHFIEvTNAeN4LUdXfRW21D4zO7n0?=
 =?us-ascii?Q?43OkNtd7yYBGwRIiy3aweqgJlYhKyGXoafPRZILoED6GtwEKCjB1t7KezhUw?=
 =?us-ascii?Q?MfCbqDbNl1teExbeyCxUy3XQeBXJsCCKIiR0wQUsZCC/et6Mo00l+l9nee/v?=
 =?us-ascii?Q?9rdSzAn2Z9VfHjLEFDbtrQf97L4v3bnACJTPZvR1Vsecl4JarXXvhDlpvvrF?=
 =?us-ascii?Q?rFqyl0ykoqBib2GKfF5YCWS1vDEAAzDBLiX5OL0cS4sPhX4yaNzp9Rl1sJyI?=
 =?us-ascii?Q?sohUbrUYu1Gw7N/F6RQpUBQLnBYicyn6kr86GzJRf96Q9kw2fgloFBWB/aI8?=
 =?us-ascii?Q?mZllrWGFV7emNLVgdPJkGo53Xpp52/7RAItgphpJmoVZ54DTmYJ3Z5AoWhFK?=
 =?us-ascii?Q?V4LDxs+Up8nqcucjkoBBocmaprUFBLax4grYYqI9WtMrXpUUV/G8JaSMzwOd?=
 =?us-ascii?Q?rjEGHGude2MuWJ0a2lZDXtODvQJsPcaCu2WYZI3RkyiVwH+5mKS2JErFSChL?=
 =?us-ascii?Q?Yz3OAvnh6GGAjA2tEd/P+dtHs+WvwE2oSK5yL7a1cmvLTeATzQJjbidUOVVw?=
 =?us-ascii?Q?PHgiXCWEdRSAwNdRaMKt3pMLWOiJa4VUTDhWf4mYHdxzhqmUgj/QgvU/TqW7?=
 =?us-ascii?Q?NwuaLYaF8UmMeAx/Q1259Zfr42nWj3DKDzR0BcWknsdhGtH71BmuEeajsSdc?=
 =?us-ascii?Q?cnNFkA2ZOlBP/xq4eIEB6tX3PpGe7a1q429Ts+0qNyq9Yd/bZtj7mufMaf9P?=
 =?us-ascii?Q?ljtwg87aVQ11mteZdKodVie8QJ2zBiloAFyisjjnsTtSIn+mAceH/PN6GC59?=
 =?us-ascii?Q?kTabu6Ho17m0c84UlC41XzE8R6RTfH83pDISvhFn5brokgy0QMsphR80Peqf?=
 =?us-ascii?Q?SnCuEXTrw4pJifut0X9sOEG86XRBXPY+DxIUlcg8l47awvfK0IJeLZ8aBmTN?=
 =?us-ascii?Q?AejpnyeyVOfWGerpMjJx3MHipxVHCoz7BeYAblf/fF5731tFjtzIhHfBwb+M?=
 =?us-ascii?Q?F0xdDNoEG4nulj88QveZ9pP6CgfyzeO41dtqdkwRPKFn9y00z2ChS6cN7uOx?=
 =?us-ascii?Q?rqbS8AqqrMXUJhCh3zna2szHXDfWQXwDM2cFFI98y/YbKzq+079dKAU4oZOP?=
 =?us-ascii?Q?rjJNuEPuLsEJoWUtyw5DWqrX5lmmsZ2tz9Xk+nKntcoLN/PFHPF8CpfZ7J7A?=
 =?us-ascii?Q?7Ihi/Q3Eir2xYG+m76cOmGxrarOEY0CjFhdkgitHJOBGSygmrwSXkwr84m7Q?=
 =?us-ascii?Q?EJgSElxath8arWLQFr8gk15itexuQLutoakTM21EvMgpY03mksJziwVTdemn?=
 =?us-ascii?Q?N0aYf5pZhpwWye6ohdRwlusLIGTsTc9bL2OdzoCz?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3c0d168e-cecf-40f0-5ef7-08db99c7b97c
X-MS-Exchange-CrossTenant-AuthSource: LV2PR12MB5869.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2023 17:32:09.4052
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: YQIvlyoxdDtU66mW0wjIrPicixWEXyNFTYfwfmSYt6T4rlF1mbATD0SXQxQmLNeQ
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4515
X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE
        autolearn=no 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Aug 11, 2023 at 01:15:14AM +0800, Michael Shavit wrote:
> > > > What dead code? Is the deal here that we keep the field, but still
> > > > infer the value to write from (cd_table->l1_desc == null) in
> > > > arm_smmu_write_strtab_ent??
> > >
> > > Keep the field and write it directly when populating the ste (i.e. don't
> > > infer anything), but the field moves into 'struct arm_smmu_ctx_desc_cfg'.
> >
> > Yes - the 'dead code' is that we introduce storage for a field that is
> > always a known constant (STRTAB_STE_0_S1FMT_64K_L2).
> 
> I'm not sure we're on the same page here. s1fmt could contain either
> `STRTAB_STE_0_S1FMT_64K_L2` or `STRTAB_STE_0_S1FMT_LINEAR`, and this
> value will be directly copied in arm_smmu_write_strtab_ent.

Ah, I did not check this closely, Will said:

 > But the computation isn't happening -- the STRTAB_STE_0_S1FMT_64K_L2
 > constant is hardcoded here.

So the nuanced answer is that computation is happening because today
the format of the CD table (linear vs 64k) is encoded in l1_desc:

 +				  cd_table->l1_desc ?
 +					  STRTAB_STE_0_S1FMT_64K_L2 :
 +					  STRTAB_STE_0_S1FMT_LINEAR);

So I would suggest that along with adding s1fmt to
arm_smmu_ctx_desc_cfg you also go and normalize the usage:

@@ -1030,7 +1030,7 @@ static __le64 *arm_smmu_get_cd_ptr(struct arm_smmu_master *master, u32 ssid)
        struct arm_smmu_device *smmu = master->smmu;
        struct arm_smmu_ctx_desc_cfg *cd_table = &master->cd_table;
 
-       if (!cd_table->l1_desc)
+       if (cd_table->s1fmt == STRTAB_STE_0_S1FMT_LINEAR)
                return cd_table->cdtab + ssid * CTXDESC_CD_DWORDS;

Jason