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 X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45209C432BE for ; Thu, 19 Aug 2021 15:39:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 250236101A for ; Thu, 19 Aug 2021 15:39:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240354AbhHSPkJ (ORCPT ); Thu, 19 Aug 2021 11:40:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238460AbhHSPkH (ORCPT ); Thu, 19 Aug 2021 11:40:07 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EDBBC061575; Thu, 19 Aug 2021 08:39:31 -0700 (PDT) Date: Thu, 19 Aug 2021 17:39:27 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1629387569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iWpeLWxYnpcuyjwtgPJFLjuLWoaH9JdYuua0wtFLXGs=; b=azrGKy/kV/ay49uaHkTdVVen2UxrL+SvGtelaYSNYUV4Hmb1Q1cvdqLMEp9m6H8MAGMDOF 6CNXJpnRNSRR1LEizhKFAXdsl97YHlaobVXVEVHNj24wXqvgYHRJzwsnaXJjL43Hnmx8aQ dP5sU2J2vwiBDLkJpsW2Sk+fWImvseYPd8Yf/+/6fsab512Q+eil1WGqMCAi+ZFRc6hyCV +ViL+A2GKIVlFqLYVpr1qQcOWfA+ijS/yEBnxjW3NgnVHcwRBSD4Vbyb0KyjYnp8DsDZUd mvSf15QhVWzvLa/+Bsj0ttHQkRYHAOLIHLzc88KoE4hClAr7uMDZq7lUqBgk6A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1629387569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iWpeLWxYnpcuyjwtgPJFLjuLWoaH9JdYuua0wtFLXGs=; b=ep66l36foTvFQ3VQw/MJeGJiBCXN3ghfNnsmtNo1DkPCcqNMNfGJ6p8BcJC1m9IPJfriH9 /QL629z+BY5x3HAw== From: Sebastian Andrzej Siewior To: "Paul E. McKenney" Cc: Valentin Schneider , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, rcu@vger.kernel.org, linux-rt-users@vger.kernel.org, Catalin Marinas , Will Deacon , Ingo Molnar , Peter Zijlstra , Thomas Gleixner , Steven Rostedt , Daniel Bristot de Oliveira , Frederic Weisbecker , Josh Triplett , Mathieu Desnoyers , Davidlohr Bueso , Lai Jiangshan , Joel Fernandes , Anshuman Khandual , Vincenzo Frascino , Steven Price , Ard Biesheuvel , Boqun Feng , Mike Galbraith , Scott Wood Subject: Re: [PATCH] rcutorture: Avoid problematic critical section nesting on RT Message-ID: <20210819153927.clqxr4f7qegpflbr@linutronix.de> References: <20210811201354.1976839-1-valentin.schneider@arm.com> <20210811201354.1976839-2-valentin.schneider@arm.com> <20210817121345.5iyj5epemczn3a52@linutronix.de> <20210817131741.evduh4fw7vyv2dzt@linutronix.de> <20210817144018.nqssoq475vitrqlv@linutronix.de> <20210818224651.GY4126399@paulmck-ThinkPad-P17-Gen-1> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20210818224651.GY4126399@paulmck-ThinkPad-P17-Gen-1> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2021-08-18 15:46:51 [-0700], Paul E. McKenney wrote: > > --- > > --- a/kernel/rcu/rcutorture.c > > +++ b/kernel/rcu/rcutorture.c > > @@ -61,10 +61,13 @@ MODULE_AUTHOR("Paul E. McKenney > - /* Next, remove old protection, irq first due to bh conflict. */ > > + /* > > + * Next, remove old protection, in decreasing order of strength > > + * to avoid unlock paths that aren't safe in the stronger > > + * context. Disable preemption around the ATOM enables in > > + * case the context was only atomic due to IRQ disabling. > > + */ > > + preempt_disable(); > > if (statesold & RCUTORTURE_RDR_IRQ) > > local_irq_enable(); > > - if (statesold & RCUTORTURE_RDR_BH) > > + if (statesold & RCUTORTURE_RDR_ATOM_BH) > > local_bh_enable(); > > + if (statesold & RCUTORTURE_RDR_ATOM_RBH) > > + rcu_read_unlock_bh(); > > + preempt_enable(); >=20 > The addition of preempt_enable() here prevents rcutorture from covering > an important part of the mainline RCU state space, namely when an RCU > read-side section ends with just local_irq_enable(). This situation > is a challenge for RCU because it must indirectly detect the end of the > critical section. >=20 > Would it work for RT if the preempt_enable() and preempt_disable() > were executed only if either RT on the one hand or statesold has the > RCUTORTURE_RDR_ATOM_BH or RCUTORTURE_RDR_ATOM_RBH bit set on the other? Now that I stared at it some more (and it stared briefly back at me) I couldn't explain why we need this and that piece of the patch so I came up with following which I can explain: diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c index 40ef5417d9545..5c8b31b7eff03 100644 --- a/kernel/rcu/rcutorture.c +++ b/kernel/rcu/rcutorture.c @@ -1432,28 +1432,34 @@ static void rcutorture_one_extend(int *readstate, i= nt newstate, /* First, put new protection in place to avoid critical-section gap. */ if (statesnew & RCUTORTURE_RDR_BH) local_bh_disable(); + if (statesnew & RCUTORTURE_RDR_RBH) + rcu_read_lock_bh(); if (statesnew & RCUTORTURE_RDR_IRQ) local_irq_disable(); if (statesnew & RCUTORTURE_RDR_PREEMPT) preempt_disable(); - if (statesnew & RCUTORTURE_RDR_RBH) - rcu_read_lock_bh(); if (statesnew & RCUTORTURE_RDR_SCHED) rcu_read_lock_sched(); if (statesnew & RCUTORTURE_RDR_RCU) idxnew =3D cur_ops->readlock() << RCUTORTURE_RDR_SHIFT; =20 - /* Next, remove old protection, irq first due to bh conflict. */ + /* + * Next, remove old protection, in decreasing order of strength + * to avoid unlock paths that aren't safe in the stronger + * context. Namely: BH can not be enabled with disabled interrupts. + * Additionally PREEMPT_RT requires that BH is enabled in preemptible + * context. + */ if (statesold & RCUTORTURE_RDR_IRQ) local_irq_enable(); - if (statesold & RCUTORTURE_RDR_BH) - local_bh_enable(); if (statesold & RCUTORTURE_RDR_PREEMPT) preempt_enable(); - if (statesold & RCUTORTURE_RDR_RBH) - rcu_read_unlock_bh(); if (statesold & RCUTORTURE_RDR_SCHED) rcu_read_unlock_sched(); + if (statesold & RCUTORTURE_RDR_BH) + local_bh_enable(); + if (statesold & RCUTORTURE_RDR_RBH) + rcu_read_unlock_bh(); if (statesold & RCUTORTURE_RDR_RCU) { bool lockit =3D !statesnew && !(torture_random(trsp) & 0xffff); =20 @@ -1496,6 +1502,9 @@ rcutorture_extend_mask(int oldmask, struct torture_ra= ndom_state *trsp) int mask =3D rcutorture_extend_mask_max(); unsigned long randmask1 =3D torture_random(trsp) >> 8; unsigned long randmask2 =3D randmask1 >> 3; + unsigned long preempts =3D RCUTORTURE_RDR_PREEMPT | RCUTORTURE_RDR_SCHED; + unsigned long preempts_irq =3D preempts | RCUTORTURE_RDR_IRQ; + unsigned long bhs =3D RCUTORTURE_RDR_BH | RCUTORTURE_RDR_RBH; =20 WARN_ON_ONCE(mask >> RCUTORTURE_RDR_SHIFT); /* Mostly only one bit (need preemption!), sometimes lots of bits. */ @@ -1503,11 +1512,37 @@ rcutorture_extend_mask(int oldmask, struct torture_= random_state *trsp) mask =3D mask & randmask2; else mask =3D mask & (1 << (randmask2 % RCUTORTURE_RDR_NBITS)); - /* Can't enable bh w/irq disabled. */ - if ((mask & RCUTORTURE_RDR_IRQ) && - ((!(mask & RCUTORTURE_RDR_BH) && (oldmask & RCUTORTURE_RDR_BH)) || - (!(mask & RCUTORTURE_RDR_RBH) && (oldmask & RCUTORTURE_RDR_RBH)))) - mask |=3D RCUTORTURE_RDR_BH | RCUTORTURE_RDR_RBH; + + /* + * Can't enable bh w/irq disabled. + */ + if (mask & RCUTORTURE_RDR_IRQ) + mask |=3D oldmask & bhs; + + /* + * Ideally these sequences would be detected in debug builds + * (regardless of RT), but until then don't stop testing + * them on non-RT. + */ + if (IS_ENABLED(CONFIG_PREEMPT_RT)) { + /* + * Can't release the outermost rcu lock in an irq disabled + * section without preemption also being disabled, if irqs + * had ever been enabled during this RCU critical section + * (could leak a special flag and delay reporting the qs). + */ + if ((oldmask & RCUTORTURE_RDR_RCU) && + (mask & RCUTORTURE_RDR_IRQ) && + !(mask & preempts)) + mask |=3D RCUTORTURE_RDR_RCU; + + /* Can't modify bh in atomic context */ + if (oldmask & preempts_irq) + mask &=3D ~bhs; + if ((oldmask | mask) & preempts_irq) + mask |=3D oldmask & bhs; + } + return mask ?: RCUTORTURE_RDR_RCU; } =20 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 X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46A52C4320E for ; Thu, 19 Aug 2021 15:41:20 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 15F7160EE4 for ; Thu, 19 Aug 2021 15:41:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 15F7160EE4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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=ha0jF9JxVCmDkHCTtxU9+kXUS0HUhcpVCG2vtvk+/ww=; b=LeOnPgP1cgQ1oU 9jq8ggc3MYunzCmQFtUNq/jdnwBsIcv2M0VWczRZBhrGGzSGL6IT5kjM5FyKgwOpSqMyluAPaprHw F7zM07rp+gzci8sep6d48HeWyb28WWt3TnqTCsu/40V1x3b76/xIDslopX2B0AwhyE0VIroxmTNHt fWvAu5+BsBgUoEg+7JCmyDn0taqWCVbLn5RvmFQbhvHYCFe42cwXsdtlUwkCr7RJR+y5CUQIR3iMw rpSMrafvtSi62rU0E0bQCdZEp7efK8wMIWLGZ59bbmjvr4Zm3MYPSOkEaLQnbq4aXjlfRinVf1G6G TORT7kN7D33ZlacConHw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mGk8n-008q9K-PV; Thu, 19 Aug 2021 15:39:37 +0000 Received: from galois.linutronix.de ([2a0a:51c0:0:12e:550::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mGk8h-008q7s-14 for linux-arm-kernel@lists.infradead.org; Thu, 19 Aug 2021 15:39:35 +0000 Date: Thu, 19 Aug 2021 17:39:27 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1629387569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iWpeLWxYnpcuyjwtgPJFLjuLWoaH9JdYuua0wtFLXGs=; b=azrGKy/kV/ay49uaHkTdVVen2UxrL+SvGtelaYSNYUV4Hmb1Q1cvdqLMEp9m6H8MAGMDOF 6CNXJpnRNSRR1LEizhKFAXdsl97YHlaobVXVEVHNj24wXqvgYHRJzwsnaXJjL43Hnmx8aQ dP5sU2J2vwiBDLkJpsW2Sk+fWImvseYPd8Yf/+/6fsab512Q+eil1WGqMCAi+ZFRc6hyCV +ViL+A2GKIVlFqLYVpr1qQcOWfA+ijS/yEBnxjW3NgnVHcwRBSD4Vbyb0KyjYnp8DsDZUd mvSf15QhVWzvLa/+Bsj0ttHQkRYHAOLIHLzc88KoE4hClAr7uMDZq7lUqBgk6A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1629387569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iWpeLWxYnpcuyjwtgPJFLjuLWoaH9JdYuua0wtFLXGs=; b=ep66l36foTvFQ3VQw/MJeGJiBCXN3ghfNnsmtNo1DkPCcqNMNfGJ6p8BcJC1m9IPJfriH9 /QL629z+BY5x3HAw== From: Sebastian Andrzej Siewior To: "Paul E. McKenney" Cc: Valentin Schneider , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, rcu@vger.kernel.org, linux-rt-users@vger.kernel.org, Catalin Marinas , Will Deacon , Ingo Molnar , Peter Zijlstra , Thomas Gleixner , Steven Rostedt , Daniel Bristot de Oliveira , Frederic Weisbecker , Josh Triplett , Mathieu Desnoyers , Davidlohr Bueso , Lai Jiangshan , Joel Fernandes , Anshuman Khandual , Vincenzo Frascino , Steven Price , Ard Biesheuvel , Boqun Feng , Mike Galbraith , Scott Wood Subject: Re: [PATCH] rcutorture: Avoid problematic critical section nesting on RT Message-ID: <20210819153927.clqxr4f7qegpflbr@linutronix.de> References: <20210811201354.1976839-1-valentin.schneider@arm.com> <20210811201354.1976839-2-valentin.schneider@arm.com> <20210817121345.5iyj5epemczn3a52@linutronix.de> <20210817131741.evduh4fw7vyv2dzt@linutronix.de> <20210817144018.nqssoq475vitrqlv@linutronix.de> <20210818224651.GY4126399@paulmck-ThinkPad-P17-Gen-1> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210818224651.GY4126399@paulmck-ThinkPad-P17-Gen-1> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210819_083931_402314_BDEF30CB X-CRM114-Status: GOOD ( 23.62 ) 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 T24gMjAyMS0wOC0xOCAxNTo0Njo1MSBbLTA3MDBdLCBQYXVsIEUuIE1jS2VubmV5IHdyb3RlOgo+ ID4gLS0tCj4gPiAtLS0gYS9rZXJuZWwvcmN1L3JjdXRvcnR1cmUuYwo+ID4gKysrIGIva2VybmVs L3JjdS9yY3V0b3J0dXJlLmMKPiA+IEBAIC02MSwxMCArNjEsMTMgQEAgTU9EVUxFX0FVVEhPUigi UGF1bCBFLiBNY0tlbm5leSA8cGF1bG1jawrigKYKPiA+IC0JLyogTmV4dCwgcmVtb3ZlIG9sZCBw cm90ZWN0aW9uLCBpcnEgZmlyc3QgZHVlIHRvIGJoIGNvbmZsaWN0LiAqLwo+ID4gKwkvKgo+ID4g KwkgKiBOZXh0LCByZW1vdmUgb2xkIHByb3RlY3Rpb24sIGluIGRlY3JlYXNpbmcgb3JkZXIgb2Yg c3RyZW5ndGgKPiA+ICsJICogdG8gYXZvaWQgdW5sb2NrIHBhdGhzIHRoYXQgYXJlbid0IHNhZmUg aW4gdGhlIHN0cm9uZ2VyCj4gPiArCSAqIGNvbnRleHQuICBEaXNhYmxlIHByZWVtcHRpb24gYXJv dW5kIHRoZSBBVE9NIGVuYWJsZXMgaW4KPiA+ICsJICogY2FzZSB0aGUgY29udGV4dCB3YXMgb25s eSBhdG9taWMgZHVlIHRvIElSUSBkaXNhYmxpbmcuCj4gPiArCSAqLwo+ID4gKwlwcmVlbXB0X2Rp c2FibGUoKTsKPiA+ICAJaWYgKHN0YXRlc29sZCAmIFJDVVRPUlRVUkVfUkRSX0lSUSkKPiA+ICAJ CWxvY2FsX2lycV9lbmFibGUoKTsKPiA+IC0JaWYgKHN0YXRlc29sZCAmIFJDVVRPUlRVUkVfUkRS X0JIKQo+ID4gKwlpZiAoc3RhdGVzb2xkICYgUkNVVE9SVFVSRV9SRFJfQVRPTV9CSCkKPiA+ICAJ CWxvY2FsX2JoX2VuYWJsZSgpOwo+ID4gKwlpZiAoc3RhdGVzb2xkICYgUkNVVE9SVFVSRV9SRFJf QVRPTV9SQkgpCj4gPiArCQlyY3VfcmVhZF91bmxvY2tfYmgoKTsKPiA+ICsJcHJlZW1wdF9lbmFi bGUoKTsKPiAKPiBUaGUgYWRkaXRpb24gb2YgcHJlZW1wdF9lbmFibGUoKSBoZXJlIHByZXZlbnRz IHJjdXRvcnR1cmUgZnJvbSBjb3ZlcmluZwo+IGFuIGltcG9ydGFudCBwYXJ0IG9mIHRoZSBtYWlu bGluZSBSQ1Ugc3RhdGUgc3BhY2UsIG5hbWVseSB3aGVuIGFuIFJDVQo+IHJlYWQtc2lkZSBzZWN0 aW9uIGVuZHMgd2l0aCBqdXN0IGxvY2FsX2lycV9lbmFibGUoKS4gIFRoaXMgc2l0dWF0aW9uCj4g aXMgYSBjaGFsbGVuZ2UgZm9yIFJDVSBiZWNhdXNlIGl0IG11c3QgaW5kaXJlY3RseSBkZXRlY3Qg dGhlIGVuZCBvZiB0aGUKPiBjcml0aWNhbCBzZWN0aW9uLgo+IAo+IFdvdWxkIGl0IHdvcmsgZm9y IFJUIGlmIHRoZSBwcmVlbXB0X2VuYWJsZSgpIGFuZCBwcmVlbXB0X2Rpc2FibGUoKQo+IHdlcmUg ZXhlY3V0ZWQgb25seSBpZiBlaXRoZXIgUlQgb24gdGhlIG9uZSBoYW5kIG9yIHN0YXRlc29sZCBo YXMgdGhlCj4gUkNVVE9SVFVSRV9SRFJfQVRPTV9CSCBvciBSQ1VUT1JUVVJFX1JEUl9BVE9NX1JC SCBiaXQgc2V0IG9uIHRoZSBvdGhlcj8KCk5vdyB0aGF0IEkgc3RhcmVkIGF0IGl0IHNvbWUgbW9y ZSAoYW5kIGl0IHN0YXJlZCBicmllZmx5IGJhY2sgYXQgbWUpIEkKY291bGRuJ3QgZXhwbGFpbiB3 aHkgd2UgbmVlZCB0aGlzIGFuZCB0aGF0IHBpZWNlIG9mIHRoZSBwYXRjaCBzbyBJIGNhbWUKdXAg d2l0aCBmb2xsb3dpbmcgd2hpY2ggSSBjYW4gZXhwbGFpbjoKCmRpZmYgLS1naXQgYS9rZXJuZWwv cmN1L3JjdXRvcnR1cmUuYyBiL2tlcm5lbC9yY3UvcmN1dG9ydHVyZS5jCmluZGV4IDQwZWY1NDE3 ZDk1NDUuLjVjOGIzMWI3ZWZmMDMgMTAwNjQ0Ci0tLSBhL2tlcm5lbC9yY3UvcmN1dG9ydHVyZS5j CisrKyBiL2tlcm5lbC9yY3UvcmN1dG9ydHVyZS5jCkBAIC0xNDMyLDI4ICsxNDMyLDM0IEBAIHN0 YXRpYyB2b2lkIHJjdXRvcnR1cmVfb25lX2V4dGVuZChpbnQgKnJlYWRzdGF0ZSwgaW50IG5ld3N0 YXRlLAogCS8qIEZpcnN0LCBwdXQgbmV3IHByb3RlY3Rpb24gaW4gcGxhY2UgdG8gYXZvaWQgY3Jp dGljYWwtc2VjdGlvbiBnYXAuICovCiAJaWYgKHN0YXRlc25ldyAmIFJDVVRPUlRVUkVfUkRSX0JI KQogCQlsb2NhbF9iaF9kaXNhYmxlKCk7CisJaWYgKHN0YXRlc25ldyAmIFJDVVRPUlRVUkVfUkRS X1JCSCkKKwkJcmN1X3JlYWRfbG9ja19iaCgpOwogCWlmIChzdGF0ZXNuZXcgJiBSQ1VUT1JUVVJF X1JEUl9JUlEpCiAJCWxvY2FsX2lycV9kaXNhYmxlKCk7CiAJaWYgKHN0YXRlc25ldyAmIFJDVVRP UlRVUkVfUkRSX1BSRUVNUFQpCiAJCXByZWVtcHRfZGlzYWJsZSgpOwotCWlmIChzdGF0ZXNuZXcg JiBSQ1VUT1JUVVJFX1JEUl9SQkgpCi0JCXJjdV9yZWFkX2xvY2tfYmgoKTsKIAlpZiAoc3RhdGVz bmV3ICYgUkNVVE9SVFVSRV9SRFJfU0NIRUQpCiAJCXJjdV9yZWFkX2xvY2tfc2NoZWQoKTsKIAlp ZiAoc3RhdGVzbmV3ICYgUkNVVE9SVFVSRV9SRFJfUkNVKQogCQlpZHhuZXcgPSBjdXJfb3BzLT5y ZWFkbG9jaygpIDw8IFJDVVRPUlRVUkVfUkRSX1NISUZUOwogCi0JLyogTmV4dCwgcmVtb3ZlIG9s ZCBwcm90ZWN0aW9uLCBpcnEgZmlyc3QgZHVlIHRvIGJoIGNvbmZsaWN0LiAqLworCS8qCisJICog TmV4dCwgcmVtb3ZlIG9sZCBwcm90ZWN0aW9uLCBpbiBkZWNyZWFzaW5nIG9yZGVyIG9mIHN0cmVu Z3RoCisJICogdG8gYXZvaWQgdW5sb2NrIHBhdGhzIHRoYXQgYXJlbid0IHNhZmUgaW4gdGhlIHN0 cm9uZ2VyCisJICogY29udGV4dC4gTmFtZWx5OiBCSCBjYW4gbm90IGJlIGVuYWJsZWQgd2l0aCBk aXNhYmxlZCBpbnRlcnJ1cHRzLgorCSAqIEFkZGl0aW9uYWxseSBQUkVFTVBUX1JUIHJlcXVpcmVz IHRoYXQgQkggaXMgZW5hYmxlZCBpbiBwcmVlbXB0aWJsZQorCSAqIGNvbnRleHQuCisJICovCiAJ aWYgKHN0YXRlc29sZCAmIFJDVVRPUlRVUkVfUkRSX0lSUSkKIAkJbG9jYWxfaXJxX2VuYWJsZSgp OwotCWlmIChzdGF0ZXNvbGQgJiBSQ1VUT1JUVVJFX1JEUl9CSCkKLQkJbG9jYWxfYmhfZW5hYmxl KCk7CiAJaWYgKHN0YXRlc29sZCAmIFJDVVRPUlRVUkVfUkRSX1BSRUVNUFQpCiAJCXByZWVtcHRf ZW5hYmxlKCk7Ci0JaWYgKHN0YXRlc29sZCAmIFJDVVRPUlRVUkVfUkRSX1JCSCkKLQkJcmN1X3Jl YWRfdW5sb2NrX2JoKCk7CiAJaWYgKHN0YXRlc29sZCAmIFJDVVRPUlRVUkVfUkRSX1NDSEVEKQog CQlyY3VfcmVhZF91bmxvY2tfc2NoZWQoKTsKKwlpZiAoc3RhdGVzb2xkICYgUkNVVE9SVFVSRV9S RFJfQkgpCisJCWxvY2FsX2JoX2VuYWJsZSgpOworCWlmIChzdGF0ZXNvbGQgJiBSQ1VUT1JUVVJF X1JEUl9SQkgpCisJCXJjdV9yZWFkX3VubG9ja19iaCgpOwogCWlmIChzdGF0ZXNvbGQgJiBSQ1VU T1JUVVJFX1JEUl9SQ1UpIHsKIAkJYm9vbCBsb2NraXQgPSAhc3RhdGVzbmV3ICYmICEodG9ydHVy ZV9yYW5kb20odHJzcCkgJiAweGZmZmYpOwogCkBAIC0xNDk2LDYgKzE1MDIsOSBAQCByY3V0b3J0 dXJlX2V4dGVuZF9tYXNrKGludCBvbGRtYXNrLCBzdHJ1Y3QgdG9ydHVyZV9yYW5kb21fc3RhdGUg KnRyc3ApCiAJaW50IG1hc2sgPSByY3V0b3J0dXJlX2V4dGVuZF9tYXNrX21heCgpOwogCXVuc2ln bmVkIGxvbmcgcmFuZG1hc2sxID0gdG9ydHVyZV9yYW5kb20odHJzcCkgPj4gODsKIAl1bnNpZ25l ZCBsb25nIHJhbmRtYXNrMiA9IHJhbmRtYXNrMSA+PiAzOworCXVuc2lnbmVkIGxvbmcgcHJlZW1w dHMgPSBSQ1VUT1JUVVJFX1JEUl9QUkVFTVBUIHwgUkNVVE9SVFVSRV9SRFJfU0NIRUQ7CisJdW5z aWduZWQgbG9uZyBwcmVlbXB0c19pcnEgPSBwcmVlbXB0cyB8IFJDVVRPUlRVUkVfUkRSX0lSUTsK Kwl1bnNpZ25lZCBsb25nIGJocyA9IFJDVVRPUlRVUkVfUkRSX0JIIHwgUkNVVE9SVFVSRV9SRFJf UkJIOwogCiAJV0FSTl9PTl9PTkNFKG1hc2sgPj4gUkNVVE9SVFVSRV9SRFJfU0hJRlQpOwogCS8q IE1vc3RseSBvbmx5IG9uZSBiaXQgKG5lZWQgcHJlZW1wdGlvbiEpLCBzb21ldGltZXMgbG90cyBv ZiBiaXRzLiAqLwpAQCAtMTUwMywxMSArMTUxMiwzNyBAQCByY3V0b3J0dXJlX2V4dGVuZF9tYXNr KGludCBvbGRtYXNrLCBzdHJ1Y3QgdG9ydHVyZV9yYW5kb21fc3RhdGUgKnRyc3ApCiAJCW1hc2sg PSBtYXNrICYgcmFuZG1hc2syOwogCWVsc2UKIAkJbWFzayA9IG1hc2sgJiAoMSA8PCAocmFuZG1h c2syICUgUkNVVE9SVFVSRV9SRFJfTkJJVFMpKTsKLQkvKiBDYW4ndCBlbmFibGUgYmggdy9pcnEg ZGlzYWJsZWQuICovCi0JaWYgKChtYXNrICYgUkNVVE9SVFVSRV9SRFJfSVJRKSAmJgotCSAgICAo KCEobWFzayAmIFJDVVRPUlRVUkVfUkRSX0JIKSAmJiAob2xkbWFzayAmIFJDVVRPUlRVUkVfUkRS X0JIKSkgfHwKLQkgICAgICghKG1hc2sgJiBSQ1VUT1JUVVJFX1JEUl9SQkgpICYmIChvbGRtYXNr ICYgUkNVVE9SVFVSRV9SRFJfUkJIKSkpKQotCQltYXNrIHw9IFJDVVRPUlRVUkVfUkRSX0JIIHwg UkNVVE9SVFVSRV9SRFJfUkJIOworCisJLyoKKwkgKiBDYW4ndCBlbmFibGUgYmggdy9pcnEgZGlz YWJsZWQuCisJICovCisJaWYgKG1hc2sgJiBSQ1VUT1JUVVJFX1JEUl9JUlEpCisJCW1hc2sgfD0g b2xkbWFzayAmIGJoczsKKworCS8qCisJICogSWRlYWxseSB0aGVzZSBzZXF1ZW5jZXMgd291bGQg YmUgZGV0ZWN0ZWQgaW4gZGVidWcgYnVpbGRzCisJICogKHJlZ2FyZGxlc3Mgb2YgUlQpLCBidXQg dW50aWwgdGhlbiBkb24ndCBzdG9wIHRlc3RpbmcKKwkgKiB0aGVtIG9uIG5vbi1SVC4KKwkgKi8K KwlpZiAoSVNfRU5BQkxFRChDT05GSUdfUFJFRU1QVF9SVCkpIHsKKwkJLyoKKwkJICogQ2FuJ3Qg cmVsZWFzZSB0aGUgb3V0ZXJtb3N0IHJjdSBsb2NrIGluIGFuIGlycSBkaXNhYmxlZAorCQkgKiBz ZWN0aW9uIHdpdGhvdXQgcHJlZW1wdGlvbiBhbHNvIGJlaW5nIGRpc2FibGVkLCBpZiBpcnFzCisJ CSAqIGhhZCBldmVyIGJlZW4gZW5hYmxlZCBkdXJpbmcgdGhpcyBSQ1UgY3JpdGljYWwgc2VjdGlv bgorCQkgKiAoY291bGQgbGVhayBhIHNwZWNpYWwgZmxhZyBhbmQgZGVsYXkgcmVwb3J0aW5nIHRo ZSBxcykuCisJCSAqLworCQlpZiAoKG9sZG1hc2sgJiBSQ1VUT1JUVVJFX1JEUl9SQ1UpICYmCisJ CSAgICAobWFzayAmIFJDVVRPUlRVUkVfUkRSX0lSUSkgJiYKKwkJICAgICEobWFzayAmIHByZWVt cHRzKSkKKwkJCW1hc2sgfD0gUkNVVE9SVFVSRV9SRFJfUkNVOworCisJCS8qIENhbid0IG1vZGlm eSBiaCBpbiBhdG9taWMgY29udGV4dCAqLworCQlpZiAob2xkbWFzayAmIHByZWVtcHRzX2lycSkK KwkJCW1hc2sgJj0gfmJoczsKKwkJaWYgKChvbGRtYXNrIHwgbWFzaykgJiBwcmVlbXB0c19pcnEp CisJCQltYXNrIHw9IG9sZG1hc2sgJiBiaHM7CisJfQorCiAJcmV0dXJuIG1hc2sgPzogUkNVVE9S VFVSRV9SRFJfUkNVOwogfQogCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVs QGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9s aXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==