Add PNP info to PCI attachment of alc, amdsmb, bfe, bge, ce, ciss, cp, dc, dpt drivers #4

lakhanshiva · 2018-05-31T04:54:45Z

The device id table for alc is

struct alc_ident {
	uint16_t	vendorid;
	uint16_t	deviceid;
	uint32_t	max_framelen;
	const char	*name;
};

Therefore i used "U16:vendor;U16:device" as descriptor string in MODULE_PNP_INFO

The device id table for amdsmb is

static struct amdsmb_dev {
       uint16_t vendorid;
       uint16_t deviceid;
       const char *description;
} amdsmb_devs[];

Therefore i used "U16:vendor;U16:device;D:#" as descriptor string in MODULE_PNP_INFO

The device id table for bfe is

struct bfe_type
{
    u_int16_t   bfe_vid;
    u_int16_t   bfe_did;
    char        *bfe_name;
};

Therefore i used "U16:vendor;U16:device" as descriptor string in MODULE_PNP_INFO

The device id table for bge is

static const struct bge_type {
	uint16_t	bge_vid;
	uint16_t	bge_did;
}

Therefore i used "U16:vendor;U16:device" as descriptor string in MODULE_PNP_INFO

The device id table for ce is

static struct ce_dev {
       uint16_t vendorid;
       uint16_t deviceid;
       const char *description;
}

Therefore i used "U16:vendor;U16:device" as descriptor string in MODULE_PNP_INFO

The device id table for dpt is

static struct dpt_dev {
	uint16_t vendorid;
	uint16_t deviceid;
	const char *description;
}

Therefore i used "U16:vendor;U16:device" as descriptor string in MODULE_PNP_INFO

The device id table for dc is

struct dc_type {
	uint32_t		dc_devid;
	uint8_t			dc_minrev;
	const char		*dc_name;
};

Therefore i used "W32:vendor/device" as descriptor string in MODULE_PNP_INFO

The device id table for ciss is

static struct
{
    u_int16_t	subvendor;
    u_int16_t	subdevice;
    int		flags;
    char	*desc;
} ciss_vendor_data[]

Therefore i used "U16:vendor;U16:device" as descriptor string in MODULE_PNP_INFO

The device id table for cp is

static struct cp_dev {
        uint16_t vendorid;
        uint16_t deviceid;
        const char *description;
} cp_devs[]

Therefore i used "U16:vendor;U16:device" as descriptor string in MODULE_PNP_INFO

bsdimp · 2018-05-31T15:05:31Z

sys/dev/dpt/dpt_pci.c

+	{ DPT_VENDOR_ID, DPT_DEVICE_ID,
+	 "DPT Caching SCSI RAID Controller"},
+};	
+
 static int
 dpt_pci_probe (device_t dev)
 {


The probe should be re-written to use the dpt_dev table.

I have used dpt_devs table now

bsdimp · 2018-05-31T15:06:22Z

sys/dev/ce/if_ce.c

 #else
 DRIVER_MODULE (ce, pci, ce_driver, ce_devclass, ce_modevent, NULL);
+MODULE_PNP_INFO("U16:vendor; U16:device", pci, ce, ce_devs,
+     sizeof(ce_devs[0]), nitems(ce_devs));
 #endif
 #else /* if __FreeBSD_version < 500000*/
 #ifdef NETGRAPH


the next two can be omitted. In fact, all this code for FreeBSD < 5.0 should be removed.

I removed that part of the code for FreeBSD < 5.0

Reviewed by: imp, chuck Submitted by: Lakhan Shiva Kamireddy <lakhanshiva@gmail.com> Sponsored by: Google, Inc. (GSoC 2018) Pull Request: #4 Url: https://reviews.freebsd.org/D15995

Reviewed by: imp, chuck Submitted by: Lakhan Shiva Kamireddy <lakhanshiva@gmail.com> Sponsored by: Google, Inc. (GSoC 2018) Pull Request: bsdimp#4 git-svn-id: svn+ssh://svn.freebsd.org/base/head@336102 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

Reviewed by: imp, chuck Submitted by: Lakhan Shiva Kamireddy <lakhanshiva@gmail.com> Sponsored by: Google, Inc. (GSoC 2018) Pull Request: bsdimp#4

Reviewed by: imp, chuck Submitted by: Lakhan Shiva Kamireddy <lakhanshiva@gmail.com> Sponsored by: Google, Inc. (GSoC 2018) Pull Request: bsdimp#4 Url: https://reviews.freebsd.org/D15995

Reviewed by: imp, chuck Submitted by: Lakhan Shiva Kamireddy <lakhanshiva@gmail.com> Sponsored by: Google, Inc. (GSoC 2018) Pull Request: #4 Url: https://reviews.freebsd.org/D15995

Reviewed by: imp, chuck Submitted by: Lakhan Shiva Kamireddy <lakhanshiva@gmail.com> Sponsored by: Google, Inc. (GSoC 2018) Pull Request: bsdimp#4 git-svn-id: https://svn.freebsd.org/base/head@336102 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

Reviewed by: imp, chuck Submitted by: Lakhan Shiva Kamireddy <lakhanshiva@gmail.com> Sponsored by: Google, Inc. (GSoC 2018) Pull Request: bsdimp#4 git-svn-id: svn+ssh://svn.freebsd.org/base/head@336102 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

Reviewed by: imp, chuck Submitted by: Lakhan Shiva Kamireddy <lakhanshiva@gmail.com> Sponsored by: Google, Inc. (GSoC 2018) Pull Request: bsdimp/freebsd#4

A couple of issues addressed: 1.) Modules with - in the name were not recognized as modules 2.) The module regex was repeated for each place a module name may appear 3.) The 'strip leading space' bits were repeated for each expression 4.) The trailing 'comment validation' stuff was repeated every expression #4 still has some more work to be done. exec lines, for instance, don't capture a 'value' -- there's only one capture pattern. This throws off the 'c' value that we match, so the trailing bits aren't *actually* being validated. This isn't a new issue, though, so a future comit will address this. git-svn-id: svn+ssh://svn.freebsd.org/base/head@338168 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f

A couple of issues addressed: 1.) Modules with - in the name were not recognized as modules 2.) The module regex was repeated for each place a module name may appear 3.) The 'strip leading space' bits were repeated for each expression 4.) The trailing 'comment validation' stuff was repeated every expression #4 still has some more work to be done. exec lines, for instance, don't capture a 'value' -- there's only one capture pattern. This throws off the 'c' value that we match, so the trailing bits aren't *actually* being validated. This isn't a new issue, though, so a future comit will address this.

Under certain loads, the following panic is hit: panic: page fault KDB: stack backtrace: #0 0xffffffff805db025 at kdb_backtrace+0x65 #1 0xffffffff8058e86f at vpanic+0x17f #2 0xffffffff8058e6e3 at panic+0x43 #3 0xffffffff808adc15 at trap_fatal+0x385 #4 0xffffffff808adc6f at trap_pfault+0x4f #5 0xffffffff80886da8 at calltrap+0x8 #6 0xffffffff80669186 at vgonel+0x186 #7 0xffffffff80669841 at vgone+0x31 #8 0xffffffff8065806d at vfs_hash_insert+0x26d #9 0xffffffff81a39069 at sfs_vgetx+0x149 #10 0xffffffff81a39c54 at zfsctl_snapdir_lookup+0x1e4 #11 0xffffffff8065a28c at lookup+0x45c #12 0xffffffff806594b9 at namei+0x259 #13 0xffffffff80676a33 at kern_statat+0xf3 #14 0xffffffff8067712f at sys_fstatat+0x2f #15 0xffffffff808ae50c at amd64_syscall+0x10c freebsd#16 0xffffffff808876bb at fast_syscall_common+0xf8 The page fault occurs because vgonel() will call VOP_CLOSE() for active vnodes. For this reason, define vop_close for zfsctl_ops_snapshot. While here, define vop_open for consistency. After adding the necessary vop, the bug progresses to the following panic: panic: VERIFY3(vrecycle(vp) == 1) failed (0 == 1) cpuid = 17 KDB: stack backtrace: #0 0xffffffff805e29c5 at kdb_backtrace+0x65 #1 0xffffffff8059620f at vpanic+0x17f #2 0xffffffff81a27f4a at spl_panic+0x3a #3 0xffffffff81a3a4d0 at zfsctl_snapshot_inactive+0x40 #4 0xffffffff8066fdee at vinactivef+0xde #5 0xffffffff80670b8a at vgonel+0x1ea #6 0xffffffff806711e1 at vgone+0x31 #7 0xffffffff8065fa0d at vfs_hash_insert+0x26d #8 0xffffffff81a39069 at sfs_vgetx+0x149 #9 0xffffffff81a39c54 at zfsctl_snapdir_lookup+0x1e4 #10 0xffffffff80661c2c at lookup+0x45c #11 0xffffffff80660e59 at namei+0x259 #12 0xffffffff8067e3d3 at kern_statat+0xf3 #13 0xffffffff8067eacf at sys_fstatat+0x2f #14 0xffffffff808b5ecc at amd64_syscall+0x10c #15 0xffffffff8088f07b at fast_syscall_common+0xf8 This is caused by a race condition that can occur when allocating a new vnode and adding that vnode to the vfs hash. If the newly created vnode loses the race when being inserted into the vfs hash, it will not be recycled as its usecount is greater than zero, hitting the above assertion. Fix this by dropping the assertion. FreeBSD-issue: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252700 Reviewed-by: Andriy Gapon <avg@FreeBSD.org> Reviewed-by: Mateusz Guzik <mjguzik@gmail.com> Reviewed-by: Alek Pinchuk <apinchuk@axcient.com> Reviewed-by: Ryan Moeller <ryan@iXsystems.com> Signed-off-by: Rob Wing <rob.wing@klarasystems.com> Co-authored-by: Rob Wing <rob.wing@klarasystems.com> Submitted-by: Klara, Inc. Sponsored-by: rsync.net Closes #14501

Avoid locking issues when if_allmulti() calls the driver's if_ioctl, because that may acquire sleepable locks (while we hold a non-sleepable rwlock). Fortunately there's no pressing need to hold the mroute lock while we do this, so we can postpone the call slightly, until after we've released the lock. This avoids the following WITNESS warning (with iflib drivers): lock order reversal: (sleepable after non-sleepable) 1st 0xffffffff82f64960 IPv4 multicast forwarding (IPv4 multicast forwarding, rw) @ /usr/src/sys/netinet/ip_mroute.c:1050 2nd 0xfffff8000480f180 iflib ctx lock (iflib ctx lock, sx) @ /usr/src/sys/net/iflib.c:4525 lock order IPv4 multicast forwarding -> iflib ctx lock attempted at: #0 0xffffffff80bbd6ce at witness_checkorder+0xbbe #1 0xffffffff80b56d10 at _sx_xlock+0x60 #2 0xffffffff80c9ce5c at iflib_if_ioctl+0x2dc #3 0xffffffff80c7c395 at if_setflag+0xe5 #4 0xffffffff82f60a0e at del_vif_locked+0x9e #5 0xffffffff82f5f0d5 at X_ip_mrouter_set+0x265 #6 0xffffffff80bfd402 at sosetopt+0xc2 #7 0xffffffff80c02105 at kern_setsockopt+0xa5 #8 0xffffffff80c02054 at sys_setsockopt+0x24 #9 0xffffffff81046be8 at amd64_syscall+0x138 #10 0xffffffff8101930b at fast_syscall_common+0xf8 See also: https://redmine.pfsense.org/issues/12079 Reviewed by: mjg Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41209

lakhanshiva self-assigned this May 31, 2018

lakhanshiva requested a review from bsdimp May 31, 2018 04:54

bsdimp reviewed May 31, 2018

View reviewed changes

lakhanshiva force-pushed the lakhan-pnpinfo-2 branch 3 times, most recently from ac8d56d to f573fe1 Compare June 1, 2018 16:22

lakhanshiva changed the title ~~Add PNP info to PCI attachment of alc, amdsmb, bfe, bge, ce, dpt drivers~~ Add PNP info to PCI attachment of alc, amdsmb, bfe, bge, ce, ciss, dc, dpt drivers Jun 2, 2018

lakhanshiva changed the title ~~Add PNP info to PCI attachment of alc, amdsmb, bfe, bge, ce, ciss, dc, dpt drivers~~ Add PNP info to PCI attachment of alc, amdsmb, bfe, bge, ce, ciss, cp, dc, dpt drivers Jun 2, 2018

lakhanshiva force-pushed the lakhan-pnpinfo-2 branch from cacf9da to 142d0f5 Compare June 2, 2018 17:34

lakhanshiva force-pushed the lakhan-pnpinfo-2 branch from 142d0f5 to 0fe3d47 Compare June 14, 2018 13:07

lakhanshiva force-pushed the lakhan-pnpinfo branch from 55369a2 to e1b82c0 Compare June 14, 2018 13:40

lakhanshiva force-pushed the lakhan-pnpinfo-2 branch from 5788400 to 90d2f43 Compare June 24, 2018 10:07

uqs pushed a commit to freebsd/freebsd-src that referenced this pull request Jul 8, 2018

Add PNP info to PCI attachment of alc driver

2d9e303

Reviewed by: imp, chuck Submitted by: Lakhan Shiva Kamireddy <lakhanshiva@gmail.com> Sponsored by: Google, Inc. (GSoC 2018) Pull Request: bsdimp#4

lakhanshiva added 6 commits July 8, 2018 22:41

Add PNP info to PCI attachment of ce driver

183c72a

Reviewed by: imp, chuck Submitted by: Lakhan Shiva Kamireddy <lakhanshiva@gmail.com> Sponsored by: Google, Inc. (GSoC 2018) Pull Request: bsdimp#4 Url: https://reviews.freebsd.org/D15995

Add PNP info to PCI attachments of ciss driver

8096356

Reviewed by: imp, chuck Submitted by: Lakhan Shiva Kamireddy <lakhanshiva@gmail.com> Sponsored by: Google, Inc. (GSoC 2018) Pull Request: bsdimp#4 Url: https://reviews.freebsd.org/D15995

Add PNP info to PCI attachment of dpt driver

a1784bb

Reviewed by: imp, chuck Submitted by: Lakhan Shiva Kamireddy <lakhanshiva@gmail.com> Sponsored by: Google, Inc. (GSoC 2018) Pull Request: bsdimp#4 Url: https://reviews.freebsd.org/D15995

Add PNP info to PCI attachment of dc driver

e79aabc

Reviewed by: imp, chuck Submitted by: Lakhan Shiva Kamireddy <lakhanshiva@gmail.com> Sponsored by: Google, Inc. (GSoC 2018) Pull Request: bsdimp#4 Url: https://reviews.freebsd.org/D15995

Add PNP info for PCI attachment of cp driver

8cb0f37

Reviewed by: imp, chuck Submitted by: Lakhan Shiva Kamireddy <lakhanshiva@gmail.com> Sponsored by: Google, Inc. (GSoC 2018) Pull Request: bsdimp#4 Url: https://reviews.freebsd.org/D15995

Add PNP info to PCI attachment of amdsmb driver

36f6eed

Reviewed by: imp, chuck Submitted by: Lakhan Shiva Kamireddy <lakhanshiva@gmail.com> Sponsored by: Google, Inc. (GSoC 2018) Pull Request: bsdimp#4 Url: https://reviews.freebsd.org/D15995

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add PNP info to PCI attachment of alc, amdsmb, bfe, bge, ce, ciss, cp, dc, dpt drivers #4

Add PNP info to PCI attachment of alc, amdsmb, bfe, bge, ce, ciss, cp, dc, dpt drivers #4

lakhanshiva commented May 31, 2018 •

edited

Loading

bsdimp May 31, 2018

lakhanshiva Jun 1, 2018

bsdimp May 31, 2018

lakhanshiva Jun 1, 2018

Add PNP info to PCI attachment of alc, amdsmb, bfe, bge, ce, ciss, cp, dc, dpt drivers #4

Add PNP info to PCI attachment of alc, amdsmb, bfe, bge, ce, ciss, cp, dc, dpt drivers #4

Conversation

lakhanshiva commented May 31, 2018 • edited Loading

bsdimp May 31, 2018

Choose a reason for hiding this comment

lakhanshiva Jun 1, 2018

Choose a reason for hiding this comment

bsdimp May 31, 2018

Choose a reason for hiding this comment

lakhanshiva Jun 1, 2018

Choose a reason for hiding this comment

lakhanshiva commented May 31, 2018 •

edited

Loading