From: Heiner Kallweit <hkallweit1@gmail.com>
To: Bjorn Helgaas <helgaas@kernel.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
"linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>
Subject: Re: [PATCH 2/2] PCI/VPD: Improve handling binary sysfs attribute
Date: Wed, 3 Feb 2021 09:03:57 +0100 [thread overview]
Message-ID: <d2b57596-f569-2fdf-0223-005e25929fde@gmail.com> (raw)
In-Reply-To: <20210203000952.GA151813@bjorn-Precision-5520>
On 03.02.2021 01:09, Bjorn Helgaas wrote:
> On Thu, Jan 07, 2021 at 10:48:55PM +0100, Heiner Kallweit wrote:
>> Since 104daa71b396 ("PCI: Determine actual VPD size on first access")
>> there's nothing that keeps us from using a static attribute.
>> This allows to significantly simplify the code.
>
> I love this! A few comments below.
>
>> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
>> ---
>> drivers/pci/vpd.c | 42 +++++++++++-------------------------------
>> 1 file changed, 11 insertions(+), 31 deletions(-)
>>
>> diff --git a/drivers/pci/vpd.c b/drivers/pci/vpd.c
>> index a3fd09105..9ef8f400e 100644
>> --- a/drivers/pci/vpd.c
>> +++ b/drivers/pci/vpd.c
>> @@ -21,7 +21,6 @@ struct pci_vpd_ops {
>>
>> struct pci_vpd {
>> const struct pci_vpd_ops *ops;
>> - struct bin_attribute *attr; /* Descriptor for sysfs VPD entry */
>> struct mutex lock;
>> unsigned int len;
>> u16 flag;
>> @@ -397,57 +396,38 @@ void pci_vpd_release(struct pci_dev *dev)
>> kfree(dev->vpd);
>> }
>>
>> -static ssize_t read_vpd_attr(struct file *filp, struct kobject *kobj,
>> - struct bin_attribute *bin_attr, char *buf,
>> - loff_t off, size_t count)
>> +static ssize_t vpd_read(struct file *filp, struct kobject *kobj,
>> + struct bin_attribute *bin_attr, char *buf,
>> + loff_t off, size_t count)
>> {
>> struct pci_dev *dev = to_pci_dev(kobj_to_dev(kobj));
>>
>> return pci_read_vpd(dev, off, count, buf);
>> }
>>
>> -static ssize_t write_vpd_attr(struct file *filp, struct kobject *kobj,
>> - struct bin_attribute *bin_attr, char *buf,
>> - loff_t off, size_t count)
>> +static ssize_t vpd_write(struct file *filp, struct kobject *kobj,
>> + struct bin_attribute *bin_attr, char *buf,
>> + loff_t off, size_t count)
>> {
>> struct pci_dev *dev = to_pci_dev(kobj_to_dev(kobj));
>>
>> return pci_write_vpd(dev, off, count, buf);
>> }
>>
>> +static const BIN_ATTR_RW(vpd, 0);
>
> Wow, I'm surprised that there are only 50ish uses of BIN_ATTR_*():
> s390/crypto, w1/slaves/..., and a few other places. It always makes
> me wonder when we're one of a small number of callers. Seems OK
> though.
>
>> void pcie_vpd_create_sysfs_dev_files(struct pci_dev *dev)
>> {
>> - int retval;
>> - struct bin_attribute *attr;
>> -
>> if (!dev->vpd)
>> return;
>>
>> - attr = kzalloc(sizeof(*attr), GFP_ATOMIC);
>> - if (!attr)
>> - return;
>> -
>> - sysfs_bin_attr_init(attr);
>> - attr->size = 0;
>> - attr->attr.name = "vpd";
>> - attr->attr.mode = S_IRUSR | S_IWUSR;
>> - attr->read = read_vpd_attr;
>> - attr->write = write_vpd_attr;
>> - retval = sysfs_create_bin_file(&dev->dev.kobj, attr);
>> - if (retval) {
>> - kfree(attr);
>> - return;
>> - }
>> -
>> - dev->vpd->attr = attr;
>
> Above is awesome. Also maybe confirms that we could remove the
> "attr->size = 0" assignment in the previous patch?
>
Technically this assignment has never been needed, because the
attribute memory is kzalloc'ed. But it makes clear to the
reader that sysfs code isn't supposed to do any length checks.
>> + if (sysfs_create_bin_file(&dev->dev.kobj, &bin_attr_vpd))
>> + pci_warn(dev, "can't create VPD sysfs file\n");
>
> Not sure we need this. Can't we use the .is_visible() thing and an
> attribute group to get rid of the explicit sysfs_create_bin_file()?
>
Nice. Let me do this, I'll send a v2 of the series.
>> }
>>
>> void pcie_vpd_remove_sysfs_dev_files(struct pci_dev *dev)
>> {
>> - if (dev->vpd && dev->vpd->attr) {
>> - sysfs_remove_bin_file(&dev->dev.kobj, dev->vpd->attr);
>> - kfree(dev->vpd->attr);
>> - }
>> + sysfs_remove_bin_file(&dev->dev.kobj, &bin_attr_vpd);
>> }
>>
>> int pci_vpd_find_tag(const u8 *buf, unsigned int off, unsigned int len, u8 rdt)
>> --
>> 2.30.0
>>
>>
prev parent reply other threads:[~2021-02-03 8:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-07 21:47 [PATCH 0/2] PCI/VPD: Improve handling binary sysfs attribute Heiner Kallweit
2021-01-07 21:48 ` [PATCH 1/2] PCI/VPD: Remove dead code from sysfs access functions Heiner Kallweit
2021-02-02 23:59 ` Bjorn Helgaas
2021-02-03 7:17 ` Heiner Kallweit
2021-01-07 21:48 ` [PATCH 2/2] PCI/VPD: Improve handling binary sysfs attribute Heiner Kallweit
2021-02-03 0:09 ` Bjorn Helgaas
2021-02-03 8:03 ` Heiner Kallweit [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d2b57596-f569-2fdf-0223-005e25929fde@gmail.com \
--to=hkallweit1@gmail.com \
--cc=bhelgaas@google.com \
--cc=helgaas@kernel.org \
--cc=linux-pci@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).