Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp895812imm; Fri, 27 Jul 2018 07:58:42 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd80xgBJJ8Tt+5QpCSi2boi7H1ZRDwiYJm9WAD3a/NBPgZ4WyDHVnRNBDPoskecBlQDeog2 X-Received: by 2002:a63:2dc1:: with SMTP id t184-v6mr6465505pgt.62.1532703522201; Fri, 27 Jul 2018 07:58:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532703522; cv=none; d=google.com; s=arc-20160816; b=usTC7TYLqt9T00K/aVQldLNs5rtbRjUMiuHfdsiRFt8jpYlLTWOJcMfSF/QkL7pH2p OCcyYqrHMDmoJjcq28RlIpsGehsk9nPVwYib0zN2zIeSUqPontZ3AYutpZtp4F1pqhXd QkG+hYKC92Av8wkoTD6+OSnG7qm5ts+uiC+e0imVmYziJP18fSmU7uQIZTCRn71JRjt9 i4CVjWaSAatFwjTAiEVR/DPk35z0SoGU+fylNRqui21lSL7SJCZ/FRfO6kZty0S5qgtr 8NsFewonsZYZLV8eWnzWtJGeTMMj41FFZBdNt6MU3hJfguF6HvbMOoDDBtYTQPkCQDc6 k2CQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:user-agent:in-reply-to :content-disposition:mime-version:references:reply-to:subject:cc:to :from:date:arc-authentication-results; bh=7LzAksFUCdsQAzHsRc098EEHWqN2MMaNJ862nbx1/Dk=; b=n+mIy9kqMxCfFYGXogPH41khMfJk/HtCKpjSGmqzMNt4dlyas/YsGZWS03mxu43nd9 s5mcXzAMfJ9r+giHsA+ZSdyZFd9Pl/nRBibPrCKoX3IHdf076ETVQY1AfYRDoIfnVfyD Z5fPQTcNJrUNGxozF6aRWQyVS6fljA8hfSXp7OhDMakSjROPIg4bEtmRoB3YDYpfJVxZ Kpzeago2fENeOBSWHrqP3/y286fHA9IXYqH+uPMpp389ePaYnX/6rENlZFPI/kw21t0q 4MvzBh+adbkBnm3ZRwyPBI3zlxosysjc1KQvUZKzl9JOc265MHv4wsTLeJH0SvA2YEpn szaw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x20-v6si3554317pln.174.2018.07.27.07.58.26; Fri, 27 Jul 2018 07:58:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388497AbeG0QTz (ORCPT + 99 others); Fri, 27 Jul 2018 12:19:55 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:42462 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730791AbeG0QTy (ORCPT ); Fri, 27 Jul 2018 12:19:54 -0400 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w6REs8mK118556 for ; Fri, 27 Jul 2018 10:57:36 -0400 Received: from e12.ny.us.ibm.com (e12.ny.us.ibm.com [129.33.205.202]) by mx0b-001b2d01.pphosted.com with ESMTP id 2kg2ejrhxw-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 27 Jul 2018 10:57:36 -0400 Received: from localhost by e12.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 27 Jul 2018 10:57:35 -0400 Received: from b01cxnp23034.gho.pok.ibm.com (9.57.198.29) by e12.ny.us.ibm.com (146.89.104.199) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Fri, 27 Jul 2018 10:57:32 -0400 Received: from b01ledav003.gho.pok.ibm.com (b01ledav003.gho.pok.ibm.com [9.57.199.108]) by b01cxnp23034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w6REvVPq8585686 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 27 Jul 2018 14:57:31 GMT Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7062EB2065; Fri, 27 Jul 2018 10:57:10 -0400 (EDT) Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 40D1CB2066; Fri, 27 Jul 2018 10:57:10 -0400 (EDT) Received: from paulmck-ThinkPad-W541 (unknown [9.70.82.159]) by b01ledav003.gho.pok.ibm.com (Postfix) with ESMTP; Fri, 27 Jul 2018 10:57:10 -0400 (EDT) Received: by paulmck-ThinkPad-W541 (Postfix, from userid 1000) id D8AF416CA3C7; Fri, 27 Jul 2018 07:57:31 -0700 (PDT) Date: Fri, 27 Jul 2018 07:57:31 -0700 From: "Paul E. McKenney" To: NeilBrown Cc: Herbert Xu , Thomas Graf , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/5] rhashtable: don't hold lock on first table throughout insertion. Reply-To: paulmck@linux.vnet.ibm.com References: <87muulqq8q.fsf@notabene.neil.brown.name> <20180722215446.GH12945@linux.vnet.ibm.com> <87h8kqrhi0.fsf@notabene.neil.brown.name> <20180723205625.GZ12945@linux.vnet.ibm.com> <87r2jtpqm4.fsf@notabene.neil.brown.name> <20180724225825.GE12945@linux.vnet.ibm.com> <87in53oqzz.fsf@notabene.neil.brown.name> <20180725152250.GN12945@linux.vnet.ibm.com> <87r2jpmqu2.fsf@notabene.neil.brown.name> <20180727031815.GW24813@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180727031815.GW24813@linux.vnet.ibm.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-GCONF: 00 x-cbid: 18072714-0060-0000-0000-000002931227 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00009438; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000266; SDB=6.01066907; UDB=6.00548186; IPR=6.00844772; MB=3.00022354; MTD=3.00000008; XFM=3.00000015; UTC=2018-07-27 14:57:33 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18072714-0061-0000-0000-000045F326AE Message-Id: <20180727145731.GA2780@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-07-27_06:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1807270153 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 26, 2018 at 08:18:15PM -0700, Paul E. McKenney wrote: > On Fri, Jul 27, 2018 at 11:04:37AM +1000, NeilBrown wrote: > > On Wed, Jul 25 2018, Paul E. McKenney wrote: > > >> > > >> Looks good ... except ... naming is hard. > > >> > > >> is_after_call_rcu_init() asserts where in the lifecycle we are, > > >> is_after_call_rcu() tests where in the lifecycle we are. > > >> > > >> The names are similar but the purpose is quite different. > > >> Maybe s/is_after_call_rcu_init/call_rcu_init/ ?? > > > > > > How about rcu_head_init() and rcu_head_after_call_rcu()? > > Very well, I will pull this change in on my next rebase. Like this? Thanx, Paul ------------------------------------------------------------------------ commit 45dfdcaee39bf6dd1785253c78e4805122ee8d93 Author: Paul E. McKenney Date: Tue Jul 24 15:28:09 2018 -0700 rcu: Provide functions for determining if call_rcu() has been invoked This commit adds rcu_head_init() and rcu_head_after_call_rcu() functions to help RCU users detect when another CPU has passed the specified rcu_head structure and function to call_rcu(). The rcu_head_init() should be invoked before making the structure visible to RCU readers, and then the rcu_head_after_call_rcu() may be invoked from within an RCU read-side critical section on an rcu_head structure that was obtained during a traversal of the data structure in question. The rcu_head_after_call_rcu() function will return true if the rcu_head structure has already been passed (with the specified function) to call_rcu(), otherwise it will return false. If rcu_head_init() has not been invoked on the rcu_head structure or if the rcu_head (AKA callback) has already been invoked, then rcu_head_after_call_rcu() will do WARN_ON_ONCE(). Reported-by: NeilBrown Signed-off-by: Paul E. McKenney [ paulmck: Apply neilb feedback on naming. ] diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index e4f821165d0b..4db8bcacc51a 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h @@ -857,6 +857,46 @@ static inline notrace void rcu_read_unlock_sched_notrace(void) #endif /* #else #ifdef CONFIG_ARCH_WEAK_RELEASE_ACQUIRE */ +/* Has the specified rcu_head structure been handed to call_rcu()? */ + +/* + * rcu_head_init - Initialize rcu_head for rcu_head_after_call_rcu() + * @rhp: The rcu_head structure to initialize. + * + * If you intend to invoke rcu_head_after_call_rcu() to test whether a + * given rcu_head structure has already been passed to call_rcu(), then + * you must also invoke this rcu_head_init() function on it just after + * allocating that structure. Calls to this function must not race with + * calls to call_rcu(), rcu_head_after_call_rcu(), or callback invocation. + */ +static inline void rcu_head_init(struct rcu_head *rhp) +{ + rhp->func = (rcu_callback_t)~0L; +} + +/* + * rcu_head_after_call_rcu - Has this rcu_head been passed to call_rcu()? + * @rhp: The rcu_head structure to test. + * @func: The function passed to call_rcu() along with @rhp. + * + * Returns @true if the @rhp has been passed to call_rcu() with @func, + * and @false otherwise. Emits a warning in any other case, including + * the case where @rhp has already been invoked after a grace period. + * Calls to this function must not race with callback invocation. One way + * to avoid such races is to enclose the call to rcu_head_after_call_rcu() + * in an RCU read-side critical section that includes a read-side fetch + * of the pointer to the structure containing @rhp. + */ +static inline bool +rcu_head_after_call_rcu(struct rcu_head *rhp, rcu_callback_t f) +{ + if (READ_ONCE(rhp->func) == f) + return true; + WARN_ON_ONCE(READ_ONCE(rhp->func) != (rcu_callback_t)~0L); + return false; +} + + /* Transitional pre-consolidation compatibility definitions. */ static inline void synchronize_rcu_bh(void) diff --git a/kernel/rcu/rcu.h b/kernel/rcu/rcu.h index 5dec94509a7e..4c56c1d98fb3 100644 --- a/kernel/rcu/rcu.h +++ b/kernel/rcu/rcu.h @@ -224,6 +224,7 @@ void kfree(const void *); */ static inline bool __rcu_reclaim(const char *rn, struct rcu_head *head) { + rcu_callback_t f; unsigned long offset = (unsigned long)head->func; rcu_lock_acquire(&rcu_callback_map); @@ -234,7 +235,9 @@ static inline bool __rcu_reclaim(const char *rn, struct rcu_head *head) return true; } else { RCU_TRACE(trace_rcu_invoke_callback(rn, head);) - head->func(head); + f = head->func; + WRITE_ONCE(head->func, (rcu_callback_t)0L); + f(head); rcu_lock_release(&rcu_callback_map); return false; }