Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp1131915img; Fri, 22 Mar 2019 16:45:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqxVxWMAViNx0nSeDdD0xwjgV867Jzf7dc1QBSxePEjg1OpYMKigD4joEpFt+Qzw7oZTHU+h X-Received: by 2002:a62:1212:: with SMTP id a18mr11865738pfj.177.1553298318527; Fri, 22 Mar 2019 16:45:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553298318; cv=none; d=google.com; s=arc-20160816; b=RkVxSmEbSTKhHY9JW7mlNMMkqmGz9gf6h5yBxhTXCOmWgq6G9M+W8/tF192OlCbPls iTdLfRCyuW+kBVzwculXgqmpXoILtQZpqTJ3viJ3zNh8Msanl0M9EkdQ+RamoYGgsU22 9AoNXJ4HfWF+KOGdWyHIwExEgwZh0kO9Xnr1yRlh2UAzMUDtL11UAqDIMtKRw/0V/ijW V7gcpbKC0R6BCu/1xIkBqOY16ho25d5LaoHC1HhqrC7ciL3g4c7y+ZMnAtoIBL35yLaJ gke51sdf3YkAEiY7vB5N4Snm7Is3vXHpd4JwxNCkXhryvtXQKPLPlBv+uZjswGZfrjJg PglQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:autocrypt:openpgp:references:cc:to:from:subject; bh=q21b/qtdREyXx/+Ia5XeDnXkq6TX0pppkhvFxIwHYTU=; b=cIjg9FJJQ5T6NRxfb367/ifDuup3R90PQTWKhGPEbT/Pf+8sTaeRRGthpZRTUMEtOi UP/C55MB3SQ4zPCgQf93WiE+3CtImbWPbM1U6iq6JAU3IWBqzaJimxjVNTMtDt2PrE5I DVGcy+/xaR6AjUaunikB/XB7zAi+yZkLFKHXWku8yLCmY7G+lHKuWFUh2Iu0fIG3xn0+ r+7u19lzoavKTnJR7vi68b5PIV1BqpFVptt1Vs6JiUprF67cJb8ziVhHqJvOEN5aSRfx zqbgNhCPHwtBvLvUUGsjwqZ6ahSLf17wPWYbKxW5ZOAdvm/T5DjUV8OvJJ3q/IQeAoyJ AAfw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t5si7655274pgu.517.2019.03.22.16.45.01; Fri, 22 Mar 2019 16:45:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727157AbfCVXoX (ORCPT + 99 others); Fri, 22 Mar 2019 19:44:23 -0400 Received: from mga04.intel.com ([192.55.52.120]:38251 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725999AbfCVXoX (ORCPT ); Fri, 22 Mar 2019 19:44:23 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Mar 2019 16:44:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,256,1549958400"; d="scan'208";a="154343226" Received: from schen9-desk.jf.intel.com (HELO [10.54.74.162]) ([10.54.74.162]) by fmsmga002.fm.intel.com with ESMTP; 22 Mar 2019 16:44:22 -0700 Subject: Re: [RFC][PATCH 03/16] sched: Wrap rq::lock access From: Tim Chen To: Subhra Mazumdar , Julien Desfossez , Peter Zijlstra , mingo@kernel.org, tglx@linutronix.de, pjt@google.com, torvalds@linux-foundation.org Cc: linux-kernel@vger.kernel.org, fweisbec@gmail.com, keescook@chromium.org, kerrnel@google.com, Vineeth Pillai , Nishanth Aravamudan , Pawan Gupta , Aubrey References: <20190218173514.064516553@infradead.org> <1552923710-30933-1-git-send-email-jdesfossez@digitalocean.com> <15f3f7e6-5dce-6bbf-30af-7cffbd7bb0c3@oracle.com> <69e2eea0-51de-bdcd-cdda-ce5cd841786d@linux.intel.com> Openpgp: preference=signencrypt Autocrypt: addr=tim.c.chen@linux.intel.com; prefer-encrypt=mutual; keydata= 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 l50q2K/r651xphs7CGEdKi1nU0YJVbQxJQ== Message-ID: <64164f69-8031-22b1-7924-28037d661fcd@linux.intel.com> Date: Fri, 22 Mar 2019 16:44:22 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.3.1 MIME-Version: 1.0 In-Reply-To: <69e2eea0-51de-bdcd-cdda-ce5cd841786d@linux.intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 3/22/19 4:28 PM, Tim Chen wrote: > On 3/19/19 7:29 PM, Subhra Mazumdar wrote: >> >> On 3/18/19 8:41 AM, Julien Desfossez wrote: >>> The case where we try to acquire the lock on 2 runqueues belonging to 2 >>> different cores requires the rq_lockp wrapper as well otherwise we >>> frequently deadlock in there. >>> >>> This fixes the crash reported in >>> 1552577311-8218-1-git-send-email-jdesfossez@digitalocean.com >>> >>> diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h >>> index 76fee56..71bb71f 100644 >>> --- a/kernel/sched/sched.h >>> +++ b/kernel/sched/sched.h >>> @@ -2078,7 +2078,7 @@ static inline void double_rq_lock(struct rq *rq1, struct rq *rq2) >>>           raw_spin_lock(rq_lockp(rq1)); >>>           __acquire(rq2->lock);    /* Fake it out ;) */ >>>       } else { >>> -        if (rq1 < rq2) { >>> +        if (rq_lockp(rq1) < rq_lockp(rq2)) { >>>               raw_spin_lock(rq_lockp(rq1)); >>>               raw_spin_lock_nested(rq_lockp(rq2), SINGLE_DEPTH_NESTING); >>>           } else { > > > Pawan was seeing occasional crashes and lock up that's avoided by doing the following. > We're trying to dig a little more tracing to see why pick_next_entity is returning > NULL. > We found the root cause was a missing chunk when we port Subhra's fix of pick_next_entity * Someone really wants this to run. If it's not unfair, run it. */ - if (cfs_rq->next && wakeup_preempt_entity(cfs_rq->next, left) < 1) + if (left && cfs_rq->next && wakeup_preempt_entity(cfs_rq->next, left) + < 1) That fixes the problem of pick_next_entity returning NULL. sorry for the noise. Tim