From patchwork Sat Nov 19 01:34:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 23179 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp511207wrr; Fri, 18 Nov 2022 17:56:08 -0800 (PST) X-Google-Smtp-Source: AA0mqf5YbEixJFi+PWcK0wt2uKDS/ZQa1HjjTR+/0tSezBV4Xbw4IrCyANVADRnWr9Qw53sr9Ybm X-Received: by 2002:a17:90a:fa46:b0:200:1df3:a7a9 with SMTP id dt6-20020a17090afa4600b002001df3a7a9mr16064135pjb.202.1668822967888; Fri, 18 Nov 2022 17:56:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668822967; cv=none; d=google.com; s=arc-20160816; b=yj7fnABQNfWC5MRJgQ+AL7hD+U1H7a/7+QclyQxE+EGFbgoFXxaedNMBhANkZi+2Lx 6QzRw6IrWfWtUiJrrVswASCnMYfkQ93O9f+ueQV7I6CFDNzNXM/rPvxTWiLK0M5MWErf kvQS27c787DFw18Qf/18iaCBv7Qpn005P3jk4ugcZa0HqK2UorJ10r+IpOHjwSFIA3og td9MKq6aduHxFRpy94L8Exh5wgdnOIpSrcORr0e87g5ne51nDqvymCBWFujd5RvHcgPg IxhqGqLt4Z2yziaw4GTTqtCtA9bUETvOXXOeY5+oO0uVvyWPHJKrGq9vcpl0Reeov5au l3Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=qzw3IRf6ZKe9LngiNeoq0Xsow8qMnOMLe6mysjx7GEY=; b=YxA2E3u8uwt81SWVdgjeJf8NPCGsWohDBTGHDiPDt5AS7h6a743HpvXSgWJXyF5cYT 7YDpx4rileo37bEr7jQGs4iaT4LmvOH172zo+t4717TrqIzrYCS0LNzgyLQk6n8LIp8x EFnfWOkOPGMf5qBylXRSFKLy6H8FQ51jOlCDJG1cwVcJCpsOLIb0T3Nb3DSixr91sAsf elciUcJ9b+PT+GsEUzfbtbWQbmwVej8PvsARyrH/uuWUMLgF0CpxSekLuvGVXR9mpuox D3HSoWFOsVwaunof+Cmvup7LrbYLCEuCXd982HKTPEn+xhLRKxupt2/M1BEAaq4AwbYv 4lNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=WWS9khtE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o15-20020a056a0015cf00b005615ef4cfccsi5312654pfu.185.2022.11.18.17.55.55; Fri, 18 Nov 2022 17:56:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=WWS9khtE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231912AbiKSBx6 (ORCPT + 99 others); Fri, 18 Nov 2022 20:53:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231954AbiKSBwr (ORCPT ); Fri, 18 Nov 2022 20:52:47 -0500 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA50DC4B7C for ; Fri, 18 Nov 2022 17:35:06 -0800 (PST) Received: by mail-pg1-x54a.google.com with SMTP id 38-20020a630b26000000b004773803dda1so1344720pgl.17 for ; Fri, 18 Nov 2022 17:35:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=qzw3IRf6ZKe9LngiNeoq0Xsow8qMnOMLe6mysjx7GEY=; b=WWS9khtEqbOMUnGtkkRMFWvzWDeu4ayjWFRQDGu0iXtOVJDbGSrq/gFRGxrZKKJlGY 5URd5JYCZgwjvnTNl+Ti4rcPQweserrYFuLxS4+F3t/CDOTOr8AEBOZfx3Z2J7idO5c3 IDrXNJR03kAw8HpcOlPfCE2+OuJJLGuPU94IZVw40YREPb5/vCeSYvPEvia9tHwTfU1C 3eBObmpTzOi0i9sxvSozcBhsXpCtw6mLFCvyTAoFKa+x82RFPn06o73N3tlHftgOtE6+ Xi5hjcYeXjmsl23MApz3bUysNrg7rYzS/9ickjvQa7GqFIN4rdzGd0NiV/GRPNAISoz2 56jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qzw3IRf6ZKe9LngiNeoq0Xsow8qMnOMLe6mysjx7GEY=; b=qIjWDLSCa4FsFnwvGs2xMDARAycqYa/anhWlFVL1lmceOKDitNK4prZQ0/wl+wYXKW 21kZe0uwa3gYgqlr+uzs7vT2NETdrWhGMgKuAYEDgCEk2KD8A34HVn7chiyWJEAkdltc Ulig5W5Rfc53YAeaFSh8yZ8zVK3I4RkUk31uTH+oYno6c2H6xdeGvuVjTjsroABqcE5f dNtXNqMTUKB4FUP0lPUNLY5nKP+pI7d8/eQca8Mce60tJ9kkBs+Ackg4VaH6jA7QuiAF xI/WyHlwTWonTWICOPbGFdA30iCCCaWQGQzFQb27+jrJ4nF8HtYiaywvLGOwB1usWNmC 61xg== X-Gm-Message-State: ANoB5pldI7YOT151b9u0kIp7cCwKtxgDTAiXh/lfehkWr+8DB7RCdsaC 0+I3PhgqDgCuAy1gdyA5WfMs5RNETQs= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a63:ce09:0:b0:470:537b:9d23 with SMTP id y9-20020a63ce09000000b00470537b9d23mr8701437pgf.185.1668821706323; Fri, 18 Nov 2022 17:35:06 -0800 (PST) Reply-To: Sean Christopherson Date: Sat, 19 Nov 2022 01:34:49 +0000 In-Reply-To: <20221119013450.2643007-1-seanjc@google.com> Mime-Version: 1.0 References: <20221119013450.2643007-1-seanjc@google.com> X-Mailer: git-send-email 2.38.1.584.g0f3c55d4c2-goog Message-ID: <20221119013450.2643007-9-seanjc@google.com> Subject: [PATCH 8/9] tools: Drop "atomic_" prefix from atomic test_and_set_bit() From: Sean Christopherson To: Yury Norov , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Marc Zyngier , Paolo Bonzini Cc: Andy Shevchenko , Rasmus Villemoes , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , James Morse , Alexandru Elisei , Suzuki K Poulose , Oliver Upton , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, Sean Christopherson X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749887712818868530?= X-GMAIL-MSGID: =?utf-8?q?1749887712818868530?= Drop the "atomic_" prefix from tools' atomic_test_and_set_bit() to match the kernel nomenclature where test_and_set_bit() is atomic, and __test_and_set_bit() provides the non-atomic variant. Signed-off-by: Sean Christopherson --- tools/arch/x86/include/asm/atomic.h | 3 +-- tools/include/asm-generic/atomic-gcc.h | 2 +- tools/testing/selftests/kvm/lib/ucall_common.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/arch/x86/include/asm/atomic.h b/tools/arch/x86/include/asm/atomic.h index 01cc27ec4520..a42733af7d51 100644 --- a/tools/arch/x86/include/asm/atomic.h +++ b/tools/arch/x86/include/asm/atomic.h @@ -71,10 +71,9 @@ static __always_inline int atomic_cmpxchg(atomic_t *v, int old, int new) return cmpxchg(&v->counter, old, new); } -static inline int atomic_test_and_set_bit(long nr, unsigned long *addr) +static inline int test_and_set_bit(long nr, unsigned long *addr) { GEN_BINARY_RMWcc(LOCK_PREFIX __ASM_SIZE(bts), *addr, "Ir", nr, "%0", "c"); - } #endif /* _TOOLS_LINUX_ASM_X86_ATOMIC_H */ diff --git a/tools/include/asm-generic/atomic-gcc.h b/tools/include/asm-generic/atomic-gcc.h index 6daa68bf5b9e..37ef522aaac4 100644 --- a/tools/include/asm-generic/atomic-gcc.h +++ b/tools/include/asm-generic/atomic-gcc.h @@ -70,7 +70,7 @@ static inline int atomic_cmpxchg(atomic_t *v, int oldval, int newval) return cmpxchg(&(v)->counter, oldval, newval); } -static inline int atomic_test_and_set_bit(long nr, unsigned long *addr) +static inline int test_and_set_bit(long nr, unsigned long *addr) { unsigned long mask = BIT_MASK(nr); long old; diff --git a/tools/testing/selftests/kvm/lib/ucall_common.c b/tools/testing/selftests/kvm/lib/ucall_common.c index fcae96461e46..820ce6c82829 100644 --- a/tools/testing/selftests/kvm/lib/ucall_common.c +++ b/tools/testing/selftests/kvm/lib/ucall_common.c @@ -44,7 +44,7 @@ static struct ucall *ucall_alloc(void) GUEST_ASSERT(ucall_pool); for (i = 0; i < KVM_MAX_VCPUS; ++i) { - if (!atomic_test_and_set_bit(i, ucall_pool->in_use)) { + if (!test_and_set_bit(i, ucall_pool->in_use)) { uc = &ucall_pool->ucalls[i]; memset(uc->args, 0, sizeof(uc->args)); return uc;