From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B7E7C49EA7 for ; Fri, 25 Jun 2021 06:37:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 326F861351 for ; Fri, 25 Jun 2021 06:37:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233213AbhFYGkH (ORCPT ); Fri, 25 Jun 2021 02:40:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:58819 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233174AbhFYGkG (ORCPT ); Fri, 25 Jun 2021 02:40:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624603065; 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: in-reply-to:in-reply-to:references:references; bh=Yz5n65zIc/Xyg4DpXJJIZ8xd/wkGvvuxBKK3Aq7wCBY=; b=KF0255OjlJfQdp1bkt75zAuGqh9usCLprvjl+Fvha2gM1BY7f8b/Dq0q7+u+0A7p/FrRW7 ZNj3S5it6MKJqSRHWJ5KXGSiJe/msSMjCbL69VKvuz65ejNz/V628p2P0yk8jEnAMVrPHD kkYtYWdndhf+ACdKVst3TW7uVczJeL0= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-270-a85W3pkEMTqki_EMpt069w-1; Fri, 25 Jun 2021 02:37:43 -0400 X-MC-Unique: a85W3pkEMTqki_EMpt069w-1 Received: by mail-wr1-f71.google.com with SMTP id g4-20020a5d64e40000b029012469ad3be8so2873334wri.1 for ; Thu, 24 Jun 2021 23:37:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Yz5n65zIc/Xyg4DpXJJIZ8xd/wkGvvuxBKK3Aq7wCBY=; b=LkZ0Z4TKup5cFtlvJcmM01+zMvy+hSN3fgtgplNq3WGxMuRm+/QkXKaKBNNKvkueHs 5nDYkre2eqwm6yXCBFf9ZGcJTmAVtkKU2g64CPznR5UiNQbTs8FP+Rq5YNk/lG5YnNRH Og7SAFKlt0yMXhk+IrDH2fpbCLrQ9FIC+vwY8Rhd2Wg+vn/EQX8bRVhkhQ4G0zX8KOWj nnJKbsA/SuwGVip2UqpnS3W3eSpUR90eELFVI2vta3x3IuGbtdOE/Gvd642qwkmUg3qu e42rQIaB9srxKCyRr4IZPaT6Wt/oMep4bIo6s098w1yuBl6aYrQ/hYyXB9HU2ljp75rl YuSA== X-Gm-Message-State: AOAM532Mmka7d4jUdn80kYUZJ/pCRdOsdOlXXKXxsZDFpSfXOWWe5zrY BECzbYCM1kO5wyLrmyDxTfkAzYDGOvv4v/FYgIcDuCpdRVD4hwzjqu2bOmr4pkFSJSqIvbjF42H 3Mo4lYqBlgopGvzEf0K238zz7 X-Received: by 2002:a05:6000:1842:: with SMTP id c2mr8898333wri.426.1624603062550; Thu, 24 Jun 2021 23:37:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPi6scAGrWiuIfyb8OVgFBLYbzUiFQiYM3knReSz8/ouGldhQ0+zTdqKVvGs366kWGA/BhbQ== X-Received: by 2002:a05:6000:1842:: with SMTP id c2mr8898315wri.426.1624603062342; Thu, 24 Jun 2021 23:37:42 -0700 (PDT) Received: from redhat.com ([77.124.79.210]) by smtp.gmail.com with ESMTPSA id r24sm11392123wmh.18.2021.06.24.23.37.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Jun 2021 23:37:41 -0700 (PDT) Date: Fri, 25 Jun 2021 02:37:38 -0400 From: "Michael S. Tsirkin" To: Yunsheng Lin Cc: davem@davemloft.net, kuba@kernel.org, jasowang@redhat.com, brouer@redhat.com, paulmck@kernel.org, peterz@infradead.org, will@kernel.org, shuah@kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linuxarm@openeuler.org Subject: Re: [PATCH net-next v2 1/2] selftests/ptr_ring: add benchmark application for ptr_ring Message-ID: <20210625023308-mutt-send-email-mst@kernel.org> References: <1624591136-6647-1-git-send-email-linyunsheng@huawei.com> <1624591136-6647-2-git-send-email-linyunsheng@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1624591136-6647-2-git-send-email-linyunsheng@huawei.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jun 25, 2021 at 11:18:55AM +0800, Yunsheng Lin wrote: > Currently ptr_ring selftest is embedded within the virtio > selftest, which involves some specific virtio operation, > such as notifying and kicking. > > As ptr_ring has been used by various subsystems, it deserves > it's owner's selftest in order to benchmark different usecase > of ptr_ring, such as page pool and pfifo_fast qdisc. > > So add a simple application to benchmark ptr_ring performance. > Currently two test mode is supported: > Mode 0: Both enqueuing and dequeuing is done in a single thread, > it is called simple test mode in the test app. > Mode 1: Enqueuing and dequeuing is done in different thread > concurrently, also known as SPSC(single-producer/ > single-consumer) test. > > The multi-producer/single-consumer test for pfifo_fast case is > not added yet, which can be added if using CAS atomic operation > to enable lockless multi-producer is proved to be better than > using r->producer_lock. > > Only supported on x86 and arm64 for now. > > Signed-off-by: Yunsheng Lin > --- > MAINTAINERS | 5 + > tools/testing/selftests/ptr_ring/Makefile | 6 + > tools/testing/selftests/ptr_ring/ptr_ring_test.c | 249 +++++++++++++++++++++++ > tools/testing/selftests/ptr_ring/ptr_ring_test.h | 150 ++++++++++++++ > 4 files changed, 410 insertions(+) > create mode 100644 tools/testing/selftests/ptr_ring/Makefile > create mode 100644 tools/testing/selftests/ptr_ring/ptr_ring_test.c > create mode 100644 tools/testing/selftests/ptr_ring/ptr_ring_test.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index cc375fd..1227022 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -14847,6 +14847,11 @@ F: drivers/net/phy/dp83640* > F: drivers/ptp/* > F: include/linux/ptp_cl* > > +PTR RING BENCHMARK > +M: Yunsheng Lin > +L: netdev@vger.kernel.org > +F: tools/testing/selftests/ptr_ring/ > + > PTRACE SUPPORT > M: Oleg Nesterov > S: Maintained > diff --git a/tools/testing/selftests/ptr_ring/Makefile b/tools/testing/selftests/ptr_ring/Makefile > new file mode 100644 > index 0000000..346dea9 > --- /dev/null > +++ b/tools/testing/selftests/ptr_ring/Makefile > @@ -0,0 +1,6 @@ > +# SPDX-License-Identifier: GPL-2.0 > +LDLIBS = -lpthread > + > +TEST_GEN_PROGS := ptr_ring_test > + > +include ../lib.mk > diff --git a/tools/testing/selftests/ptr_ring/ptr_ring_test.c b/tools/testing/selftests/ptr_ring/ptr_ring_test.c > new file mode 100644 > index 0000000..4f32d3d > --- /dev/null > +++ b/tools/testing/selftests/ptr_ring/ptr_ring_test.c > @@ -0,0 +1,249 @@ > +// SPDX-License-Identifier: GPL-2.0-only Can we keep this GPL-2.0-or-later same as ptr ring itself? Encourages reuse ... > +/* > + * Copyright (C) 2021 HiSilicon Limited. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "ptr_ring_test.h" > +#include "../../../../include/linux/ptr_ring.h" > + > +#define MIN_RING_SIZE 2 > +#define MAX_RING_SIZE 10000000 > + > +static struct ptr_ring ring ____cacheline_aligned_in_smp; > + > +struct worker_info { > + pthread_t tid; > + int test_count; > + bool error; > + long duration_us; > +}; > + > +static void *produce_worker(void *arg) > +{ > + struct worker_info *info = arg; > + struct timeval start, end; > + unsigned long i = 0; > + long sec, us; > + int ret; > + > + gettimeofday(&start, NULL); > + > + while (++i <= info->test_count) { > + while (__ptr_ring_full(&ring)) > + cpu_relax(); > + > + ret = __ptr_ring_produce(&ring, (void *)i); > + if (ret) { > + fprintf(stderr, "produce failed: %d\n", ret); > + info->error = true; > + return NULL; > + } > + } > + > + gettimeofday(&end, NULL); > + > + sec = (end.tv_sec - start.tv_sec); > + us = ((sec * 1000000) + end.tv_usec) - (start.tv_usec); > + info->duration_us = us; > + info->error = false; > + > + return NULL; > +} perf does all of this and more. Let's not reinvent the wheel - just run the test. > + > +static void *consume_worker(void *arg) > +{ > + struct worker_info *info = arg; > + struct timeval start, end; > + unsigned long i = 0; > + long sec, us; > + int *ptr; > + > + gettimeofday(&start, NULL); > + > + while (++i <= info->test_count) { > + while (__ptr_ring_empty(&ring)) > + cpu_relax(); > + > + ptr = __ptr_ring_consume(&ring); > + if ((unsigned long)ptr != i) { > + fprintf(stderr, "consumer failed, ptr: %lu, i: %lu\n", > + (unsigned long)ptr, i); > + info->error = true; > + return NULL; > + } > + } > + > + gettimeofday(&end, NULL); > + > + if (!__ptr_ring_empty(&ring)) { > + fprintf(stderr, "ring should be empty, test failed\n"); > + info->error = true; > + return NULL; > + } > + > + sec = (end.tv_sec - start.tv_sec); > + us = ((sec * 1000000) + end.tv_usec) - (start.tv_usec); > + info->duration_us = us; > + info->error = false; > + return NULL; > +} > + > +/* test case for single producer single consumer */ > +static void spsc_test(int size, int count) > +{ > + struct worker_info producer, consumer; > + pthread_attr_t attr; > + void *res; > + int ret; > + > + ret = ptr_ring_init(&ring, size, 0); > + if (ret) { > + fprintf(stderr, "init failed: %d\n", ret); > + return; > + } > + > + producer.test_count = count; > + consumer.test_count = count; > + > + ret = pthread_attr_init(&attr); > + if (ret) { > + fprintf(stderr, "pthread attr init failed: %d\n", ret); > + goto out; > + } > + > + ret = pthread_create(&producer.tid, &attr, > + produce_worker, &producer); > + if (ret) { > + fprintf(stderr, "create producer thread failed: %d\n", ret); > + goto out; > + } > + > + ret = pthread_create(&consumer.tid, &attr, > + consume_worker, &consumer); > + if (ret) { > + fprintf(stderr, "create consumer thread failed: %d\n", ret); > + goto out; > + } > + > + ret = pthread_join(producer.tid, &res); > + if (ret) { > + fprintf(stderr, "join producer thread failed: %d\n", ret); > + goto out; > + } > + > + ret = pthread_join(consumer.tid, &res); > + if (ret) { > + fprintf(stderr, "join consumer thread failed: %d\n", ret); > + goto out; > + } > + > + if (producer.error || consumer.error) { > + fprintf(stderr, "spsc test failed\n"); > + goto out; > + } > + > + printf("ptr_ring(size:%d) perf spsc test for %d times, took %ld us + %ld us\n", > + size, count, producer.duration_us, consumer.duration_us); > +out: > + ptr_ring_cleanup(&ring, NULL); > +} > + > +static void simple_test(int size, int count) > +{ > + struct timeval start, end; > + long sec, us; > + int i = 0; > + int *ptr; > + int ret; > + > + ret = ptr_ring_init(&ring, size, 0); > + if (ret) { > + fprintf(stderr, "init failed: %d\n", ret); > + return; > + } > + > + gettimeofday(&start, NULL); > + > + while (++i <= count) { > + ret = __ptr_ring_produce(&ring, &count); > + if (ret) { > + fprintf(stderr, "produce failed: %d\n", ret); > + goto out; > + } > + > + ptr = __ptr_ring_consume(&ring); > + if (ptr != &count) { > + fprintf(stderr, "consume failed: %p\n", ptr); > + goto out; > + } > + } > + > + gettimeofday(&end, NULL); > + sec = (end.tv_sec - start.tv_sec); > + us = ((sec * 1000000) + end.tv_usec) - (start.tv_usec); > + printf("ptr_ring(size:%d) perf simple test for %d times, took %ld us\n", > + size, count, us); > + > +out: > + ptr_ring_cleanup(&ring, NULL); > +} > + > +int main(int argc, char *argv[]) > +{ > + int count = 1000000; > + int size = 1000; > + int mode = 0; > + int opt; > + > + while ((opt = getopt(argc, argv, "N:s:m:")) != -1) { > + switch (opt) { > + case 'N': > + count = atoi(optarg); > + break; > + case 's': > + size = atoi(optarg); > + break; > + case 'm': > + mode = atoi(optarg); > + break; > + default: > + return -1; > + } > + } > + > + if (count <= 0) { > + fprintf(stderr, "invalid test count, must be > 0\n"); > + return -1; > + } > + > + if (size < MIN_RING_SIZE || size > MAX_RING_SIZE) { > + fprintf(stderr, "invalid ring size, must be in %d-%d\n", > + MIN_RING_SIZE, MAX_RING_SIZE); > + return -1; > + } > + > + switch (mode) { > + case 0: > + simple_test(size, count); > + break; > + case 1: > + spsc_test(size, count); > + break; > + default: > + fprintf(stderr, "invalid test mode\n"); > + return -1; > + } > + > + return 0; > +} > diff --git a/tools/testing/selftests/ptr_ring/ptr_ring_test.h b/tools/testing/selftests/ptr_ring/ptr_ring_test.h > new file mode 100644 > index 0000000..6bf2494 > --- /dev/null > +++ b/tools/testing/selftests/ptr_ring/ptr_ring_test.h > @@ -0,0 +1,150 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ We already have hacks like this in the virtio test. Let's refactor not duplicate please. > + > +#ifndef _TEST_PTR_RING_IMPL_H > +#define _TEST_PTR_RING_IMPL_H > + > +#if defined(__x86_64__) || defined(__i386__) > +static inline void cpu_relax(void) > +{ > + asm volatile ("rep; nop" ::: "memory"); > +} > +#elif defined(__aarch64__) > +static inline void cpu_relax(void) > +{ > + asm volatile("yield" ::: "memory"); > +} > +#else > +#define cpu_relax() assert(0) > +#endif > + > +static inline void barrier(void) > +{ > + asm volatile("" ::: "memory"); > +} > + > +/* > + * This abuses the atomic builtins for thread fences, and > + * adds a compiler barrier. > + */ > +#define smp_release() do { \ > + barrier(); \ > + __atomic_thread_fence(__ATOMIC_RELEASE); \ > +} while (0) > + > +#define smp_acquire() do { \ > + __atomic_thread_fence(__ATOMIC_ACQUIRE); \ > + barrier(); \ > +} while (0) > + > +#if defined(__i386__) || defined(__x86_64__) > +#define smp_wmb() barrier() > +#else > +#define smp_wmb() smp_release() > +#endif > + > +#define READ_ONCE(x) (*(volatile typeof(x) *)&(x)) > +#define WRITE_ONCE(x, val) ((*(volatile typeof(x) *)&(x)) = (val)) > +#define SMP_CACHE_BYTES 64 > +#define cache_line_size SMP_CACHE_BYTES > +#define unlikely(x) (__builtin_expect(!!(x), 0)) > +#define likely(x) (__builtin_expect(!!(x), 1)) > +#define ALIGN(x, a) (((x) + (a) - 1) / (a) * (a)) > +#define SIZE_MAX (~(size_t)0) > +#define KMALLOC_MAX_SIZE SIZE_MAX > +#define spinlock_t pthread_spinlock_t > +#define gfp_t int > +#define __GFP_ZERO 0x1 > + > +#define ____cacheline_aligned_in_smp __attribute__((aligned(SMP_CACHE_BYTES))) > + > +static void *kmalloc(unsigned int size, gfp_t gfp) > +{ > + void *p; > + > + p = memalign(64, size); > + if (!p) > + return p; > + > + if (gfp & __GFP_ZERO) > + memset(p, 0, size); > + > + return p; > +} > + > +static inline void *kzalloc(unsigned int size, gfp_t flags) > +{ > + return kmalloc(size, flags | __GFP_ZERO); > +} > + > +static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags) > +{ > + if (size != 0 && n > SIZE_MAX / size) > + return NULL; > + return kmalloc(n * size, flags); > +} > + > +static inline void *kcalloc(size_t n, size_t size, gfp_t flags) > +{ > + return kmalloc_array(n, size, flags | __GFP_ZERO); > +} > + > +static void kfree(void *p) > +{ > + free(p); > +} > + > +#define kvmalloc_array kmalloc_array > +#define kvfree kfree > + > +static void spin_lock_init(spinlock_t *lock) > +{ > + int r = pthread_spin_init(lock, 0); > + > + assert(!r); > +} > + > +static void spin_lock(spinlock_t *lock) > +{ > + int ret = pthread_spin_lock(lock); > + > + assert(!ret); > +} > + > +static void spin_unlock(spinlock_t *lock) > +{ > + int ret = pthread_spin_unlock(lock); > + > + assert(!ret); > +} > + > +static void spin_lock_bh(spinlock_t *lock) > +{ > + spin_lock(lock); > +} > + > +static void spin_unlock_bh(spinlock_t *lock) > +{ > + spin_unlock(lock); > +} > + > +static void spin_lock_irq(spinlock_t *lock) > +{ > + spin_lock(lock); > +} > + > +static void spin_unlock_irq(spinlock_t *lock) > +{ > + spin_unlock(lock); > +} > + > +static void spin_lock_irqsave(spinlock_t *lock, unsigned long f) > +{ > + spin_lock(lock); > +} > + > +static void spin_unlock_irqrestore(spinlock_t *lock, unsigned long f) > +{ > + spin_unlock(lock); > +} > + > +#endif > -- > 2.7.4