From patchwork Thu Feb 2 22:34:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 52197 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp510558wrn; Thu, 2 Feb 2023 14:36:17 -0800 (PST) X-Google-Smtp-Source: AK7set87/qEhGlQQb4Kbr+9WXVoJ7y4RcnOtzQBqr7Rg6D+izm5Bfg1MXGz+vPd+v5asr0BmoR20 X-Received: by 2002:a17:90a:1908:b0:22b:baf3:8f0d with SMTP id 8-20020a17090a190800b0022bbaf38f0dmr8324981pjg.16.1675377376774; Thu, 02 Feb 2023 14:36:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675377376; cv=none; d=google.com; s=arc-20160816; b=J3NNQewOfqQUfxL9yPiVeTJXs89AEQAvwPHCvEYfmmBcQeE629UN0AXvcdXRdaEyzX qEN+LD46ExUm/+NKahqdSbfHMQhTdajPwUwh7o0xHirnH8Srb3PmwZRFP20SlzZdWply XwJQ0w303bnKQq7+j9lpiZgwIZyn28PE8fU/UKZE2HoxlOBOLJ+SnA/zbhG5ZG0AnkqU j7ONjjMJZE9i8O+KRg9T/X1QnQHd/RE9FoYMubdQrHNkQDr4xR7PBYqi2qWqFGgCjONP +NlZ9KE0tt+Tw/idzwj9vK5vgl2zJkDABE0B1uEkjlB4e2YIAWUbMknBUgVmGB+NFt1n Sfxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :dkim-signature; bh=JqXBZCshocKpxm4gEZMlbqbtIQK38/N6xcknjdoOafE=; b=scPgX2+8GuaeN7dOqILWvjVsPztOsoK8KV5lrsjN0nr7Uua9kb1lpeBGyaVFmo9Fh2 /QpvKbWM8O+dgq5Lx66c1IC6P1uGzqwb5OT08acqzv7tQekDkR6MPdbftzXnto75gJ3n 9XzzPd6BUEwyIX2h+Q1iEugp1r+QI+dFLg3MnA8BGSK/R2HX6sDgW90Gu/7QUCY8h2cR xyxhJ78pRaf691T08JfVLACJsDT0lnamEy1mypvo5kPAeJ3CIxVa4gyK86Ln1+nySmTg w4qoN2uibz2KRev0SPU1O92//fxzIR026tecJi8isWTLvotqv2r4NV7r88kxxEg35SlE 57sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=rtxJ+BeT; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y25-20020a637d19000000b004f1a97a4c9fsi841362pgc.470.2023.02.02.14.36.04; Thu, 02 Feb 2023 14:36:16 -0800 (PST) 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; dkim=pass header.i=@google.com header.s=20210112 header.b=rtxJ+BeT; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232389AbjBBWeS (ORCPT + 99 others); Thu, 2 Feb 2023 17:34:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229667AbjBBWeP (ORCPT ); Thu, 2 Feb 2023 17:34:15 -0500 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2D5668AD4 for ; Thu, 2 Feb 2023 14:34:12 -0800 (PST) Received: by mail-pl1-x64a.google.com with SMTP id z9-20020a170902d54900b00196680ec8bbso1575385plf.16 for ; Thu, 02 Feb 2023 14:34:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=JqXBZCshocKpxm4gEZMlbqbtIQK38/N6xcknjdoOafE=; b=rtxJ+BeTJ2KGfEbZbbP4kOUdXR7t10eCA7N/6Qus1DybSK7fnJzApwwV+0M4y+1A7C QNE+jnNgMUEclDsYBGvrxLCJFp1efPe1N+3AruYpf1ePfHUDbH3USc2n7YDrQO52Z3yW S+vVueWtrBlQjeLj1foHFhrVTOUyeY48oR319ratj8r031ViZk6P6heXrazbE2XQKSQb d4TeNmyocCJmTUYe1n3PsuZBmUBRwiX9+dSvL6Gg8JysuDgdFFYev52/dVinOiLgxIK1 O9ZT2V6B25uH8VmekIe1mqwmng5zEYHkW8F3ohP7EsyL+U04jVQhnye+GsGlW/0gHa4r P/nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=JqXBZCshocKpxm4gEZMlbqbtIQK38/N6xcknjdoOafE=; b=DYuTmLYWqcI0XQLdQuwZGDYpFW4DhW6gXRA1erievxgLHA3rHOISmEWGBSYWLASViU yEWa9ghmGYBED2yRTU3NxPX8OPVtL35e7Gq7H8oXwX0n7nfowePGYjRQNWKuBN8eplfA 66wI/jzxoD0CIa/Ma/85mnM4J04TX+m7W56EZxovnmHLFfQuckfKpFtQ9L4NbRkOHd+d MlZSIcybbwRXUERoAjlFDvGuzbTswKJk+mtmJGKyqaAbEpJbKGq3vubv78QwEawb5Y+S ir3wBxYWm96hn6u+ZZ9iO/ajJO9hgskOhv433A89Bh32KLWEQ7nkx1jqtH67VZs0SiK1 Hatg== X-Gm-Message-State: AO0yUKV41oR792oIWb92ybC4xHIUoAjwkVRLPxRrRajnwqItHlJFw/oA B9e6mnIEsP9i+vUAx7IlGP4rbIpCYHKZprotj/+ErdQUQCr2NYv9wC7/BEzvDPKstcXdVkAiB1V J6AUKn/mpilNHF7LzbY72HemErhRXm0obhI6iIBYhcQOG68Pvsqjw2i+0FHqSxjWEQknI7N4= X-Received: from jstultz-noogler2.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:600]) (user=jstultz job=sendgmr) by 2002:a17:90a:3d04:b0:22c:7639:a926 with SMTP id h4-20020a17090a3d0400b0022c7639a926mr974784pjc.83.1675377252249; Thu, 02 Feb 2023 14:34:12 -0800 (PST) Date: Thu, 2 Feb 2023 22:34:06 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog Message-ID: <20230202223409.2812443-1-jstultz@google.com> Subject: [RFC][PATCH 1/4] locktorture: Add nested_[un]lock() hooks and nlocks parameter From: John Stultz To: LKML Cc: John Stultz , Davidlohr Bueso , "Paul E. McKenney" , Josh Triplett , Joel Fernandes , Juri Lelli , Valentin Schneider , Dietmar Eggemann X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756760508217429866?= X-GMAIL-MSGID: =?utf-8?q?1756760508217429866?= In order ot extend locktorture to support lock nesting, add nested_lock() and nested_unlock() hooks to the torture ops. These take a 32bit lockset mask which is generated at random, so some number of locks will be taken before the main lock is taken and released afterwards. Additionally, add nlocks module parameter to allow specifying the number of nested locks to be used. This has been helpful to uncover issues in the proxy-exec series development. This was inspired by locktorture extensions originally implemented by Connor O'Brien, for stress testing the proxy-execution series: https://lore.kernel.org/lkml/20221003214501.2050087-12-connoro@google.com/ Comments or feedback would be greatly appreciated! Cc: Davidlohr Bueso Cc: "Paul E. McKenney" Cc: Josh Triplett Cc: Joel Fernandes Cc: Juri Lelli Cc: Valentin Schneider Cc: Dietmar Eggemann Signed-off-by: John Stultz --- kernel/locking/locktorture.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c index 9c2fb613a55d..f4fbd3194654 100644 --- a/kernel/locking/locktorture.c +++ b/kernel/locking/locktorture.c @@ -48,6 +48,9 @@ torture_param(int, stat_interval, 60, torture_param(int, stutter, 5, "Number of jiffies to run/halt test, 0=disable"); torture_param(int, verbose, 1, "Enable verbose debugging printk()s"); +torture_param(int, nlocks, 0, "Number of nested locks"); +/* Going much higher trips "BUG: MAX_LOCKDEP_CHAIN_HLOCKS too low!" errors */ +#define MAX_LOCKS 8 static char *torture_type = "spin_lock"; module_param(torture_type, charp, 0444); @@ -76,10 +79,12 @@ static void lock_torture_cleanup(void); struct lock_torture_ops { void (*init)(void); void (*exit)(void); + int (*nested_lock)(int tid, u32 lockset); int (*writelock)(int tid); void (*write_delay)(struct torture_random_state *trsp); void (*task_boost)(struct torture_random_state *trsp); void (*writeunlock)(int tid); + void (*nested_unlock)(int tid, u32 lockset); int (*readlock)(int tid); void (*read_delay)(struct torture_random_state *trsp); void (*readunlock)(int tid); @@ -669,6 +674,7 @@ static int lock_torture_writer(void *arg) struct lock_stress_stats *lwsp = arg; int tid = lwsp - cxt.lwsa; DEFINE_TORTURE_RANDOM(rand); + u32 lockset_mask; VERBOSE_TOROUT_STRING("lock_torture_writer task started"); set_user_nice(current, MAX_NICE); @@ -677,7 +683,10 @@ static int lock_torture_writer(void *arg) if ((torture_random(&rand) & 0xfffff) == 0) schedule_timeout_uninterruptible(1); + lockset_mask = torture_random(&rand); cxt.cur_ops->task_boost(&rand); + if (cxt.cur_ops->nested_lock) + cxt.cur_ops->nested_lock(tid, lockset_mask); cxt.cur_ops->writelock(tid); if (WARN_ON_ONCE(lock_is_write_held)) lwsp->n_lock_fail++; @@ -690,6 +699,8 @@ static int lock_torture_writer(void *arg) lock_is_write_held = false; WRITE_ONCE(last_lock_release, jiffies); cxt.cur_ops->writeunlock(tid); + if (cxt.cur_ops->nested_unlock) + cxt.cur_ops->nested_unlock(tid, lockset_mask); stutter_wait("lock_torture_writer"); } while (!torture_must_stop()); @@ -830,11 +841,11 @@ lock_torture_print_module_parms(struct lock_torture_ops *cur_ops, const char *tag) { pr_alert("%s" TORTURE_FLAG - "--- %s%s: nwriters_stress=%d nreaders_stress=%d stat_interval=%d verbose=%d shuffle_interval=%d stutter=%d shutdown_secs=%d onoff_interval=%d onoff_holdoff=%d\n", + "--- %s%s: nwriters_stress=%d nreaders_stress=%d nlocks=%d stat_interval=%d verbose=%d shuffle_interval=%d stutter=%d shutdown_secs=%d onoff_interval=%d onoff_holdoff=%d\n", torture_type, tag, cxt.debug_lock ? " [debug]": "", - cxt.nrealwriters_stress, cxt.nrealreaders_stress, stat_interval, - verbose, shuffle_interval, stutter, shutdown_secs, - onoff_interval, onoff_holdoff); + cxt.nrealwriters_stress, cxt.nrealreaders_stress, nlocks, + stat_interval, verbose, shuffle_interval, stutter, + shutdown_secs, onoff_interval, onoff_holdoff); } static void lock_torture_cleanup(void) @@ -1053,6 +1064,10 @@ static int __init lock_torture_init(void) } } + /* cap nlocks to MAX_LOCKS */ + if (nlocks > MAX_LOCKS) + nlocks = MAX_LOCKS; + if (cxt.cur_ops->readlock) { reader_tasks = kcalloc(cxt.nrealreaders_stress, sizeof(reader_tasks[0]),