From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (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 935371A269 for ; Tue, 4 Jun 2024 16:01:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717516902; cv=none; b=OxdcHwpQZAIUbJK4nL4keHOAT1QesbZZ3CF2zL2xUZORfCjnh+VOJimQk5d5+fplPndcgh6JhaSephjVw/LRaonQyIx2juDacmwQ3Q9w6CfXOFJsiRnzl1fX4AwmDlvCkGPRbrWDll+5bFrrkdEpgZqksONrGEeF7UfsKY6kkbg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717516902; c=relaxed/simple; bh=R+jDvWtyrjG2OM7iDEB4WKKq+nY6RPTFbp8Br2Pc0OU=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=ACUVrc3oZwV8zdAPEWWAbRHlQm2m8yqJm7w+1jcLyTrUtIiXAnYNRTK9XNQ//4Ws6y4LGTG+b9VnLDamX71f0ttoVblwmrsRBlC0/v3VdEU2nb5rUdQ5CbMVelkPz19J+RQhAmm82jjf/Tpm14Dme5PjF/CfcvdPzJGJx3txLK0= 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=lARXnf4U; arc=none smtp.client-ip=209.85.208.52 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="lARXnf4U" Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-57a16f4b8bfso15519a12.0 for ; Tue, 04 Jun 2024 09:01:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1717516899; x=1718121699; darn=lists.linux.dev; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=5sDyHX8QmmV3/QPRkJPGCst6kWW/P8hQxMehL8hNX3Y=; b=lARXnf4UIxkfNVHRzMVbn2M3KiRJl+FLSlRMph7OxEd3FzMoLKCg5XhtL6UIeGsgph PKqJPqzzrsg79GmMfdddcsfKoeONTsnbczYvgHMxLP1uoLZZSDWo9AO6m+hXa1+Ohfuz J14h0LYlUfi/K5Bb4BfV0bkFhjXwc8/3Epw3cS9IaHWjsKTQoEOy8Ssvw4qR+RLyvMhq 9RGx4se1MFIZ0+j99e8UnjqKj8Pu5pBxxtBvW4co/qv1K/emmFDz5nXOJXMDcwDVgI3R TSZLEqf6qZwMffQiTfO66//vI0QOXxJyJcl2Z436KC2jk2lgpHBA8dO3rZKGixs8q8r2 SwOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717516899; x=1718121699; h=in-reply-to:content-transfer-encoding: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=5sDyHX8QmmV3/QPRkJPGCst6kWW/P8hQxMehL8hNX3Y=; b=k9/FJSnZY2pMZG5fP0A84ytSfv9x81ectUldYZncKWbknQ4XN/C8G+JOuKu+xXAcN+ tF/g5NOsmYqRbtvT+Z8Y6X2HJD8gZhwgHYA6SP+CqZGHH2thfmmhxuksbY944iyXSVW5 E3eiTdwE7zGy6bmh6oPbDve+JbcCKy7II2AlIi/+DvVh+jC0DTdVexb1fas70atQRFOe +ZCnTJQ3sqqKmhGYRBsoe2RN0fPzYE6majvLdmqs/jBR3SzPYme2rmPow4dGpsEsVDHf 6w/EyqfQ6q1z/cx1OG1py9toJQkXrxuU/ZLwBe33p52uJIqUXYQAPfzAwgImzGO+2EAk ED9A== X-Gm-Message-State: AOJu0YwKTZ6eGghJfMdGVWmLwhLGIidY5mfwFD1oSQc8ZevupQUxy2s5 3fe9t2RU3rluWUJwmAqcQewzlXgcAuhX0kgY8k84RTR0xyBtkWCgg4t/fr5HOA== X-Google-Smtp-Source: AGHT+IF/Y8fneq1ZfCQ8Xb1nbB2+gLqpJQuXXgr/ND/41kEm1jE0lksXx31VmwPCgMLeHPLBErO9xg== X-Received: by 2002:aa7:d752:0:b0:576:b1a9:2960 with SMTP id 4fb4d7f45d1cf-57a805b202bmr134474a12.5.1717516898500; Tue, 04 Jun 2024 09:01:38 -0700 (PDT) Received: from google.com (230.213.79.34.bc.googleusercontent.com. [34.79.213.230]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35dd04c0f47sm11988161f8f.8.2024.06.04.09.01.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jun 2024 09:01:38 -0700 (PDT) Date: Tue, 4 Jun 2024 16:01:34 +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 3/7] iommu/arm-smmu-v3: Shrink the strtab l1_desc array Message-ID: References: <0-v1-1b720dce51d1+4f44-smmuv3_tidy_jgg@nvidia.com> <3-v1-1b720dce51d1+4f44-smmuv3_tidy_jgg@nvidia.com> Precedence: bulk X-Mailing-List: iommu@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <3-v1-1b720dce51d1+4f44-smmuv3_tidy_jgg@nvidia.com> Hi Jason, On Mon, Jun 03, 2024 at 07:31:29PM -0300, Jason Gunthorpe wrote: > The top of the 2 level stream table is (at most) 128k entries big, and two > high order allocations are required. One of __le64 which is programmed > into the HW (1M), and one of struct arm_smmu_strtab_l1_desc which holds > the CPU pointer (3M). > > There is no reason to store the l2ptr_dma as nothing reads it. devm stores > a copy of it and the DMA memory will be freed via devm mechanisms. span is > a constant of 8+1. Remove both. > This caught my eye before, I imagine(although I was not there) there was some thought about having different spans per SMMUs maybe, but that’s not the case. > This removes 16 bytes from each arm_smmu_l1_ctx_desc and saves up to 2M of > memory per iommu instance. > > Signed-off-by: Jason Gunthorpe Reviewed-by: Mostafa Saleh > --- > drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 14 +++++++------- > drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 3 --- > 2 files changed, 7 insertions(+), 10 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 d27dd0600bf1df..735dd9ff61890e 100644 > --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > @@ -1448,12 +1448,12 @@ bool arm_smmu_free_asid(struct arm_smmu_ctx_desc *cd) > > /* Stream table manipulation functions */ > static void > -arm_smmu_write_strtab_l1_desc(__le64 *dst, struct arm_smmu_strtab_l1_desc *desc) > +arm_smmu_write_strtab_l1_desc(__le64 *dst, dma_addr_t l2ptr_dma, u8 span) > { > u64 val = 0; > > - val |= FIELD_PREP(STRTAB_L1_DESC_SPAN, desc->span); > - val |= desc->l2ptr_dma & STRTAB_L1_DESC_L2PTR_MASK; > + val |= FIELD_PREP(STRTAB_L1_DESC_SPAN, span); > + val |= l2ptr_dma & STRTAB_L1_DESC_L2PTR_MASK; > > /* The HW has 64 bit atomicity with stores to the L2 STE table */ > WRITE_ONCE(*dst, cpu_to_le64(val)); > @@ -1655,6 +1655,7 @@ static int arm_smmu_init_l2_strtab(struct arm_smmu_device *smmu, u32 sid) > { > size_t size; > void *strtab; > + dma_addr_t l2ptr_dma; > struct arm_smmu_strtab_cfg *cfg = &smmu->strtab_cfg; > struct arm_smmu_strtab_l1_desc *desc = &cfg->l1_desc[sid >> STRTAB_SPLIT]; > > @@ -1664,9 +1665,8 @@ static int arm_smmu_init_l2_strtab(struct arm_smmu_device *smmu, u32 sid) > size = (1 << STRTAB_SPLIT) * sizeof(struct arm_smmu_ste); > strtab = &cfg->strtab.l1_desc[sid >> STRTAB_SPLIT]; > > - desc->span = STRTAB_SPLIT + 1; > - desc->l2ptr = dmam_alloc_coherent(smmu->dev, size, &desc->l2ptr_dma, > - GFP_KERNEL); > + desc->l2ptr = > + dmam_alloc_coherent(smmu->dev, size, &l2ptr_dma, GFP_KERNEL); > if (!desc->l2ptr) { > dev_err(smmu->dev, > "failed to allocate l2 stream table for SID %u\n", > @@ -1675,7 +1675,7 @@ static int arm_smmu_init_l2_strtab(struct arm_smmu_device *smmu, u32 sid) > } > > arm_smmu_init_initial_stes(desc->l2ptr, 1 << STRTAB_SPLIT); > - arm_smmu_write_strtab_l1_desc(strtab, desc); > + arm_smmu_write_strtab_l1_desc(strtab, l2ptr_dma, STRTAB_SPLIT + 1); > return 0; > } > > 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 4769780259affc..280a04bfb7230c 100644 > --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h > +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h > @@ -577,10 +577,7 @@ struct arm_smmu_priq { > > /* High-level stream table and context descriptor structures */ > struct arm_smmu_strtab_l1_desc { > - u8 span; > - > struct arm_smmu_ste *l2ptr; > - dma_addr_t l2ptr_dma; > }; > > struct arm_smmu_ctx_desc { > -- > 2.45.2 > 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 16C06C27C52 for ; Tue, 4 Jun 2024 16:02:04 +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=hBb2mc6EdKdR9eLN4rmOdVoSHoAmIFJ+XT78BWl2jng=; b=uucyky2BU/YgHa AEUI2B6yuxdCIp47kjCmQwLxqoHnll2Q5RHTRMZWKa9HLG08c2dkAbZULRtk7tfr8V+EwmVOQqpTN SjQNLI2fqt24i7EVitlawlIzJ/6MWlznyfiCCPzipQfdBlVGxbpejIq0xuW2LMpQBikusLYqVvzeB FfvmIMxZ5r/1Atqa6Dh4AfWrnRiSRO7N9SZTFPGK56Lkze+1h1XJLXaVlUKvniLKjR+coKFv0JnN3 SvEM7vAvXpMYoabKNMFSZb+aOowQXzfeqwr+RJ7k/ji+exVa48h6qBTvJgHlAPvTNnzw8hLtjaxLb Nk5WIjy5CNm/8CFYgibg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sEWbZ-000000032h4-0btn; Tue, 04 Jun 2024 16:01:45 +0000 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sEWbV-000000032fH-38vm for linux-arm-kernel@lists.infradead.org; Tue, 04 Jun 2024 16:01:43 +0000 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-57a16f4b8bfso15516a12.0 for ; Tue, 04 Jun 2024 09:01:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1717516899; x=1718121699; darn=lists.infradead.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=5sDyHX8QmmV3/QPRkJPGCst6kWW/P8hQxMehL8hNX3Y=; b=jeqqQItvuwKKb4Q6iy0SyOnMDrOuepCRHFVIjI6+n+iCL3OFwt6kd6vNsd8DAuQ8X4 VQ14pXbXVuX4pxmtUi2T+ARX6UBiwArrhOOjU1Par2KIL77sfykERVDulR00ihbjr7m0 VRBt7hy7wCLR36ebY3Q7h4RiAe6J0y6GxAQqAzJ3QlT1IZGzeg9mC2e8HTvbf1aeQ5Qv iPvs9DJyGozJy2fgA8uLd50ueSYwTbCHXp95znWi4Tl9sXqnB7hZN4cAwkl+ff6qxOui xDByMy83ZODa5rpdGF8fFzjenF3lZzKJR5R+gMAN+4X6DuGzAPRBtahulhBDqfWm3+Lc IBXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717516899; x=1718121699; h=in-reply-to:content-transfer-encoding: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=5sDyHX8QmmV3/QPRkJPGCst6kWW/P8hQxMehL8hNX3Y=; b=q1YzDB1fZ2dpl8t1a95eUI/T6doYzpY9LFLX9Vu0OJwWjqXXGS1mjwQUn5ZmTehwCM 5cs/TE0ov/1XtyW4nk3r4xa7Kaldc1cd91OTl7FAfDyIP+K/HH0v64nZcMrwejaruqqU mo6GEcPLBpe4x0055gXYRlUZiX/CaI0jZN3iqbJR17Ew/N5ArQn9hxk3a8af9YP1MTTk C2hiJVRIMHRXupPUVUu6utKfiqUhk3Ei2ijL2jvRFj40a0o2RlIk1RZeHC+41ZCHd1Bd M86fJwR66KQKcQFbbzlOafp03I2ZbdcytUZ8p61yR4Bdu/RTKKQ1QM3w1Ii3RA3jqjdM h7rQ== X-Forwarded-Encrypted: i=1; AJvYcCVJi5MsOu6LcAejBuaPNv+2etmJOYHCs5UYBM7kESe0+MnH71rSA3icj52E727cU82RZC1kX4ExujSLVoUcUOIr4Ed1w8T7jK33srphPo3iXBMP/+s= X-Gm-Message-State: AOJu0YzYeDcn8zglEjydd+HZPXMg1RaffswIOjsgBGcQvS6NcNEzfmA8 J+xnTLa4FNOdKKVu6amNHb/6ZfVMLboc7z3JsYkmX5QCXyc98VqRLkwCtgd2bQ== X-Google-Smtp-Source: AGHT+IF/Y8fneq1ZfCQ8Xb1nbB2+gLqpJQuXXgr/ND/41kEm1jE0lksXx31VmwPCgMLeHPLBErO9xg== X-Received: by 2002:aa7:d752:0:b0:576:b1a9:2960 with SMTP id 4fb4d7f45d1cf-57a805b202bmr134474a12.5.1717516898500; Tue, 04 Jun 2024 09:01:38 -0700 (PDT) Received: from google.com (230.213.79.34.bc.googleusercontent.com. [34.79.213.230]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35dd04c0f47sm11988161f8f.8.2024.06.04.09.01.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jun 2024 09:01:38 -0700 (PDT) Date: Tue, 4 Jun 2024 16:01:34 +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 3/7] iommu/arm-smmu-v3: Shrink the strtab l1_desc array Message-ID: References: <0-v1-1b720dce51d1+4f44-smmuv3_tidy_jgg@nvidia.com> <3-v1-1b720dce51d1+4f44-smmuv3_tidy_jgg@nvidia.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <3-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_090141_951860_DE482A68 X-CRM114-Status: GOOD ( 24.50 ) 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="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org SGkgSmFzb24sCgpPbiBNb24sIEp1biAwMywgMjAyNCBhdCAwNzozMToyOVBNIC0wMzAwLCBKYXNv biBHdW50aG9ycGUgd3JvdGU6Cj4gVGhlIHRvcCBvZiB0aGUgMiBsZXZlbCBzdHJlYW0gdGFibGUg aXMgKGF0IG1vc3QpIDEyOGsgZW50cmllcyBiaWcsIGFuZCB0d28KPiBoaWdoIG9yZGVyIGFsbG9j YXRpb25zIGFyZSByZXF1aXJlZC4gT25lIG9mIF9fbGU2NCB3aGljaCBpcyBwcm9ncmFtbWVkCj4g aW50byB0aGUgSFcgKDFNKSwgYW5kIG9uZSBvZiBzdHJ1Y3QgYXJtX3NtbXVfc3RydGFiX2wxX2Rl c2Mgd2hpY2ggaG9sZHMKPiB0aGUgQ1BVIHBvaW50ZXIgKDNNKS4KPiAKPiBUaGVyZSBpcyBubyBy ZWFzb24gdG8gc3RvcmUgdGhlIGwycHRyX2RtYSBhcyBub3RoaW5nIHJlYWRzIGl0LiBkZXZtIHN0 b3Jlcwo+IGEgY29weSBvZiBpdCBhbmQgdGhlIERNQSBtZW1vcnkgd2lsbCBiZSBmcmVlZCB2aWEg ZGV2bSBtZWNoYW5pc21zLiBzcGFuIGlzCj4gYSBjb25zdGFudCBvZiA4KzEuIFJlbW92ZSBib3Ro Lgo+IApUaGlzIGNhdWdodCBteSBleWUgYmVmb3JlLCBJIGltYWdpbmUoYWx0aG91Z2ggSSB3YXMg bm90IHRoZXJlKSB0aGVyZSB3YXMgc29tZQp0aG91Z2h0IGFib3V0IGhhdmluZyBkaWZmZXJlbnQg c3BhbnMgcGVyIFNNTVVzIG1heWJlLCBidXQgdGhhdOKAmXMgbm90IHRoZSBjYXNlLgoKPiBUaGlz IHJlbW92ZXMgMTYgYnl0ZXMgZnJvbSBlYWNoIGFybV9zbW11X2wxX2N0eF9kZXNjIGFuZCBzYXZl cyB1cCB0byAyTSBvZgo+IG1lbW9yeSBwZXIgaW9tbXUgaW5zdGFuY2UuCj4gCj4gU2lnbmVkLW9m Zi1ieTogSmFzb24gR3VudGhvcnBlIDxqZ2dAbnZpZGlhLmNvbT4KClJldmlld2VkLWJ5OiBNb3N0 YWZhIFNhbGVoIDxzbW9zdGFmYUBnb29nbGUuY29tPgoKPiAtLS0KPiAgZHJpdmVycy9pb21tdS9h cm0vYXJtLXNtbXUtdjMvYXJtLXNtbXUtdjMuYyB8IDE0ICsrKysrKystLS0tLS0tCj4gIGRyaXZl cnMvaW9tbXUvYXJtL2FybS1zbW11LXYzL2FybS1zbW11LXYzLmggfCAgMyAtLS0KPiAgMiBmaWxl cyBjaGFuZ2VkLCA3IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1n aXQgYS9kcml2ZXJzL2lvbW11L2FybS9hcm0tc21tdS12My9hcm0tc21tdS12My5jIGIvZHJpdmVy cy9pb21tdS9hcm0vYXJtLXNtbXUtdjMvYXJtLXNtbXUtdjMuYwo+IGluZGV4IGQyN2RkMDYwMGJm MWRmLi43MzVkZDlmZjYxODkwZSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2lvbW11L2FybS9hcm0t c21tdS12My9hcm0tc21tdS12My5jCj4gKysrIGIvZHJpdmVycy9pb21tdS9hcm0vYXJtLXNtbXUt djMvYXJtLXNtbXUtdjMuYwo+IEBAIC0xNDQ4LDEyICsxNDQ4LDEyIEBAIGJvb2wgYXJtX3NtbXVf ZnJlZV9hc2lkKHN0cnVjdCBhcm1fc21tdV9jdHhfZGVzYyAqY2QpCj4gIAo+ICAvKiBTdHJlYW0g dGFibGUgbWFuaXB1bGF0aW9uIGZ1bmN0aW9ucyAqLwo+ICBzdGF0aWMgdm9pZAo+IC1hcm1fc21t dV93cml0ZV9zdHJ0YWJfbDFfZGVzYyhfX2xlNjQgKmRzdCwgc3RydWN0IGFybV9zbW11X3N0cnRh Yl9sMV9kZXNjICpkZXNjKQo+ICthcm1fc21tdV93cml0ZV9zdHJ0YWJfbDFfZGVzYyhfX2xlNjQg KmRzdCwgZG1hX2FkZHJfdCBsMnB0cl9kbWEsIHU4IHNwYW4pCj4gIHsKPiAgCXU2NCB2YWwgPSAw Owo+ICAKPiAtCXZhbCB8PSBGSUVMRF9QUkVQKFNUUlRBQl9MMV9ERVNDX1NQQU4sIGRlc2MtPnNw YW4pOwo+IC0JdmFsIHw9IGRlc2MtPmwycHRyX2RtYSAmIFNUUlRBQl9MMV9ERVNDX0wyUFRSX01B U0s7Cj4gKwl2YWwgfD0gRklFTERfUFJFUChTVFJUQUJfTDFfREVTQ19TUEFOLCBzcGFuKTsKPiAr CXZhbCB8PSBsMnB0cl9kbWEgJiBTVFJUQUJfTDFfREVTQ19MMlBUUl9NQVNLOwo+ICAKPiAgCS8q IFRoZSBIVyBoYXMgNjQgYml0IGF0b21pY2l0eSB3aXRoIHN0b3JlcyB0byB0aGUgTDIgU1RFIHRh YmxlICovCj4gIAlXUklURV9PTkNFKCpkc3QsIGNwdV90b19sZTY0KHZhbCkpOwo+IEBAIC0xNjU1 LDYgKzE2NTUsNyBAQCBzdGF0aWMgaW50IGFybV9zbW11X2luaXRfbDJfc3RydGFiKHN0cnVjdCBh cm1fc21tdV9kZXZpY2UgKnNtbXUsIHUzMiBzaWQpCj4gIHsKPiAgCXNpemVfdCBzaXplOwo+ICAJ dm9pZCAqc3RydGFiOwo+ICsJZG1hX2FkZHJfdCBsMnB0cl9kbWE7Cj4gIAlzdHJ1Y3QgYXJtX3Nt bXVfc3RydGFiX2NmZyAqY2ZnID0gJnNtbXUtPnN0cnRhYl9jZmc7Cj4gIAlzdHJ1Y3QgYXJtX3Nt bXVfc3RydGFiX2wxX2Rlc2MgKmRlc2MgPSAmY2ZnLT5sMV9kZXNjW3NpZCA+PiBTVFJUQUJfU1BM SVRdOwo+ICAKPiBAQCAtMTY2NCw5ICsxNjY1LDggQEAgc3RhdGljIGludCBhcm1fc21tdV9pbml0 X2wyX3N0cnRhYihzdHJ1Y3QgYXJtX3NtbXVfZGV2aWNlICpzbW11LCB1MzIgc2lkKQo+ICAJc2l6 ZSA9ICgxIDw8IFNUUlRBQl9TUExJVCkgKiBzaXplb2Yoc3RydWN0IGFybV9zbW11X3N0ZSk7Cj4g IAlzdHJ0YWIgPSAmY2ZnLT5zdHJ0YWIubDFfZGVzY1tzaWQgPj4gU1RSVEFCX1NQTElUXTsKPiAg Cj4gLQlkZXNjLT5zcGFuID0gU1RSVEFCX1NQTElUICsgMTsKPiAtCWRlc2MtPmwycHRyID0gZG1h bV9hbGxvY19jb2hlcmVudChzbW11LT5kZXYsIHNpemUsICZkZXNjLT5sMnB0cl9kbWEsCj4gLQkJ CQkJICBHRlBfS0VSTkVMKTsKPiArCWRlc2MtPmwycHRyID0KPiArCQlkbWFtX2FsbG9jX2NvaGVy ZW50KHNtbXUtPmRldiwgc2l6ZSwgJmwycHRyX2RtYSwgR0ZQX0tFUk5FTCk7Cj4gIAlpZiAoIWRl c2MtPmwycHRyKSB7Cj4gIAkJZGV2X2VycihzbW11LT5kZXYsCj4gIAkJCSJmYWlsZWQgdG8gYWxs b2NhdGUgbDIgc3RyZWFtIHRhYmxlIGZvciBTSUQgJXVcbiIsCj4gQEAgLTE2NzUsNyArMTY3NSw3 IEBAIHN0YXRpYyBpbnQgYXJtX3NtbXVfaW5pdF9sMl9zdHJ0YWIoc3RydWN0IGFybV9zbW11X2Rl dmljZSAqc21tdSwgdTMyIHNpZCkKPiAgCX0KPiAgCj4gIAlhcm1fc21tdV9pbml0X2luaXRpYWxf c3RlcyhkZXNjLT5sMnB0ciwgMSA8PCBTVFJUQUJfU1BMSVQpOwo+IC0JYXJtX3NtbXVfd3JpdGVf c3RydGFiX2wxX2Rlc2Moc3RydGFiLCBkZXNjKTsKPiArCWFybV9zbW11X3dyaXRlX3N0cnRhYl9s MV9kZXNjKHN0cnRhYiwgbDJwdHJfZG1hLCBTVFJUQUJfU1BMSVQgKyAxKTsKPiAgCXJldHVybiAw Owo+ICB9Cj4gIAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2lvbW11L2FybS9hcm0tc21tdS12My9h cm0tc21tdS12My5oIGIvZHJpdmVycy9pb21tdS9hcm0vYXJtLXNtbXUtdjMvYXJtLXNtbXUtdjMu aAo+IGluZGV4IDQ3Njk3ODAyNTlhZmZjLi4yODBhMDRiZmI3MjMwYyAxMDA2NDQKPiAtLS0gYS9k cml2ZXJzL2lvbW11L2FybS9hcm0tc21tdS12My9hcm0tc21tdS12My5oCj4gKysrIGIvZHJpdmVy cy9pb21tdS9hcm0vYXJtLXNtbXUtdjMvYXJtLXNtbXUtdjMuaAo+IEBAIC01NzcsMTAgKzU3Nyw3 IEBAIHN0cnVjdCBhcm1fc21tdV9wcmlxIHsKPiAgCj4gIC8qIEhpZ2gtbGV2ZWwgc3RyZWFtIHRh YmxlIGFuZCBjb250ZXh0IGRlc2NyaXB0b3Igc3RydWN0dXJlcyAqLwo+ICBzdHJ1Y3QgYXJtX3Nt bXVfc3RydGFiX2wxX2Rlc2Mgewo+IC0JdTgJCQkJc3BhbjsKPiAtCj4gIAlzdHJ1Y3QgYXJtX3Nt bXVfc3RlCQkqbDJwdHI7Cj4gLQlkbWFfYWRkcl90CQkJbDJwdHJfZG1hOwo+ICB9Owo+ICAKPiAg c3RydWN0IGFybV9zbW11X2N0eF9kZXNjIHsKPiAtLSAKPiAyLjQ1LjIKPiAKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFp bGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlz dHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK