From patchwork Mon Mar 13 16:25:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 13172858 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B113FC74A4B for ; Mon, 13 Mar 2023 16:28:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D34756B0088; Mon, 13 Mar 2023 12:27:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CBAC26B0089; Mon, 13 Mar 2023 12:27:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B34C96B008A; Mon, 13 Mar 2023 12:27:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id A152E6B0088 for ; Mon, 13 Mar 2023 12:27:51 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 2186940C55 for ; Mon, 13 Mar 2023 16:27:51 +0000 (UTC) X-FDA: 80564406342.25.B05354A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf05.hostedemail.com (Postfix) with ESMTP id 63678100010 for ; Mon, 13 Mar 2023 16:27:49 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Ks9A+Y+U; spf=pass (imf05.hostedemail.com: domain of mtosatti@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=mtosatti@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678724869; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references:references:dkim-signature; bh=hjd5gtUB1FFqfcJWUv9qrW5kcd1bszAAtI+X6kwFBXk=; b=i+J9VG0KtXMnwgDyWdy6NY5iJ7kUAK0rl/V2ECq3RDov9rIo4AwoMU9gg4Ydqghaykb1d2 HrhmFD7dwsZ6jKqT6mtTGOuiDWFr+hTYPdXfAStGTbWyGrHUJmkNCB7iHpox8LMbiOng+P zovsDrTJAdn03qffBDAqIP4f35gTjDQ= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Ks9A+Y+U; spf=pass (imf05.hostedemail.com: domain of mtosatti@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=mtosatti@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678724869; a=rsa-sha256; cv=none; b=T7kXuP2dLuzVZu6AN2T6p7UVL/xcpu88NK6735RZR55SKldFcOSxLUxLMI80W5xxKzBZfE pbkVQ8IvbUEGbYk7vGS/uccJN5JELJx74yEEyxqDubUfoaPOJQL2muQ/SNY3pWSoeiDiGq Mz+GOq0hNcfxurSFWcX3k/RCLycYrMI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678724868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=hjd5gtUB1FFqfcJWUv9qrW5kcd1bszAAtI+X6kwFBXk=; b=Ks9A+Y+Ue+vODelrx5yLeCPN5qbfxcn+9y7bXNXzDbns+pov0IIQAnLXNktfGVF2kTlpxP 4GmP/ijj//psPkWO9X1cglGez9YUfHIbbRxhOgMmKysEW1j+1F2KB/pxyv6LsHyr3BWtEl oD0iE/GN4wO104ZclxPRIS/SofCtnEs= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-391-Zn_ZEv9WPYGg8gX5FrCE0Q-1; Mon, 13 Mar 2023 12:27:43 -0400 X-MC-Unique: Zn_ZEv9WPYGg8gX5FrCE0Q-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0723D85CBE9; Mon, 13 Mar 2023 16:27:42 +0000 (UTC) Received: from tpad.localdomain (ovpn-112-2.gru2.redhat.com [10.97.112.2]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A8FAF40C6E67; Mon, 13 Mar 2023 16:27:41 +0000 (UTC) Received: by tpad.localdomain (Postfix, from userid 1000) id 1B95E4038A1E1; Mon, 13 Mar 2023 13:26:44 -0300 (-03) Message-ID: <20230313162634.359258017@redhat.com> User-Agent: quilt/0.67 Date: Mon, 13 Mar 2023 13:25:11 -0300 From: Marcelo Tosatti To: Christoph Lameter Cc: Aaron Tomlin , Frederic Weisbecker , Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Russell King , Huacai Chen , Heiko Carstens , x86@kernel.org, Vlastimil Babka , Marcelo Tosatti Subject: [PATCH v5 04/12] this_cpu_cmpxchg: x86: switch this_cpu_cmpxchg to locked, add _local function References: <20230313162507.032200398@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Stat-Signature: r7zt4nw67p3atamhhfyt83xguqykk311 X-Rspam-User: X-Rspamd-Queue-Id: 63678100010 X-Rspamd-Server: rspam06 X-HE-Tag: 1678724869-851029 X-HE-Meta: U2FsdGVkX1/h92bF3RwbyAx/xEnoKE2/j/JmRUpXFs09woAj88D10dnz9xInR8o5PLMajSgdU8EqwL+CrhQ1BMpsJuL4oWBtwyBDB7rlKmBJdFNvGnhvXLr9mwEC0Zje9BsWRgP/+etwiW9QgM1Oq+1BcD2QoJXL1ECBcqsxex4mXXc/bDi00MJGT1dQEsliTwAsT5MkGpDU2bQVDVo/hOR4jqfmgugnJ/IWAqwmpuFdD7RVAkRVCUBD4kUQ3xmn3rcpwJwGwNPYBTFBLAy3psWnOmG84Sm9duYU8oITkaTrMSQwDrcsK0x4YL++z3/V/NctVa5XFMJYVatfZDubqqMa26ylHuONspRP27EpO6on+SizeKMKh/zbcBzuYcyFV/YHOmWaE76QFPle+Doye4S9M8AAGG5DyRkxB1NGP49+soD3vX3A8h2y9xP6NlOrWRdnDoNvtdKdskVcDTzyh3IKWh04YE2tORpAm664T7sL37IcfGyNRhMSSY6U2+kG3HQwtCAD51Z/kwFR7tuP1BUrNPVNzOK342eT35UmBSZ5YD5eaSM5i1FLwNkGRz61ELzzGobYqTOpqYAreIrywPqTfiyB8BL1hpOLD7YWaddDGykZyBjGt6FsxlErOkBEfSgNkH6f4PqP34IaUuIUqoFfK7i2gphtFouUqPP+WFv8lz623vS+FUbkIwiwZGOfBewjaAJgDjSEWtDhYf2oobsHckwCxrpMTG8bxMVa8XJs2qIGogya9L2HS59f27I38InGQn8Io7fTRWKuTnZPxZYF3O9oplMY97SIgzI7ICJ2Ir00F6qxyqyAgZa+rD+LAtqPHiXmUr8nCq6jVvooNRHapjuuhRWi5IjaIsFTJ3pdVJMmuyQ6IAYFcHzteL/WKZtfE7Vz/hfSGC1jY5E/Ouo70I3D8aAYS0Cu0Up+lZca8l+1dPf9TgqwERdxyrWhexQQQw+Y/SVDckNQZPF kPnWQ2d/ ak+YZ1yjh+EPY669apzst2fT+D0wYOt1IgrMoqbYXY+Af5qxEg1tTLmPJVoVJIBI/lvnySGsWd0R1w2oI01/F/dmj50/3ZpVeZNLDH0NxcCLl+jfDc/mOospQVd4Cf1Y7o1ePOlbXBO9iallmkIw2VgpaFUQKbwRAxFNaxibOYbgnjPtGA2MwFaa5mrw/zrsbWRNdIPf5e3o7ZOIzSFLXSrb8SpmdTsYIXrrfkN9v0jLqRCoL608JutvWlA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Goal is to have vmstat_shepherd to transfer from per-CPU counters to global counters remotely. For this, an atomic this_cpu_cmpxchg is necessary. Following the kernel convention for cmpxchg/cmpxchg_local, change x86's this_cpu_cmpxchg_ helpers to be atomic. and add this_cpu_cmpxchg_local_ helpers which are not atomic. Signed-off-by: Marcelo Tosatti Index: linux-vmstat-remote/arch/x86/include/asm/percpu.h =================================================================== --- linux-vmstat-remote.orig/arch/x86/include/asm/percpu.h +++ linux-vmstat-remote/arch/x86/include/asm/percpu.h @@ -197,11 +197,11 @@ do { \ * cmpxchg has no such implied lock semantics as a result it is much * more efficient for cpu local operations. */ -#define percpu_cmpxchg_op(size, qual, _var, _oval, _nval) \ +#define percpu_cmpxchg_op(size, qual, _var, _oval, _nval, lockp) \ ({ \ __pcpu_type_##size pco_old__ = __pcpu_cast_##size(_oval); \ __pcpu_type_##size pco_new__ = __pcpu_cast_##size(_nval); \ - asm qual (__pcpu_op2_##size("cmpxchg", "%[nval]", \ + asm qual (__pcpu_op2_##size(lockp "cmpxchg", "%[nval]", \ __percpu_arg([var])) \ : [oval] "+a" (pco_old__), \ [var] "+m" (_var) \ @@ -279,16 +279,20 @@ do { \ #define raw_cpu_add_return_1(pcp, val) percpu_add_return_op(1, , pcp, val) #define raw_cpu_add_return_2(pcp, val) percpu_add_return_op(2, , pcp, val) #define raw_cpu_add_return_4(pcp, val) percpu_add_return_op(4, , pcp, val) -#define raw_cpu_cmpxchg_1(pcp, oval, nval) percpu_cmpxchg_op(1, , pcp, oval, nval) -#define raw_cpu_cmpxchg_2(pcp, oval, nval) percpu_cmpxchg_op(2, , pcp, oval, nval) -#define raw_cpu_cmpxchg_4(pcp, oval, nval) percpu_cmpxchg_op(4, , pcp, oval, nval) +#define raw_cpu_cmpxchg_1(pcp, oval, nval) percpu_cmpxchg_op(1, , pcp, oval, nval, "") +#define raw_cpu_cmpxchg_2(pcp, oval, nval) percpu_cmpxchg_op(2, , pcp, oval, nval, "") +#define raw_cpu_cmpxchg_4(pcp, oval, nval) percpu_cmpxchg_op(4, , pcp, oval, nval, "") #define this_cpu_add_return_1(pcp, val) percpu_add_return_op(1, volatile, pcp, val) #define this_cpu_add_return_2(pcp, val) percpu_add_return_op(2, volatile, pcp, val) #define this_cpu_add_return_4(pcp, val) percpu_add_return_op(4, volatile, pcp, val) -#define this_cpu_cmpxchg_1(pcp, oval, nval) percpu_cmpxchg_op(1, volatile, pcp, oval, nval) -#define this_cpu_cmpxchg_2(pcp, oval, nval) percpu_cmpxchg_op(2, volatile, pcp, oval, nval) -#define this_cpu_cmpxchg_4(pcp, oval, nval) percpu_cmpxchg_op(4, volatile, pcp, oval, nval) +#define this_cpu_cmpxchg_local_1(pcp, oval, nval) percpu_cmpxchg_op(1, volatile, pcp, oval, nval, "") +#define this_cpu_cmpxchg_local_2(pcp, oval, nval) percpu_cmpxchg_op(2, volatile, pcp, oval, nval, "") +#define this_cpu_cmpxchg_local_4(pcp, oval, nval) percpu_cmpxchg_op(4, volatile, pcp, oval, nval, "") + +#define this_cpu_cmpxchg_1(pcp, oval, nval) percpu_cmpxchg_op(1, volatile, pcp, oval, nval, LOCK_PREFIX) +#define this_cpu_cmpxchg_2(pcp, oval, nval) percpu_cmpxchg_op(2, volatile, pcp, oval, nval, LOCK_PREFIX) +#define this_cpu_cmpxchg_4(pcp, oval, nval) percpu_cmpxchg_op(4, volatile, pcp, oval, nval, LOCK_PREFIX) #ifdef CONFIG_X86_CMPXCHG64 #define percpu_cmpxchg8b_double(pcp1, pcp2, o1, o2, n1, n2) \ @@ -319,16 +323,17 @@ do { \ #define raw_cpu_or_8(pcp, val) percpu_to_op(8, , "or", (pcp), val) #define raw_cpu_add_return_8(pcp, val) percpu_add_return_op(8, , pcp, val) #define raw_cpu_xchg_8(pcp, nval) raw_percpu_xchg_op(pcp, nval) -#define raw_cpu_cmpxchg_8(pcp, oval, nval) percpu_cmpxchg_op(8, , pcp, oval, nval) +#define raw_cpu_cmpxchg_8(pcp, oval, nval) percpu_cmpxchg_op(8, , pcp, oval, nval, "") -#define this_cpu_read_8(pcp) percpu_from_op(8, volatile, "mov", pcp) -#define this_cpu_write_8(pcp, val) percpu_to_op(8, volatile, "mov", (pcp), val) -#define this_cpu_add_8(pcp, val) percpu_add_op(8, volatile, (pcp), val) -#define this_cpu_and_8(pcp, val) percpu_to_op(8, volatile, "and", (pcp), val) -#define this_cpu_or_8(pcp, val) percpu_to_op(8, volatile, "or", (pcp), val) -#define this_cpu_add_return_8(pcp, val) percpu_add_return_op(8, volatile, pcp, val) -#define this_cpu_xchg_8(pcp, nval) percpu_xchg_op(8, volatile, pcp, nval) -#define this_cpu_cmpxchg_8(pcp, oval, nval) percpu_cmpxchg_op(8, volatile, pcp, oval, nval) +#define this_cpu_read_8(pcp) percpu_from_op(8, volatile, "mov", pcp) +#define this_cpu_write_8(pcp, val) percpu_to_op(8, volatile, "mov", (pcp), val) +#define this_cpu_add_8(pcp, val) percpu_add_op(8, volatile, (pcp), val) +#define this_cpu_and_8(pcp, val) percpu_to_op(8, volatile, "and", (pcp), val) +#define this_cpu_or_8(pcp, val) percpu_to_op(8, volatile, "or", (pcp), val) +#define this_cpu_add_return_8(pcp, val) percpu_add_return_op(8, volatile, pcp, val) +#define this_cpu_xchg_8(pcp, nval) percpu_xchg_op(8, volatile, pcp, nval) +#define this_cpu_cmpxchg_local_8(pcp, oval, nval) percpu_cmpxchg_op(8, volatile, pcp, oval, nval, "") +#define this_cpu_cmpxchg_8(pcp, oval, nval) percpu_cmpxchg_op(8, volatile, pcp, oval, nval, LOCK_PREFIX) /* * Pretty complex macro to generate cmpxchg16 instruction. The instruction