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=-9.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 96DD7C32771 for ; Wed, 15 Jan 2020 22:42:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 640792081E for ; Wed, 15 Jan 2020 22:42:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=joelfernandes.org header.i=@joelfernandes.org header.b="l3/nsl8B" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729125AbgAOWmf (ORCPT ); Wed, 15 Jan 2020 17:42:35 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:44305 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728903AbgAOWme (ORCPT ); Wed, 15 Jan 2020 17:42:34 -0500 Received: by mail-pl1-f195.google.com with SMTP id az3so7436470plb.11 for ; Wed, 15 Jan 2020 14:42:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pBRklvpY40dAtXS3gJ1rJGgLsz/TSxLUhsVoH1/CwJc=; b=l3/nsl8Bwl1a+r6YuzCnXbDxoaFrXX642vIJ0IIRznCLxzeyV9j6lI3/CVr6sBGaSt i7s8Xb3ZUhOfeDj4IwhzyvGkR/nXG6gZQzHgrASCPBY1sfqvTgos9qZ7xE9ZEI4Qm1a3 4FMIwweCy8aA4dnJQyQwLX9LXAh7UI7TCvnW4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pBRklvpY40dAtXS3gJ1rJGgLsz/TSxLUhsVoH1/CwJc=; b=f9G1Gl1wIQht4+4IQE5FPQ0rYTjxyhAdGSAaG+Knbqg5eIPK9pkY+vW34VZsKK2P1W Cxz//U/jQSjwY2JFzxBroxoA/tml4ZSm3IZWE/n+HQHlMCJoDK6eEDWxDtHqAbYBY4hv IdhoOEaSx3wWxyKmn0l3VemREXu1/06XOuJV9/+gTbCrLdEaYL1+S1GZOw3lcpVFH+PZ Pfyx7BEOWcb4T7IxZYyc+JaTgLg57dO2iOfEbB6pdc5AOTjSvnVZdNu+JOVZNQzHo5Ui nJ13Uze7as/Cu6D8hRPx4bxWFuhnlny0A5udj6A+qKW2n9QCTdxNhxTtq7r1Osh167VB UIyw== X-Gm-Message-State: APjAAAW5j2SQdOLYgbGmPjD+xLvQVBhnPAojVlrvmAjm/3Fbh0MDfmMJ vJK+zX2ZE00/gteyLkYT78Z9Ew== X-Google-Smtp-Source: APXvYqzjBcuBDfXVoe7+Zw9TfoCpqMatlKnu9yEhidgIRn1QIoc3ZX3TFJZU57VzGCVSoZEQd1ekIQ== X-Received: by 2002:a17:90a:d141:: with SMTP id t1mr2746096pjw.38.1579128154243; Wed, 15 Jan 2020 14:42:34 -0800 (PST) Received: from joelaf.cam.corp.google.com ([2620:15c:6:12:9c46:e0da:efbf:69cc]) by smtp.gmail.com with ESMTPSA id e1sm23186209pfl.98.2020.01.15.14.42.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2020 14:42:33 -0800 (PST) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , urezki@gmail.com, Davidlohr Bueso , Josh Triplett , Lai Jiangshan , Mathieu Desnoyers , "Paul E. McKenney" , rcu@vger.kernel.org, Steven Rostedt Subject: [PATCH 1/2] rcuperf: Add support to vary the slab object sizes Date: Wed, 15 Jan 2020 17:42:24 -0500 Message-Id: <20200115224225.246061-1-joel@joelfernandes.org> X-Mailer: git-send-email 2.25.0.rc1.283.g88dfdc4193-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: rcu-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: rcu@vger.kernel.org This patch varies the allocated size of objects to be more realistic in comparison to production workloads. Cc: urezki@gmail.com Signed-off-by: Joel Fernandes (Google) --- kernel/rcu/rcuperf.c | 48 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/kernel/rcu/rcuperf.c b/kernel/rcu/rcuperf.c index da94b89cd531..1fd0cc72022e 100644 --- a/kernel/rcu/rcuperf.c +++ b/kernel/rcu/rcuperf.c @@ -87,6 +87,7 @@ torture_param(bool, shutdown, RCUPERF_SHUTDOWN, torture_param(int, verbose, 1, "Enable verbose debugging printk()s"); torture_param(int, writer_holdoff, 0, "Holdoff (us) between GPs, zero to disable"); torture_param(int, kfree_rcu_test, 0, "Do we run a kfree_rcu() perf test?"); +torture_param(bool, kfree_vary_obj_size, 0, "Vary the kfree_rcu object size"); static char *perf_type = "rcu"; module_param(perf_type, charp, 0444); @@ -599,17 +600,29 @@ static int kfree_nrealthreads; static atomic_t n_kfree_perf_thread_started; static atomic_t n_kfree_perf_thread_ended; -struct kfree_obj { - char kfree_obj[8]; - struct rcu_head rh; -}; +/* + * Define a kfree_obj with size as the @size parameter + the size of rcu_head + * (rcu_head is 16 bytes on 64-bit arch). + */ +#define DEFINE_KFREE_OBJ(size) \ +struct kfree_obj_ ## size { \ + char kfree_obj[size]; \ + struct rcu_head rh; \ +} + +/* This should goto the right sized slabs on both 32-bit and 64-bit arch */ +DEFINE_KFREE_OBJ(16); // goes on kmalloc-32 slab +DEFINE_KFREE_OBJ(32); // goes on kmalloc-64 slab +DEFINE_KFREE_OBJ(64); // goes on kmalloc-96 slab +DEFINE_KFREE_OBJ(96); // goes on kmalloc-128 slab static int kfree_perf_thread(void *arg) { int i, loop = 0; long me = (long)arg; - struct kfree_obj *alloc_ptr; + void *alloc_ptr; + u64 start_time, end_time; VERBOSE_PERFOUT_STRING("kfree_perf_thread task started"); @@ -627,11 +640,32 @@ kfree_perf_thread(void *arg) do { for (i = 0; i < kfree_alloc_num; i++) { - alloc_ptr = kmalloc(sizeof(struct kfree_obj), GFP_KERNEL); + int kfree_type = i % 4; + + // Allocate only kfree_obj_16 if rcuperf.kfree_vary_obj_size not passed. + if (!kfree_vary_obj_size) + kfree_type = 0; + + if (kfree_type == 0) + alloc_ptr = kmalloc(sizeof(struct kfree_obj_16), GFP_KERNEL); + else if (kfree_type == 1) + alloc_ptr = kmalloc(sizeof(struct kfree_obj_32), GFP_KERNEL); + else if (kfree_type == 2) + alloc_ptr = kmalloc(sizeof(struct kfree_obj_64), GFP_KERNEL); + else + alloc_ptr = kmalloc(sizeof(struct kfree_obj_96), GFP_KERNEL); + if (!alloc_ptr) return -ENOMEM; - kfree_rcu(alloc_ptr, rh); + if (kfree_type == 0) + kfree_rcu((struct kfree_obj_16 *)alloc_ptr, rh); + else if (kfree_type == 1) + kfree_rcu((struct kfree_obj_32 *)alloc_ptr, rh); + else if (kfree_type == 2) + kfree_rcu((struct kfree_obj_64 *)alloc_ptr, rh); + else + kfree_rcu((struct kfree_obj_96 *)alloc_ptr, rh); } cond_resched(); -- 2.25.0.rc1.283.g88dfdc4193-goog