From patchwork Tue Apr 11 11:48:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 81919 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2520010vqo; Tue, 11 Apr 2023 05:09:15 -0700 (PDT) X-Google-Smtp-Source: AKy350Z5+KpCeDcN3Q/YdprqlKghOgEC81cKAUF6w7CiV60uXhg+pAfkcEIuphLikSl/RhFfb+uM X-Received: by 2002:a17:90b:1d8f:b0:23a:8f25:7fd6 with SMTP id pf15-20020a17090b1d8f00b0023a8f257fd6mr19340976pjb.29.1681214955216; Tue, 11 Apr 2023 05:09:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681214955; cv=none; d=google.com; s=arc-20160816; b=sRuzPg6ASBVqFO3w98lA4+7y0GfPJ0b26B7phqJUAcL8P/EKG+eemD26/QJiyYSHPE BFXjk4rlOsd3Pfyho4SwMG6cc+sWcg8fLQFQIO5TZQZfOF1bUn+rYiCFXpW/zbHBcWAb m65Me4WKnuAapJ74r/NRRQSq3xHAxqe7PFqpchlGfZ6wYPB6HMMtktc6yLFehIj+k9Ad Ez4x6Sa8WZj/L2aeCNno+yWMPcKCI68UuK567SKgKH2bRmB/wGYb1YTxmSpJ0tzQYugh z1W++zys04C55PmMREUZzyxjq2zKMhmy2zqs7AgfzMnaEXNah/4IZgdroNXBf4qFBzZL /Uzw== 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=BM6g1sdAuviQznAoes5H6DMNH8rAmGnN6r9hxJZ9IMY=; b=c7sPdaFMaMnDHcxB5b69ty9o4Jej4UxifATV1Py+LMYMce3CnwKHsOBRNT0Wg9T+41 hO0b9/EmLEQJ5kW4eookoPUSfdd5+kRp5npognkzCnlgC8pmtK2rtDGWVg80oc9Z9DM9 akDM/xAP5aAjB0yFAwAMYFyVtLNbZ+CD6jwsFd8giW4/ucZzdR7PUhBO3aHs3A8PlXCV idFU2bAvnMPBXXkRA6a8TrZNE5kbsDh/eT65NOzYoaP6afwSn7t9hDi2vJ+aPKIhm9vQ bcWrAYVDQZHzQyI09FwSOSHdyDvv1tbkVUkjkLHluXWAe9j534YeO8va8EMv/UsuvQ3b ZpCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=GiUqo90n; 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=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id np4-20020a17090b4c4400b002467a036c62si9189471pjb.45.2023.04.11.05.09.02; Tue, 11 Apr 2023 05:09:15 -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=@intel.com header.s=Intel header.b=GiUqo90n; 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229897AbjDKLtD (ORCPT + 99 others); Tue, 11 Apr 2023 07:49:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229992AbjDKLsy (ORCPT ); Tue, 11 Apr 2023 07:48:54 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 682BB49D9 for ; Tue, 11 Apr 2023 04:48:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681213714; x=1712749714; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IQmuM7vKMWhAKUjAzRnsD5sMpdUzY1CJtq2zna0j1Rk=; b=GiUqo90n6BK9bJA4zl6aqYo++xBUWpLb0n0bkjO6PFFFxCBOG17kess/ zFuVPOR3eFrGFRHxuUoeHmVilHk1sP6EXUXM1TvBmf1sdACqVPsaEiwkT HsACAuWbJ7dIgnwIkLj+OmW41YyYR6/1XGFFir2UlfhMsfCuOP/gtIzyL iwU+MagVEWaEwrYMCs9b8xDUa1zlq5bY1kOgDyUeuFmio+P3e19jRYTKK CCuvlig1GGXlqOndquuTJ3Bw8SjMOUlafxideRiEDOorZz/7/gfyDCLUy MfBv4wxyOLxOWbyOTkQnkA1kvI1Wd/1JDS9GM87kSpBmGT5oJEIvX+EkH Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10676"; a="332281209" X-IronPort-AV: E=Sophos;i="5.98,336,1673942400"; d="scan'208";a="332281209" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2023 04:48:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10676"; a="691123837" X-IronPort-AV: E=Sophos;i="5.98,336,1673942400"; d="scan'208";a="691123837" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 11 Apr 2023 04:48:23 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 3BAB314B; Tue, 11 Apr 2023 14:48:26 +0300 (EEST) From: Andy Shevchenko To: Chanwoo Choi , Bumwoo Lee , Andy Shevchenko , linux-kernel@vger.kernel.org Cc: MyungJoo Ham Subject: [PATCH v3 1/3] extcon: Use unique number for the extcon device ID Date: Tue, 11 Apr 2023 14:48:22 +0300 Message-Id: <20230411114824.82960-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230411114824.82960-1-andriy.shevchenko@linux.intel.com> References: <20230411114824.82960-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1762881652971712819?= X-GMAIL-MSGID: =?utf-8?q?1762881652971712819?= The use of atomic variable is still racy when we do not control which device has been unregistered and there is a (theoretical) possibility of the overflow that may cause a duplicate extcon device ID number to be allocated next time a device is registered. Replace above mentioned approach by using IDA framework. Signed-off-by: Andy Shevchenko --- drivers/extcon/extcon.c | 16 +++++++++++++--- drivers/extcon/extcon.h | 2 ++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c index 47819c5144d5..5da1cc60582a 100644 --- a/drivers/extcon/extcon.c +++ b/drivers/extcon/extcon.c @@ -16,6 +16,7 @@ #include #include +#include #include #include #include @@ -238,6 +239,7 @@ struct extcon_cable { static struct class *extcon_class; +static DEFINE_IDA(extcon_dev_ids); static LIST_HEAD(extcon_dev_list); static DEFINE_MUTEX(extcon_dev_list_lock); @@ -1248,7 +1250,6 @@ static int extcon_alloc_groups(struct extcon_dev *edev) int extcon_dev_register(struct extcon_dev *edev) { int ret, index = 0; - static atomic_t edev_no = ATOMIC_INIT(-1); ret = create_extcon_class(); if (ret < 0) @@ -1275,8 +1276,14 @@ int extcon_dev_register(struct extcon_dev *edev) "extcon device name is null\n"); return -EINVAL; } - dev_set_name(&edev->dev, "extcon%lu", - (unsigned long)atomic_inc_return(&edev_no)); + + ret = ida_alloc(&extcon_dev_ids, GFP_KERNEL); + if (ret < 0) + return ret; + + edev->id = ret; + + dev_set_name(&edev->dev, "extcon%d", edev->id); ret = extcon_alloc_cables(edev); if (ret < 0) @@ -1339,6 +1346,7 @@ int extcon_dev_register(struct extcon_dev *edev) if (edev->max_supported) kfree(edev->cables); err_alloc_cables: + ida_free(&extcon_dev_ids, edev->id); return ret; } @@ -1367,6 +1375,8 @@ void extcon_dev_unregister(struct extcon_dev *edev) return; } + ida_free(&extcon_dev_ids, edev->id); + device_unregister(&edev->dev); if (edev->mutually_exclusive && edev->max_supported) { diff --git a/drivers/extcon/extcon.h b/drivers/extcon/extcon.h index 15616446140d..946182687786 100644 --- a/drivers/extcon/extcon.h +++ b/drivers/extcon/extcon.h @@ -20,6 +20,7 @@ * {0x3, 0x6, 0x5, 0}. If it is {0xFFFFFFFF, 0}, there * can be no simultaneous connections. * @dev: Device of this extcon. + * @id: Unique device ID of this extcon. * @state: Attach/detach state of this extcon. Do not provide at * register-time. * @nh_all: Notifier for the state change events for all supported @@ -46,6 +47,7 @@ struct extcon_dev { /* Internal data. Please do not set. */ struct device dev; + unsigned int id; struct raw_notifier_head nh_all; struct raw_notifier_head *nh; struct list_head entry;