Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp846876iog; Wed, 15 Jun 2022 13:47:16 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u9um1zG7iUxtaufRdh+6ZLrZekeigfhcYw3XBiIhmEqXnZNQik/K52R6x0Jj7Zk894Sf8M X-Received: by 2002:a17:902:ccca:b0:168:a88f:4833 with SMTP id z10-20020a170902ccca00b00168a88f4833mr1155211ple.104.1655326036698; Wed, 15 Jun 2022 13:47:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655326036; cv=none; d=google.com; s=arc-20160816; b=zoWVCKhPEhH9+ATYLlw8ZsU4N4pWhwtATxhWTSdGILTYRY5l6Uu0kilz1uYsTlaimT SLZAW84IPofW/ICUwDM9gMFZDR3WyAeJcYrCRDDK1jXmLoSiAEorAxpqElUy+JskTk3/ wRLy/uFOvhhcfl/CF51+9siJ2vFbrskriiPtkVpiiV2ovvPekk5lSFKi2l0RYyv3Yb4N sbc2w/KCS9aO1+0ImRVKmzYz53G1vf/xp0T8QIa83YoERGR5JyyJ2+u+thcyJj5+jPBV c+f8AJg/ddtgC8CFuHlDoE2XQl0+JYNIo+pmrxFgaBrim69aYO2ZRjLibRVis679D+g/ nulw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=yMCklTCfBEfu1+s01fVuvmfQuZAk4CVG1//MJ4TRqY8=; b=gQaB73Zjn1rTLPNqRrjw0mp3UWs+mp3DEzh8ZlvaZIKS3e1Pa0tWtKmsXuzcskY6EM ztY9mfUiQdE3mmMzMOH6cY3T8MZl8p+Onnj9Th66NJnHh0wzYBMneNm3pWkvFh7KB8d5 Gn8IYZKWNm54ZlZ6RIWyi3e7tVvfw+pK7n2RJ+Gkd/dBc1lQhGh/oV64wMgB39TX/B1o wc8Le8iQHC0J2CLNJSNGfrq/OCOCCUe8aWjd1h1kd1hYs5SZ3x3aZNbSQLOquDEm+7Rp WTSOd9RkPHUMPyWaTyeaxJ2eeFKv4vAZ4COkDUozDmAznyHU+8Zk5hWvfM+iWJZYl6rZ mfwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=V9exO7kq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l8-20020a170902f68800b00163a6be1210si259843plg.228.2022.06.15.13.47.05; Wed, 15 Jun 2022 13:47:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=V9exO7kq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345695AbiFOU2N (ORCPT + 99 others); Wed, 15 Jun 2022 16:28:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345405AbiFOU2I (ORCPT ); Wed, 15 Jun 2022 16:28:08 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D074129C9A for ; Wed, 15 Jun 2022 13:28:01 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id 3-20020a17090a174300b001e426a02ac5so3226087pjm.2 for ; Wed, 15 Jun 2022 13:28:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=yMCklTCfBEfu1+s01fVuvmfQuZAk4CVG1//MJ4TRqY8=; b=V9exO7kqwC3fJwLiBdLMNh7e2NTzSQPXYlgtV/Gr15Ud7DWzNv4ABtfWWzkYx6I0d0 jAE87FSYs1r/hE1VEXszBB3otRDLkzTSY2oD5gVjSL+dr+xqDOWYRbrI8Mza3mLBu9xS i1W019LbMw4Eqn/kHzng56gm7n//xzDVnp5qI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=yMCklTCfBEfu1+s01fVuvmfQuZAk4CVG1//MJ4TRqY8=; b=hMgguAoBmT81uzam4UpIb0ySmNrCsMIqWotiIIlLqS9h1W6yPyA4JyuvVMe7/cRrux OaBoOh7FUIfmTbPFRe5iy38rruijnOfghwt/EUUD36lSIfg9qJZUsqaNY1nRYGBZCPoB Lyzw3JLbehlmdRIqlWm9yNzFTCRpOMtU2Akf11jmr8qBG6Z3ecvBe5gNxJG7brx4pR0Z r19USZtwwWTj7ZOBuGtr/TyO+JHYcDunYZjnXPwzxnzMsVco1tOZNm4iM5eSdqHbSdZY eNvgDquhlEf7s1DAAcJoFVsCBPg4yMau+oyDZFNqnQzIPRj4LKufgmPYm72kcIJnGPDN yKFQ== X-Gm-Message-State: AJIora8Y2A/dDpFIrEsgZ7RuoV3KR+laGFB0bgSCc0I+gabYCEnuxVfJ DItqJkzIykRaJzMsgKs0DukXpw== X-Received: by 2002:a17:90b:4ac1:b0:1e6:7c82:9aee with SMTP id mh1-20020a17090b4ac100b001e67c829aeemr12042611pjb.234.1655324881349; Wed, 15 Jun 2022 13:28:01 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id x15-20020a63b34f000000b003fe28130b12sm10146453pgt.62.2022.06.15.13.28.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 13:28:01 -0700 (PDT) Date: Wed, 15 Jun 2022 13:28:00 -0700 From: Kees Cook To: Nathan Chancellor Cc: Stephen Rothwell , "Paul E. McKenney" , Frederic Weisbecker , Sami Tolvanen , llvm@lists.linux.dev, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org Subject: Re: Contextual conflict between kspp and rcu trees Message-ID: <202206151326.E34CDE453@keescook> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jun 15, 2022 at 12:55:53PM -0700, Nathan Chancellor wrote: > Per the above RCU commit and commit 6c5218715286 ("context_tracking: > Take IRQ eqs entrypoints over RCU"), it appears that the following diff > is the proper fix up. Would you mind applying it to the merge of > whichever tree comes second if possible? I did build and boot test it > but it would not be a bad idea for Sami and Frederic to verify that it > is correct so that Kees/Paul can mention it to Linus :) Actually, the CFI fix (and a few others) are meant to be sent for -rc3, so if the ct_irq_enter() change is in -next, this can maybe get sorted out? -- Kees Cook