Message ID | 1478077718-37424-3-git-send-email-xinhui.pan@linux.vnet.ibm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <xen-devel-bounces@lists.xen.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 34A4C60234 for <patchwork-xen-devel@patchwork.kernel.org>; Wed, 2 Nov 2016 05:15:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 265CB29E05 for <patchwork-xen-devel@patchwork.kernel.org>; Wed, 2 Nov 2016 05:15:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1A73729E08; Wed, 2 Nov 2016 05:15:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.2 required=2.0 tests=BAYES_00, DATE_IN_FUTURE_03_06, RCVD_IN_DNSWL_MED autolearn=no version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C36E329E05 for <patchwork-xen-devel@patchwork.kernel.org>; Wed, 2 Nov 2016 05:15:48 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from <xen-devel-bounces@lists.xen.org>) id 1c1nrq-0001xX-OG; Wed, 02 Nov 2016 05:13:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from <xinhui.pan@linux.vnet.ibm.com>) id 1c1nrp-0001x1-7f for xen-devel@lists.xenproject.org; Wed, 02 Nov 2016 05:13:41 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id EB/45-22514-40679185; Wed, 02 Nov 2016 05:13:40 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBIsWRWlGSWpSXmKPExsUyZfEcRl3mMsk Ig+8rTS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oz/7yazFEwWqVj/9hpjA2OPYBcjJ4eQwCVG idazkl2MXEB2C5PEqu0/GCGcN4wSB39PY4dwTjNKXPx9kgnCWc8o8frEVKiynYwSe49/Z4Nw1 jFKbHi2Cipzm1Hi7KyrrCBr2AQMJG5c2MQCkhAR6GaSeLVhDSNIglngPLPE+S8GILawgJvEsb YOsDiLgKrE0YedQNs5OCQE5CWe3a4HCXMK+Ek8+riMGeJ0X4llF76DlUsIiEhM/PueDcJWlbg 4ZyYzhK0jcXPKTSjbQmJFA8Q9EgJGEt/eLgSr5wWac7L5GlRvlsT+vbfB7pQQ+M8o8eX0QvYJ jBILGBlWMaoXpxaVpRbpmuslFWWmZ5TkJmbm6BoamOrlphYXJ6an5iQmFesl5+duYgTGCAMQ7 GA8Ntn5EKMkB5OSKK9NsmSEEF9SfkplRmJxRnxRaU5q8SFGGQ4OJQlekxKgnGBRanpqRVpmDj BaYdISHDxKIrzmIGne4oLE3OLMdIjUKUZFKXFeFZCEAEgiozQPrg2WIC4xykoJ8zICHSLEU5B alJtZgir/ilGcg1FJmNcGZApPZl4J3PRXQIuZQBYnSYAsLklESEk1MCab/Rb7kXmlz7jm/Jzi A0+lekxeLW7ptJh650PNlCP9pjPMU1wKXS49ZHCLeF3T6TDDUJc9N7fWv30e+6abK35OeKrQq rPjYjbDlvWKGzcy5JgXSCmJTLq9T9pmRvZ+Dz/O33+OXi3dHHhLLqLzzXtD4zkpO32UQ9eWi+ y+2TNN8aT9UjGti0osxRmJhlrMRcWJACLvsR8LAwAA X-Env-Sender: xinhui.pan@linux.vnet.ibm.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1478063618!68143373!1 X-Originating-IP: [148.163.156.1] X-SpamReason: No, hits=2.1 required=7.0 tests=DATE_IN_FUTURE_03_06, UNPARSEABLE_RELAY X-StarScan-Received: X-StarScan-Version: 9.0.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13293 invoked from network); 2 Nov 2016 05:13:39 -0000 Received: from mx0a-001b2d01.pphosted.com (HELO mx0a-001b2d01.pphosted.com) (148.163.156.1) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 2 Nov 2016 05:13:39 -0000 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id uA25DQZT132015 for <xen-devel@lists.xenproject.org>; Wed, 2 Nov 2016 01:13:38 -0400 Received: from e23smtp05.au.ibm.com (e23smtp05.au.ibm.com [202.81.31.147]) by mx0a-001b2d01.pphosted.com with ESMTP id 26f7awgq8x-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for <xen-devel@lists.xenproject.org>; Wed, 02 Nov 2016 01:13:37 -0400 Received: from localhost by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for <xen-devel@lists.xenproject.org> from <xinhui.pan@linux.vnet.ibm.com>; Wed, 2 Nov 2016 15:13:35 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp05.au.ibm.com (202.81.31.211) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 2 Nov 2016 15:13:32 +1000 Received: from d23relay10.au.ibm.com (d23relay10.au.ibm.com [9.190.26.77]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 5A0142BB0059; Wed, 2 Nov 2016 16:13:32 +1100 (EST) Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay10.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id uA25DWdY3145998; Wed, 2 Nov 2016 16:13:32 +1100 Received: from d23av02.au.ibm.com (localhost [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id uA25DUX1007248; Wed, 2 Nov 2016 16:13:32 +1100 Received: from ltcalpine2-lp13.aus.stglabs.ibm.com (ltcalpine2-lp13.aus.stglabs.ibm.com [9.40.195.196]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id uA25CnXg006036; Wed, 2 Nov 2016 16:13:25 +1100 From: Pan Xinhui <xinhui.pan@linux.vnet.ibm.com> To: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, virtualization@lists.linux-foundation.org, linux-s390@vger.kernel.org, xen-devel-request@lists.xenproject.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, x86@kernel.org Date: Wed, 2 Nov 2016 05:08:29 -0400 X-Mailer: git-send-email 2.4.11 In-Reply-To: <1478077718-37424-1-git-send-email-xinhui.pan@linux.vnet.ibm.com> References: <1478077718-37424-1-git-send-email-xinhui.pan@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16110205-0016-0000-0000-000001E61B9F X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16110205-0017-0000-0000-000005C0798C Message-Id: <1478077718-37424-3-git-send-email-xinhui.pan@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-11-02_02:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609300000 definitions=main-1611020096 Cc: kernellwp@gmail.com, jgross@suse.com, dave@stgolabs.net, David.Laight@ACULAB.COM, rkrcmar@redhat.com, peterz@infradead.org, benh@kernel.crashing.org, bsingharora@gmail.com, will.deacon@arm.com, Pan Xinhui <xinhui.pan@linux.vnet.ibm.com>, borntraeger@de.ibm.com, mingo@redhat.com, paulus@samba.org, mpe@ellerman.id.au, pbonzini@redhat.com, paulmck@linux.vnet.ibm.com, boqun.feng@gmail.com Subject: [Xen-devel] [PATCH v7 02/11] locking/osq: Drop the overload of osq_lock() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion <xen-devel.lists.xen.org> List-Unsubscribe: <https://lists.xen.org/cgi-bin/mailman/options/xen-devel>, <mailto:xen-devel-request@lists.xen.org?subject=unsubscribe> List-Post: <mailto:xen-devel@lists.xen.org> List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help> List-Subscribe: <https://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xen.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" <xen-devel-bounces@lists.xen.org> X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/kernel/locking/osq_lock.c b/kernel/locking/osq_lock.c index 05a3785..091f97f 100644 --- a/kernel/locking/osq_lock.c +++ b/kernel/locking/osq_lock.c @@ -21,6 +21,11 @@ static inline int encode_cpu(int cpu_nr) return cpu_nr + 1; } +static inline int node_cpu(struct optimistic_spin_node *node) +{ + return node->cpu - 1; +} + static inline struct optimistic_spin_node *decode_cpu(int encoded_cpu_val) { int cpu_nr = encoded_cpu_val - 1; @@ -118,8 +123,9 @@ bool osq_lock(struct optimistic_spin_queue *lock) while (!READ_ONCE(node->locked)) { /* * If we need to reschedule bail... so we can block. + * Use vcpu_is_preempted to detect lock holder preemption issue. */ - if (need_resched()) + if (need_resched() || vcpu_is_preempted(node_cpu(node->prev))) goto unqueue; cpu_relax_lowlatency();