From patchwork Mon Feb 6 21:05:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 53509 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2462571wrn; Mon, 6 Feb 2023 13:09:18 -0800 (PST) X-Google-Smtp-Source: AK7set9Xi5+gupEpV10oAHUt1bBLXD+T2wVWEYn+DxPbeobUv4W7h8XYUonE5QL4WeiNb6hJpDRn X-Received: by 2002:a05:6a20:b1a6:b0:bf:58d1:ce8f with SMTP id ee38-20020a056a20b1a600b000bf58d1ce8fmr10783079pzb.14.1675717758561; Mon, 06 Feb 2023 13:09:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675717758; cv=none; d=google.com; s=arc-20160816; b=x/ye3Cxtzph/XKhqqEyDYUkHdHSgRrk3fbocAHEQ1/Q0PEmE2ph6XwiasML9LaHQ46 YxNfppoSsE0RpP1coLPojBvk8CUSU0ahE645DxBiGlB43IqNTqT2LQKIsaabPV2pSiF6 zB5kUTA8jJHFwvjUd3/69lRdZ8S+p2cywqn1uLPuAUX9RLEuuWL6W7Stzki/ij3LOUIr 726uTwor0DbtCBj5ni3z1Q4z48F3ZVlGpoBYvOOmzQjCE1Ty7VOwo4wL7PvMWgGiKXbX razP6CS8GnGt+cN1ECd5FFpyVyvFzpNKV6gx1Ue1gXelvlsEX57Hpq636g79Ful2iww7 YP9A== 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=r4JnahttLljJJlPAPN3loqxjqxcv9cWRfojdRp8HWw8=; b=koolX7FDW5BSOwtxTwVqcL+rJGIzYltNsKgy4bD0I/WDAq2WQBc/89koUHH6txeHbi tZ7pabxC0SNRCZYD/mLmxlVTh8k0kNREk/0W7aho6fwf/qQnuAFEn3xklJvkYLiY0ihn WeU2bvwM0YH5uBMzrOZ50UMrK1UWwCUpilFTN6rLQRGfg8rZjU1EJy2JuP+IbsmJbLp5 EVs5MpW9NkdHUtA0aW+AIQhO2GUpqPc4rcEDAwgNMLHHxmPhgjDy/SswBPnbyBvaoNF3 5S1rUJJe/LNsW7joyDR4jM5lv/NHRUan3DXT4X9ccyAWmFESq8u28meBgOu/wBVnBO3U bxFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=HzxXLThh; 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 s14-20020a17090a880e00b0022c890c2d4asi16217518pjn.179.2023.02.06.13.09.05; Mon, 06 Feb 2023 13:09:18 -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=HzxXLThh; 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 S229571AbjBFVGK (ORCPT + 99 others); Mon, 6 Feb 2023 16:06:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229498AbjBFVGJ (ORCPT ); Mon, 6 Feb 2023 16:06:09 -0500 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0EF06E83 for ; Mon, 6 Feb 2023 13:06:07 -0800 (PST) Received: by mail-pf1-x44a.google.com with SMTP id z7-20020aa79587000000b00593f19705d5so7049965pfj.10 for ; Mon, 06 Feb 2023 13:06:07 -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=r4JnahttLljJJlPAPN3loqxjqxcv9cWRfojdRp8HWw8=; b=HzxXLThhUtwk2vaY+Xxj4TK/5HUQjNE6rzyLCh2JeTeGA9uAqXNQh95UvZWkhGFWv2 Lbvo51XgSqQnkIkxOaWDx0T5HEyxTfChGwa2H70A6XEsgiri9RysXUvdvis0MHCteMfd gTn7X3GdNFkbRdOpsZ/h142lZt6cdRnmSBtz8q83adXlP/DSQBqYNW4FOJQMzarSP5cI gWc124qhi3sg5GO+m4HaARbZko3ehJcNU/cKWuSiU6aN+GPOcjLQTSvifBeF9q1+4Uan ZP1W7bgtnCz9joJnjPkIv1LVODbIa/D3qs84k0a8Ev0UB3NMRyfhhWqmrz0VmiGKgYfb XWZQ== 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=r4JnahttLljJJlPAPN3loqxjqxcv9cWRfojdRp8HWw8=; b=4ZZV0qa3TCUMyHJhcoImiyIYT48bEF3+XFAPfrUap86H5cflro1G3hsmRogKeWMInJ AQemGmg7XWHhe/02/wmDcu5AApgyf67Xj+k0rHlyY7hZG3ADvydb58WFkCjqIr4D5Bsc pW45S+z0GF0zu6mpXTjIb/97TzCBO/CQ8llIF5J8HFFssm4ih3UL+6AESoRJ+XXULRfE B09an2+F9YLs4/Tj/cR+dOJCjGgiUQ/zLAcZsGjC/UL56zKiaqVFXs1wKFnUk0eY+w0f Hnyv9QCPcFifzXwEZy8edxETnr1/AP7HkSV2+znSAVHna6DYn84Hwy7y6YvHb5IBOWpX VPxg== X-Gm-Message-State: AO0yUKXMaFdzxNcdB2MokvvMnZIOWvgfc0iVVwE1aWQWHVzUEbf2VTYn MjZXJamS1XOmGAD0q2vVtJOS+87GpyV/MpYrHw24x0TYnrxsS9CfIRGkP30ixHWf/v+a17/NEJa me9/AIz2AOEfdNflXC3l8zFJtsSNTF9jp4jg8CozjTu0LXB19Je+xD6gL3osUX5zfvkW5F6M= X-Received: from jstultz-noogler2.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:600]) (user=jstultz job=sendgmr) by 2002:a17:90a:29c3:b0:228:d64f:ddbe with SMTP id h61-20020a17090a29c300b00228d64fddbemr279824pjd.40.1675717566433; Mon, 06 Feb 2023 13:06:06 -0800 (PST) Date: Mon, 6 Feb 2023 21:05:53 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog Message-ID: <20230206210556.660318-1-jstultz@google.com> Subject: [PATCH v3 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?1756841740703601986?= X-GMAIL-MSGID: =?utf-8?q?1757117424478827079?= In order to 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 nested_locks 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/ Cc: Davidlohr Bueso Cc: "Paul E. McKenney" Cc: Josh Triplett Cc: Joel Fernandes Cc: Juri Lelli Cc: Valentin Schneider Cc: Dietmar Eggemann Reviewed-by: Davidlohr Bueso Signed-off-by: John Stultz --- v3: * Minor commit message tweaks and naming changes suggested by Davidlohr Bueso --- 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..6fe046594868 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, nested_locks, 0, "Number of nested locks (max = 8)"); +/* Going much higher trips "BUG: MAX_LOCKDEP_CHAIN_HLOCKS too low!" errors */ +#define MAX_NESTED_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 nested_locks=%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, + nested_locks, 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 nested_locks to MAX_NESTED_LOCKS */ + if (nested_locks > MAX_NESTED_LOCKS) + nested_locks = MAX_NESTED_LOCKS; + if (cxt.cur_ops->readlock) { reader_tasks = kcalloc(cxt.nrealreaders_stress, sizeof(reader_tasks[0]),