Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp1334039rdh; Mon, 25 Sep 2023 09:29:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEs3S8nixOZJWuYyx6pJQxkHBggNwVb0W/wS9kBWGGS4XETEig1qy2uHTqz3dwernqRc9Ad X-Received: by 2002:a05:6a20:3d29:b0:159:f5fb:bf74 with SMTP id y41-20020a056a203d2900b00159f5fbbf74mr10700777pzi.3.1695659372715; Mon, 25 Sep 2023 09:29:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695659372; cv=none; d=google.com; s=arc-20160816; b=eCZVbH03iuq6O7V76kkaCL+5ySwJb3T8aSKR8oeSomWzAEm5J/1sLprlx0qDFewXHf OdyaV9xYMbaGLhd7x0lTeb4k+TApcOSCWRMmkO2S7JGx8OULmaxhfy2AcdBa3m8kn9oZ zs5ykSvEjLw5/XcP6ubn9diG/p6YGUO8Rb4/3UhTlXdMWuD/tZKDa8Uaucc5XdaWNLVt wzTeUdfTqR45pmpjEk7tHkj3lKcDx/MDlctkve88tN5JyPcoGkskig5bvZnXLl5wChQi pTK08iWZ4fx8zrW4sHfZiDr46uDoqpBeGB3xztdllglAtbw0/neOR04QwLE0h+dO/viy qH3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=eC20xI+X56Gh8DNv6Zud5IHxjD2gnnvulA3kJH1zjMo=; fh=oYLmOjdVRcynsGxj/woJDJFI3cX4I+zd8Zp2czk4tCE=; b=cz7WcPCLDJZvNqIGJvMX1F0p3nJ60NMhNRv/7f3tB8M9WxR5fa6Y74t0cxBMQbsajl AQkY7uLwgJ05K66WM5MS6cCcm2/LFmNAzcPLURmSo+cRu/kzZdQD+/5iIKkdRf6Q5quN B76pHZkfAxKJxSeouGuj8Us6+v8BlB//pxeXBR961HL1NE+BtOlEv6GYfvOi2rD+NRmD PLuoTJE1HV82hyljG9K4Rcfz0kMheqxsMh8Vdn1bOEe0QnrFCx23+1golOyfbipL9Vym EaRxL/oTZCC3YrL0XUI/X7uNx92KPLzsoJspnAw1EjSZwA1u5j7we58lCRHOh93ipo1Z Zlyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=V7um3RNH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id e10-20020a056a001a8a00b0069100376ba4si10945972pfv.347.2023.09.25.09.29.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Sep 2023 09:29:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=V7um3RNH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 67AC680ADF2E; Mon, 25 Sep 2023 08:10:00 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232405AbjIYPKD (ORCPT + 99 others); Mon, 25 Sep 2023 11:10:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231263AbjIYPKB (ORCPT ); Mon, 25 Sep 2023 11:10:01 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90A46103 for ; Mon, 25 Sep 2023 08:09:55 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-9b0168a9e05so578748366b.3 for ; Mon, 25 Sep 2023 08:09:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695654594; x=1696259394; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eC20xI+X56Gh8DNv6Zud5IHxjD2gnnvulA3kJH1zjMo=; b=V7um3RNHEMlI2ENEsAM54gm8G28JaVKxoFXWP6yCulk6LnB4NycUE+5/qnn6ySKLgo Uo0tuBTgMX3Tc4U9TIt0RKHeSJgG8drrpq96DeKS52GNqZgx21u5xULvz7bzgZ99xNYt a1GKpuhasaMXQwwlLw8IoNe+Dd28rojetOlUID14Jk0TbWNabA3Wl9kmFmdadQG6jnm2 Xri7LihKtPh3hpvy5TkvyQzpLsFlqCpXqGx3XzSZdyWI5wNefS3kdYbqbLqEFy/ARkpi Fn97pN83ikW3j2Yrjx+sD8Jk9i9ZNfv/B/vNxslCrDrkTWrJI5ycmssPcipvGlYvyR5J KgIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695654594; x=1696259394; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eC20xI+X56Gh8DNv6Zud5IHxjD2gnnvulA3kJH1zjMo=; b=I/MjlfyiMIwMYQcCrDG/E55g4HnxC9FRxp+9jegFaWJ1eac/YlGd43ecd51rYt4kQD If4GkdszALM4TLYgLit2NJtnEhLuguocjukXCCtdzQI2VJ3FBkOkW6lFYE/wCf1Wg0my T9WkYct25epaBbbGzlXd9IhAxu9nWkdB7/2YLTG6gHeyfK4NzETA2wyPhMNXh3mv/Gws 5SCx/+KG1mzN8qnGw1Bx4WS4bSCR1kGQfZGrXvx7HvF78NY5vuzViJvU1/xIFBHpzvyL ie0kRfvNVX64rDYcwbvKZ0+lQEJG1+6JOurGca4Csp1FSYFaD2jByfMUikowWxs3w5Dn Yh2w== X-Gm-Message-State: AOJu0YxOl08DKwqVuzhhArH38O80YaeS/PGmINtVTCaXxPBF1hd/bj4H B2Htgl9GzyG0E2bdm53YXKL+dHbV0Fb4FA== X-Received: by 2002:a17:906:9a:b0:9ae:56b5:619d with SMTP id 26-20020a170906009a00b009ae56b5619dmr6161137ejc.16.1695654593710; Mon, 25 Sep 2023 08:09:53 -0700 (PDT) Received: from localhost.localdomain ([46.248.82.114]) by smtp.gmail.com with ESMTPSA id i13-20020a1709061ccd00b00989828a42e8sm6442191ejh.154.2023.09.25.08.09.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Sep 2023 08:09:53 -0700 (PDT) From: Uros Bizjak To: x86@kernel.org, linux-kernel@vger.kernel.org Cc: Uros Bizjak , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [RESEND PATCH 2/2] locking/x86: Wire up sync_try_cmpxchg Date: Mon, 25 Sep 2023 17:08:24 +0200 Message-ID: <20230925150905.54842-2-ubizjak@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230925150905.54842-1-ubizjak@gmail.com> References: <20230925150905.54842-1-ubizjak@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 25 Sep 2023 08:10:00 -0700 (PDT) Implement target specific support for sync_try_cmpxchg. Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: "H. Peter Anvin" Signed-off-by: Uros Bizjak --- arch/x86/include/asm/cmpxchg.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h index d53636506134..5612648b0202 100644 --- a/arch/x86/include/asm/cmpxchg.h +++ b/arch/x86/include/asm/cmpxchg.h @@ -221,12 +221,18 @@ extern void __add_wrong_size(void) #define __try_cmpxchg(ptr, pold, new, size) \ __raw_try_cmpxchg((ptr), (pold), (new), (size), LOCK_PREFIX) +#define __sync_try_cmpxchg(ptr, pold, new, size) \ + __raw_try_cmpxchg((ptr), (pold), (new), (size), "lock; ") + #define __try_cmpxchg_local(ptr, pold, new, size) \ __raw_try_cmpxchg((ptr), (pold), (new), (size), "") #define arch_try_cmpxchg(ptr, pold, new) \ __try_cmpxchg((ptr), (pold), (new), sizeof(*(ptr))) +#define arch_sync_try_cmpxchg(ptr, pold, new) \ + __sync_try_cmpxchg((ptr), (pold), (new), sizeof(*(ptr))) + #define arch_try_cmpxchg_local(ptr, pold, new) \ __try_cmpxchg_local((ptr), (pold), (new), sizeof(*(ptr))) -- 2.41.0