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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 B234EC25B78 for ; Tue, 4 Jun 2024 16:15:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=o4A2aPy52p1Vku8om91mkj1SZBPLcXSzrUwisADFMbw=; b=E1k71ydMUbwAYA ZG8Bdf+0dvi+TUHuQbngm8tRlZIbJPaHCk/xo+DzkdZVQzYFCq5TecYpWdKgTkrNct8kw9S/QxDK9 GxlgAMjrPrsvgqk/4WZa61Zh/84DNMBa7tMVvg5ddIZqQwGgvsa9yo2ZWBEp24EDoJvU1VSYeNTAH BEakDvIQqVzzbzWYG0UKaHiMwyiiLeYvfDDMA4RMgUAmM1rN6EJnW3d/gu9U69gs9ORQDH2k7SZ1i sdws3iRYqXrA/eLm1OL6R1ajCMHeJOdxqLholEJ0itFZvA2gC4+WWs3Md4iuffm6djNUg1jkoCZ7S hxTz1FkfscXSDOai3sOg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sEWoN-0000000356H-23ok; Tue, 04 Jun 2024 16:14:59 +0000 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sEWoK-0000000355h-22M6 for linux-arm-kernel@lists.infradead.org; Tue, 04 Jun 2024 16:14:57 +0000 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-42135a497c3so143445e9.0 for ; Tue, 04 Jun 2024 09:14:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1717517694; x=1718122494; darn=lists.infradead.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=sog84U7Wd5TBpIF8EHL5jNYn8tkvMRV0fzjn9o9wjNM=; b=vR0aLtVKiEtwVuf/jgS6OrE3IjDZ5i4XSM4IVY3qZu6AD8QDK/6m2lNpdlWyPhaTSu 4zGIIsw082u5nCOo3Fa8yJUrvcGnJnA7SJuuteEeGx0yP702Ab3Tv7xQzJUBoTvZGZq8 B9t2KZYiBd/AjsLgku7v9da5WxmbZvENQqvIZvAfqfEyDSPMJrwYKPMc1FBVV8q8ouh6 imcYPyNG1co9jMMASGmwdRYoH9kj2aD3BXBGrFiekQbp8II1hUU9SenVSmNqlwbsmMLD 8SfBKTGiixgvSBRpKmQarGAM+kPe6AvEggGFQWCo3DyDRKp9z/SJXF8yiiCcDTw7cH7U VL+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717517694; x=1718122494; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=sog84U7Wd5TBpIF8EHL5jNYn8tkvMRV0fzjn9o9wjNM=; b=anpvOd7frEKlW0mE+NUcWr2FtdaKDXTRMUNKKB2AqgVhxGE64+EGXVI2ZKluX2QBpL uWQuXJGN9IJ08U8EgbYi49ksFasOQPvxPHVWVhgkkU9VNnwD5hTVsgPTe2Uu5xV060Z7 fIDLRvomg7qTayr0aJiMXxV1jQcg6/o+HFHcWo+R5/7XnzIMwDcLJHZIgWzaqu4OSffZ fkgMtyuE0hO8KbZjkcGAgBtED7mmwgyUP3ZFTtQ33yAHIN80Ae2iOm55F8eybsewtuwA gjKFF1CxIK4Uuk4LSzpNwTdcynY0TlPjVQLLsoDgsSdb7TnaB3TK1bw7U3m+uvuR5uSd H6yw== X-Forwarded-Encrypted: i=1; AJvYcCVuQw43+QvQbNpQd84gu+5MBm8wrbyp1mVzILiW+FQBAvxi7pMjAf2E0SkeKy4aMDyuudEh+2bFfs7lfLbyy9PgLACZzs9yPF+5tnsltPemoilZwUc= X-Gm-Message-State: AOJu0YxGdVgUSXjfe7oLJE7rZldtFsZr4OOKlEP0L3FaGw8bTDk1eeam QH5XBdj0XIiEiZkLAZcbyArSt2/uiuzLxl/akOUa+aPgVdNcHYPmnfEE3vVokw== X-Google-Smtp-Source: AGHT+IHORJ6oTFX5Gt9IksIYn5pHPDh+i7h51QlKwFVCpGyoweS9KLKWHiKZzbzJ90ofU21HdPIECA== X-Received: by 2002:a05:600c:5122:b0:41b:e55c:8dca with SMTP id 5b1f17b1804b1-4214b226851mr2552395e9.7.1717517694401; Tue, 04 Jun 2024 09:14:54 -0700 (PDT) Received: from google.com (230.213.79.34.bc.googleusercontent.com. [34.79.213.230]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4214f46edd4sm26319855e9.45.2024.06.04.09.14.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jun 2024 09:14:54 -0700 (PDT) Date: Tue, 4 Jun 2024 16:14:50 +0000 From: Mostafa Saleh To: Jason Gunthorpe Cc: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Ryan Roberts Subject: Re: [PATCH 6/7] iommu/arm-smmu-v3: Shrink the cdtab l1_desc array Message-ID: References: <0-v1-1b720dce51d1+4f44-smmuv3_tidy_jgg@nvidia.com> <6-v1-1b720dce51d1+4f44-smmuv3_tidy_jgg@nvidia.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <6-v1-1b720dce51d1+4f44-smmuv3_tidy_jgg@nvidia.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240604_091456_548351_0752DE25 X-CRM114-Status: GOOD ( 26.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Jason, On Mon, Jun 03, 2024 at 07:31:32PM -0300, Jason Gunthorpe wrote: > The top of the 2 level CD table is (at most) 1024 entries big, and two > high order allocations are required. One of __le64 which is programmed > into the HW (8k) and one of struct arm_smmu_l1_ctx_desc which holds the > CPU pointer (16k). > > There are two copies of the l2ptr_dma, one is stored in the struct > arm_smmu_l1_ctx_desc, and another is encoded in the __le64 for the HW to > use. Instead of storing two copies just decode the value from the __le64. > > Signed-off-by: Jason Gunthorpe > --- > drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 35 ++++++++++----------- > drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 1 - > 2 files changed, 16 insertions(+), 20 deletions(-) > > diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > index 3f2e0462433d2d..7a6c9aac4cd450 100644 > --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > @@ -1167,28 +1167,19 @@ static void arm_smmu_sync_cd(struct arm_smmu_master *master, > arm_smmu_cmdq_batch_submit(smmu, &cmds); > } > > -static int arm_smmu_alloc_cd_leaf_table(struct arm_smmu_device *smmu, > - struct arm_smmu_l1_ctx_desc *l1_desc) > +static void arm_smmu_write_cd_l1_desc(__le64 *dst, dma_addr_t l2ptr_dma) > { > - size_t size = CTXDESC_L2_ENTRIES * sizeof(struct arm_smmu_cd); > - > - l1_desc->l2ptr = dma_alloc_coherent(smmu->dev, size, > - &l1_desc->l2ptr_dma, GFP_KERNEL); > - if (!l1_desc->l2ptr) > - return -ENOMEM; > - return 0; > -} > - > -static void arm_smmu_write_cd_l1_desc(__le64 *dst, > - struct arm_smmu_l1_ctx_desc *l1_desc) > -{ > - u64 val = (l1_desc->l2ptr_dma & CTXDESC_L1_DESC_L2PTR_MASK) | > - CTXDESC_L1_DESC_V; > + u64 val = (l2ptr_dma & CTXDESC_L1_DESC_L2PTR_MASK) | CTXDESC_L1_DESC_V; > > /* The HW has 64 bit atomicity with stores to the L2 CD table */ > WRITE_ONCE(*dst, cpu_to_le64(val)); > } > > +static dma_addr_t arm_smmu_cd_l1_get_desc(__le64 *src) > +{ > + return le64_to_cpu(*src) & CTXDESC_L1_DESC_L2PTR_MASK; > +} > + > struct arm_smmu_cd *arm_smmu_get_cd_ptr(struct arm_smmu_master *master, > u32 ssid) > { > @@ -1227,13 +1218,18 @@ struct arm_smmu_cd *arm_smmu_alloc_cd_ptr(struct arm_smmu_master *master, > > l1_desc = &cd_table->l1_desc[idx]; > if (!l1_desc->l2ptr) { > + dma_addr_t l2ptr_dma; > __le64 *l1ptr; > > - if (arm_smmu_alloc_cd_leaf_table(smmu, l1_desc)) > + l1_desc->l2ptr = dma_alloc_coherent( > + smmu->dev, > + CTXDESC_L2_ENTRIES * sizeof(struct arm_smmu_cd), > + &l2ptr_dma, GFP_KERNEL); > + if (!l1_desc->l2ptr) > return NULL; > > l1ptr = &cd_table->cdtab.l1_desc[idx]; > - arm_smmu_write_cd_l1_desc(l1ptr, l1_desc); > + arm_smmu_write_cd_l1_desc(l1ptr, l2ptr_dma); > /* An invalid L1CD can be cached */ > arm_smmu_sync_cd(master, ssid, false); > } > @@ -1406,7 +1402,8 @@ static void arm_smmu_free_cd_tables(struct arm_smmu_master *master) > > dma_free_coherent(smmu->dev, size, > cd_table->l1_desc[i].l2ptr, > - cd_table->l1_desc[i].l2ptr_dma); > + arm_smmu_cd_l1_get_desc( > + &cd_table->cdtab.l1_desc[i])); > } > kfree(cd_table->l1_desc); > > diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h > index 21c1acf34dd29c..1ffe2fdfd3755f 100644 > --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h > +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h > @@ -587,7 +587,6 @@ struct arm_smmu_ctx_desc { > > struct arm_smmu_l1_ctx_desc { > struct arm_smmu_cd *l2ptr; > - dma_addr_t l2ptr_dma; Maybe now we can also get rid of arm_smmu_l1_ctx_desc, and embed l2ptr directly in arm_smmu_ctx_desc_cfg? > }; > > struct arm_smmu_ctx_desc_cfg { > -- > 2.45.2 > Thanks, Mostafa _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel