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 BA4B9E77179 for ; Fri, 6 Dec 2024 16:44:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=6pTgQSov7vYTWNucdQE0t9hyfOwyYPp0snQQ1hygLdA=; b=LGSFx7bRQrMIhvYAob7E/EboPu fKgOBt+T8lu2EkgHujfzxAF2vWJesDDYhv85648uvFeAjPIXvOQ3c/dqJYlkL4qdU8xzRmvyRavwy euP/qHE3Bza7M2gV9IOS4150lzPtKfcRJRa9eJ5DbwKSeP3kiAUK82Yi1i9t33FdxzWTmUzkDec2I NPUSzzyBMqA6bJDtJxOqWfkbBJeh0cIw+ROw/fWlCxAcar+ZTVD+d+9yvRxW5+TdJZwyN8l19Ou1Q otUwuSoVbh49jod+44PmwnOkkTAJxQogCpBank9yTkNOMSXHYG8iC4ODEnlXQ2w7T9VqquOSB0kpt Rm4l8Y5A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tJbRS-00000002DpO-0zjd; Fri, 06 Dec 2024 16:44:34 +0000 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tJbEZ-00000002AM6-2mHG for linux-arm-kernel@lists.infradead.org; Fri, 06 Dec 2024 16:31:16 +0000 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-434a766b475so22249335e9.1 for ; Fri, 06 Dec 2024 08:31:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1733502673; x=1734107473; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6pTgQSov7vYTWNucdQE0t9hyfOwyYPp0snQQ1hygLdA=; b=vPs+nmqP5EhBxPfOxdtt4W6CeUWNr/LKELP4Am8MDe1EAi4E08bI/6o+8M5F0JgK8g XTrJDVbuX++23Q3C2H66slqDF+wiEzaQlRjKXwchCGimsxE63uoErpB1/rcWps2Sx+Nk 86mYPc1StFzIaKSRA4mBo7idztungb9FPn/96NpmqaouxEuecTImSev8/zQy/egz5YOj D+J2z8M1CyNqSyNLFXrYoBIsbaJLcRr3xaDz5G1YUGFZ6X1+8OBZVKt/zw2HcR6KiH5D nb+zwWrxxtBxYu0TjBFO4NrJux14hdZiAFDaIROgq6Ht0MFIUO1pX6JIxdoJlOD30B+3 PK2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733502673; x=1734107473; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6pTgQSov7vYTWNucdQE0t9hyfOwyYPp0snQQ1hygLdA=; b=wQO3wNWt+LqmKqWxqPjTQkXfivyakf45PKbi+3yg6fSXCvVkw2dqiKkhX+6pGiolRr QVQzPOiblVWVJuken1Jeof6tqpPGEJxNAWPlTRdAUU5/MTqpvo++fClfQc/YA9WBzSHH yxHqNvMkGkEbdBGf4YjqepCUGt1wu9A/iJ/KDpLMuaXCqkZjjhENgq5pLBepIRV0qU3X 2+9KjUE4GxBBz7C376GpKLV/Ld4EcD6VywpRu/z+wuRRQ06uu1Fy7D6BHynd8JnKA8EB aJ+e9DP/5BDBJTtQpApUlvP21yxVSzQ+xY22MMnkBDo8YRe8R9o0Q62NyArnDLbz5M4C Q88A== X-Forwarded-Encrypted: i=1; AJvYcCW6I8bB1cKWH7I2nOcibYv/yywHg19L4Vjmj7xF0jsbTDofEX3nfvE8Vz14F2Tzg5SVH5xPIQdeLbNAjlScdLXe@lists.infradead.org X-Gm-Message-State: AOJu0Yx6DzzDhzPyqi1XhekwuA7PX6KcDK5bgH3CZBKJ1W5vfIXs+MmS 6ddvMT8T6Ty9vp3BDuT8CBQ6EgZN+/3MG+55GYBrM4+R8upuhwz6qbzu8CBWnHw= X-Gm-Gg: ASbGncvaUTGTyx4EzWQ3UW1Ki70XxvoU3LasO8TcOJOJAp/I1ZPewVRl2hbYnDekmkg AmDnfOwRIUOB0yx7bPo577dtSE660E0uMQYEEvkE/Ztet7rr2nYuSbdH8BQxBXlF5IYVly9hV16 tMNwCgGLo7QesxPXHSJ5/5ioCN4EMGm59SsZ777DR/GdxbieOrbEA6gDIZj8aWltDdW+6Q6FCyG 9vfPMj+8RsZ2pvsezjStSYc2I8bGlSJYcLLquvNYRPUr+/nCHM= X-Google-Smtp-Source: AGHT+IEXqcNtnOQtrn9HCLkcY6FnKIIl9CkgV9xxYEovPWiiPgpTNBlpOFS9Y9bIrLbUO0lLfarFWQ== X-Received: by 2002:a05:6000:1846:b0:385:fb2c:6034 with SMTP id ffacd0b85a97d-3862b3e6fddmr2723661f8f.47.1733502673558; Fri, 06 Dec 2024 08:31:13 -0800 (PST) Received: from carbon-x1.. ([2a01:e0a:e17:9700:16d2:7456:6634:9626]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3862f02f5c3sm1151942f8f.65.2024.12.06.08.31.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Dec 2024 08:31:12 -0800 (PST) From: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= To: Paul Walmsley , Palmer Dabbelt , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= , Himanshu Chauhan , Anup Patel , Xu Lu , Atish Patra Subject: [PATCH v3 4/4] perf: RISC-V: add support for SSE event Date: Fri, 6 Dec 2024 17:31:00 +0100 Message-ID: <20241206163102.843505-5-cleger@rivosinc.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241206163102.843505-1-cleger@rivosinc.com> References: <20241206163102.843505-1-cleger@rivosinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241206_083115_694209_B6973B57 X-CRM114-Status: GOOD ( 18.02 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In order to use SSE within PMU drivers, register a SSE handler for the local PMU event. Reuse the existing overflow IRQ handler and pass appropriate pt_regs. Signed-off-by: Clément Léger --- drivers/perf/riscv_pmu_sbi.c | 51 +++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c index 1aa303f76cc7..bd7ab15483db 100644 --- a/drivers/perf/riscv_pmu_sbi.c +++ b/drivers/perf/riscv_pmu_sbi.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -946,10 +947,10 @@ static void pmu_sbi_start_overflow_mask(struct riscv_pmu *pmu, pmu_sbi_start_ovf_ctrs_sbi(cpu_hw_evt, ctr_ovf_mask); } -static irqreturn_t pmu_sbi_ovf_handler(int irq, void *dev) +static irqreturn_t pmu_sbi_ovf_handler(struct cpu_hw_events *cpu_hw_evt, + struct pt_regs *regs, bool from_sse) { struct perf_sample_data data; - struct pt_regs *regs; struct hw_perf_event *hw_evt; union sbi_pmu_ctr_info *info; int lidx, hidx, fidx; @@ -957,7 +958,6 @@ static irqreturn_t pmu_sbi_ovf_handler(int irq, void *dev) struct perf_event *event; u64 overflow; u64 overflowed_ctrs = 0; - struct cpu_hw_events *cpu_hw_evt = dev; u64 start_clock = sched_clock(); struct riscv_pmu_snapshot_data *sdata = cpu_hw_evt->snapshot_addr; @@ -967,13 +967,15 @@ static irqreturn_t pmu_sbi_ovf_handler(int irq, void *dev) /* Firmware counter don't support overflow yet */ fidx = find_first_bit(cpu_hw_evt->used_hw_ctrs, RISCV_MAX_COUNTERS); if (fidx == RISCV_MAX_COUNTERS) { - csr_clear(CSR_SIP, BIT(riscv_pmu_irq_num)); + if (!from_sse) + csr_clear(CSR_SIP, BIT(riscv_pmu_irq_num)); return IRQ_NONE; } event = cpu_hw_evt->events[fidx]; if (!event) { - ALT_SBI_PMU_OVF_CLEAR_PENDING(riscv_pmu_irq_mask); + if (!from_sse) + ALT_SBI_PMU_OVF_CLEAR_PENDING(riscv_pmu_irq_mask); return IRQ_NONE; } @@ -988,16 +990,16 @@ static irqreturn_t pmu_sbi_ovf_handler(int irq, void *dev) /* * Overflow interrupt pending bit should only be cleared after stopping - * all the counters to avoid any race condition. + * all the counters to avoid any race condition. When using SSE, + * interrupt is cleared when stopping counters. */ - ALT_SBI_PMU_OVF_CLEAR_PENDING(riscv_pmu_irq_mask); + if (!from_sse) + ALT_SBI_PMU_OVF_CLEAR_PENDING(riscv_pmu_irq_mask); /* No overflow bit is set */ if (!overflow) return IRQ_NONE; - regs = get_irq_regs(); - for_each_set_bit(lidx, cpu_hw_evt->used_hw_ctrs, RISCV_MAX_COUNTERS) { struct perf_event *event = cpu_hw_evt->events[lidx]; @@ -1053,6 +1055,22 @@ static irqreturn_t pmu_sbi_ovf_handler(int irq, void *dev) return IRQ_HANDLED; } +static irqreturn_t pmu_sbi_ovf_irq_handler(int irq, void *dev) +{ + return pmu_sbi_ovf_handler(dev, get_irq_regs(), false); +} + +static int pmu_sbi_ovf_sse_handler(uint32_t evt, void *arg, + struct pt_regs *regs) +{ + struct cpu_hw_events __percpu *hw_events = arg; + struct cpu_hw_events *hw_event = raw_cpu_ptr(hw_events); + + pmu_sbi_ovf_handler(hw_event, regs, true); + + return 0; +} + static int pmu_sbi_starting_cpu(unsigned int cpu, struct hlist_node *node) { struct riscv_pmu *pmu = hlist_entry_safe(node, struct riscv_pmu, node); @@ -1100,9 +1118,22 @@ static int pmu_sbi_dying_cpu(unsigned int cpu, struct hlist_node *node) static int pmu_sbi_setup_irqs(struct riscv_pmu *pmu, struct platform_device *pdev) { int ret; + struct sse_event *evt; struct cpu_hw_events __percpu *hw_events = pmu->hw_events; struct irq_domain *domain = NULL; + evt = sse_event_register(SBI_SSE_EVENT_LOCAL_PMU, 0, + pmu_sbi_ovf_sse_handler, hw_events); + if (!IS_ERR(evt)) { + ret = sse_event_enable(evt); + if (!ret) { + pr_info("using SSE for PMU event delivery\n"); + return 0; + } + + sse_event_unregister(evt); + } + if (riscv_isa_extension_available(NULL, SSCOFPMF)) { riscv_pmu_irq_num = RV_IRQ_PMU; riscv_pmu_use_irq = true; @@ -1137,7 +1168,7 @@ static int pmu_sbi_setup_irqs(struct riscv_pmu *pmu, struct platform_device *pde return -ENODEV; } - ret = request_percpu_irq(riscv_pmu_irq, pmu_sbi_ovf_handler, "riscv-pmu", hw_events); + ret = request_percpu_irq(riscv_pmu_irq, pmu_sbi_ovf_irq_handler, "riscv-pmu", hw_events); if (ret) { pr_err("registering percpu irq failed [%d]\n", ret); return ret; -- 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 C96EDE7717B for ; Fri, 6 Dec 2024 16:43:38 +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:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yiFRZbflJj0XZmXfjcIJun8MjXLkg5YixIgyljY5CkY=; b=mk9BviV6UKirBV UmjB3MXpO1xIdar3AzALhcH3kMXsjJtBieTAeKEgdcKjdPtyZVYg0BbOk/oxmG9VrRlNNJjk+tByc MEx0It6+zfGTmpenTTWp6eVwMdEo7Ckqjw+V5V8+g1+AhomcDRI2ECJWKo/I1KPe5e0287323bDgl X2SYL/aq6r3fXraHmkWcHPdpdZVzyDHGdylYF+cbwwGa78BWplZVXgw7Lh4J3QXe898ch6+APLNAT Rrxj/n1uGX0IlK+D8nQgsn3ElWDmGjNQkqMyuxDLt+SCBxyZ4mMUMiHwkPuIxk64UmINWDDQHSN+x ZO0md8f0fV/lUzjoLniA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tJbQT-00000002DOF-2I8u; Fri, 06 Dec 2024 16:43:33 +0000 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tJbEY-00000002AM7-3xIF for linux-riscv@lists.infradead.org; Fri, 06 Dec 2024 16:31:16 +0000 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-385e35912f1so1689979f8f.3 for ; Fri, 06 Dec 2024 08:31:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1733502673; x=1734107473; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6pTgQSov7vYTWNucdQE0t9hyfOwyYPp0snQQ1hygLdA=; b=vPs+nmqP5EhBxPfOxdtt4W6CeUWNr/LKELP4Am8MDe1EAi4E08bI/6o+8M5F0JgK8g XTrJDVbuX++23Q3C2H66slqDF+wiEzaQlRjKXwchCGimsxE63uoErpB1/rcWps2Sx+Nk 86mYPc1StFzIaKSRA4mBo7idztungb9FPn/96NpmqaouxEuecTImSev8/zQy/egz5YOj D+J2z8M1CyNqSyNLFXrYoBIsbaJLcRr3xaDz5G1YUGFZ6X1+8OBZVKt/zw2HcR6KiH5D nb+zwWrxxtBxYu0TjBFO4NrJux14hdZiAFDaIROgq6Ht0MFIUO1pX6JIxdoJlOD30B+3 PK2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733502673; x=1734107473; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6pTgQSov7vYTWNucdQE0t9hyfOwyYPp0snQQ1hygLdA=; b=gK49KBpOVRxMcmLqplzWH8DKsKyNkye7L4tSIyGmFXvtzIp2gesMjAdyu2wgHdbPhX Azl3E/pgoLoAIcAYyQ5xrOxZI/5KCA52GR8rcFgV16lZ/25crhAk8QDIQBoN7+3mzVEH GvEr0BUGDBfOnJnG46MlReECeLLCw4PRd+EFWzUIeMJIIrATCu5PtgP4vR9DLjpMt0bx wleAeenRfLyK8OiRDLK9wYu1IiScuoaZvJ9rOoEEjL9uizszLc+lYbsI6wDkJEhOMi+i N/2BEkV6ZxwkXICRybygdGlxt5O4POiAegwob03EAm3A61W3+4iZV2OhsV218ZjLZYZT mh9A== X-Forwarded-Encrypted: i=1; AJvYcCUG+pAPHHwI/fE6HwELdRrNYR6DFAlTO/hvF9X+gzVl2VthHp/xxczT4NHNunx++bWXsUkp08t3Qj1Vew==@lists.infradead.org X-Gm-Message-State: AOJu0YxdzI+WLQXW+w3z5ewDrGqIgsLNnnwqxL5he2tcOjEaf+Jn3LYt 1gCLOdKNAtCiBPpACsHuZzDalVs/Hkt5i+ojpJk4ss1lr8DhC2NA6WFmYTnM0BM= X-Gm-Gg: ASbGncvscd/tVdfI+yDL/zZvB8bYeJmbpvGUtYCBwQav+VMmaeZuT/EGHXNnS4S3cDb 7Ho5stP3NPTA0MxPE5EH+/0sPgwl/+pyfk/D+AAIkUtGvHwEjBfVuU7+XnWc3ugcxdO4w3DvhDd gqjowoBNIfLgYt93lVGzIUIoMT4A6mmNtleq2+7FlAzFW5UhDeU+CVntfn4MZZlQ9SdWEMLRW11 9JChy8LHtD6Qfp/fQukUfUTGenSY8uKcNm24BaYLN4m0fAVGXU= X-Google-Smtp-Source: AGHT+IEXqcNtnOQtrn9HCLkcY6FnKIIl9CkgV9xxYEovPWiiPgpTNBlpOFS9Y9bIrLbUO0lLfarFWQ== X-Received: by 2002:a05:6000:1846:b0:385:fb2c:6034 with SMTP id ffacd0b85a97d-3862b3e6fddmr2723661f8f.47.1733502673558; Fri, 06 Dec 2024 08:31:13 -0800 (PST) Received: from carbon-x1.. ([2a01:e0a:e17:9700:16d2:7456:6634:9626]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3862f02f5c3sm1151942f8f.65.2024.12.06.08.31.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Dec 2024 08:31:12 -0800 (PST) From: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= To: Paul Walmsley , Palmer Dabbelt , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= , Himanshu Chauhan , Anup Patel , Xu Lu , Atish Patra Subject: [PATCH v3 4/4] perf: RISC-V: add support for SSE event Date: Fri, 6 Dec 2024 17:31:00 +0100 Message-ID: <20241206163102.843505-5-cleger@rivosinc.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241206163102.843505-1-cleger@rivosinc.com> References: <20241206163102.843505-1-cleger@rivosinc.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241206_083115_001379_E6F73F63 X-CRM114-Status: GOOD ( 16.53 ) X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org SW4gb3JkZXIgdG8gdXNlIFNTRSB3aXRoaW4gUE1VIGRyaXZlcnMsIHJlZ2lzdGVyIGEgU1NFIGhh bmRsZXIgZm9yIHRoZQpsb2NhbCBQTVUgZXZlbnQuIFJldXNlIHRoZSBleGlzdGluZyBvdmVyZmxv dyBJUlEgaGFuZGxlciBhbmQgcGFzcwphcHByb3ByaWF0ZSBwdF9yZWdzLgoKU2lnbmVkLW9mZi1i eTogQ2zDqW1lbnQgTMOpZ2VyIDxjbGVnZXJAcml2b3NpbmMuY29tPgotLS0KIGRyaXZlcnMvcGVy Zi9yaXNjdl9wbXVfc2JpLmMgfCA1MSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCA0MSBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL3BlcmYvcmlzY3ZfcG11X3NiaS5jIGIvZHJpdmVycy9wZXJmL3Jp c2N2X3BtdV9zYmkuYwppbmRleCAxYWEzMDNmNzZjYzcuLmJkN2FiMTU0ODNkYiAxMDA2NDQKLS0t IGEvZHJpdmVycy9wZXJmL3Jpc2N2X3BtdV9zYmkuYworKysgYi9kcml2ZXJzL3BlcmYvcmlzY3Zf cG11X3NiaS5jCkBAIC0xNyw2ICsxNyw3IEBACiAjaW5jbHVkZSA8bGludXgvaXJxZG9tYWluLmg+ CiAjaW5jbHVkZSA8bGludXgvb2ZfaXJxLmg+CiAjaW5jbHVkZSA8bGludXgvb2YuaD4KKyNpbmNs dWRlIDxsaW51eC9yaXNjdl9zc2UuaD4KICNpbmNsdWRlIDxsaW51eC9jcHVfcG0uaD4KICNpbmNs dWRlIDxsaW51eC9zY2hlZC9jbG9jay5oPgogI2luY2x1ZGUgPGxpbnV4L3NvYy9hbmRlcy9pcnEu aD4KQEAgLTk0NiwxMCArOTQ3LDEwIEBAIHN0YXRpYyB2b2lkIHBtdV9zYmlfc3RhcnRfb3ZlcmZs b3dfbWFzayhzdHJ1Y3QgcmlzY3ZfcG11ICpwbXUsCiAJCXBtdV9zYmlfc3RhcnRfb3ZmX2N0cnNf c2JpKGNwdV9od19ldnQsIGN0cl9vdmZfbWFzayk7CiB9CiAKLXN0YXRpYyBpcnFyZXR1cm5fdCBw bXVfc2JpX292Zl9oYW5kbGVyKGludCBpcnEsIHZvaWQgKmRldikKK3N0YXRpYyBpcnFyZXR1cm5f dCBwbXVfc2JpX292Zl9oYW5kbGVyKHN0cnVjdCBjcHVfaHdfZXZlbnRzICpjcHVfaHdfZXZ0LAor CQkJCSAgICAgICBzdHJ1Y3QgcHRfcmVncyAqcmVncywgYm9vbCBmcm9tX3NzZSkKIHsKIAlzdHJ1 Y3QgcGVyZl9zYW1wbGVfZGF0YSBkYXRhOwotCXN0cnVjdCBwdF9yZWdzICpyZWdzOwogCXN0cnVj dCBod19wZXJmX2V2ZW50ICpod19ldnQ7CiAJdW5pb24gc2JpX3BtdV9jdHJfaW5mbyAqaW5mbzsK IAlpbnQgbGlkeCwgaGlkeCwgZmlkeDsKQEAgLTk1Nyw3ICs5NTgsNiBAQCBzdGF0aWMgaXJxcmV0 dXJuX3QgcG11X3NiaV9vdmZfaGFuZGxlcihpbnQgaXJxLCB2b2lkICpkZXYpCiAJc3RydWN0IHBl cmZfZXZlbnQgKmV2ZW50OwogCXU2NCBvdmVyZmxvdzsKIAl1NjQgb3ZlcmZsb3dlZF9jdHJzID0g MDsKLQlzdHJ1Y3QgY3B1X2h3X2V2ZW50cyAqY3B1X2h3X2V2dCA9IGRldjsKIAl1NjQgc3RhcnRf Y2xvY2sgPSBzY2hlZF9jbG9jaygpOwogCXN0cnVjdCByaXNjdl9wbXVfc25hcHNob3RfZGF0YSAq c2RhdGEgPSBjcHVfaHdfZXZ0LT5zbmFwc2hvdF9hZGRyOwogCkBAIC05NjcsMTMgKzk2NywxNSBA QCBzdGF0aWMgaXJxcmV0dXJuX3QgcG11X3NiaV9vdmZfaGFuZGxlcihpbnQgaXJxLCB2b2lkICpk ZXYpCiAJLyogRmlybXdhcmUgY291bnRlciBkb24ndCBzdXBwb3J0IG92ZXJmbG93IHlldCAqLwog CWZpZHggPSBmaW5kX2ZpcnN0X2JpdChjcHVfaHdfZXZ0LT51c2VkX2h3X2N0cnMsIFJJU0NWX01B WF9DT1VOVEVSUyk7CiAJaWYgKGZpZHggPT0gUklTQ1ZfTUFYX0NPVU5URVJTKSB7Ci0JCWNzcl9j bGVhcihDU1JfU0lQLCBCSVQocmlzY3ZfcG11X2lycV9udW0pKTsKKwkJaWYgKCFmcm9tX3NzZSkK KwkJCWNzcl9jbGVhcihDU1JfU0lQLCBCSVQocmlzY3ZfcG11X2lycV9udW0pKTsKIAkJcmV0dXJu IElSUV9OT05FOwogCX0KIAogCWV2ZW50ID0gY3B1X2h3X2V2dC0+ZXZlbnRzW2ZpZHhdOwogCWlm ICghZXZlbnQpIHsKLQkJQUxUX1NCSV9QTVVfT1ZGX0NMRUFSX1BFTkRJTkcocmlzY3ZfcG11X2ly cV9tYXNrKTsKKwkJaWYgKCFmcm9tX3NzZSkKKwkJCUFMVF9TQklfUE1VX09WRl9DTEVBUl9QRU5E SU5HKHJpc2N2X3BtdV9pcnFfbWFzayk7CiAJCXJldHVybiBJUlFfTk9ORTsKIAl9CiAKQEAgLTk4 OCwxNiArOTkwLDE2IEBAIHN0YXRpYyBpcnFyZXR1cm5fdCBwbXVfc2JpX292Zl9oYW5kbGVyKGlu dCBpcnEsIHZvaWQgKmRldikKIAogCS8qCiAJICogT3ZlcmZsb3cgaW50ZXJydXB0IHBlbmRpbmcg Yml0IHNob3VsZCBvbmx5IGJlIGNsZWFyZWQgYWZ0ZXIgc3RvcHBpbmcKLQkgKiBhbGwgdGhlIGNv dW50ZXJzIHRvIGF2b2lkIGFueSByYWNlIGNvbmRpdGlvbi4KKwkgKiBhbGwgdGhlIGNvdW50ZXJz IHRvIGF2b2lkIGFueSByYWNlIGNvbmRpdGlvbi4gV2hlbiB1c2luZyBTU0UsCisJICogaW50ZXJy dXB0IGlzIGNsZWFyZWQgd2hlbiBzdG9wcGluZyBjb3VudGVycy4KIAkgKi8KLQlBTFRfU0JJX1BN VV9PVkZfQ0xFQVJfUEVORElORyhyaXNjdl9wbXVfaXJxX21hc2spOworCWlmICghZnJvbV9zc2Up CisJCUFMVF9TQklfUE1VX09WRl9DTEVBUl9QRU5ESU5HKHJpc2N2X3BtdV9pcnFfbWFzayk7CiAK IAkvKiBObyBvdmVyZmxvdyBiaXQgaXMgc2V0ICovCiAJaWYgKCFvdmVyZmxvdykKIAkJcmV0dXJu IElSUV9OT05FOwogCi0JcmVncyA9IGdldF9pcnFfcmVncygpOwotCiAJZm9yX2VhY2hfc2V0X2Jp dChsaWR4LCBjcHVfaHdfZXZ0LT51c2VkX2h3X2N0cnMsIFJJU0NWX01BWF9DT1VOVEVSUykgewog CQlzdHJ1Y3QgcGVyZl9ldmVudCAqZXZlbnQgPSBjcHVfaHdfZXZ0LT5ldmVudHNbbGlkeF07CiAK QEAgLTEwNTMsNiArMTA1NSwyMiBAQCBzdGF0aWMgaXJxcmV0dXJuX3QgcG11X3NiaV9vdmZfaGFu ZGxlcihpbnQgaXJxLCB2b2lkICpkZXYpCiAJcmV0dXJuIElSUV9IQU5ETEVEOwogfQogCitzdGF0 aWMgaXJxcmV0dXJuX3QgcG11X3NiaV9vdmZfaXJxX2hhbmRsZXIoaW50IGlycSwgdm9pZCAqZGV2 KQoreworCXJldHVybiBwbXVfc2JpX292Zl9oYW5kbGVyKGRldiwgZ2V0X2lycV9yZWdzKCksIGZh bHNlKTsKK30KKworc3RhdGljIGludCBwbXVfc2JpX292Zl9zc2VfaGFuZGxlcih1aW50MzJfdCBl dnQsIHZvaWQgKmFyZywKKwkJCQkgICBzdHJ1Y3QgcHRfcmVncyAqcmVncykKK3sKKwlzdHJ1Y3Qg Y3B1X2h3X2V2ZW50cyBfX3BlcmNwdSAqaHdfZXZlbnRzID0gYXJnOworCXN0cnVjdCBjcHVfaHdf ZXZlbnRzICpod19ldmVudCA9IHJhd19jcHVfcHRyKGh3X2V2ZW50cyk7CisKKwlwbXVfc2JpX292 Zl9oYW5kbGVyKGh3X2V2ZW50LCByZWdzLCB0cnVlKTsKKworCXJldHVybiAwOworfQorCiBzdGF0 aWMgaW50IHBtdV9zYmlfc3RhcnRpbmdfY3B1KHVuc2lnbmVkIGludCBjcHUsIHN0cnVjdCBobGlz dF9ub2RlICpub2RlKQogewogCXN0cnVjdCByaXNjdl9wbXUgKnBtdSA9IGhsaXN0X2VudHJ5X3Nh ZmUobm9kZSwgc3RydWN0IHJpc2N2X3BtdSwgbm9kZSk7CkBAIC0xMTAwLDkgKzExMTgsMjIgQEAg c3RhdGljIGludCBwbXVfc2JpX2R5aW5nX2NwdSh1bnNpZ25lZCBpbnQgY3B1LCBzdHJ1Y3QgaGxp c3Rfbm9kZSAqbm9kZSkKIHN0YXRpYyBpbnQgcG11X3NiaV9zZXR1cF9pcnFzKHN0cnVjdCByaXNj dl9wbXUgKnBtdSwgc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIHsKIAlpbnQgcmV0Owor CXN0cnVjdCBzc2VfZXZlbnQgKmV2dDsKIAlzdHJ1Y3QgY3B1X2h3X2V2ZW50cyBfX3BlcmNwdSAq aHdfZXZlbnRzID0gcG11LT5od19ldmVudHM7CiAJc3RydWN0IGlycV9kb21haW4gKmRvbWFpbiA9 IE5VTEw7CiAKKwlldnQgPSBzc2VfZXZlbnRfcmVnaXN0ZXIoU0JJX1NTRV9FVkVOVF9MT0NBTF9Q TVUsIDAsCisJCQkJIHBtdV9zYmlfb3ZmX3NzZV9oYW5kbGVyLCBod19ldmVudHMpOworCWlmICgh SVNfRVJSKGV2dCkpIHsKKwkJcmV0ID0gc3NlX2V2ZW50X2VuYWJsZShldnQpOworCQlpZiAoIXJl dCkgeworCQkJcHJfaW5mbygidXNpbmcgU1NFIGZvciBQTVUgZXZlbnQgZGVsaXZlcnlcbiIpOwor CQkJcmV0dXJuIDA7CisJCX0KKworCQlzc2VfZXZlbnRfdW5yZWdpc3RlcihldnQpOworCX0KKwog CWlmIChyaXNjdl9pc2FfZXh0ZW5zaW9uX2F2YWlsYWJsZShOVUxMLCBTU0NPRlBNRikpIHsKIAkJ cmlzY3ZfcG11X2lycV9udW0gPSBSVl9JUlFfUE1VOwogCQlyaXNjdl9wbXVfdXNlX2lycSA9IHRy dWU7CkBAIC0xMTM3LDcgKzExNjgsNyBAQCBzdGF0aWMgaW50IHBtdV9zYmlfc2V0dXBfaXJxcyhz dHJ1Y3QgcmlzY3ZfcG11ICpwbXUsIHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZQogCQlyZXR1 cm4gLUVOT0RFVjsKIAl9CiAKLQlyZXQgPSByZXF1ZXN0X3BlcmNwdV9pcnEocmlzY3ZfcG11X2ly cSwgcG11X3NiaV9vdmZfaGFuZGxlciwgInJpc2N2LXBtdSIsIGh3X2V2ZW50cyk7CisJcmV0ID0g cmVxdWVzdF9wZXJjcHVfaXJxKHJpc2N2X3BtdV9pcnEsIHBtdV9zYmlfb3ZmX2lycV9oYW5kbGVy LCAicmlzY3YtcG11IiwgaHdfZXZlbnRzKTsKIAlpZiAocmV0KSB7CiAJCXByX2VycigicmVnaXN0 ZXJpbmcgcGVyY3B1IGlycSBmYWlsZWQgWyVkXVxuIiwgcmV0KTsKIAkJcmV0dXJuIHJldDsKLS0g CjIuNDUuMgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmxpbnV4LXJpc2N2IG1haWxpbmcgbGlzdApsaW51eC1yaXNjdkBsaXN0cy5pbmZyYWRlYWQub3Jn Cmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtcmlzY3YK