From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43017C432C0 for ; Fri, 29 Nov 2019 13:43:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1494721736 for ; Fri, 29 Nov 2019 13:43:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="jZI1p2tQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726856AbfK2Nna (ORCPT ); Fri, 29 Nov 2019 08:43:30 -0500 Received: from smtp-fw-9102.amazon.com ([207.171.184.29]:43721 "EHLO smtp-fw-9102.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726608AbfK2Nna (ORCPT ); Fri, 29 Nov 2019 08:43:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1575035010; x=1606571010; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=c6kyduALUMlhgXr7+NWpnW7lYxje+66n8zte1sjHPtQ=; b=jZI1p2tQm84hhNT9kA2BsYkOEJDBN+dzu2478xJfVE/S9A0hamYq8xyH p+wcMwnN2YZZYftb9/OfqNI/Ex0DFZjfV5Ff9RUltO8xz+hKMM2dzJf64 GaPPS8Y8no1TFC2rKpKDQO4LHWvXDRWV3dxrNQiqefHU+1itoRrgYvN11 A=; IronPort-SDR: e313tRJFZvKq/8QfO6v7WwPLs4wfemBryy0e4hKh5dmdkHBgrPoM/p7KJ6uTkCfaGL2Pd6S3K8 aRuogK46WYNw== X-IronPort-AV: E=Sophos;i="5.69,257,1571702400"; d="scan'208";a="10582565" Received: from sea32-co-svc-lb4-vlan3.sea.corp.amazon.com (HELO email-inbound-relay-1d-37fd6b3d.us-east-1.amazon.com) ([10.47.23.38]) by smtp-border-fw-out-9102.sea19.amazon.com with ESMTP; 29 Nov 2019 13:43:18 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1d-37fd6b3d.us-east-1.amazon.com (Postfix) with ESMTPS id 04DBE282697; Fri, 29 Nov 2019 13:43:15 +0000 (UTC) Received: from EX13D32EUB003.ant.amazon.com (10.43.166.165) by EX13MTAUEA001.ant.amazon.com (10.43.61.82) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Fri, 29 Nov 2019 13:43:15 +0000 Received: from EX13MTAUEE001.ant.amazon.com (10.43.62.200) by EX13D32EUB003.ant.amazon.com (10.43.166.165) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Fri, 29 Nov 2019 13:43:14 +0000 Received: from u2f063a87eabd5f.cbg10.amazon.com (10.125.106.135) by mail-relay.amazon.com (10.43.62.226) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Fri, 29 Nov 2019 13:43:12 +0000 From: Paul Durrant To: , , CC: Paul Durrant , Jan Beulich , "Boris Ostrovsky" , Juergen Gross , Stefano Stabellini Subject: [PATCH v2 1/2] xen/xenbus: reference count registered modules Date: Fri, 29 Nov 2019 13:43:05 +0000 Message-ID: <20191129134306.2738-2-pdurrant@amazon.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191129134306.2738-1-pdurrant@amazon.com> References: <20191129134306.2738-1-pdurrant@amazon.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org To prevent a module being removed whilst attached to a frontend, and hence xenbus calling into potentially invalid text, take a reference on the module before calling the probe() method (dropping it if unsuccessful) and drop the reference after returning from the remove() method. NOTE: This allows the ad-hoc reference counting in xen-netback to be removed. This will be done in a subsequent patch. Suggested-by: Jan Beulich Signed-off-by: Paul Durrant --- Cc: Boris Ostrovsky Cc: Juergen Gross Cc: Stefano Stabellini v2: - New in v2 --- drivers/xen/xenbus/xenbus_probe.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c index 5b471889d723..5a4947690500 100644 --- a/drivers/xen/xenbus/xenbus_probe.c +++ b/drivers/xen/xenbus/xenbus_probe.c @@ -232,9 +232,11 @@ int xenbus_dev_probe(struct device *_dev) return err; } + __module_get(drv->driver.owner); + err = drv->probe(dev, id); if (err) - goto fail; + goto fail_put; err = watch_otherend(dev); if (err) { @@ -244,6 +246,8 @@ int xenbus_dev_probe(struct device *_dev) } return 0; +fail_put: + module_put(drv->driver.owner); fail: xenbus_dev_error(dev, err, "xenbus_dev_probe on %s", dev->nodename); xenbus_switch_state(dev, XenbusStateClosed); @@ -263,6 +267,8 @@ int xenbus_dev_remove(struct device *_dev) if (drv->remove) drv->remove(dev); + module_put(drv->driver.owner); + free_otherend_details(dev); xenbus_switch_state(dev, XenbusStateClosed); -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIM_ADSP_ALL,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9CE05C432C0 for ; Fri, 29 Nov 2019 13:43:47 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6E1B52053B for ; Fri, 29 Nov 2019 13:43:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="jZI1p2tQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6E1B52053B Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amazon.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iagYb-00050u-Re; Fri, 29 Nov 2019 13:43:37 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iagYa-00050g-HA for xen-devel@lists.xenproject.org; Fri, 29 Nov 2019 13:43:36 +0000 X-Inumbo-ID: 394d9fb5-12ae-11ea-a3e7-12813bfff9fa Received: from smtp-fw-9102.amazon.com (unknown [207.171.184.29]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 394d9fb5-12ae-11ea-a3e7-12813bfff9fa; Fri, 29 Nov 2019 13:43:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1575035010; x=1606571010; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=c6kyduALUMlhgXr7+NWpnW7lYxje+66n8zte1sjHPtQ=; b=jZI1p2tQm84hhNT9kA2BsYkOEJDBN+dzu2478xJfVE/S9A0hamYq8xyH p+wcMwnN2YZZYftb9/OfqNI/Ex0DFZjfV5Ff9RUltO8xz+hKMM2dzJf64 GaPPS8Y8no1TFC2rKpKDQO4LHWvXDRWV3dxrNQiqefHU+1itoRrgYvN11 A=; IronPort-SDR: e313tRJFZvKq/8QfO6v7WwPLs4wfemBryy0e4hKh5dmdkHBgrPoM/p7KJ6uTkCfaGL2Pd6S3K8 aRuogK46WYNw== X-IronPort-AV: E=Sophos;i="5.69,257,1571702400"; d="scan'208";a="10582565" Received: from sea32-co-svc-lb4-vlan3.sea.corp.amazon.com (HELO email-inbound-relay-1d-37fd6b3d.us-east-1.amazon.com) ([10.47.23.38]) by smtp-border-fw-out-9102.sea19.amazon.com with ESMTP; 29 Nov 2019 13:43:18 +0000 Received: from EX13MTAUEA001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1d-37fd6b3d.us-east-1.amazon.com (Postfix) with ESMTPS id 04DBE282697; Fri, 29 Nov 2019 13:43:15 +0000 (UTC) Received: from EX13D32EUB003.ant.amazon.com (10.43.166.165) by EX13MTAUEA001.ant.amazon.com (10.43.61.82) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Fri, 29 Nov 2019 13:43:15 +0000 Received: from EX13MTAUEE001.ant.amazon.com (10.43.62.200) by EX13D32EUB003.ant.amazon.com (10.43.166.165) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Fri, 29 Nov 2019 13:43:14 +0000 Received: from u2f063a87eabd5f.cbg10.amazon.com (10.125.106.135) by mail-relay.amazon.com (10.43.62.226) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Fri, 29 Nov 2019 13:43:12 +0000 From: Paul Durrant To: , , Date: Fri, 29 Nov 2019 13:43:05 +0000 Message-ID: <20191129134306.2738-2-pdurrant@amazon.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191129134306.2738-1-pdurrant@amazon.com> References: <20191129134306.2738-1-pdurrant@amazon.com> MIME-Version: 1.0 Precedence: Bulk Subject: [Xen-devel] [PATCH v2 1/2] xen/xenbus: reference count registered modules X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Paul Durrant , Stefano Stabellini , Boris Ostrovsky , Jan Beulich Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" VG8gcHJldmVudCBhIG1vZHVsZSBiZWluZyByZW1vdmVkIHdoaWxzdCBhdHRhY2hlZCB0byBhIGZy b250ZW5kLCBhbmQKaGVuY2UgeGVuYnVzIGNhbGxpbmcgaW50byBwb3RlbnRpYWxseSBpbnZhbGlk IHRleHQsIHRha2UgYSByZWZlcmVuY2Ugb24KdGhlIG1vZHVsZSBiZWZvcmUgY2FsbGluZyB0aGUg cHJvYmUoKSBtZXRob2QgKGRyb3BwaW5nIGl0IGlmIHVuc3VjY2Vzc2Z1bCkKYW5kIGRyb3AgdGhl IHJlZmVyZW5jZSBhZnRlciByZXR1cm5pbmcgZnJvbSB0aGUgcmVtb3ZlKCkgbWV0aG9kLgoKTk9U RTogVGhpcyBhbGxvd3MgdGhlIGFkLWhvYyByZWZlcmVuY2UgY291bnRpbmcgaW4geGVuLW5ldGJh Y2sgdG8gYmUKICAgICAgcmVtb3ZlZC4gVGhpcyB3aWxsIGJlIGRvbmUgaW4gYSBzdWJzZXF1ZW50 IHBhdGNoLgoKU3VnZ2VzdGVkLWJ5OiBKYW4gQmV1bGljaCA8amJldWxpY2hAc3VzZS5jb20+ClNp Z25lZC1vZmYtYnk6IFBhdWwgRHVycmFudCA8cGR1cnJhbnRAYW1hem9uLmNvbT4KLS0tCkNjOiBC b3JpcyBPc3Ryb3Zza3kgPGJvcmlzLm9zdHJvdnNreUBvcmFjbGUuY29tPgpDYzogSnVlcmdlbiBH cm9zcyA8amdyb3NzQHN1c2UuY29tPgpDYzogU3RlZmFubyBTdGFiZWxsaW5pIDxzc3RhYmVsbGlu aUBrZXJuZWwub3JnPgoKdjI6CiAtIE5ldyBpbiB2MgotLS0KIGRyaXZlcnMveGVuL3hlbmJ1cy94 ZW5idXNfcHJvYmUuYyB8IDggKysrKysrKy0KIDEgZmlsZSBjaGFuZ2VkLCA3IGluc2VydGlvbnMo KyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3hlbi94ZW5idXMveGVuYnVz X3Byb2JlLmMgYi9kcml2ZXJzL3hlbi94ZW5idXMveGVuYnVzX3Byb2JlLmMKaW5kZXggNWI0NzE4 ODlkNzIzLi41YTQ5NDc2OTA1MDAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMveGVuL3hlbmJ1cy94ZW5i dXNfcHJvYmUuYworKysgYi9kcml2ZXJzL3hlbi94ZW5idXMveGVuYnVzX3Byb2JlLmMKQEAgLTIz Miw5ICsyMzIsMTEgQEAgaW50IHhlbmJ1c19kZXZfcHJvYmUoc3RydWN0IGRldmljZSAqX2RldikK IAkJcmV0dXJuIGVycjsKIAl9CiAKKwlfX21vZHVsZV9nZXQoZHJ2LT5kcml2ZXIub3duZXIpOwor CiAJZXJyID0gZHJ2LT5wcm9iZShkZXYsIGlkKTsKIAlpZiAoZXJyKQotCQlnb3RvIGZhaWw7CisJ CWdvdG8gZmFpbF9wdXQ7CiAKIAllcnIgPSB3YXRjaF9vdGhlcmVuZChkZXYpOwogCWlmIChlcnIp IHsKQEAgLTI0NCw2ICsyNDYsOCBAQCBpbnQgeGVuYnVzX2Rldl9wcm9iZShzdHJ1Y3QgZGV2aWNl ICpfZGV2KQogCX0KIAogCXJldHVybiAwOworZmFpbF9wdXQ6CisJbW9kdWxlX3B1dChkcnYtPmRy aXZlci5vd25lcik7CiBmYWlsOgogCXhlbmJ1c19kZXZfZXJyb3IoZGV2LCBlcnIsICJ4ZW5idXNf ZGV2X3Byb2JlIG9uICVzIiwgZGV2LT5ub2RlbmFtZSk7CiAJeGVuYnVzX3N3aXRjaF9zdGF0ZShk ZXYsIFhlbmJ1c1N0YXRlQ2xvc2VkKTsKQEAgLTI2Myw2ICsyNjcsOCBAQCBpbnQgeGVuYnVzX2Rl dl9yZW1vdmUoc3RydWN0IGRldmljZSAqX2RldikKIAlpZiAoZHJ2LT5yZW1vdmUpCiAJCWRydi0+ cmVtb3ZlKGRldik7CiAKKwltb2R1bGVfcHV0KGRydi0+ZHJpdmVyLm93bmVyKTsKKwogCWZyZWVf b3RoZXJlbmRfZGV0YWlscyhkZXYpOwogCiAJeGVuYnVzX3N3aXRjaF9zdGF0ZShkZXYsIFhlbmJ1 c1N0YXRlQ2xvc2VkKTsKLS0gCjIuMjAuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3Rz LnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0 aW5mby94ZW4tZGV2ZWw=