From patchwork Mon Nov 25 08:45:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Gantois X-Patchwork-Id: 845875 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B77A53804; Mon, 25 Nov 2024 08:45:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732524339; cv=none; b=CNh93q4nvjuWm+T0LlHSkpjRgZ8EDADnDFsKIvzgJ5d5JdmRgSO0Ujm7ZMrq+aLDcFukzvAoGCMNcPoumpOmsAPT8yfyMFBdLDyFzC71uHDG5qHA1uM2Us8PFXEV4GM3jLF3XLwmPlCXpMTiW4vt8tTjjrFxik+ZrS7YpPIiCp8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732524339; c=relaxed/simple; bh=u3850H6HDMj3d6UhcPkiKAmao322p05bJ/lEKAJSgtE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NgJIlkvHo4Vc0m121eshD1PoQGbRIi0ER9+En4p82BY86S28IDhGIBlbK9rtqweqIlIBvENBxUwnM5aK0TXxxkIfSXsmuhaZaZEaVDaMwr62wyxHm3/2oZy3mAGpGARTOQFZ+j/S5GsIsDDDr3G9+rU6mlTO7Z8lvufGJhDiD5Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=FydRVxZ8; arc=none smtp.client-ip=217.70.183.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="FydRVxZ8" Received: by mail.gandi.net (Postfix) with ESMTPSA id 0B9191BF212; Mon, 25 Nov 2024 08:45:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1732524334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P5zllN3RyR2rCAMaUjg2lao0VPW3ctT8CwfZRn1byPs=; b=FydRVxZ8gI4pD8IKX4iygmNnsLI43LM7geDNkkTz30GfbHOONXtQu4wExvczUuOCNZnpXF mlUd+ipycAm1k8wceenneGINFeO8uwkVhsD1gDy2ANvxWooraj5uOZQDQST9SkdADGHULd 4zuVBjmjnRXngOdXH9A6824BrKgCQsSqTnjB503e7sflYmqIDryi/fSAwP8vr/Dyw6wVId yA0AKtY5PcEp//XbF7GUnG+wmYh2wnFKhrVh1Mcby9J/akjGEwkmzkLXPSZteFbLwjkT0U 2Y/Rmk3DuPrSruIFjYaldVqeBHYKO7sIXV2bUFzJQ+AhCrJ1hOXRMkO7BemKHA== From: Romain Gantois Date: Mon, 25 Nov 2024 09:45:17 +0100 Subject: [PATCH v3 3/9] media: i2c: ds90ub960: Protect alias_use_mask with a mutex Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241125-fpc202-v3-3-34e86bcb5b56@bootlin.com> References: <20241125-fpc202-v3-0-34e86bcb5b56@bootlin.com> In-Reply-To: <20241125-fpc202-v3-0-34e86bcb5b56@bootlin.com> To: Wolfram Sang , Tomi Valkeinen , Luca Ceresoli , Andi Shyti , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Derek Kiernan , Dragan Cvetic , Arnd Bergmann , Greg Kroah-Hartman , Mauro Carvalho Chehab , Linus Walleij , Bartosz Golaszewski Cc: Thomas Petazzoni , Kory Maincent , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-media@vger.kernel.org, linux-gpio@vger.kernel.org, Romain Gantois X-Mailer: b4 0.14.2 X-GND-Sasl: romain.gantois@bootlin.com The alias_use_mask bitmap represents the occupation of an RX port's hardware alias table. This bitmap and the underlying hardware table are only accessed in the attach/detach_client() callbacks. These functions are only called from a bus notifier handler in i2c-atr.c, which is always called with the notifier chain's semaphore held. This indirectly prevents concurrent access to the alias_use_mask bitmap. However, more explicit and direct locking is preferable. Moreover, with the introduction of dynamic address translation in a future patch, the attach/detach_client() callbacks will be called from outside of the notifier chain's read section. Introduce a mutex to protect access to the alias_use_mask bitmap and its underlying hardware table. Signed-off-by: Romain Gantois --- drivers/media/i2c/ds90ub960.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/ds90ub960.c b/drivers/media/i2c/ds90ub960.c index f86028894c78187257efc8fd70812387000796f7..84aa976bed2d74f1d639684601f4c1c38d748188 100644 --- a/drivers/media/i2c/ds90ub960.c +++ b/drivers/media/i2c/ds90ub960.c @@ -468,6 +468,8 @@ struct ub960_rxport { }; } eq; + /* lock for alias_use_mask and associated registers */ + struct mutex alias_mask_lock; DECLARE_BITMAP(alias_use_mask, UB960_MAX_PORT_ALIASES); }; @@ -1031,11 +1033,15 @@ static int ub960_atr_attach_client(struct i2c_atr *atr, u32 chan_id, struct ub960_rxport *rxport = priv->rxports[chan_id]; struct device *dev = &priv->client->dev; unsigned int reg_idx; + int ret = 0; + + mutex_lock(&rxport->alias_mask_lock); reg_idx = find_first_zero_bit(rxport->alias_use_mask, UB960_MAX_PORT_ALIASES); if (reg_idx >= UB960_MAX_PORT_ALIASES) { dev_err(dev, "rx%u: alias pool exhausted\n", rxport->nport); - return -EADDRNOTAVAIL; + ret = -EADDRNOTAVAIL; + goto out_unlock; } set_bit(reg_idx, rxport->alias_use_mask); @@ -1048,7 +1054,9 @@ static int ub960_atr_attach_client(struct i2c_atr *atr, u32 chan_id, dev_dbg(dev, "rx%u: client 0x%02x assigned alias 0x%02x at slot %u\n", rxport->nport, client->addr, alias, reg_idx); - return 0; +out_unlock: + mutex_unlock(&rxport->alias_mask_lock); + return ret; } static void ub960_atr_detach_client(struct i2c_atr *atr, u32 chan_id, @@ -1059,12 +1067,14 @@ static void ub960_atr_detach_client(struct i2c_atr *atr, u32 chan_id, struct device *dev = &priv->client->dev; unsigned int reg_idx; + mutex_lock(&rxport->alias_mask_lock); + reg_idx = find_first_zero_bit(rxport->alias_use_mask, UB960_MAX_PORT_ALIASES); if (reg_idx >= UB960_MAX_PORT_ALIASES) { dev_err(dev, "rx%u: client 0x%02x is not mapped!\n", rxport->nport, client->addr); - return; + goto out_unlock; } clear_bit(reg_idx, rxport->alias_use_mask); @@ -1073,6 +1083,9 @@ static void ub960_atr_detach_client(struct i2c_atr *atr, u32 chan_id, dev_dbg(dev, "rx%u: client 0x%02x released at slot %u\n", rxport->nport, client->addr, reg_idx); + +out_unlock: + mutex_unlock(&rxport->alias_mask_lock); } static const struct i2c_atr_ops ub960_atr_ops = { @@ -3177,6 +3190,8 @@ static void ub960_rxport_free_ports(struct ub960_data *priv) fwnode_handle_put(rxport->source.ep_fwnode); fwnode_handle_put(rxport->ser.fwnode); + mutex_destroy(&rxport->alias_mask_lock); + kfree(rxport); priv->rxports[nport] = NULL; } @@ -3398,6 +3413,7 @@ static int ub960_parse_dt_rxport(struct ub960_data *priv, unsigned int nport, goto err_put_remote_fwnode; bitmap_zero(rxport->alias_use_mask, UB960_MAX_PORT_ALIASES); + mutex_init(&rxport->alias_mask_lock); return 0;