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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED 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 40FC6C4708F for ; Wed, 2 Jun 2021 13:59:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2B71D613E7 for ; Wed, 2 Jun 2021 13:59:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229839AbhFBOAx (ORCPT ); Wed, 2 Jun 2021 10:00:53 -0400 Received: from mail.efficios.com ([167.114.26.124]:35192 "EHLO mail.efficios.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230029AbhFBOAw (ORCPT ); Wed, 2 Jun 2021 10:00:52 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.efficios.com (Postfix) with ESMTP id 0BB63302B2C; Wed, 2 Jun 2021 09:59:09 -0400 (EDT) Received: from mail.efficios.com ([127.0.0.1]) by localhost (mail03.efficios.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id zle7ixm03a6t; Wed, 2 Jun 2021 09:59:08 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.efficios.com (Postfix) with ESMTP id 3623D302779; Wed, 2 Jun 2021 09:59:08 -0400 (EDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.efficios.com 3623D302779 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficios.com; s=default; t=1622642348; bh=3NQkpeJ7B+hKtKJgR6oI37w8WcTETaBafQ5/DPMEWwI=; h=Date:From:To:Message-ID:MIME-Version; b=ZlLvrNpb7FSQdBC5tIEKb93seCOYMQlGgXqNDCt4mx931pzNw8PkQPGTIAknvIKON NpDSBJXZebM5bdDBEXJUhkVKv214RxCfD9cnMAu+E9jlJUbxCT0sSH9pfYpV4sduq4 x3/Ha4HOzhfJ5u6uVpyJg0D3SZEpnzu++L3CaXS5k4TUIGuZ+VTcOcX9C3+gYxGHL4 vP87muDZtj763iw70P68DkCsJf/o77PvwVPhmezDZ6qbVfVNe7D4w95pMohMEmylCc wLPLpR4HOsL54+3PlAjOEK3N1Uw5WtMxdLnoo8ef/7RMfiFuOK3kBtQodyzCCa6QyK u+WAXvtkoLOCw== X-Virus-Scanned: amavisd-new at efficios.com Received: from mail.efficios.com ([127.0.0.1]) by localhost (mail03.efficios.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id sGHjL0HFYOjb; Wed, 2 Jun 2021 09:59:08 -0400 (EDT) Received: from mail03.efficios.com (mail03.efficios.com [167.114.26.124]) by mail.efficios.com (Postfix) with ESMTP id 00C463028D6; Wed, 2 Jun 2021 09:59:08 -0400 (EDT) Date: Wed, 2 Jun 2021 09:59:07 -0400 (EDT) From: Mathieu Desnoyers To: Peter Zijlstra Cc: Thomas Gleixner , Ingo Molnar , Juri Lelli , Vincent Guittot , Dietmar Eggemann , rostedt , Ben Segall , Mel Gorman , bristot , Borislav Petkov , x86 , "H. Peter Anvin" , Jens Axboe , Alasdair Kergon , Mike Snitzer , dm-devel@redhat.com, "David S. Miller" , Jakub Kicinski , Felipe Balbi , Greg Kroah-Hartman , Alexander Viro , Tejun Heo , Zefan Li , Johannes Weiner , Jason Wessel , Daniel Thompson , Douglas Anderson , acme , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , "Rafael J. Wysocki" , Pavel Machek , Will Deacon , Waiman Long , Boqun Feng , Oleg Nesterov , Davidlohr Bueso , paulmck , Josh Triplett , Lai Jiangshan , "Joel Fernandes, Google" , John Stultz , Stephen Boyd , Andrew Morton , Paolo Bonzini , linux-kernel , linux-block@vger.kernel.org, netdev , linux-usb@vger.kernel.org, linux-fsdevel , cgroups , kgdb-bugreport@lists.sourceforge.net, linux-perf-users@vger.kernel.org, linux-pm@vger.kernel.org, rcu , linux-mm , KVM list Message-ID: <1873020549.5854.1622642347895.JavaMail.zimbra@efficios.com> In-Reply-To: <20210602133040.398289363@infradead.org> References: <20210602131225.336600299@infradead.org> <20210602133040.398289363@infradead.org> Subject: Re: [PATCH 3/6] sched,perf,kvm: Fix preemption condition MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [167.114.26.124] X-Mailer: Zimbra 8.8.15_GA_4018 (ZimbraWebClient - FF88 (Linux)/8.8.15_GA_4026) Thread-Topic: sched,perf,kvm: Fix preemption condition Thread-Index: r+iuleOU2QevO+uazLhH122pXkMx7g== Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org ----- On Jun 2, 2021, at 9:12 AM, Peter Zijlstra peterz@infradead.org wrote: > When ran from the sched-out path (preempt_notifier or perf_event), > p->state is irrelevant to determine preemption. You can get preempted > with !task_is_running() just fine. > > The right indicator for preemption is if the task is still on the > runqueue in the sched-out path. > > Signed-off-by: Peter Zijlstra (Intel) > --- > kernel/events/core.c | 7 +++---- > virt/kvm/kvm_main.c | 2 +- > 2 files changed, 4 insertions(+), 5 deletions(-) > > --- a/kernel/events/core.c > +++ b/kernel/events/core.c > @@ -8568,13 +8568,12 @@ static void perf_event_switch(struct tas > }, > }; > > - if (!sched_in && task->state == TASK_RUNNING) > + if (!sched_in && current->on_rq) { This changes from checking task->state to current->on_rq, but this change from "task" to "current" is not described in the commit message, which is odd. Are we really sure that task == current here ? Thanks, Mathieu > switch_event.event_id.header.misc |= > PERF_RECORD_MISC_SWITCH_OUT_PREEMPT; > + } > > - perf_iterate_sb(perf_event_switch_output, > - &switch_event, > - NULL); > + perf_iterate_sb(perf_event_switch_output, &switch_event, NULL); > } > > /* > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -4869,7 +4869,7 @@ static void kvm_sched_out(struct preempt > { > struct kvm_vcpu *vcpu = preempt_notifier_to_vcpu(pn); > > - if (current->state == TASK_RUNNING) { > + if (current->on_rq) { > WRITE_ONCE(vcpu->preempted, true); > WRITE_ONCE(vcpu->ready, true); > } -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com 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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED 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 4F47EC47092 for ; Wed, 2 Jun 2021 13:59:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C118C613E6 for ; Wed, 2 Jun 2021 13:59:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C118C613E6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 4E7C26B006E; Wed, 2 Jun 2021 09:59:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 497CC6B0070; Wed, 2 Jun 2021 09:59:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2EA1E6B0071; Wed, 2 Jun 2021 09:59:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0055.hostedemail.com [216.40.44.55]) by kanga.kvack.org (Postfix) with ESMTP id E7EF96B006E for ; Wed, 2 Jun 2021 09:59:10 -0400 (EDT) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 86909180AD804 for ; Wed, 2 Jun 2021 13:59:10 +0000 (UTC) X-FDA: 78208940460.23.00B183B Received: from mail.efficios.com (mail.efficios.com [167.114.26.124]) by imf15.hostedemail.com (Postfix) with ESMTP id 8692CA00025B for ; Wed, 2 Jun 2021 13:59:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.efficios.com (Postfix) with ESMTP id 0BB63302B2C; Wed, 2 Jun 2021 09:59:09 -0400 (EDT) Received: from mail.efficios.com ([127.0.0.1]) by localhost (mail03.efficios.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id zle7ixm03a6t; Wed, 2 Jun 2021 09:59:08 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.efficios.com (Postfix) with ESMTP id 3623D302779; Wed, 2 Jun 2021 09:59:08 -0400 (EDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.efficios.com 3623D302779 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficios.com; s=default; t=1622642348; bh=3NQkpeJ7B+hKtKJgR6oI37w8WcTETaBafQ5/DPMEWwI=; h=Date:From:To:Message-ID:MIME-Version; b=ZlLvrNpb7FSQdBC5tIEKb93seCOYMQlGgXqNDCt4mx931pzNw8PkQPGTIAknvIKON NpDSBJXZebM5bdDBEXJUhkVKv214RxCfD9cnMAu+E9jlJUbxCT0sSH9pfYpV4sduq4 x3/Ha4HOzhfJ5u6uVpyJg0D3SZEpnzu++L3CaXS5k4TUIGuZ+VTcOcX9C3+gYxGHL4 vP87muDZtj763iw70P68DkCsJf/o77PvwVPhmezDZ6qbVfVNe7D4w95pMohMEmylCc wLPLpR4HOsL54+3PlAjOEK3N1Uw5WtMxdLnoo8ef/7RMfiFuOK3kBtQodyzCCa6QyK u+WAXvtkoLOCw== X-Virus-Scanned: amavisd-new at efficios.com Received: from mail.efficios.com ([127.0.0.1]) by localhost (mail03.efficios.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id sGHjL0HFYOjb; Wed, 2 Jun 2021 09:59:08 -0400 (EDT) Received: from mail03.efficios.com (mail03.efficios.com [167.114.26.124]) by mail.efficios.com (Postfix) with ESMTP id 00C463028D6; Wed, 2 Jun 2021 09:59:08 -0400 (EDT) Date: Wed, 2 Jun 2021 09:59:07 -0400 (EDT) From: Mathieu Desnoyers To: Peter Zijlstra Cc: Thomas Gleixner , Ingo Molnar , Juri Lelli , Vincent Guittot , Dietmar Eggemann , rostedt , Ben Segall , Mel Gorman , bristot , Borislav Petkov , x86 , "H. Peter Anvin" , Jens Axboe , Alasdair Kergon , Mike Snitzer , dm-devel@redhat.com, "David S. Miller" , Jakub Kicinski , Felipe Balbi , Greg Kroah-Hartman , Alexander Viro , Tejun Heo , Zefan Li , Johannes Weiner , Jason Wessel , Daniel Thompson , Douglas Anderson , acme , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , "Rafael J. Wysocki" , Pavel Machek , Will Deacon , Waiman Long , Boqun Feng , Oleg Nesterov , Davidlohr Bueso , paulmck , Josh Triplett , Lai Jiangshan , "Joel Fernandes, Google" , John Stultz , Stephen Boyd , Andrew Morton , Paolo Bonzini , linux-kernel , linux-block@vger.kernel.org, netdev , linux-usb@vger.kernel.org, linux-fsdevel , cgroups , kgdb-bugreport@lists.sourceforge.net, linux-perf-users@vger.kernel.org, linux-pm@vger.kernel.org, rcu , linux-mm , KVM list Message-ID: <1873020549.5854.1622642347895.JavaMail.zimbra@efficios.com> In-Reply-To: <20210602133040.398289363@infradead.org> References: <20210602131225.336600299@infradead.org> <20210602133040.398289363@infradead.org> Subject: Re: [PATCH 3/6] sched,perf,kvm: Fix preemption condition MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [167.114.26.124] X-Mailer: Zimbra 8.8.15_GA_4018 (ZimbraWebClient - FF88 (Linux)/8.8.15_GA_4026) Thread-Topic: sched,perf,kvm: Fix preemption condition Thread-Index: r+iuleOU2QevO+uazLhH122pXkMx7g== Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=efficios.com header.s=default header.b=ZlLvrNpb; dmarc=pass (policy=none) header.from=efficios.com; spf=pass (imf15.hostedemail.com: domain of compudj@efficios.com designates 167.114.26.124 as permitted sender) smtp.mailfrom=compudj@efficios.com X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 8692CA00025B X-Stat-Signature: gr9ns14wzq1z1zggs4iohtxqjb5z3tzt X-HE-Tag: 1622642342-132639 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: ----- On Jun 2, 2021, at 9:12 AM, Peter Zijlstra peterz@infradead.org wrote: > When ran from the sched-out path (preempt_notifier or perf_event), > p->state is irrelevant to determine preemption. You can get preempted > with !task_is_running() just fine. > > The right indicator for preemption is if the task is still on the > runqueue in the sched-out path. > > Signed-off-by: Peter Zijlstra (Intel) > --- > kernel/events/core.c | 7 +++---- > virt/kvm/kvm_main.c | 2 +- > 2 files changed, 4 insertions(+), 5 deletions(-) > > --- a/kernel/events/core.c > +++ b/kernel/events/core.c > @@ -8568,13 +8568,12 @@ static void perf_event_switch(struct tas > }, > }; > > - if (!sched_in && task->state == TASK_RUNNING) > + if (!sched_in && current->on_rq) { This changes from checking task->state to current->on_rq, but this change from "task" to "current" is not described in the commit message, which is odd. Are we really sure that task == current here ? Thanks, Mathieu > switch_event.event_id.header.misc |= > PERF_RECORD_MISC_SWITCH_OUT_PREEMPT; > + } > > - perf_iterate_sb(perf_event_switch_output, > - &switch_event, > - NULL); > + perf_iterate_sb(perf_event_switch_output, &switch_event, NULL); > } > > /* > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -4869,7 +4869,7 @@ static void kvm_sched_out(struct preempt > { > struct kvm_vcpu *vcpu = preempt_notifier_to_vcpu(pn); > > - if (current->state == TASK_RUNNING) { > + if (current->on_rq) { > WRITE_ONCE(vcpu->preempted, true); > WRITE_ONCE(vcpu->ready, true); > } -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com 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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,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 05778C47082 for ; Thu, 3 Jun 2021 06:34:01 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (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 74889613F4 for ; Thu, 3 Jun 2021 06:33:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 74889613F4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=dm-devel-bounces@redhat.com Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-387-fH6yUqEfOpih0kTbSF3OEw-1; Thu, 03 Jun 2021 02:33:25 -0400 X-MC-Unique: fH6yUqEfOpih0kTbSF3OEw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BB70B79EC2; Thu, 3 Jun 2021 06:33:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 992F269108; Thu, 3 Jun 2021 06:33:16 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 608021801268; Thu, 3 Jun 2021 06:33:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 152E7ePt031499 for ; Wed, 2 Jun 2021 10:07:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id D357BAEC98; Wed, 2 Jun 2021 14:07:40 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CDEA1AEC88 for ; Wed, 2 Jun 2021 14:07:32 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 00D8590DE3B for ; Wed, 2 Jun 2021 14:07:32 +0000 (UTC) Received: from mail.efficios.com (mail.efficios.com [167.114.26.124]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-268-6a5AP2fpMPScEC7XEyfFiw-1; Wed, 02 Jun 2021 10:07:28 -0400 X-MC-Unique: 6a5AP2fpMPScEC7XEyfFiw-1 Received: from localhost (localhost [127.0.0.1]) by mail.efficios.com (Postfix) with ESMTP id 0BB63302B2C; Wed, 2 Jun 2021 09:59:09 -0400 (EDT) Received: from mail.efficios.com ([127.0.0.1]) by localhost (mail03.efficios.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id zle7ixm03a6t; Wed, 2 Jun 2021 09:59:08 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.efficios.com (Postfix) with ESMTP id 3623D302779; Wed, 2 Jun 2021 09:59:08 -0400 (EDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.efficios.com 3623D302779 X-Virus-Scanned: amavisd-new at efficios.com Received: from mail.efficios.com ([127.0.0.1]) by localhost (mail03.efficios.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id sGHjL0HFYOjb; Wed, 2 Jun 2021 09:59:08 -0400 (EDT) Received: from mail03.efficios.com (mail03.efficios.com [167.114.26.124]) by mail.efficios.com (Postfix) with ESMTP id 00C463028D6; Wed, 2 Jun 2021 09:59:08 -0400 (EDT) Date: Wed, 2 Jun 2021 09:59:07 -0400 (EDT) From: Mathieu Desnoyers To: Peter Zijlstra Message-ID: <1873020549.5854.1622642347895.JavaMail.zimbra@efficios.com> In-Reply-To: <20210602133040.398289363@infradead.org> References: <20210602131225.336600299@infradead.org> <20210602133040.398289363@infradead.org> MIME-Version: 1.0 X-Originating-IP: [167.114.26.124] Thread-Topic: sched,perf,kvm: Fix preemption condition Thread-Index: r+iuleOU2QevO+uazLhH122pXkMx7g== X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: dm-devel@redhat.com X-Mailman-Approved-At: Thu, 03 Jun 2021 02:32:49 -0400 Cc: Juri Lelli , Mark Rutland , Pavel Machek , Mike Snitzer , Alexander Shishkin , kgdb-bugreport@lists.sourceforge.net, Lai Jiangshan , Oleg Nesterov , Ben Segall , linux-mm , dm-devel@redhat.com, Paolo Bonzini , Zefan Li , "H. Peter Anvin" , "Joel Fernandes, Google" , netdev , Jiri Olsa , Alasdair Kergon , Daniel Thompson , Davidlohr Bueso , Vincent Guittot , KVM list , Will Deacon , cgroups , x86 , Ingo Molnar , Mel Gorman , Jakub Kicinski , paulmck , linux-pm@vger.kernel.org, Boqun Feng , Jason Wessel , Josh Triplett , rostedt , linux-block@vger.kernel.org, linux-fsdevel , Borislav Petkov , Alexander Viro , Waiman Long , Namhyung Kim , Thomas Gleixner , acme , Dietmar Eggemann , Jens Axboe , Felipe Balbi , Stephen Boyd , Greg Kroah-Hartman , linux-usb@vger.kernel.org, "Rafael J. Wysocki" , Douglas Anderson , linux-kernel , linux-perf-users@vger.kernel.org, Johannes Weiner , Tejun Heo , John Stultz , Andrew Morton , rcu , bristot , "David S. Miller" Subject: Re: [dm-devel] [PATCH 3/6] sched, perf, kvm: Fix preemption condition X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit ----- On Jun 2, 2021, at 9:12 AM, Peter Zijlstra peterz@infradead.org wrote: > When ran from the sched-out path (preempt_notifier or perf_event), > p->state is irrelevant to determine preemption. You can get preempted > with !task_is_running() just fine. > > The right indicator for preemption is if the task is still on the > runqueue in the sched-out path. > > Signed-off-by: Peter Zijlstra (Intel) > --- > kernel/events/core.c | 7 +++---- > virt/kvm/kvm_main.c | 2 +- > 2 files changed, 4 insertions(+), 5 deletions(-) > > --- a/kernel/events/core.c > +++ b/kernel/events/core.c > @@ -8568,13 +8568,12 @@ static void perf_event_switch(struct tas > }, > }; > > - if (!sched_in && task->state == TASK_RUNNING) > + if (!sched_in && current->on_rq) { This changes from checking task->state to current->on_rq, but this change from "task" to "current" is not described in the commit message, which is odd. Are we really sure that task == current here ? Thanks, Mathieu > switch_event.event_id.header.misc |= > PERF_RECORD_MISC_SWITCH_OUT_PREEMPT; > + } > > - perf_iterate_sb(perf_event_switch_output, > - &switch_event, > - NULL); > + perf_iterate_sb(perf_event_switch_output, &switch_event, NULL); > } > > /* > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -4869,7 +4869,7 @@ static void kvm_sched_out(struct preempt > { > struct kvm_vcpu *vcpu = preempt_notifier_to_vcpu(pn); > > - if (current->state == TASK_RUNNING) { > + if (current->on_rq) { > WRITE_ONCE(vcpu->preempted, true); > WRITE_ONCE(vcpu->ready, true); > } -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mathieu Desnoyers Subject: Re: [PATCH 3/6] sched,perf,kvm: Fix preemption condition Date: Wed, 2 Jun 2021 09:59:07 -0400 (EDT) Message-ID: <1873020549.5854.1622642347895.JavaMail.zimbra@efficios.com> References: <20210602131225.336600299@infradead.org> <20210602133040.398289363@infradead.org> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Return-path: DKIM-Filter: OpenDKIM Filter v2.10.3 mail.efficios.com 2A108302BA9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficios.com; s=default; t=1622642348; bh=3NQkpeJ7B+hKtKJgR6oI37w8WcTETaBafQ5/DPMEWwI=; h=Date:From:To:Message-ID:MIME-Version; b=ZlLvrNpb7FSQdBC5tIEKb93seCOYMQlGgXqNDCt4mx931pzNw8PkQPGTIAknvIKON NpDSBJXZebM5bdDBEXJUhkVKv214RxCfD9cnMAu+E9jlJUbxCT0sSH9pfYpV4sduq4 x3/Ha4HOzhfJ5u6uVpyJg0D3SZEpnzu++L3CaXS5k4TUIGuZ+VTcOcX9C3+gYxGHL4 vP87muDZtj763iw70P68DkCsJf/o77PvwVPhmezDZ6qbVfVNe7D4w95pMohMEmylCc wLPLpR4HOsL54+3PlAjOEK3N1Uw5WtMxdLnoo8ef/7RMfiFuOK3kBtQodyzCCa6QyK u+WAXvtkoLOCw== In-Reply-To: <20210602133040.398289363@infradead.org> List-ID: Content-Type: text/plain; charset="us-ascii" To: Peter Zijlstra Cc: Thomas Gleixner , Ingo Molnar , Juri Lelli , Vincent Guittot , Dietmar Eggemann , rostedt , Ben Segall , Mel Gorman , bristot , Borislav Petkov , x86 , "H. Peter Anvin" , Jens Axboe , Alasdair Kergon , Mike Snitzer , dm-devel@redhat.com, "David S. Miller" , Jakub Kicinski , Felipe Balbi , Greg Kroah-Hartman , Alexander Viro , Tejun Heo , Zefan Li ----- On Jun 2, 2021, at 9:12 AM, Peter Zijlstra peterz@infradead.org wrote: > When ran from the sched-out path (preempt_notifier or perf_event), > p->state is irrelevant to determine preemption. You can get preempted > with !task_is_running() just fine. > > The right indicator for preemption is if the task is still on the > runqueue in the sched-out path. > > Signed-off-by: Peter Zijlstra (Intel) > --- > kernel/events/core.c | 7 +++---- > virt/kvm/kvm_main.c | 2 +- > 2 files changed, 4 insertions(+), 5 deletions(-) > > --- a/kernel/events/core.c > +++ b/kernel/events/core.c > @@ -8568,13 +8568,12 @@ static void perf_event_switch(struct tas > }, > }; > > - if (!sched_in && task->state == TASK_RUNNING) > + if (!sched_in && current->on_rq) { This changes from checking task->state to current->on_rq, but this change from "task" to "current" is not described in the commit message, which is odd. Are we really sure that task == current here ? Thanks, Mathieu > switch_event.event_id.header.misc |= > PERF_RECORD_MISC_SWITCH_OUT_PREEMPT; > + } > > - perf_iterate_sb(perf_event_switch_output, > - &switch_event, > - NULL); > + perf_iterate_sb(perf_event_switch_output, &switch_event, NULL); > } > > /* > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -4869,7 +4869,7 @@ static void kvm_sched_out(struct preempt > { > struct kvm_vcpu *vcpu = preempt_notifier_to_vcpu(pn); > > - if (current->state == TASK_RUNNING) { > + if (current->on_rq) { > WRITE_ONCE(vcpu->preempted, true); > WRITE_ONCE(vcpu->ready, true); > } -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com