Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4235155pxj; Wed, 12 May 2021 00:39:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3AcIWgEbdAgziEdWCX+DE7pc4CifTRAG9MPh1vKVDOxwXrAPU/unLcNmxkb25Goprw/bg X-Received: by 2002:a05:6e02:194b:: with SMTP id x11mr31224226ilu.213.1620805140343; Wed, 12 May 2021 00:39:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620805140; cv=none; d=google.com; s=arc-20160816; b=zU1S2EvWhi8dKggdWCcpD7DoJNXaPd49aJW5Uv+fkrn70dXK5rBd6SSBQEaLKWET+w OgA5tvJ4LmpnTKPvtK9sjN2Kk7+NaRc6MXKFLWvVRlcvcWbXEuX74Dx42iLGW5QyMwN+ 4RGt2IuNYqzS7aM3VrhHCjkm1cAUf1fzXBYwfHkYjI8lLhSyTyhN+i/bgeVyl+3TyAvd mAT37Xg1GGSY917ADfH9gANE3BTrS6lEg1h+Y5EiGn+r0FHFFIVgNCMWWQIwep0DaF4t cW6X0GPQ9vN0X1nyiscU7CguWcgmpyzVj/H1wQNmfWm1RZr9OcVtC0OIhJyEnV8WhBCF Y3PQ== 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=m/HtEgfo+8owKtHSJ9OtxcPSq83IlwZd34hGYP6JvrQ=; b=i5G2PMWOMd6uNMz30uqx85em2o9kh1+sWurI2kbD1M0DhFtaDU+PzQlzWf9KAIJsyh EFDgLWnEKCoD81zwguAD/5GJyViubR7c+LpwVMsd/fDHwpTawSOtRnh3Q82cy2VYdf+A 7QnlQWW/Bg0xaeTDzBx6mtLTsSofgCH/n9F0qC1DKJxQ4xj7FwN39snzaDVDQMNBbGXf FGhP78knX1mBIWfrgxzlLMbZTmS7sN62IGcueIPmsmCoJnt3bCfzmzzxQNymMQpiZe+7 QMsX0MeMng3N5SYb6HjqaxHd/dapjkHZy+VZMRaD+hLGSMdsBAKaUsMt1nrX1PidqOF2 rpPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=UU46eiON; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j28si20920860jaq.115.2021.05.12.00.38.47; Wed, 12 May 2021 00:39:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=UU46eiON; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229994AbhELHjT (ORCPT + 99 others); Wed, 12 May 2021 03:39:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229627AbhELHjQ (ORCPT ); Wed, 12 May 2021 03:39:16 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A74B3C061574 for ; Wed, 12 May 2021 00:38:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=m/HtEgfo+8owKtHSJ9OtxcPSq83IlwZd34hGYP6JvrQ=; b=UU46eiONlI6w/kWKXRxOK1NeTa aGh0R2DWj6eIklnONmQk6uz1UWUzzHWIzfM9OPclwKLjF/OxF8osvfKn/bZBimzbbx/3SN9EiULsx 4laXg6fh/4t3OGqoPvMsNJ83vWMfrWIIrY5sQP/jwWO2/Jmhmycu7Ml/uqKaIYLXxzl8ptEYcJ9ZK 4YijAUZwqrb3tiqu/xvqOsddlGTt0ik+2RNoafc1TC2+R7hr/LB3lyFuKRSd0Dq8GRDLYcf5y5BFj C9ubITz56QNrqTStc0jjq5yf2yPu2aODpWvBVIKtfrTjNKNdtPFcdXZTryKoIZ2O+GkuPdTURqnVt bbC/7DEA==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.94 #2 (Red Hat Linux)) id 1lgjPS-0083wY-K4; Wed, 12 May 2021 07:36:11 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id CF4C3300242; Wed, 12 May 2021 09:35:55 +0200 (CEST) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 1000) id A9C2320237F69; Wed, 12 May 2021 09:35:55 +0200 (CEST) Date: Wed, 12 May 2021 09:35:55 +0200 From: Peter Zijlstra To: "Liang, Kan" Cc: Rob Herring , Ingo Molnar , "linux-kernel@vger.kernel.org" , Andi Kleen , Arnaldo Carvalho de Melo , Mark Rutland , Andy Lutomirski , Stephane Eranian , Namhyung Kim Subject: Re: [PATCH V6] perf: Reset the dirty counter to prevent the leak for an RDPMC task Message-ID: References: <1619115952-155809-1-git-send-email-kan.liang@linux.intel.com> <20210510191811.GA21560@worktop.programming.kicks-ass.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, May 11, 2021 at 05:42:54PM -0400, Liang, Kan wrote: > diff --git a/kernel/events/core.c b/kernel/events/core.c > index 1574b70..8216acc 100644 > --- a/kernel/events/core.c > +++ b/kernel/events/core.c > @@ -3851,7 +3851,7 @@ static void perf_event_context_sched_in(struct > perf_event_context *ctx, > cpu_ctx_sched_out(cpuctx, EVENT_FLEXIBLE); > perf_event_sched_in(cpuctx, ctx, task); > > - if (cpuctx->sched_cb_usage && pmu->sched_task) > + if (pmu->sched_task && (cpuctx->sched_cb_usage || > atomic_read(&pmu->sched_cb_usages))) > pmu->sched_task(cpuctx->task_ctx, true); Aside from the obvious whitespace issues; I think this should work.