From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 EC8F110A2C for ; Fri, 19 Apr 2024 21:14:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713561269; cv=none; b=gYVJh6JOPiM4sxPkLv0KrWZanxgkPgKwVVO38t1Dui5fN74is427SCpnnZeee+M0VG9TnZpcpK+LDauOShiN6wg22MCj7m6HY9nN9tBx89l1LOWlkYCa545zzXRMiasG5jvcqa39TVwJ4wxVTQFwMKmAOcQg+tTcazrikn49hYc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713561269; c=relaxed/simple; bh=ei3WV3eKZApVvjnxFDD/9l86kQvXZQuBIlUUHzX/AZE=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=h/oW3+49lFkhSGNuJXzaK02CJknD7yz2ucs56xoqt37J9wh6B264kOGF9+WiT9j5l6zhm2G4Qu2qDo6ICpWix2y5lDIAhTf1abaQ3kSX1rdf4t6ZITSFuXaa/FKi0DuKR+6SDLGnESBbGWsBh7B+eBz1pjq0cLmkg9UpImN0f4g= 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=u1kWXPS1; arc=none smtp.client-ip=209.85.128.43 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="u1kWXPS1" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-41699bbfb91so19915e9.0 for ; Fri, 19 Apr 2024 14:14:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1713561265; x=1714166065; 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=NBshQTXstt+sMGqJKp0WLRunXAoergcq+aJYNYcSuag=; b=u1kWXPS138E91R5F+D71rDKLNaUN7wJKZ3u1SS6nsH2vdkTUft+mMgj8XEo3YUXmJ6 I5Q/Svckq4LS1Cq/jD1qMv6ZOqAewjSsCP+mNvnrj94TYBLJSOkjoq47nsrr/h3OVklL Mj+kHuFPfaIO9V9s5OF7eEWKQooeer8xeqVc98CrzVj7qR8cFNEZOtsAEgrpnAFKIWA1 CFhMGR+y8ydkOZiyGjG6SkR7eFHwZR9qQEwy6ccRUdHAzZYhMsTqXe5CuSIgRN7IMD3Q YFbje3AWmAJuxZ49DWeFyAzK/9AvFNa5ayKu2mqMju9LAerVhFSYiQONNgJLu9G/YJaX 6PYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713561265; x=1714166065; 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=NBshQTXstt+sMGqJKp0WLRunXAoergcq+aJYNYcSuag=; b=NL7Cs5CSvLraaEcm2y/J5bMKhv1F72ng9NMcBnrvNS/WhpyYYvMfd/v86FN4T3Hapa lag2DsnAZryix9FHOy2KoOYaeXe8HTE7rnFa7oNiSvRKo6BcgSdicWOmmBy4wmb+pdhu i9OMgJXFy2sETfzjujMvbmDcDVKvIm6vefmHrDmxJ0ND7ZYerncinwITTvkBcC4FY+A/ vsSAnNA4ptb91JD8uNv0fhfYi6MDpjJohVtCgx+gxEvnJ9VnpXfXxffbGKu4cfhEjaFG k+5OKPjTR7oZuJRoQO1cvbo3Aj7BNqJX5CH838aq3WpuWwXRUWHBzhukWhVjd8xc6fiz 4MXA== X-Gm-Message-State: AOJu0YwwZRyHAZ2CXmpawj0wdbQnSSZEg3Np0dqEyuJYoDy69TCHqMvJ 40D+vmr8Q3g5/9w61FrnBcTeh3B2b2obz4Fdco/hn28K4LvAOyzotpcJD2LePTYLDyZpxXPE9J2 gng== X-Google-Smtp-Source: AGHT+IFLigvap1IyJFZX6L4BzxYOOZ93Cld6hXcotWfnlKp+57JZRX+1O7JEsAQnzJVywfRXaFaiAg== X-Received: by 2002:a05:600c:4f87:b0:418:39a2:3820 with SMTP id n7-20020a05600c4f8700b0041839a23820mr11030wmq.5.1713561265188; Fri, 19 Apr 2024 14:14:25 -0700 (PDT) Received: from google.com (180.232.140.34.bc.googleusercontent.com. [34.140.232.180]) by smtp.gmail.com with ESMTPSA id o8-20020adfcf08000000b00345c2f84d5asm5304082wrj.10.2024.04.19.14.14.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 14:14:24 -0700 (PDT) Date: Fri, 19 Apr 2024 21:14:21 +0000 From: Mostafa Saleh To: Jason Gunthorpe Cc: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon , Eric Auger , Moritz Fischer , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameerali Kolothum Thodi Subject: Re: [PATCH v7 5/9] iommu/arm-smmu-v3: Make arm_smmu_alloc_cd_ptr() Message-ID: References: <0-v7-cb149db3a320+3b5-smmuv3_newapi_p2_jgg@nvidia.com> <5-v7-cb149db3a320+3b5-smmuv3_newapi_p2_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: <5-v7-cb149db3a320+3b5-smmuv3_newapi_p2_jgg@nvidia.com> Hi Jason, On Tue, Apr 16, 2024 at 04:28:16PM -0300, Jason Gunthorpe wrote: > Only the attach callers can perform an allocation for the CD table entry, > the other callers must not do so, they do not have the correct locking and > they cannot sleep. Split up the functions so this is clear. > > arm_smmu_get_cd_ptr() will return pointer to a CD table entry without > doing any kind of allocation. > > arm_smmu_alloc_cd_ptr() will allocate the table and any required > leaf. > > A following patch will add lockdep assertions to arm_smmu_alloc_cd_ptr() > once the restructuring is completed and arm_smmu_alloc_cd_ptr() is never > called in the wrong context. > > Signed-off-by: Jason Gunthorpe > --- > drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 61 +++++++++++++-------- > 1 file changed, 39 insertions(+), 22 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 f3df1ec8d258dc..a0d1237272936f 100644 > --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c > @@ -98,6 +98,7 @@ static struct arm_smmu_option_prop arm_smmu_options[] = { > > static int arm_smmu_domain_finalise(struct arm_smmu_domain *smmu_domain, > struct arm_smmu_device *smmu); > +static int arm_smmu_alloc_cd_tables(struct arm_smmu_master *master); > > static void parse_driver_options(struct arm_smmu_device *smmu) > { > @@ -1207,29 +1208,51 @@ static void arm_smmu_write_cd_l1_desc(__le64 *dst, > struct arm_smmu_cd *arm_smmu_get_cd_ptr(struct arm_smmu_master *master, > u32 ssid) > { > - __le64 *l1ptr; > - unsigned int idx; > struct arm_smmu_l1_ctx_desc *l1_desc; > - struct arm_smmu_device *smmu = master->smmu; > struct arm_smmu_ctx_desc_cfg *cd_table = &master->cd_table; > > + if (!cd_table->cdtab) > + return NULL; > + > if (cd_table->s1fmt == STRTAB_STE_0_S1FMT_LINEAR) > return (struct arm_smmu_cd *)(cd_table->cdtab + > ssid * CTXDESC_CD_DWORDS); > > - idx = ssid >> CTXDESC_SPLIT; > - l1_desc = &cd_table->l1_desc[idx]; > - if (!l1_desc->l2ptr) { > - if (arm_smmu_alloc_cd_leaf_table(smmu, l1_desc)) > - return NULL; > + l1_desc = &cd_table->l1_desc[ssid / CTXDESC_L2_ENTRIES]; These operations used to be shift and bit masking which made sense as it does what hardware does, is there any reason you changed it to division and modulo? I checked the disassembly and gcc does the right thing as constants are power of 2, but I am just curious. > + if (!l1_desc->l2ptr) > + return NULL; > + return &l1_desc->l2ptr[ssid % CTXDESC_L2_ENTRIES]; > +} > > - l1ptr = cd_table->cdtab + idx * CTXDESC_L1_DESC_DWORDS; > - arm_smmu_write_cd_l1_desc(l1ptr, l1_desc); > - /* An invalid L1CD can be cached */ > - arm_smmu_sync_cd(master, ssid, false); > +static struct arm_smmu_cd *arm_smmu_alloc_cd_ptr(struct arm_smmu_master *master, > + u32 ssid) > +{ > + struct arm_smmu_ctx_desc_cfg *cd_table = &master->cd_table; > + struct arm_smmu_device *smmu = master->smmu; > + > + if (!cd_table->cdtab) { > + if (arm_smmu_alloc_cd_tables(master)) > + return NULL; > } > - idx = ssid & (CTXDESC_L2_ENTRIES - 1); > - return &l1_desc->l2ptr[idx]; > + > + if (cd_table->s1fmt == STRTAB_STE_0_S1FMT_64K_L2) { > + unsigned int idx = ssid >> CTXDESC_SPLIT; Ok, now it’s a shift, I think we should be consistent with how we calculate the index. > + struct arm_smmu_l1_ctx_desc *l1_desc; > + > + l1_desc = &cd_table->l1_desc[idx]; > + if (!l1_desc->l2ptr) { > + __le64 *l1ptr; > + > + if (arm_smmu_alloc_cd_leaf_table(smmu, l1_desc)) > + return NULL; > + > + l1ptr = cd_table->cdtab + idx * CTXDESC_L1_DESC_DWORDS; > + arm_smmu_write_cd_l1_desc(l1ptr, l1_desc); > + /* An invalid L1CD can be cached */ > + arm_smmu_sync_cd(master, ssid, false); > + } > + } > + return arm_smmu_get_cd_ptr(master, ssid); > } > > struct arm_smmu_cd_writer { > @@ -1357,7 +1380,7 @@ int arm_smmu_write_ctx_desc(struct arm_smmu_master *master, int ssid, > if (WARN_ON(ssid >= (1 << cd_table->s1cdmax))) > return -E2BIG; > > - cd_table_entry = arm_smmu_get_cd_ptr(master, ssid); > + cd_table_entry = arm_smmu_alloc_cd_ptr(master, ssid); The only path allocates the main table is “arm_smmu_attach_dev”, I guess it would be more robust to leave that as is and have 2 versions of get_cd, one that allocates leaf and one that is not allocating, what do you think? Thanks, Mostafa > if (!cd_table_entry) > return -ENOMEM; > > @@ -2687,13 +2710,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) > struct arm_smmu_cd target_cd; > struct arm_smmu_cd *cdptr; > > - if (!master->cd_table.cdtab) { > - ret = arm_smmu_alloc_cd_tables(master); > - if (ret) > - goto out_list_del; > - } > - > - cdptr = arm_smmu_get_cd_ptr(master, IOMMU_NO_PASID); > + cdptr = arm_smmu_alloc_cd_ptr(master, IOMMU_NO_PASID); > if (!cdptr) { > ret = -ENOMEM; > goto out_list_del; > -- > 2.43.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 0E2D7C4345F for ; Fri, 19 Apr 2024 21:14:39 +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=Jq1RjchmkhjD4ZvdxKb/ongcHTM0YrKCVd+YDQ93uIo=; b=ZrI4r4Y83YsLcA NoV8kPrr4kFbqo0UHOr3DtH785783YkOt01WOgLcbdjevM1Imi9YOPojn0MZxvC5i3DCkk8XA8/Cg tsyh5Nid1b2LjKBOU+kH20f65x0bOxUgvNeCfQ935xtsdbso9+BtfF7bqEVC4JlCm5KcJW01jWU0p OZFGjehDRBFVxcV+hadTEKcqbQ1EHcrkwXFkiK4nhnrat/8fisrSM7+QX9ydggEbOHTOBHQWo5EAI /Nom5OyTnb5H9SDlMc9anzlkcrKpT7Xod+nT1WPWtV+h8ETLlqLlDSRZy5SFFqzfO0J5oKLfqqqFO iRgVMz5fbiEs6aiF6g7Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxvZ0-000000070SZ-1at3; Fri, 19 Apr 2024 21:14:30 +0000 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxvYx-000000070S5-3dl4 for linux-arm-kernel@lists.infradead.org; Fri, 19 Apr 2024 21:14:29 +0000 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-418dc2724bbso6005e9.1 for ; Fri, 19 Apr 2024 14:14:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1713561265; x=1714166065; 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=NBshQTXstt+sMGqJKp0WLRunXAoergcq+aJYNYcSuag=; b=yojVXvyfHI09soxklrl/DpR2fePHCWFF/tfh16zhMy6IS/ZXsQ6UF4OyJ76qPM4AX0 38U08BTNvfB/Ngp1BCgbqOgYOKW3w2+UJr8TgNpkavm5NiZrrk8XniL4NJwU6iQdTK24 IU7WQGRMNeeWTd+aC2hmwdZxIE6VxsO5k2YaODW2MhaF9XLruf1tPhzSfJl2GTnYDP9+ mlBlxYfVuSWJygumVI95RX+C3WiYvnsnF4/HeOzB9CuAnM2B5F9JAPPyGXtfV7nYc30C gRxe4XG8sjIbPpzZBHBC8LtmNlJ/Frs1nsj1uDw452lpMg7GSZ9LKS5Dr84ntAiR6at9 NwUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713561265; x=1714166065; 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=NBshQTXstt+sMGqJKp0WLRunXAoergcq+aJYNYcSuag=; b=ua0mSbs2lhEG838rREs+3Ap+yc3ajdtg++a1o/Ak20meWxS2KXLfk8GeuJjykDruqE cQ7lw6oYbcZdtPCGutxxWRR4fMkZDRgrY4vc1Y6vRcpN4JMtcXzmfjt6era79r5K55D4 TBFtZMEmQpd/YJYzEZpiouPFmelStoGRDRoWwGJBvnGn8z9rmaJ3lOYP6NFYcyFtMq5i IyVhiXHtKZrS08wBTa8Uh5HaSKwvGdadfs4axS/Dd4V4qEs6er6ITWktQ08EoyzQG0b5 8S5kV/yeFc7+yTmVkQKmFg/bEiCNQjNd9OTGdqLscvwXlsZqp0CyGkoGVVLhfEejhG9Z j2Mg== X-Forwarded-Encrypted: i=1; AJvYcCX6ZpLXSb7cjB2ZsaKktk+NnyM9zq99DIpF3zOGxXN7pFhP+kZGdeKj1uU/68wYlv4Q8lN1ISAlPyyYUl5yHXJnr4ge9w/xrM99XCxMIOpLOQNtZXs= X-Gm-Message-State: AOJu0Yw5iqNNF7HxWlX8+uIFW5mhm2cGW6JC09YSs4PWO3flThWPJwOZ Qww+5TgJaEitWQpW/7/LhlhNhDXg9AcIs8I4kDO5j0Eni+cbJmcSj3i89vMvsA== X-Google-Smtp-Source: AGHT+IFLigvap1IyJFZX6L4BzxYOOZ93Cld6hXcotWfnlKp+57JZRX+1O7JEsAQnzJVywfRXaFaiAg== X-Received: by 2002:a05:600c:4f87:b0:418:39a2:3820 with SMTP id n7-20020a05600c4f8700b0041839a23820mr11030wmq.5.1713561265188; Fri, 19 Apr 2024 14:14:25 -0700 (PDT) Received: from google.com (180.232.140.34.bc.googleusercontent.com. [34.140.232.180]) by smtp.gmail.com with ESMTPSA id o8-20020adfcf08000000b00345c2f84d5asm5304082wrj.10.2024.04.19.14.14.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 14:14:24 -0700 (PDT) Date: Fri, 19 Apr 2024 21:14:21 +0000 From: Mostafa Saleh To: Jason Gunthorpe Cc: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon , Eric Auger , Moritz Fischer , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameerali Kolothum Thodi Subject: Re: [PATCH v7 5/9] iommu/arm-smmu-v3: Make arm_smmu_alloc_cd_ptr() Message-ID: References: <0-v7-cb149db3a320+3b5-smmuv3_newapi_p2_jgg@nvidia.com> <5-v7-cb149db3a320+3b5-smmuv3_newapi_p2_jgg@nvidia.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5-v7-cb149db3a320+3b5-smmuv3_newapi_p2_jgg@nvidia.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240419_141427_932000_E315FD3E X-CRM114-Status: GOOD ( 29.16 ) 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 SGkgSmFzb24sCgpPbiBUdWUsIEFwciAxNiwgMjAyNCBhdCAwNDoyODoxNlBNIC0wMzAwLCBKYXNv biBHdW50aG9ycGUgd3JvdGU6Cj4gT25seSB0aGUgYXR0YWNoIGNhbGxlcnMgY2FuIHBlcmZvcm0g YW4gYWxsb2NhdGlvbiBmb3IgdGhlIENEIHRhYmxlIGVudHJ5LAo+IHRoZSBvdGhlciBjYWxsZXJz IG11c3Qgbm90IGRvIHNvLCB0aGV5IGRvIG5vdCBoYXZlIHRoZSBjb3JyZWN0IGxvY2tpbmcgYW5k Cj4gdGhleSBjYW5ub3Qgc2xlZXAuIFNwbGl0IHVwIHRoZSBmdW5jdGlvbnMgc28gdGhpcyBpcyBj bGVhci4KPiAKPiBhcm1fc21tdV9nZXRfY2RfcHRyKCkgd2lsbCByZXR1cm4gcG9pbnRlciB0byBh IENEIHRhYmxlIGVudHJ5IHdpdGhvdXQKPiBkb2luZyBhbnkga2luZCBvZiBhbGxvY2F0aW9uLgo+ IAo+IGFybV9zbW11X2FsbG9jX2NkX3B0cigpIHdpbGwgYWxsb2NhdGUgdGhlIHRhYmxlIGFuZCBh bnkgcmVxdWlyZWQKPiBsZWFmLgo+IAo+IEEgZm9sbG93aW5nIHBhdGNoIHdpbGwgYWRkIGxvY2tk ZXAgYXNzZXJ0aW9ucyB0byBhcm1fc21tdV9hbGxvY19jZF9wdHIoKQo+IG9uY2UgdGhlIHJlc3Ry dWN0dXJpbmcgaXMgY29tcGxldGVkIGFuZCBhcm1fc21tdV9hbGxvY19jZF9wdHIoKSBpcyBuZXZl cgo+IGNhbGxlZCBpbiB0aGUgd3JvbmcgY29udGV4dC4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBKYXNv biBHdW50aG9ycGUgPGpnZ0BudmlkaWEuY29tPgo+IC0tLQo+ICBkcml2ZXJzL2lvbW11L2FybS9h cm0tc21tdS12My9hcm0tc21tdS12My5jIHwgNjEgKysrKysrKysrKysrKy0tLS0tLS0tCj4gIDEg ZmlsZSBjaGFuZ2VkLCAzOSBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKPiAKPiBkaWZm IC0tZ2l0IGEvZHJpdmVycy9pb21tdS9hcm0vYXJtLXNtbXUtdjMvYXJtLXNtbXUtdjMuYyBiL2Ry aXZlcnMvaW9tbXUvYXJtL2FybS1zbW11LXYzL2FybS1zbW11LXYzLmMKPiBpbmRleCBmM2RmMWVj OGQyNThkYy4uYTBkMTIzNzI3MjkzNmYgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9pb21tdS9hcm0v YXJtLXNtbXUtdjMvYXJtLXNtbXUtdjMuYwo+ICsrKyBiL2RyaXZlcnMvaW9tbXUvYXJtL2FybS1z bW11LXYzL2FybS1zbW11LXYzLmMKPiBAQCAtOTgsNiArOTgsNyBAQCBzdGF0aWMgc3RydWN0IGFy bV9zbW11X29wdGlvbl9wcm9wIGFybV9zbW11X29wdGlvbnNbXSA9IHsKPiAgCj4gIHN0YXRpYyBp bnQgYXJtX3NtbXVfZG9tYWluX2ZpbmFsaXNlKHN0cnVjdCBhcm1fc21tdV9kb21haW4gKnNtbXVf ZG9tYWluLAo+ICAJCQkJICAgIHN0cnVjdCBhcm1fc21tdV9kZXZpY2UgKnNtbXUpOwo+ICtzdGF0 aWMgaW50IGFybV9zbW11X2FsbG9jX2NkX3RhYmxlcyhzdHJ1Y3QgYXJtX3NtbXVfbWFzdGVyICpt YXN0ZXIpOwo+ICAKPiAgc3RhdGljIHZvaWQgcGFyc2VfZHJpdmVyX29wdGlvbnMoc3RydWN0IGFy bV9zbW11X2RldmljZSAqc21tdSkKPiAgewo+IEBAIC0xMjA3LDI5ICsxMjA4LDUxIEBAIHN0YXRp YyB2b2lkIGFybV9zbW11X3dyaXRlX2NkX2wxX2Rlc2MoX19sZTY0ICpkc3QsCj4gIHN0cnVjdCBh cm1fc21tdV9jZCAqYXJtX3NtbXVfZ2V0X2NkX3B0cihzdHJ1Y3QgYXJtX3NtbXVfbWFzdGVyICpt YXN0ZXIsCj4gIAkJCQkJdTMyIHNzaWQpCj4gIHsKPiAtCV9fbGU2NCAqbDFwdHI7Cj4gLQl1bnNp Z25lZCBpbnQgaWR4Owo+ICAJc3RydWN0IGFybV9zbW11X2wxX2N0eF9kZXNjICpsMV9kZXNjOwo+ IC0Jc3RydWN0IGFybV9zbW11X2RldmljZSAqc21tdSA9IG1hc3Rlci0+c21tdTsKPiAgCXN0cnVj dCBhcm1fc21tdV9jdHhfZGVzY19jZmcgKmNkX3RhYmxlID0gJm1hc3Rlci0+Y2RfdGFibGU7Cj4g IAo+ICsJaWYgKCFjZF90YWJsZS0+Y2R0YWIpCj4gKwkJcmV0dXJuIE5VTEw7Cj4gKwo+ICAJaWYg KGNkX3RhYmxlLT5zMWZtdCA9PSBTVFJUQUJfU1RFXzBfUzFGTVRfTElORUFSKQo+ICAJCXJldHVy biAoc3RydWN0IGFybV9zbW11X2NkICopKGNkX3RhYmxlLT5jZHRhYiArCj4gIAkJCQkJICAgICAg c3NpZCAqIENUWERFU0NfQ0RfRFdPUkRTKTsKPiAgCj4gLQlpZHggPSBzc2lkID4+IENUWERFU0Nf U1BMSVQ7Cj4gLQlsMV9kZXNjID0gJmNkX3RhYmxlLT5sMV9kZXNjW2lkeF07Cj4gLQlpZiAoIWwx X2Rlc2MtPmwycHRyKSB7Cj4gLQkJaWYgKGFybV9zbW11X2FsbG9jX2NkX2xlYWZfdGFibGUoc21t dSwgbDFfZGVzYykpCj4gLQkJCXJldHVybiBOVUxMOwo+ICsJbDFfZGVzYyA9ICZjZF90YWJsZS0+ bDFfZGVzY1tzc2lkIC8gQ1RYREVTQ19MMl9FTlRSSUVTXTsKClRoZXNlIG9wZXJhdGlvbnMgdXNl ZCB0byBiZSBzaGlmdCBhbmQgYml0IG1hc2tpbmcgd2hpY2ggbWFkZSBzZW5zZSBhcyBpdCBkb2Vz CndoYXQgaGFyZHdhcmUgZG9lcywgaXMgdGhlcmUgYW55IHJlYXNvbiB5b3UgY2hhbmdlZCBpdCB0 byBkaXZpc2lvbiBhbmQgbW9kdWxvPwpJIGNoZWNrZWQgdGhlIGRpc2Fzc2VtYmx5IGFuZCBnY2Mg ZG9lcyB0aGUgcmlnaHQgdGhpbmcgYXMgY29uc3RhbnRzIGFyZSBwb3dlcgpvZiAyLCBidXQgSSBh bSBqdXN0IGN1cmlvdXMuCgo+ICsJaWYgKCFsMV9kZXNjLT5sMnB0cikKPiArCQlyZXR1cm4gTlVM TDsKPiArCXJldHVybiAmbDFfZGVzYy0+bDJwdHJbc3NpZCAlIENUWERFU0NfTDJfRU5UUklFU107 Cj4gK30KPiAgCj4gLQkJbDFwdHIgPSBjZF90YWJsZS0+Y2R0YWIgKyBpZHggKiBDVFhERVNDX0wx X0RFU0NfRFdPUkRTOwo+IC0JCWFybV9zbW11X3dyaXRlX2NkX2wxX2Rlc2MobDFwdHIsIGwxX2Rl c2MpOwo+IC0JCS8qIEFuIGludmFsaWQgTDFDRCBjYW4gYmUgY2FjaGVkICovCj4gLQkJYXJtX3Nt bXVfc3luY19jZChtYXN0ZXIsIHNzaWQsIGZhbHNlKTsKPiArc3RhdGljIHN0cnVjdCBhcm1fc21t dV9jZCAqYXJtX3NtbXVfYWxsb2NfY2RfcHRyKHN0cnVjdCBhcm1fc21tdV9tYXN0ZXIgKm1hc3Rl ciwKPiArCQkJCQkJIHUzMiBzc2lkKQo+ICt7Cj4gKwlzdHJ1Y3QgYXJtX3NtbXVfY3R4X2Rlc2Nf Y2ZnICpjZF90YWJsZSA9ICZtYXN0ZXItPmNkX3RhYmxlOwo+ICsJc3RydWN0IGFybV9zbW11X2Rl dmljZSAqc21tdSA9IG1hc3Rlci0+c21tdTsKPiArCj4gKwlpZiAoIWNkX3RhYmxlLT5jZHRhYikg ewo+ICsJCWlmIChhcm1fc21tdV9hbGxvY19jZF90YWJsZXMobWFzdGVyKSkKPiArCQkJcmV0dXJu IE5VTEw7Cj4gIAl9Cj4gLQlpZHggPSBzc2lkICYgKENUWERFU0NfTDJfRU5UUklFUyAtIDEpOwo+ IC0JcmV0dXJuICZsMV9kZXNjLT5sMnB0cltpZHhdOwo+ICsKPiArCWlmIChjZF90YWJsZS0+czFm bXQgPT0gU1RSVEFCX1NURV8wX1MxRk1UXzY0S19MMikgewo+ICsJCXVuc2lnbmVkIGludCBpZHgg PSBzc2lkID4+IENUWERFU0NfU1BMSVQ7CgpPaywgbm93IGl04oCZcyBhIHNoaWZ0LCBJIHRoaW5r IHdlIHNob3VsZCBiZSBjb25zaXN0ZW50IHdpdGggaG93IHdlCmNhbGN1bGF0ZSB0aGUgaW5kZXgu Cgo+ICsJCXN0cnVjdCBhcm1fc21tdV9sMV9jdHhfZGVzYyAqbDFfZGVzYzsKPiArCj4gKwkJbDFf ZGVzYyA9ICZjZF90YWJsZS0+bDFfZGVzY1tpZHhdOwo+ICsJCWlmICghbDFfZGVzYy0+bDJwdHIp IHsKPiArCQkJX19sZTY0ICpsMXB0cjsKPiArCj4gKwkJCWlmIChhcm1fc21tdV9hbGxvY19jZF9s ZWFmX3RhYmxlKHNtbXUsIGwxX2Rlc2MpKQo+ICsJCQkJcmV0dXJuIE5VTEw7Cj4gKwo+ICsJCQls MXB0ciA9IGNkX3RhYmxlLT5jZHRhYiArIGlkeCAqIENUWERFU0NfTDFfREVTQ19EV09SRFM7Cj4g KwkJCWFybV9zbW11X3dyaXRlX2NkX2wxX2Rlc2MobDFwdHIsIGwxX2Rlc2MpOwo+ICsJCQkvKiBB biBpbnZhbGlkIEwxQ0QgY2FuIGJlIGNhY2hlZCAqLwo+ICsJCQlhcm1fc21tdV9zeW5jX2NkKG1h c3Rlciwgc3NpZCwgZmFsc2UpOwo+ICsJCX0KPiArCX0KPiArCXJldHVybiBhcm1fc21tdV9nZXRf Y2RfcHRyKG1hc3Rlciwgc3NpZCk7Cj4gIH0KPiAgCj4gIHN0cnVjdCBhcm1fc21tdV9jZF93cml0 ZXIgewo+IEBAIC0xMzU3LDcgKzEzODAsNyBAQCBpbnQgYXJtX3NtbXVfd3JpdGVfY3R4X2Rlc2Mo c3RydWN0IGFybV9zbW11X21hc3RlciAqbWFzdGVyLCBpbnQgc3NpZCwKPiAgCWlmIChXQVJOX09O KHNzaWQgPj0gKDEgPDwgY2RfdGFibGUtPnMxY2RtYXgpKSkKPiAgCQlyZXR1cm4gLUUyQklHOwo+ ICAKPiAtCWNkX3RhYmxlX2VudHJ5ID0gYXJtX3NtbXVfZ2V0X2NkX3B0cihtYXN0ZXIsIHNzaWQp Owo+ICsJY2RfdGFibGVfZW50cnkgPSBhcm1fc21tdV9hbGxvY19jZF9wdHIobWFzdGVyLCBzc2lk KTsKClRoZSBvbmx5IHBhdGggYWxsb2NhdGVzIHRoZSBtYWluIHRhYmxlIGlzIOKAnGFybV9zbW11 X2F0dGFjaF9kZXbigJ0sIEkgZ3Vlc3MKaXQgd291bGQgYmUgbW9yZSByb2J1c3QgdG8gbGVhdmUg dGhhdCBhcyBpcyBhbmQgaGF2ZSAyIHZlcnNpb25zIG9mIGdldF9jZCwKb25lIHRoYXQgYWxsb2Nh dGVzIGxlYWYgYW5kIG9uZSB0aGF0IGlzIG5vdCBhbGxvY2F0aW5nLCB3aGF0IGRvIHlvdSB0aGlu az8KClRoYW5rcywKTW9zdGFmYQoKCgo+ICAJaWYgKCFjZF90YWJsZV9lbnRyeSkKPiAgCQlyZXR1 cm4gLUVOT01FTTsKPiAgCj4gQEAgLTI2ODcsMTMgKzI3MTAsNyBAQCBzdGF0aWMgaW50IGFybV9z bW11X2F0dGFjaF9kZXYoc3RydWN0IGlvbW11X2RvbWFpbiAqZG9tYWluLCBzdHJ1Y3QgZGV2aWNl ICpkZXYpCj4gIAkJc3RydWN0IGFybV9zbW11X2NkIHRhcmdldF9jZDsKPiAgCQlzdHJ1Y3QgYXJt X3NtbXVfY2QgKmNkcHRyOwo+ICAKPiAtCQlpZiAoIW1hc3Rlci0+Y2RfdGFibGUuY2R0YWIpIHsK PiAtCQkJcmV0ID0gYXJtX3NtbXVfYWxsb2NfY2RfdGFibGVzKG1hc3Rlcik7Cj4gLQkJCWlmIChy ZXQpCj4gLQkJCQlnb3RvIG91dF9saXN0X2RlbDsKPiAtCQl9Cj4gLQo+IC0JCWNkcHRyID0gYXJt X3NtbXVfZ2V0X2NkX3B0cihtYXN0ZXIsIElPTU1VX05PX1BBU0lEKTsKPiArCQljZHB0ciA9IGFy bV9zbW11X2FsbG9jX2NkX3B0cihtYXN0ZXIsIElPTU1VX05PX1BBU0lEKTsKPiAgCQlpZiAoIWNk cHRyKSB7Cj4gIAkJCXJldCA9IC1FTk9NRU07Cj4gIAkJCWdvdG8gb3V0X2xpc3RfZGVsOwo+IC0t IAo+IDIuNDMuMgo+IAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0 cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGlu Zm8vbGludXgtYXJtLWtlcm5lbAo=