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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8E05C43334 for ; Wed, 15 Jun 2022 20:35:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244799AbiFOUfg (ORCPT ); Wed, 15 Jun 2022 16:35:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244033AbiFOUfd (ORCPT ); Wed, 15 Jun 2022 16:35:33 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85FB154F83; Wed, 15 Jun 2022 13:35:32 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id CA4FD615C1; Wed, 15 Jun 2022 20:35:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AB528C3411A; Wed, 15 Jun 2022 20:35:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655325331; bh=xL3iRBMb0QwwFJnaKQCkBT5757ICTMbyClIDX5a/oko=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=atA2+jvX/Jftx7vrJ/RGVSj0e6RnEXoaWrD3iWmWva1XdR4n6Nq1jtvXhVe5ThF9i tgfsMb+pTFAkoSzRIKSZSncni477eTTbe9NHb+BIkmqh4uGPOomuX8GZLwU1Xo+G43 tBnJnd3QzabTZSNEJFR68DelHR6DeyPjxPOJ0ymgNfE4T+DZ9b66F4G5u8bspmYMXh LrCdUfJ8AkBqp3JZTlaGU1YaJIp7jCO9AZqlj/akVXnrIC4IaD6NakQJiTrGVd/E1N sr8/LKwoDkqrXIHkrkggYtsw51Pt/jEnVgs3FrvJ1/etwcDYSyPXaUVRRivdNmve1K VY5Om/NP+1lSQ== Date: Wed, 15 Jun 2022 13:35:28 -0700 From: Nathan Chancellor To: Kees Cook 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: References: <202206151326.E34CDE453@keescook> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202206151326.E34CDE453@keescook> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jun 15, 2022 at 01:28:00PM -0700, Kees Cook wrote: > 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? Ah, I had assumed that branch was destined for the next release. If it is for 5.19 and they make -rc3 then it should be trivial for Paul to either rebase the changes on -rc3 and apply that diff as part of "context_tracking: Take IRQ eqs entrypoints over RCU" (if his tree is mutable) or just merge -rc3 and apply that diff as part of the merge. I don't really care how it gets resolved, just so long as it does :) Cheers, Nathan