From patchwork Thu Dec 13 14:09:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 153646 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp846204ljp; Thu, 13 Dec 2018 06:10:05 -0800 (PST) X-Google-Smtp-Source: AFSGD/UNF8FFCeGi4sbeuQMGjfEljxu7knP7j9nCg3xxx5J9AYZkr/RmTf5n+lFT/ytOw2Y5EMZt X-Received: by 2002:a63:e21:: with SMTP id d33mr771582pgl.272.1544710205188; Thu, 13 Dec 2018 06:10:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544710205; cv=none; d=google.com; s=arc-20160816; b=aG10zJHpjY1Rp1KtSoNcIRwg7/GJzEMGIUx+utXiSgA/RD6CGeZ69BFyrpd9Xr0q9O +d2G3wPfAtCPpgfWUQ1pw9WsLfNaC9j9WGnz/gjnU2+umlvpU1otm/1duajSmPUONz/1 /J2EEzBFK84yGMaNEOhemu/6XykO5LDxJ3xaD+vo+/LmRV0FORlJvXkPtltYiI40NWYh dtCB+37DL6L9x4vSP3W3B1PdqudfBmKym1eSweT+L9R8CxyHWjovGEVBZ1wF7xXct/jI j4vjOCk2aCqJcEQCvkGuH6/Jq26VIO3DoCSNGQToKUsk16aFieF6ktw5NlAvWSvGJ4Gx 1sjA== 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:mime-version :illegal-object:reply-to:references:in-reply-to:message-id:date :subject:cc:to:from; bh=KJaYXGPWaIz/oDET0dgR+wUqU2B6GFZlX8cgobDxj6g=; b=Uf7CUNT25gdNvPdZDInb4Ym+Wp8xKBtaEGxt5bPePteo8gH3KcA844rTRQy+2LZubB QpAoRxHbkUuyHUUZsXD++B+kT8saRQpZoSYSZ+ZJezxMV03/RoI0NZr6bVqD1o52ptOU /nC96uzHJ07rPztuF2jvgDHJWIZG6e7b5Z6T0TaOgb3da4R7yuxGSjDSYOIbqUaBoRY0 3TVYka42jmOFl9HhOqL9TEY+CGy7CFxWwFx4r3li+bhiU8HmVAxE08QkC+izq+box3+f nWM3f2KqKqACTKAR/WOdz41WQv912zvv5cwMJcYywKTSf2l7ccdYcJHEwAJXfISNe5+O pekQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t16si1817482pfk.139.2018.12.13.06.10.04; Thu, 13 Dec 2018 06:10:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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 stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728654AbeLMOJs (ORCPT + 15 others); Thu, 13 Dec 2018 09:09:48 -0500 Received: from Galois.linutronix.de ([146.0.238.70]:46533 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728288AbeLMOJr (ORCPT ); Thu, 13 Dec 2018 09:09:47 -0500 Received: from localhost ([127.0.0.1] helo=bazinga.breakpoint.cc) by Galois.linutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1gXRgI-0001G3-4l; Thu, 13 Dec 2018 15:09:38 +0100 From: Sebastian Andrzej Siewior To: stable@vger.kernel.org Cc: Peter Zijlstra , Will Deacon , Thomas Gleixner , Daniel Wagner , Waiman Long , Linus Torvalds , boqun.feng@gmail.com, linux-arm-kernel@lists.infradead.org, paulmck@linux.vnet.ibm.com, Ingo Molnar , Sebastian Andrzej Siewior Subject: [PATCH STABLE v4.9 06/10] locking/qspinlock: Remove duplicate clear_pending() function from PV code Date: Thu, 13 Dec 2018 15:09:21 +0100 Message-Id: <20181213140925.6179-7-bigeasy@linutronix.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181213140925.6179-1-bigeasy@linutronix.de> References: <20181213140925.6179-1-bigeasy@linutronix.de> Reply-To: [PATCH STABLE v4.9 00/10], Backport, for, cache line starvation on x86 Illegal-Object: Syntax error in Reply-To: address found on vger.kernel.org: Reply-To: cache line starvation on x86 ^-extraneous tokens in address MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Will Deacon commit 3bea9adc96842b8a7345c7fb202c16ae9c8d5b25 upstream. The native clear_pending() function is identical to the PV version, so the latter can simply be removed. This fixes the build for systems with >= 16K CPUs using the PV lock implementation. Reported-by: Waiman Long Signed-off-by: Will Deacon Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: boqun.feng@gmail.com Cc: linux-arm-kernel@lists.infradead.org Cc: paulmck@linux.vnet.ibm.com Link: http://lkml.kernel.org/r/20180427101619.GB21705@arm.com Signed-off-by: Ingo Molnar Signed-off-by: Sebastian Andrzej Siewior --- kernel/locking/qspinlock_paravirt.h | 5 ----- 1 file changed, 5 deletions(-) -- 2.20.0 diff --git a/kernel/locking/qspinlock_paravirt.h b/kernel/locking/qspinlock_paravirt.h index 9c07c72fb10e9..af2a24d484aab 100644 --- a/kernel/locking/qspinlock_paravirt.h +++ b/kernel/locking/qspinlock_paravirt.h @@ -105,11 +105,6 @@ static __always_inline void set_pending(struct qspinlock *lock) atomic_or(_Q_PENDING_VAL, &lock->val); } -static __always_inline void clear_pending(struct qspinlock *lock) -{ - atomic_andnot(_Q_PENDING_VAL, &lock->val); -} - static __always_inline int trylock_clear_pending(struct qspinlock *lock) { int val = atomic_read(&lock->val);