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.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 B9D57C43331 for ; Fri, 27 Mar 2020 10:32:42 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 9368D20578 for ; Fri, 27 Mar 2020 10:32:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9368D20578 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jHmHH-0004Xk-0n; Fri, 27 Mar 2020 10:31:51 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jHmHF-0004XJ-Jp for xen-devel@lists.xenproject.org; Fri, 27 Mar 2020 10:31:49 +0000 X-Inumbo-ID: 29ca194f-7016-11ea-893a-12813bfff9fa Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 29ca194f-7016-11ea-893a-12813bfff9fa; Fri, 27 Mar 2020 10:31:48 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 1AD2AAE07; Fri, 27 Mar 2020 10:31:47 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Fri, 27 Mar 2020 11:31:44 +0100 Message-Id: <20200327103144.19914-1-jgross@suse.com> X-Mailer: git-send-email 2.16.4 Subject: [Xen-devel] [PATCH] xen/softirq: adjust comment X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Julien Grall , Wei Liu , Andrew Cooper , Ian Jackson , George Dunlap , Jan Beulich Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" With commit cef21210fb133 ("rcu: don't process callbacks when holding a rcu_read_lock()") the comment in process_pending_softirqs() about not entering the scheduler should have been moved. Signed-off-by: Juergen Gross --- xen/common/softirq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/softirq.c b/xen/common/softirq.c index eba65c5fc0..063e93cbe3 100644 --- a/xen/common/softirq.c +++ b/xen/common/softirq.c @@ -56,6 +56,7 @@ static void __do_softirq(unsigned long ignore_mask) void process_pending_softirqs(void) { + /* Do not enter scheduler as it can preempt the calling context. */ unsigned long ignore_mask = (1ul << SCHEDULE_SOFTIRQ) | (1ul << SCHED_SLAVE_SOFTIRQ); @@ -64,7 +65,6 @@ void process_pending_softirqs(void) ignore_mask |= 1ul << RCU_SOFTIRQ; ASSERT(!in_irq() && local_irq_is_enabled()); - /* Do not enter scheduler as it can preempt the calling context. */ __do_softirq(ignore_mask); } -- 2.16.4