From patchwork Tue May 29 15:43:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 137193 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp4216284lji; Tue, 29 May 2018 08:47:48 -0700 (PDT) X-Google-Smtp-Source: AB8JxZokGm7Xs9xr0G/NHR4exL77Y6kAWTwYWW7YTpx3Cfy7EEgnJ3X3fN4QSNG8btn8O8Iiyjf+ X-Received: by 2002:a63:7d47:: with SMTP id m7-v6mr14292256pgn.443.1527608868851; Tue, 29 May 2018 08:47:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527608868; cv=none; d=google.com; s=arc-20160816; b=JMP2pvOzuB2Puecn36z3VrgEOcvMHA0C4aAtJOIE2BwCo1RvGT96HqCL21jBLTQWXB VUAvU56C2M/j16KNmjIV/p1d/F23A8r/DuUuU6WB+gxEx6hTo5giQMOx4paAyYcd11k7 J1sJb8hfqLdw5IdWoo2qqHQ91+v22GABV5ctJr222gGYbPUG+uzoVI6OaMt4Uzl0OWDT oAFLvk24W7acnnawjbOUj7DVUVyJNYewTGLx7OwHFSPGQLXoiUYWgaZzJkvn5hTeIgmb 8muYDxhaNylKjkZPUDiQxCnjklJt9VVz13EvVud+ghk623ZvTMbkbslj7D5dp0nlEfJW i0TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=jwm+QnNT6wzAfIvMD/yS5Uhf0X+zv9nSyomVjCWJXoE=; b=sOTOfchK+uOj5+GrDkz527kU/+m06U7/AGWR2PpD4YG9p1mhjZkckONqwFkE9nVi64 oydEB0ziHJ4TA38wzOHeywJxT6LiG9kOkW+lgEKngbpA3xfWqJCetn3sSoL54QvzhZ9m 8CdcJDLnJjOAHTmreBBUqwPjCTjEWyAkvGn4BLkzsf7X7VMy7WYSw8Dc15erCBLjhNMU bd4bYvDLsD2N7TH0htsJ52XXP6Di4Ih0v24miqh+IJsDN4RIbUOnl9GFuo/jbF+Whtq3 5/WGwIZjk7SsJpw9L/mkKYlG3kurYg/eS2jA4qxMg2Ba+/Hl0XKGgC8o+BRUV17CU7LI gPWQ== 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v4-v6si32205684plp.580.2018.05.29.08.47.48; Tue, 29 May 2018 08:47:48 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936902AbeE2Prq (ORCPT + 30 others); Tue, 29 May 2018 11:47:46 -0400 Received: from foss.arm.com ([217.140.101.70]:43434 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936801AbeE2PoP (ORCPT ); Tue, 29 May 2018 11:44:15 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A878215AD; Tue, 29 May 2018 08:44:14 -0700 (PDT) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9AFF43F25D; Tue, 29 May 2018 08:44:13 -0700 (PDT) From: Mark Rutland To: linux-kernel@vger.kernel.org Cc: Mark Rutland , Boqun Feng , Will Deacon , Arnd Bergmann Subject: [PATCHv2 06/16] atomics/generic: define atomic64_fetch_add_unless() Date: Tue, 29 May 2018 16:43:36 +0100 Message-Id: <20180529154346.3168-7-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180529154346.3168-1-mark.rutland@arm.com> References: <20180529154346.3168-1-mark.rutland@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As a step towards unifying the atomic/atomic64/atomic_long APIs, this patch converts the generic implementation of atomic64_add_unless() into a generic implementation of atomic64_fetch_add_unless(). A wrapper in will build atomic_add_unless() atop of this, provided it is given a preprocessor definition. No functional change is intended as a result of this patch. Signed-off-by: Mark Rutland Acked-by: Peter Zijlstra (Intel) Cc: Boqun Feng Cc: Will Deacon Cc: Arnd Bergmann --- include/asm-generic/atomic64.h | 3 ++- lib/atomic64.c | 13 ++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) -- 2.11.0 diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h index e9a94b7a4d0a..b0aa425361ad 100644 --- a/include/asm-generic/atomic64.h +++ b/include/asm-generic/atomic64.h @@ -52,7 +52,8 @@ ATOMIC64_OPS(xor) extern long long atomic64_dec_if_positive(atomic64_t *v); extern long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n); extern long long atomic64_xchg(atomic64_t *v, long long new); -extern int atomic64_add_unless(atomic64_t *v, long long a, long long u); +extern long long atomic64_fetch_add_unless(atomic64_t *v, long long a, long long u); +#define atomic64_fetch_add_unless atomic64_fetch_add_unless #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0) #define atomic64_inc(v) atomic64_add(1LL, (v)) diff --git a/lib/atomic64.c b/lib/atomic64.c index 53c2d5edc826..fb2a38af5ae8 100644 --- a/lib/atomic64.c +++ b/lib/atomic64.c @@ -178,18 +178,17 @@ long long atomic64_xchg(atomic64_t *v, long long new) } EXPORT_SYMBOL(atomic64_xchg); -int atomic64_add_unless(atomic64_t *v, long long a, long long u) +long long atomic64_fetch_add_unless(atomic64_t *v, long long a, long long u) { unsigned long flags; raw_spinlock_t *lock = lock_addr(v); - int ret = 0; + long long val; raw_spin_lock_irqsave(lock, flags); - if (v->counter != u) { + val = v->counter; + if (val != u) v->counter += a; - ret = 1; - } raw_spin_unlock_irqrestore(lock, flags); - return ret; + return val; } -EXPORT_SYMBOL(atomic64_add_unless); +EXPORT_SYMBOL(atomic64_fetch_add_unless);