From patchwork Thu Feb 9 15:01:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 13134755 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 AFF67C61DA4 for ; Thu, 9 Feb 2023 15:33:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 30F746B0082; Thu, 9 Feb 2023 10:33:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1AE156B0078; Thu, 9 Feb 2023 10:33:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A10A16B0081; Thu, 9 Feb 2023 10:33:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 7EDA06B0078 for ; Thu, 9 Feb 2023 10:33:24 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 4D2FA40814 for ; Thu, 9 Feb 2023 15:33:24 +0000 (UTC) X-FDA: 80448147528.18.07D87F6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf19.hostedemail.com (Postfix) with ESMTP id 775291A0017 for ; Thu, 9 Feb 2023 15:33:22 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=G6qcjjaj; spf=pass (imf19.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=1675956802; 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=VGaxrHSHIWDZ9wNuzcFJJG7J1CJshnD7QKbHX2GovRBKMAjNwv8fgxlIjlGaN0jvJMaq/b JVZX+cxl+0rWIz4RjKHYvwmh6a3qKDwg6VFqC+JdU6zg9yXditwZe90gAsoDv6axZz7pae 7gFPBJ0zxNzWBMHk1liT2cjPzms0tdM= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=G6qcjjaj; spf=pass (imf19.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=1675956802; a=rsa-sha256; cv=none; b=BjuVO7OpQhJwNuI7B77OnNOvZA/4zevcFyn95HN+fW455PbnupHSwVFWAlot6hPuONM2iO Soz4nJxX9fuslWM0Oj1zS+VFW0lTXiWTc2J+AWR0Wx/lgSJ4jwEEEYwBt6sgWOujOAlg+r sfugT48F5SzKu/H13kzG3YpNFNW6KAQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675956801; 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=G6qcjjajdVmVDzxZqne2LsGRPlIf+l8TNlOG7Y30iM3hvqULTMLiqQ5QrxRvdpE1OBfzzJ kUOyDwy7sonVNsw0x7Msv8C8uagxvow5rj9//6W8H37q7HoT7l4eEOXBmXdV24vIFIEgYf nVP1DS2jApkOXNyOcB84t2B3Bmwiy0g= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-311-unXOuOmGPT2X0gACJlUVeQ-1; Thu, 09 Feb 2023 10:33:18 -0500 X-MC-Unique: unXOuOmGPT2X0gACJlUVeQ-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 98BE93C10EDA; Thu, 9 Feb 2023 15:33:16 +0000 (UTC) Received: from tpad.localdomain (ovpn-112-3.gru2.redhat.com [10.97.112.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4973F40398A0; Thu, 9 Feb 2023 15:33:16 +0000 (UTC) Received: by tpad.localdomain (Postfix, from userid 1000) id 72D73403CC077; Thu, 9 Feb 2023 12:32:51 -0300 (-03) Message-ID: <20230209153204.765612949@redhat.com> User-Agent: quilt/0.67 Date: Thu, 09 Feb 2023 12:01:55 -0300 From: Marcelo Tosatti To: Christoph Lameter Cc: Aaron Tomlin , Frederic Weisbecker , Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Marcelo Tosatti Subject: [PATCH v2 05/11] this_cpu_cmpxchg: x86: switch this_cpu_cmpxchg to locked, add _local function References: <20230209150150.380060673@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 775291A0017 X-Stat-Signature: bhweurukghh7ebfdn5coossdzdjcbanm X-HE-Tag: 1675956802-67319 X-HE-Meta: U2FsdGVkX18oUtt0g0ktrvDhv04zy6kMBgnlBzbkAu2Tw6O32YbDqzUN+kl+U4ymNEa2+qmLDaGA9dKOZK43MpQFK83vgXWvCg5KigxCLCMabaEmGEdCaq5e0zAfNQmuXPeIGToP2Hn6uvcZ7AtAjSzpOLefatW7Pu8G/2dxCNrdZ6yDHH2Kiv0uV+MCED70BlSMhKK46A6iqwTHhA/L8HYVjNIffka6iwRtx53Dp94ilBm0ulKMj0ksOFo1eVeRWywzP9pWObvXHOedFYtl+T7zuhlCXZ12ABlip/2VWvMmh+dD3hGi41H6Ls9acMyWO5UY5cXXVSslaRjO2539G0V5iFF+v1fiCqsue6kPp9Yz3mxLpgNuFqXuntG58nTjIUbrRFOenU7TLMV/JaxXTsL0uM+4k4xYpQv1VOu/4UPi7iMS+kVf45t8ZtRsV1dKFCdRbmfCS210l5zm63TEJkeISz80G9aHUChnvJNfxXF8KcJCrnBXCpchvi0N8FSi6jq+iqCBDFziAGl6FgdCoo0GFodQ1yMBEcYjyf7pfcSavgbwOPPy5Fik0BvRloUq/8brUJ9ecYD7RpbdAex+FXgpAh7iVrg8IVWpta44TXPhpFm7UaUT1uvaRkC8H3ONAAdh4OkEStDCMmSyRLtrQ0ubNeGnlMFjfBneOkh8y5HyUsKKQifX/oSkvRnXELA9uv9zfzsDew7D4oRfhOy69mRLH8YvA5Xi9k1bo0WKxMHXxBlzidkzVE9hj+ZVz1MxIfYYQHa0RzgdUB+VkABDHfIeihKyr1MttTeV7r+yBBGHiF5jpFWxDbfEw9Euv8oi7RCo9TB4mYNehWUbYH5En7RP0j1+UxTWDBVjyfiUD1sscK2VS1Tjy7Udr8aoroeIWrwqRfISUziY3zkP++YC/hYIAFOGe7E+jRRro7faC70NXQmIL15mcFZLLldgGX4dhqJfFqsSgveHTdYP7j7 8k8ZHOTI rVt8Jh3XGLz+7Gefr9JEULVIj8W7da8ZIZHmrK64G3VuIdStOg0r8PyN0Bee13e8DBOx1yKplTUAsYbOKVdN5eRKrL5UCiSiS9Wz/Ho4tMBxB0MQc5c/TrxB7hXQQpl2dc5rkyS0fUhs7UKl0rNGwzYMIWL7s3mbxCgPlwdKMILpCulPoEj/fgqvZJ09Cu3ZLVsFFpZGzhKQNdvEETxx11+h6tBppdby+Ym/0OfrcQvxJFtjtyke2VHEpQw== 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