mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-30 17:18:21 +03:00
b5b0369e4d
When a device id is set for a device, using an idtype other than devname, it means that sysfs has been used with the device to match the device id. So, checking for a sysfs entry for the device in filter-sysfs is redundant. For any other cases not covered by this (e.g. devname ids), have filter-sysfs simply stat /sys/dev/block/major:minor to test if the device exists in sysfs. The extensive processing done by filter-sysfs init is removed. It was taking an immense amount of time with many devices, e.g. . 1024 PVs in 520 VGs . 520 concurrent vgchange -ay <vgname> commands . vgchange scans only PVs in the named VG (based on pvs_online files from a pending patch) A large number of the vgchange commands were taking over 1 min, and nearly half of that time was used by filter-sysfs init. With this patch, the vgchange commands take about half the time.
94 lines
2.1 KiB
C
94 lines
2.1 KiB
C
/*
|
|
* Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved.
|
|
*
|
|
* This file is part of LVM2.
|
|
*
|
|
* This copyrighted material is made available to anyone wishing to use,
|
|
* modify, copy, or redistribute it subject to the terms and conditions
|
|
* of the GNU Lesser General Public License v.2.1.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "lib/misc/lib.h"
|
|
#include "lib/filters/filter.h"
|
|
|
|
#ifdef __linux__
|
|
|
|
static int _accept_p(struct cmd_context *cmd, struct dev_filter *f, struct device *dev, const char *use_filter_name)
|
|
{
|
|
char path[PATH_MAX];
|
|
const char *sysfs_dir;
|
|
struct stat info;
|
|
|
|
dev->filtered_flags &= ~DEV_FILTERED_SYSFS;
|
|
|
|
/*
|
|
* Any kind of device id other than devname has been set
|
|
* using sysfs so we know that sysfs info exists for dev.
|
|
*/
|
|
if (dev->id && dev->id->idtype && (dev->id->idtype != DEV_ID_TYPE_DEVNAME))
|
|
return 1;
|
|
|
|
sysfs_dir = dm_sysfs_dir();
|
|
if (sysfs_dir && *sysfs_dir) {
|
|
if (dm_snprintf(path, sizeof(path), "%sdev/block/%d:%d",
|
|
sysfs_dir, (int)MAJOR(dev->dev), (int)MINOR(dev->dev)) < 0) {
|
|
log_debug("failed to create sysfs path");
|
|
return 1;
|
|
}
|
|
|
|
if (lstat(path, &info)) {
|
|
log_debug_devs("%s: Skipping (sysfs)", dev_name(dev));
|
|
dev->filtered_flags |= DEV_FILTERED_SYSFS;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
static void _destroy(struct dev_filter *f)
|
|
{
|
|
if (f->use_count)
|
|
log_error(INTERNAL_ERROR "Destroying sysfs filter while in use %u times.", f->use_count);
|
|
free(f);
|
|
}
|
|
|
|
struct dev_filter *sysfs_filter_create(void)
|
|
{
|
|
const char *sysfs_dir = dm_sysfs_dir();
|
|
struct dev_filter *f;
|
|
|
|
if (!*sysfs_dir) {
|
|
log_verbose("No proc filesystem found: skipping sysfs filter");
|
|
return NULL;
|
|
}
|
|
|
|
if (!(f = zalloc(sizeof(*f))))
|
|
goto_bad;
|
|
|
|
f->passes_filter = _accept_p;
|
|
f->destroy = _destroy;
|
|
f->use_count = 0;
|
|
f->name = "sysfs";
|
|
|
|
log_debug_devs("Sysfs filter initialised.");
|
|
|
|
return f;
|
|
|
|
bad:
|
|
return NULL;
|
|
}
|
|
|
|
#else
|
|
|
|
struct dev_filter *sysfs_filter_create(const char *sysfs_dir __attribute__((unused)))
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
#endif
|