From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80E271A23AB for ; Wed, 18 Dec 2024 12:27:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734524866; cv=none; b=bKXAvMhVMpnIjr95KTIEPEEdmCFCC+58kKo1kJOwd5wZGA7z0nl6ySc9aXyazAqRmPzz8YuLmtXiTGUsCTuDUMY+WHyx0T4MmPplZd8xCkovWmmqV1lnRH3xc47Nh5JPzaa8aS1be2Lx/0L9yj9401JpRSLD2HJDJ3Z7K3iQbUY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734524866; c=relaxed/simple; bh=DckKqKKp0TF0ejfLprKprBfby84Z1lMdE0wYm2Z4hLM=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=OZnf9l0BtHWxBTeZ7rw/tfCDDg40ecz+EWClohBBxMWJmWGDV063ssiE+cbvkl3whfywVYGXzf9xhfKglRmNuDvsX4xWXJCGlQDMq1tPUyVbn1VZiy9IGitiqR8TuXGEqZHqnTfRhWGnYHGMoolcgtC6OLbLjXB8GSfBB2DLPSY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=VBYmtQJQ; arc=none smtp.client-ip=209.85.221.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="VBYmtQJQ" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-385e3621518so3308874f8f.1 for ; Wed, 18 Dec 2024 04:27:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1734524863; x=1735129663; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=cIhOvlG3f0MrhGiGuks0+e7HWiAmYlFCv+0bC0cSdE0=; b=VBYmtQJQzHKCkrbtxJsEPLellZAKg6Drni4vCTEYVFVSSTlqg2tqE6NlY76Bl9ACRv 0GgPLDk6EBJbNVGksGakZ+LTskBB4ivikjZ3bnxXzc4TuM3HaQnACO2H20+6I8mKy61l 4kfouAaOiSC80cwtGmI8dX99fwZ/Echb27lmv/SqomU0EORCCrz+nlNv6a9Isz5WpVTK M3Eg1OWXfJGa7xX3vNYOGrZpmR6kUkHU98/Ugs9gbWSfZh2iQV/ds2rWMhhEUqn7e2qO OAb6Ytqcf6/qH7ec2Aj2dg6jFLpnSsELic4F51DWCLINvJxpDobR7d4tGFXYpAJmmZ/b BMXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734524863; x=1735129663; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=cIhOvlG3f0MrhGiGuks0+e7HWiAmYlFCv+0bC0cSdE0=; b=R7uN1seYu7l5kQ7dkzP3CVXIp7gWE9qdeJSGtT97L4Ylfgc5OENWxkyLhuhdd6qkTC ux+VrfS82mnbW+3vlNbDfFR2SivVt+TshgzM0qaTVTrN4I8VPrPYKZii8WED4BHFH0On HcLmPn7TscrL0jwlrX0dZ/pApZUg9nAzSsQNKDw0iQ7P034v43fagN08Upw2HANg+sPg 2GnsfFLzQB21uWXEl981RL4xXN3pCy1CwqaRm5/Emwu5Owvn2EcSp1vGwhcdfE7LODen nFRbFMVBbnBBabfajW2+Xm5Aau0Hw156FQ0FdY9lA05VANAEOBlxHJi0h91+X29pE3yO K+Ug== X-Forwarded-Encrypted: i=1; AJvYcCXBL5QNRXnr4u+regUiIJt2ur6lqsFC+8xjmq+L2CUABoqJwZzOdNAt0c61e8ZGGAS6PVdINb67fTQb07U=@vger.kernel.org X-Gm-Message-State: AOJu0YzLR83plx2eBYQAdhOOnGpTUJgdeQopZ/mlHptedBEYcFWpt633 4N1H9GlVv5aPMNmbw5IShbowp+ymdQsWHMCzp8/8mrhsmbgvZqGOaXiZMD/Wv6Y= X-Gm-Gg: ASbGncvcsMWP/vuUkRYdE6MHdME/5QtkL3+YBFFJA0k5gkP6PZX4bEMipaVLNjMF8QE kE2iIGewg5cHn1imF8ShEY0oIJV1WvBylchETQ2ewRKGaTvOZleKcdCYuCVY6UMyRDjPB1XlXPp 6Qknfw6Gr/QB/gAnPT33ZoiaQe3eEim3xDmtfgPwkNnUV6OepQkJ40ovz9lEbT529gSRXbVtKGF zHjKdnohERc0ZX9dtOI0r4HHIWa6/YK6oRS8QNS5mr2jNAWEOLNa7i/MA== X-Google-Smtp-Source: AGHT+IEocBHt79Oo3qypc8W6vC7SL80cW4NXBnickBoH2uXVqJXpbrOgbtRvkL5/00XQoPdTFLxskQ== X-Received: by 2002:a05:6000:1a8e:b0:385:f573:1f78 with SMTP id ffacd0b85a97d-388e4d6703cmr2276104f8f.24.1734524862655; Wed, 18 Dec 2024 04:27:42 -0800 (PST) Received: from pathway.suse.cz ([176.114.240.50]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-388c806cc06sm13836594f8f.110.2024.12.18.04.27.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 04:27:41 -0800 (PST) Date: Wed, 18 Dec 2024 13:27:39 +0100 From: Petr Mladek To: "Rob Herring (Arm)" , Linus Torvalds Cc: Steven Rostedt , Andy Shevchenko , Rasmus Villemoes , Sergey Senozhatsky , Jonathan Corbet , Saravana Kannan , Andrew Morton , John Ogness , Peter Zijlstra , Thomas Gleixner , Zijun Hu , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: lock in vsprintf(): was: Re: [PATCH] of: Add printf '%pOFm' for generating modalias Message-ID: References: <20241217183711.2525863-1-robh@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241217183711.2525863-1-robh@kernel.org> Adding Linus and some other guys into Cc. My concern is taking a lock when processing a printf format, see below for more details. On Tue 2024-12-17 12:37:09, Rob Herring (Arm) wrote: > The callers for of_modalias() generally need the module alias as part of > some larger string. That results in some error prone manipulation of the > buffer prepend/append the module alias string. In fact, > of_device_uevent_modalias() has several issues. First, it's off by one > too few characters in utilization of the full buffer. Second, the error > paths leave OF_MODALIAS with a truncated value when in the end nothing > should be added to the buffer. It is also fragile because it needs > internal details of struct kobj_uevent_env. add_uevent_var() really > wants to write the env variable and value in one shot which would need > either a temporary buffer for value or a format specifier. > > Fix these issues by adding a new printf format specifier, "%pOFm". With > the format specifier in place, simplify all the callers of > of_modalias(). of_modalias() can also be simplified with vsprintf() > being the only caller as it avoids the error conditions. > > Cc: Zijun Hu > Signed-off-by: Rob Herring (Arm) > --- > Documentation/core-api/printk-formats.rst | 1 + > drivers/of/device.c | 25 ++-------------- > drivers/of/module.c | 35 +++++------------------ > drivers/of/unittest.c | 2 ++ > include/linux/of.h | 8 +++--- > lib/vsprintf.c | 7 +++-- > 6 files changed, 22 insertions(+), 56 deletions(-) > > diff --git a/Documentation/core-api/printk-formats.rst b/Documentation/core-api/printk-formats.rst > index ecccc0473da9..d72fe3d8c427 100644 > --- a/Documentation/core-api/printk-formats.rst > +++ b/Documentation/core-api/printk-formats.rst > @@ -496,6 +496,7 @@ equivalent to %pOFf. > - F - device node flags > - c - major compatible string > - C - full compatible string > + - m - module alias string > > The separator when using multiple arguments is ':' > > diff --git a/drivers/of/device.c b/drivers/of/device.c > index edf3be197265..ae8c47d5db8e 100644 > --- a/drivers/of/device.c > +++ b/drivers/of/device.c > @@ -256,24 +251,10 @@ EXPORT_SYMBOL_GPL(of_device_uevent); > > int of_device_uevent_modalias(const struct device *dev, struct kobj_uevent_env *env) > { > - int sl; > - > if ((!dev) || (!dev->of_node) || dev->of_node_reused) > return -ENODEV; > > - /* Devicetree modalias is tricky, we add it in 2 steps */ > - if (add_uevent_var(env, "MODALIAS=")) > - return -ENOMEM; > - > - sl = of_modalias(dev->of_node, &env->buf[env->buflen-1], > - sizeof(env->buf) - env->buflen); > - if (sl < 0) > - return sl; > - if (sl >= (sizeof(env->buf) - env->buflen)) > - return -ENOMEM; > - env->buflen += sl; > - > - return 0; > + return add_uevent_var(env, "MODALIAS=%pOFm", dev->of_node); The proposed %pOFm format takes a lock inside. It calls: size_t of_modalias(const struct device_node *np, char *str, size_t len) { [...] csize = snprintf(str, len, "of:N%pOFn%c%s", np, 'T', of_node_get_device_type(np)); [...] which calls: + of_node_get_device_type() + of_get_property() + of_find_property() , where struct property *of_find_property(const struct device_node *np, const char *name, int *lenp) { [...] raw_spin_lock_irqsave(&devtree_lock, flags); pp = __of_find_property(np, name, lenp); raw_spin_unlock_irqrestore(&devtree_lock, flags); [...] return pp; I personally think that taking locks when formatting string is a way to hell. In this case, add_uevent_var() is lockless so that it should not cause any problem. But just imagine that it does: int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...) { some_lock(); va_start(args, format); len = vsnprintf(&env->buf[env->buflen], sizeof(env->buf) - env->buflen, format, args); va_end(args); some_unlock(); return 0; } Would anyone consider that the vsprintf() here might need to take a lock? Also, the format might be used in printk(). We put a huge effort into creating a lockless ringbuffer and safe console locking. I would really appreciate to avoid any locking in the formatting part. That said, we already have a precedent. "%pOFf" might take a lock, for example, via: + fwnode_full_name_string() + fwnode_handle_put() + of_fwnode_put() + of_node_put() + kobject_put() + kref_put() + schedule_delayed_work() + queue_delayed_work() + queue_delayed_work_on() + __queue_delayed_work() + add_timer_on() + add_timer_on() + lock_timer_base() + raw_spin_lock_irqsave(&base->lock, *flags); But this would happen only when the last reference is released when formatting the string which is kind of corner case. As I said, I think that taking lock in vsprintf() formats is highly unexpected and thus a way to hell. What do others think, please? Best Regards, Petr > } > EXPORT_SYMBOL_GPL(of_device_uevent_modalias); > > diff --git a/drivers/of/module.c b/drivers/of/module.c > index 1e735fc130ad..80879d2abea8 100644 > --- a/drivers/of/module.c > +++ b/drivers/of/module.c > @@ -8,21 +8,14 @@ > #include > #include > > -ssize_t of_modalias(const struct device_node *np, char *str, ssize_t len) > +/* Do not use directly, use %pOFm format specifier instead */ > +size_t of_modalias(const struct device_node *np, char *str, size_t len) > { > const char *compat; > char *c; > struct property *p; > - ssize_t csize; > - ssize_t tsize; > - > - /* > - * Prevent a kernel oops in vsnprintf() -- it only allows passing a > - * NULL ptr when the length is also 0. Also filter out the negative > - * lengths... > - */ > - if ((len > 0 && !str) || len < 0) > - return -EINVAL; > + size_t csize; > + size_t tsize; > > /* Name & Type */ > /* %p eats all alphanum characters, so %c must be used here */ > @@ -53,29 +46,15 @@ ssize_t of_modalias(const struct device_node *np, char *str, ssize_t len) > > int of_request_module(const struct device_node *np) > { > - char *str; > - ssize_t size; > - int ret; > + char *str __free(kfree); > > if (!np) > return -ENODEV; > > - size = of_modalias(np, NULL, 0); > - if (size < 0) > - return size; > - > - /* Reserve an additional byte for the trailing '\0' */ > - size++; > - > - str = kmalloc(size, GFP_KERNEL); > + str = kasprintf(GFP_KERNEL, "%pOFm", np); > if (!str) > return -ENOMEM; > > - of_modalias(np, str, size); > - str[size - 1] = '\0'; > - ret = request_module(str); > - kfree(str); > - > - return ret; > + return request_module(str); > } > EXPORT_SYMBOL_GPL(of_request_module); > diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c > index daf9a2dddd7e..93921399f02d 100644 > --- a/drivers/of/unittest.c > +++ b/drivers/of/unittest.c > @@ -342,6 +342,8 @@ static void __init of_unittest_printf(void) > of_unittest_printf_one(np, "%pOFc", "test-sub-device"); > of_unittest_printf_one(np, "%pOFC", > "\"test-sub-device\",\"test-compat2\",\"test-compat3\""); > + of_unittest_printf_one(np, "%pOFm", > + "of:NdevT(null)Ctest-sub-deviceCtest-compat2Ctest-compat3"); > } > > struct node_hash { > diff --git a/include/linux/of.h b/include/linux/of.h > index f921786cb8ac..9fe7d17ce7e2 100644 > --- a/include/linux/of.h > +++ b/include/linux/of.h > @@ -382,7 +382,7 @@ extern int of_count_phandle_with_args(const struct device_node *np, > const char *list_name, const char *cells_name); > > /* module functions */ > -extern ssize_t of_modalias(const struct device_node *np, char *str, ssize_t len); > +extern size_t of_modalias(const struct device_node *np, char *str, size_t len); > extern int of_request_module(const struct device_node *np); > > /* phandle iterator functions */ > @@ -762,10 +762,10 @@ static inline int of_count_phandle_with_args(const struct device_node *np, > return -ENOSYS; > } > > -static inline ssize_t of_modalias(const struct device_node *np, char *str, > - ssize_t len) > +static inline size_t of_modalias(const struct device_node *np, char *str, > + size_t len) > { > - return -ENODEV; > + return 0; > } > > static inline int of_request_module(const struct device_node *np) > diff --git a/lib/vsprintf.c b/lib/vsprintf.c > index 9d3dac38a3f4..6a4f99b39de0 100644 > --- a/lib/vsprintf.c > +++ b/lib/vsprintf.c > @@ -2169,10 +2169,10 @@ char *device_node_string(char *buf, char *end, struct device_node *dn, > > /* simple case without anything any more format specifiers */ > fmt++; > - if (fmt[0] == '\0' || strcspn(fmt,"fnpPFcC") > 0) > + if (fmt[0] == '\0' || strcspn(fmt,"fnpPFcCm") > 0) > fmt = "f"; > > - for (pass = false; strspn(fmt,"fnpPFcC"); fmt++, pass = true) { > + for (pass = false; strspn(fmt,"fnpPFcCm"); fmt++, pass = true) { > int precision; > if (pass) { > if (buf < end) > @@ -2226,6 +2226,9 @@ char *device_node_string(char *buf, char *end, struct device_node *dn, > has_mult = true; > } > break; > + case 'm': > + buf += of_modalias(dn, buf, end - buf); > + break; > default: > break; > } > -- > 2.45.2