From patchwork Thu Jun 15 18:10:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 108676 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp826807vqr; Thu, 15 Jun 2023 11:14:29 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7OcDDCp7rBAIvwh3OZQJJvyAxZhQeKlrvDICOyajJfnaEc4eCKmonNvzH6fXJZtHssYMU5 X-Received: by 2002:a17:902:ea05:b0:1b0:62e2:1f84 with SMTP id s5-20020a170902ea0500b001b062e21f84mr7304712plg.5.1686852869015; Thu, 15 Jun 2023 11:14:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686852868; cv=none; d=google.com; s=arc-20160816; b=lSVCKPvssCp9YcuvzLUx01+tU9cELUhpUEC8rOWhlnc6/PoORsB1Jkq14U0zvFnPjD TEQwMUpmlXeMp11+bPVGbGPmrD2HyRWI9xpCQ+FuiQ+KW+4fhp1epifOvRpOmxICpBwi o1fE4uHNSQyzdVczELUO/FKwPTmQ8RJ7+Giqpvrp43ROW8FJI47hEZY2D/YtCSSesp2U /Roq1mkxstAnhqsMDW8Nt7EMDft63iBykwuQpVmFO74zCU1BBhJym8PiuicyfxPmSy4M KniJJFGNEJzJmeb3mRQh6aUNE6SF90AH/3AxieBuDJsAJH2Yugu7pguRZnkBU9fXrFUM gn3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=2DUkFDXVxWSeUw8jnmQvHS6FBLIqk6q7IjEZVAMVUFc=; b=EQa88vGnmYuTLPxwpjquQYzzxhZdiySWSpLaeUl6iLStFOt/qX2JOlnwSRQl0hEan3 SAtH+pb08cRPvb2zSy3SXoh5iOHg5lq6FD0rZjH2BJ2pciPLtrXN7Ii0l4z6GqrGm/td pgmBRHI42yyKIOkVyEDJsMl6edXqPunJay6x/Mup3xqkQ5Re8q8X9bPyZIKky06Smnvo S+iUL9nayTc/irrIcuiAJBf0rZm6IxkFG4Gi2cTN37Oj3FNhCCU0rj/lRBEscr/tnGDa iMjxe13N7/Z4TthtoSqAeR0uufdsQ9VZgWx1gJ24xK/NHmWRhEBFvOPnAW9KdwN7GcX1 WZUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=I0z65ADi; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l15-20020a170903120f00b001aaed82c2afsi13982823plh.171.2023.06.15.11.14.16; Thu, 15 Jun 2023 11:14:28 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=I0z65ADi; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238198AbjFOSKU (ORCPT + 99 others); Thu, 15 Jun 2023 14:10:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239403AbjFOSKN (ORCPT ); Thu, 15 Jun 2023 14:10:13 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4CDD295B; Thu, 15 Jun 2023 11:10:12 -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 51D8F61B53; Thu, 15 Jun 2023 18:10:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 31B7DC433CA; Thu, 15 Jun 2023 18:10:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686852611; bh=LmZp49bujap0FTIZFNAjgmpNWjLBvfyY95sutmfr3+o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I0z65ADiAyCKOR5m6JF1PbHdbNM4ZmghQ5OQ4yv+XKhkevdpcC/ZohV0VrPfJf9pS cpWNYWx/mCgQYAtQvH453C8EsIKCD812AlfSG06/IWxk83+ZcnkP6vOS3WKGxVXeny QQ6agvN4Mx5e05DClpoq2uACw7grNLMcKj+ubI1cVCrBOsZ/TF9hioKzc16IelEDws 1FLeKO+irNBu1zMl0dtL4Re4406jhXNOZrc6XvGx3jTOV1+KaDq3fiVoF67cYDPA+K BP9JVFHkq35qBwLCE0DRmkIdanrbxvb5oUkQubgmdnX1VrFzSXJNBbYTW7HGwNZVXQ vEcQ4o6XC8kQw== From: SeongJae Park To: paulmck@kernel.org Cc: SeongJae Park , joel@joelfernandes.org, mmpgouride@gmail.com, corbet@lwn.net, rcu@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/3] Docs/RCU/rculist_nulls: Fix hlist_[nulls]_head field names of 'obj' Date: Thu, 15 Jun 2023 18:10:03 +0000 Message-Id: <20230615181004.86850-3-sj@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230615181004.86850-1-sj@kernel.org> References: <20230615181004.86850-1-sj@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768793433808992906?= X-GMAIL-MSGID: =?utf-8?q?1768793433808992906?= The example code snippets on rculist_nulls.rst are assuming 'obj' to have the 'hlist_head' or 'hlist_nulls_head' field named 'obj_node', but a sentence and some code snippets are wrongly calling 'obj->obj_node.next' as 'obj->obj_next', or 'obj->obj_node' as 'member'. Fix it. Signed-off-by: SeongJae Park --- Documentation/RCU/rculist_nulls.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/RCU/rculist_nulls.rst b/Documentation/RCU/rculist_nulls.rst index 4b66e2fd2fb5..a24783ebc5df 100644 --- a/Documentation/RCU/rculist_nulls.rst +++ b/Documentation/RCU/rculist_nulls.rst @@ -63,7 +63,7 @@ but a version with an additional memory barrier (smp_rmb()) struct hlist_node *node, *next; for (pos = rcu_dereference((head)->first); pos && ({ next = pos->next; smp_rmb(); prefetch(next); 1; }) && - ({ obj = hlist_entry(pos, typeof(*obj), member); 1; }); + ({ obj = hlist_entry(pos, typeof(*obj), obj_node); 1; }); pos = rcu_dereference(next)) if (obj->key == key) return obj; @@ -75,7 +75,7 @@ And note the traditional hlist_for_each_entry_rcu() misses this smp_rmb():: struct hlist_node *node; for (pos = rcu_dereference((head)->first); pos && ({ prefetch(pos->next); 1; }) && - ({ obj = hlist_entry(pos, typeof(*obj), member); 1; }); + ({ obj = hlist_entry(pos, typeof(*obj), obj_node); 1; }); pos = rcu_dereference(pos->next)) if (obj->key == key) return obj; @@ -95,7 +95,7 @@ Quoting Corey Minyard:: 2) Insertion algorithm ---------------------- -We need to make sure a reader cannot read the new 'obj->obj_next' value +We need to make sure a reader cannot read the new 'obj->obj_node.next' value and previous value of 'obj->key'. Otherwise, an item could be deleted from a chain, and inserted into another chain. If new chain was empty before the move, 'next' pointer is NULL, and lockless reader can not @@ -163,7 +163,7 @@ Note that using hlist_nulls means the type of 'obj_node' field of head = &table[slot]; begin: rcu_read_lock(); - hlist_nulls_for_each_entry_rcu(obj, node, head, member) { + hlist_nulls_for_each_entry_rcu(obj, node, head, obj_node) { if (obj->key == key) { if (!try_get_ref(obj)) { // might fail for free objects rcu_read_unlock();