From patchwork Thu Dec 7 14:58:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 175202 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp4850413vqy; Thu, 7 Dec 2023 07:14:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IGY/xpXOuVo/LZiqM88ftPunxk4ZgvC3RmVUm70Xbr/nOdG3DC4RO6E43ZxQg48cuw9lgxk X-Received: by 2002:a05:6a20:2584:b0:187:5fe9:3046 with SMTP id k4-20020a056a20258400b001875fe93046mr3363781pzd.0.1701962073166; Thu, 07 Dec 2023 07:14:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701962073; cv=none; d=google.com; s=arc-20160816; b=zpE5ns0UpcYTVdJDCHw+BD6JVsYC36kDCKHqkazimzHoEBdUucHgKu5+MQWcucm/T9 L4gYJfBQeCygGIX9ZxFH1CRLftv7RLIwaPr1iliXrBjYzN+cDnbq/2G+UacS0YWEd2su DSSjYRWI2nHXg3m4BDPhqppyUNpjm5SRK6eF1mX5fOjRlZvhpGko/yqEfij+mDLxe7fM ja56PnPFtxGmjG8SHwE5yqyX4ttt61l8v72Z8Q1GGzfFA9zocNw0fMEMmoZlzhEOmwqE 3QoCX3we7jfaA8Cpj9gUcHskeaynuy10BPEJxN8yxLz5J1AO6mLJn4TaFJDjiFkQDqTW EwSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WE9ZyEGuVyo72628JRvkXj4/XgUWNLTkHhkataYllOQ=; fh=DXO5guTOWIURWh/aofN6x8Fmkei7q4bukDkUi5PGLBA=; b=cuK1oVBR7DuSlU8u3w4TxxgbieSo/JCTis6yVHtH5NciJDYg661uUS+sK1RZ6JkQVR /oF9kHnNB4R0llDKptkz/0cWwlA2H7t8wcJw0tHpXbxY5RbUoGRcX7i2SiwjoqyQ1AJr EogPGF9YTeKRisQsUDrYCrawGq2htlEl3VUcrcgmIsCz+qZUesQtdTbSZC2FLKThInGT DAc2Qtq1og0Ldxq3jc19H03CXDX/NCllGWuzUDyc3ee9jmLljXh0q6XYh5NEgJVqejzj efdNutiI5vyckn31vmZH9tEJZF/OTPtcvgKVYdu+meaHRwa5mbEP+oCrEixXTdKstT2K oiIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@monom.org header.s=dkim header.b=VRAoZBvs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=monom.org Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id t8-20020a656088000000b00589878c0a5bsi1301324pgu.71.2023.12.07.07.14.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 07:14:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@monom.org header.s=dkim header.b=VRAoZBvs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=monom.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 83BF380B26E2; Thu, 7 Dec 2023 07:14:23 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1443396AbjLGPN7 (ORCPT + 99 others); Thu, 7 Dec 2023 10:13:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233043AbjLGPN5 (ORCPT ); Thu, 7 Dec 2023 10:13:57 -0500 Received: from mail.nearlyone.de (mail.nearlyone.de [IPv6:2a01:4f8:1c1e:abde::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BED0019A; Thu, 7 Dec 2023 07:14:01 -0800 (PST) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 55DD4E1A5B; Thu, 7 Dec 2023 15:58:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monom.org; s=dkim; t=1701961102; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=WE9ZyEGuVyo72628JRvkXj4/XgUWNLTkHhkataYllOQ=; b=VRAoZBvsthvwrxPtFqnCCI0qI4/ETcx8w++DbEUaLSmA+nPP1SwvbySSWXBm/z3IIsKrsD aM1QB9nIJ6FDj5G598nOibnnQxtcwCLWsTYNpLNft+4GQQsV1R+Kp/0lGXs7vpFLK2TTUl DXL4helLxHw/nVTV3TJdrb/3biMtKTZVSXvLb1d2BOXFf9BSgawt3D8QfRZesYJez4DSti A1sKDCAt8hMW8SWugS8hTINDKXdvK0ub8IDm8ePgFrxu8wMQVndjX393dM7vfAb0CS/fBr UYYlaAomPmSM1ZjjX/euVa2gMs8aIP8v5JaH+AObanwe235W2vGGAif3EN1KBQ== From: Daniel Wagner To: LKML , , , Steven Rostedt , Thomas Gleixner , Sebastian Andrzej Siewior , Tom Zanussi , Clark Williams Cc: Daniel Wagner Subject: [PATCH RT 1/2] Revert "sched/rt: Provide migrate_disable/enable() inlines" Date: Thu, 7 Dec 2023 15:58:14 +0100 Message-ID: <20231207145815.30461-2-wagi@monom.org> In-Reply-To: <20231207145815.30461-1-wagi@monom.org> References: <20231207145815.30461-1-wagi@monom.org> MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Thu, 07 Dec 2023 07:14:23 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784636582864128436 X-GMAIL-MSGID: 1784636582864128436 v4.19.299-rt130-rc1 stable review patch. If anyone has any objections, please let me know. ----------- This reverts commit 56e8949825226341d28dd5156b3d0057684ff669. The tree contains already the migrate_disable/enable() helpers thus this stable backport conflicts (b) with the existing definition (compiler complains with conflicting definition). Thus we don't need this backported functions and can avoid the conflict by just dropping the backport. Signed-off-by: Daniel Wagner --- include/linux/preempt.h | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/include/linux/preempt.h b/include/linux/preempt.h index 29ecd13afdda..9c74a019bf57 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h @@ -422,34 +422,4 @@ static inline void preempt_notifier_init(struct preempt_notifier *notifier, #endif -/** - * migrate_disable - Prevent migration of the current task - * - * Maps to preempt_disable() which also disables preemption. Use - * migrate_disable() to annotate that the intent is to prevent migration, - * but not necessarily preemption. - * - * Can be invoked nested like preempt_disable() and needs the corresponding - * number of migrate_enable() invocations. - */ -static __always_inline void migrate_disable(void) -{ - preempt_disable(); -} - -/** - * migrate_enable - Allow migration of the current task - * - * Counterpart to migrate_disable(). - * - * As migrate_disable() can be invoked nested, only the outermost invocation - * reenables migration. - * - * Currently mapped to preempt_enable(). - */ -static __always_inline void migrate_enable(void) -{ - preempt_enable(); -} - #endif /* __LINUX_PREEMPT_H */ From patchwork Thu Dec 7 14:58:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 175206 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp4857312vqy; Thu, 7 Dec 2023 07:24:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IHbWuSz2ik+88qnN9f25efcJp6zEio5MqQNl0rPZbcrGfZ/OasBq53o9ZxVx+0JXDd14+hb X-Received: by 2002:a92:d6ca:0:b0:35d:59a2:2da with SMTP id z10-20020a92d6ca000000b0035d59a202damr3135302ilp.122.1701962652684; Thu, 07 Dec 2023 07:24:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701962652; cv=none; d=google.com; s=arc-20160816; b=KWq6wUhKZMcb/t71kPPy1gNeEmc8+JWHu4VDRg3+OQsLOSJTZYUC4IrIftCjdhANRU 2zNJgto5Y1QG7qG84Duv4J47zWwwmq5mrQkPkNU5qK4t1xHdM+THMVpNM5K7Gev0cIrs GqxzC8LA9FfZKFxsPfQl3nDePUfoWFlJqmdGi6mrYVOHQtm3nKdu/hC4xulUaCJfGuto SOaP6J1Xj1ViLrMkWip0PasvYLD7ohZ8xwNPKjyYxQ3zA18pi3Ec0fSJHIXxzHKcKVZz U1FxH1E2vtJ/v7EwfqJncKTBPFD8A5QXWuKLzdCo3k6aTEMFsq4vZ3FOqzUDWX1AclSn rpfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=oz0c7Is7QI/c/jVxuy5gKuSAUsDwxVIB55INpmNanLE=; fh=DXO5guTOWIURWh/aofN6x8Fmkei7q4bukDkUi5PGLBA=; b=L7T836074qEmZl83NiDHD00S3+ejCt08D2yToIZKvWfF7Xr+ueqgtcTQkSDixKMvg9 5rOskDxhLwZgJfPBgDP6IKYUvPjSQdRGnBumiz4tJ3+6NNCE8BaZCKyj1gd2E+LB+yEn Euqq408iQOC5+WD961CIyAuCLq5avCQ0+CsO0qGTngBfTU+raP4lH5Tv21ID7tGydx3e zOykZOuR/ETUfS23Aul1kTE8sbKNCuFHCgrVXlh5rFYLxWIL8gIb4ZM8occ0fOWv0fbY YaDXaxyngJRvNk95teVuEGwQV8T12/oexeABOk4yJyDdKl5Xkg3wszy8K78CnbEatb0r A3tQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@monom.org header.s=dkim header.b=mB0wlUBd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=monom.org Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id b38-20020a631b66000000b005bdf5961d93si1334443pgm.387.2023.12.07.07.24.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 07:24:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@monom.org header.s=dkim header.b=mB0wlUBd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=monom.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 619E680AFBAA; Thu, 7 Dec 2023 07:24:10 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1443455AbjLGPXw (ORCPT + 99 others); Thu, 7 Dec 2023 10:23:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1443450AbjLGPXw (ORCPT ); Thu, 7 Dec 2023 10:23:52 -0500 X-Greylist: delayed 597 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Thu, 07 Dec 2023 07:23:58 PST Received: from mail.nearlyone.de (mail.nearlyone.de [IPv6:2a01:4f8:1c1e:abde::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64A8810C2; Thu, 7 Dec 2023 07:23:58 -0800 (PST) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 6CADBE1A67; Thu, 7 Dec 2023 15:58:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monom.org; s=dkim; t=1701961103; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=oz0c7Is7QI/c/jVxuy5gKuSAUsDwxVIB55INpmNanLE=; b=mB0wlUBd7Fk2NmKgefjKbOHRxPqLP2x7XGKAwqp4WafXUwXeaCLzzWmtRRZyo3SFKC+SOI TkqXRZYng0a/OaSBl3wU9JO3n0bxBp3N3hgxlL8vPDd3q24MCFxbXXQCWFq2gw9ZwolxmM RBn8XVxqZ2OEAHcWvr0hc+Azd5qAKlkzJPJj6u8KVb4TlPOzOqcSEyaj/GLoavfkqEl2Pj K2oWZsfMtzIcgKEFrATwKwKBtTru82M6P1bG8tefXP6RXzF1+Bx54YvSBMvJJCsP/oiZqx O++OJIVeyWJCanOz3+IvvsZHtB9OSK7Xdiyj41OoUQHA9ZJC45QsxkELLKzX5Q== From: Daniel Wagner To: LKML , , , Steven Rostedt , Thomas Gleixner , Sebastian Andrzej Siewior , Tom Zanussi , Clark Williams Cc: Daniel Wagner Subject: [PATCH RT 2/2] Linux 4.19.299-rt130 Date: Thu, 7 Dec 2023 15:58:15 +0100 Message-ID: <20231207145815.30461-3-wagi@monom.org> In-Reply-To: <20231207145815.30461-1-wagi@monom.org> References: <20231207145815.30461-1-wagi@monom.org> MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Thu, 07 Dec 2023 07:24:10 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784637190384530683 X-GMAIL-MSGID: 1784637190384530683 v4.19.299-rt130-rc1 stable review patch. If anyone has any objections, please let me know. ----------- Signed-off-by: Daniel Wagner --- localversion-rt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localversion-rt b/localversion-rt index 90303f5aabcf..6fa797e5b850 100644 --- a/localversion-rt +++ b/localversion-rt @@ -1 +1 @@ --rt129 +-rt130