Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp949163pxp; Wed, 9 Mar 2022 16:45:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJw9/22AVemgmpWbMlWci6Xlz9n29XwekHDZEWqTcsKNhS8TW0d54l6HHFoa8GnNvku09GPS X-Received: by 2002:a05:6a00:1694:b0:4e1:5931:b040 with SMTP id k20-20020a056a00169400b004e15931b040mr2059554pfc.7.1646873155015; Wed, 09 Mar 2022 16:45:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646873155; cv=none; d=google.com; s=arc-20160816; b=0jEWq7X1a6wxPr/FXWlX1m6ZNJARmVMMQP1zvAqumdhx2UGvIIN4EIUBuoI8UdOWG5 pN3efeBu2orxRpz6+oGd0Ao+4ea7k/3/ySyJUuFirI5IZhaF+yDjCgHjA00wz9dZrGVV ulPjsx9llQmGP9WRNdGvMDrb8JtsmjAmylS2O0WN6cKNDL7yW1vGTnA6UbxCLSOKxB6J Y24sW7JVp59xtcrr6KXwkkcCa/D2JHRyHmZNOoEVIb5JpSoRLX+mSTyDOeT9WLPQdMjE w4W7wM9GUom1O3GZPgQKuYW6i+DhuILOBs2meEzkgWVEQRi5W3+AAzDVmKOAEiz1nbzm Y3Pg== 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 :organization:references:in-reply-to:message-id:subject:cc:to:from :date; bh=i5MnGmRXbCe9PBMWES6M6mE3+PluvRkP4/JyYYxfP/s=; b=b1x1Dz5ZWBAbCme6GvAQslF7tZuUXLMNNWY1DfvSLkcFntX/C+DQJUB93egWuVUdIT u4GkeZyYI5ntakliDbkwCuSftUYyt5oJQURMJ/06LXEl+i3EV+xSwlEVMFMOS3XSKEPP xkLuZuQFhMttNU3xcXaWKDzXvG7Eqc6n5cNNFYuUFQygBnbM8D+SrBeecf2touNOLyKs rVh/yS44cLodL792N+x1lLXxLOSBSEo79S57ZgmqWsvA917l1ePBz3CfGjBOdQ64qe3v OWvN+s//eegpGDNEiMFlefsyDkwrnr4dmEG9LxpNNfa/HLJV0vj0+eH7CNmbp9UpL6dS lLTg== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c1-20020a6566c1000000b00378dd95c40fsi3441822pgw.333.2022.03.09.16.45.38; Wed, 09 Mar 2022 16:45:55 -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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235294AbiCISeb (ORCPT + 99 others); Wed, 9 Mar 2022 13:34:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230427AbiCISea (ORCPT ); Wed, 9 Mar 2022 13:34:30 -0500 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F12855C378; Wed, 9 Mar 2022 10:33:30 -0800 (PST) Received: from fraeml739-chm.china.huawei.com (unknown [172.18.147.200]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4KDLRJ1f2jz67drY; Thu, 10 Mar 2022 02:33:00 +0800 (CST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by fraeml739-chm.china.huawei.com (10.206.15.220) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Wed, 9 Mar 2022 19:33:28 +0100 Received: from localhost (10.47.72.217) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Wed, 9 Mar 2022 18:33:27 +0000 Date: Wed, 9 Mar 2022 18:33:23 +0000 From: Jonathan Cameron To: Dan Williams CC: , , "Alison Schofield" , Vishal Verma , Ira Weiny , Ben Widawsky , , , Subject: Re: [PATCH 05/11] cxl/core: Introduce cxl_set_lock_class() Message-ID: <20220309183323.00000048@Huawei.com> In-Reply-To: <164610295699.2682974.3646198829625502263.stgit@dwillia2-desk3.amr.corp.intel.com> References: <164610292916.2682974.12924748003366352335.stgit@dwillia2-desk3.amr.corp.intel.com> <164610295699.2682974.3646198829625502263.stgit@dwillia2-desk3.amr.corp.intel.com> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.29; i686-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.47.72.217] X-ClientProxiedBy: lhreml733-chm.china.huawei.com (10.201.108.84) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 On Mon, 28 Feb 2022 18:49:17 -0800 Dan Williams wrote: > Update CONFIG_PROVE_CXL_LOCKING to use the common device-core helpers > for device_lock validation. > > When CONFIG_PROVE_LOCKING is enabled and device_set_lock_class() is > passed a non-zero lock class the core acquires the 'struct device' > @lockdep_mutex everywhere it acquires the device_lock. Where > lockdep_mutex does not skip lockdep validation like device_lock. > > cxl_set_lock_class() wraps device_set_lock_class() as to not collide > with other subsystems that may also support this lockdep validation > scheme. See the 'choice' for the various CONFIG_PROVE_$SUBSYS_LOCKING > options in lib/Kconfig.debug. > > Cc: Alison Schofield > Cc: Vishal Verma > Cc: Ira Weiny > Cc: Ben Widawsky > Signed-off-by: Dan Williams One query inline - otherwise looks good to me. > --- > diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c > index b1a4ba622739..f0a821de94cf 100644 > --- a/drivers/cxl/core/region.c > +++ b/drivers/cxl/core/region.c > @@ -476,6 +476,7 @@ int cxl_add_region(struct cxl_decoder *cxld, struct cxl_region *cxlr) > if (rc) > goto err; > > + cxl_set_lock_class(dev); I didn't see a cxl_lock_class for regions. Or is this meant to use the ANON_LOCK? > rc = device_add(dev); > if (rc) > goto err; > diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h > index 1357a245037d..f94eff659cce 100644 > --- a/drivers/cxl/cxl.h > +++ b/drivers/cxl/cxl.h > @@ -543,5 +543,14 @@ static inline int cxl_lock_class(struct device *dev) > else > return CXL_ANON_LOCK; > } > + > +static inline void cxl_set_lock_class(struct device *dev) > +{ > + device_set_lock_class(dev, cxl_lock_class(dev)); > +} > +#else > +static inline void cxl_set_lock_class(struct device *dev) > +{ > +} > #endif > #endif /* __CXL_H__ */ >