From patchwork Mon Jul 31 23:16:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 128920 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2335731vqg; Mon, 31 Jul 2023 16:55:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlF2kC0wKQD0JUKYG+fW+kSLcqax9LgIL7wIK4FGcqnVwy7MGqZUdVRPcbVcFGlOZ1G2t4Pw X-Received: by 2002:a05:620a:4154:b0:767:2d95:fae4 with SMTP id k20-20020a05620a415400b007672d95fae4mr15432501qko.73.1690847711050; Mon, 31 Jul 2023 16:55:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690847711; cv=none; d=google.com; s=arc-20160816; b=hLXjgAWt8eCadN6RdBMqOy5lQehSEUmO9fccIWity1BmYm8gSkbRt3J2+cl+i90luo sLnfn/sWnl658YrdURshZRK4qKBBPySDwEjPJaO1uiYpl4MPcjWg1UDgka4EcSbEuKdz p6RTSRT6I3+V+IyEGLO/zAIfRU9tWufEmyguCL7dR9EI0rm8RbvqdCiorcty16evipm3 Iy88ARFtA9fruKsWHwNwaQOIJyYdzckW8Kmi/BdNwdrhwDDwDw5ZP5rCfp4fYd7lKNwz eFqzmvKsJLzJppbJ2HPoOQ9B/wb3fGbrF6zF76iYX8zcc/gslkWJ7MvuT1ImanZuSKm+ srKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=JAinr7zOS2tEcpDLb5kU5hzc98X7FblXXsmYRI8cB0Q=; fh=PsKSmUxaima+BOq0Zg5AVIoJorpWR+yRtLLYkG/9a2A=; b=IKC3yKknQm4pSt9BQErkmJETX5OJzqJQZMq2FsjqISWVOtotOuci8T9zWB0hpSP12/ qKIwc5M8sTiNcCwF6iITKLGngswP4p3Fqg012Ff5nlR+Ki/cK4My6rW+O7ymeDir5R7K ZFZlu+N+ScbeIra7NqkzOPslULYXQQ3E49leuSCBjwRGY5lPUPk4oXaxittBlG3DkRil A3YdxDwBICpnvcGPrqhCkgQthEq7rzy2eQCacbWrCWUslxO7W/RWF4tX8yfd7BjW0tCC ip1G+mq0/pvdYVEeIkXhNDdA0MKhNgxJGpyqoKM/BWCVcHlryY5FWVZNQWcwgkcvd78w np0w== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q6-20020a056a00088600b006687255a465si4038791pfj.298.2023.07.31.16.54.58; Mon, 31 Jul 2023 16:55:10 -0700 (PDT) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231908AbjGaXRX (ORCPT + 99 others); Mon, 31 Jul 2023 19:17:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231864AbjGaXRQ (ORCPT ); Mon, 31 Jul 2023 19:17:16 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B51971BE7 for ; Mon, 31 Jul 2023 16:17:07 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3DAF761353 for ; Mon, 31 Jul 2023 23:17:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C85BC433CC; Mon, 31 Jul 2023 23:17:06 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qQc8P-003fKr-1V; Mon, 31 Jul 2023 19:17:05 -0400 Message-ID: <20230731231705.275332195@goodmis.org> User-Agent: quilt/0.66 Date: Mon, 31 Jul 2023 19:16:36 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Uros Bizjak Subject: [for-next][PATCH 02/15] ring_buffer: Use try_cmpxchg instead of cmpxchg References: <20230731231634.031452225@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1772982329328278714 X-GMAIL-MSGID: 1772982329328278714 From: Uros Bizjak Use try_cmpxchg instead of cmpxchg (*ptr, old, new) == old in ring_buffer.c. x86 CMPXCHG instruction returns success in ZF flag, so this change saves a compare after cmpxchg (and related move instruction in front of cmpxchg). No functional change intended. Link: https://lore.kernel.org/linux-trace-kernel/20230714154418.8884-1-ubizjak@gmail.com Cc: Steven Rostedt Cc: Masami Hiramatsu Signed-off-by: Uros Bizjak Signed-off-by: Steven Rostedt (Google) --- kernel/trace/ring_buffer.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 52dea5dd5362..78502d4c7214 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -692,10 +692,7 @@ static void rb_time_set(rb_time_t *t, u64 val) static inline bool rb_time_read_cmpxchg(local_t *l, unsigned long expect, unsigned long set) { - unsigned long ret; - - ret = local_cmpxchg(l, expect, set); - return ret == expect; + return local_try_cmpxchg(l, &expect, set); } static bool rb_time_cmpxchg(rb_time_t *t, u64 expect, u64 set) @@ -752,9 +749,7 @@ static void rb_time_set(rb_time_t *t, u64 val) static bool rb_time_cmpxchg(rb_time_t *t, u64 expect, u64 set) { - u64 val; - val = local64_cmpxchg(&t->time, expect, set); - return val == expect; + return local64_try_cmpxchg(&t->time, &expect, set); } #endif @@ -1494,14 +1489,11 @@ static bool rb_head_page_replace(struct buffer_page *old, { unsigned long *ptr = (unsigned long *)&old->list.prev->next; unsigned long val; - unsigned long ret; val = *ptr & ~RB_FLAG_MASK; val |= RB_PAGE_HEAD; - ret = cmpxchg(ptr, val, (unsigned long)&new->list); - - return ret == val; + return try_cmpxchg(ptr, &val, (unsigned long)&new->list); } /* @@ -3003,7 +2995,6 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer, { unsigned long new_index, old_index; struct buffer_page *bpage; - unsigned long index; unsigned long addr; u64 write_stamp; u64 delta; @@ -3060,8 +3051,9 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer, */ old_index += write_mask; new_index += write_mask; - index = local_cmpxchg(&bpage->write, old_index, new_index); - if (index == old_index) { + + /* caution: old_index gets updated on cmpxchg failure */ + if (local_try_cmpxchg(&bpage->write, &old_index, new_index)) { /* update counters */ local_sub(event_length, &cpu_buffer->entries_bytes); return true;