svn commit: r347951 - stable/12/lib/libc/stdlib
Author: bcr (doc committer)
Date: Sat May 18 03:15:07 2019
New Revision: 347951
URL: https://svnweb.freebsd.org/changeset/base/347951
Log:
MFC r347617:
Add small EXAMPLE section to bsearch.3.
Submitted by: fernape (via Phabricator)
Reviewed by: bcr, jilles, dab
Approved by: bcr (man pages), jilles (src)
Differential Revision:https://reviews.freebsd.org/D19902
Modified:
stable/12/lib/libc/stdlib/bsearch.3
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/lib/libc/stdlib/bsearch.3
==
--- stable/12/lib/libc/stdlib/bsearch.3 Sat May 18 02:02:14 2019
(r347950)
+++ stable/12/lib/libc/stdlib/bsearch.3 Sat May 18 03:15:07 2019
(r347951)
@@ -32,7 +32,7 @@
.\" @(#)bsearch.3 8.3 (Berkeley) 4/19/94
.\" $FreeBSD$
.\"
-.Dd February 22, 2013
+.Dd May 15, 2019
.Dt BSEARCH 3
.Os
.Sh NAME
@@ -83,6 +83,61 @@ The
function returns a pointer to a matching member of the array, or a null
pointer if no match is found.
If two members compare as equal, which member is matched is unspecified.
+.Sh EXAMPLES
+A sample program that searches people by age in a sorted array:
+.Bd -literal
+#include
+#include
+#include
+#include
+#include
+
+struct person {
+ char name[5];
+ int age;
+};
+
+int
+compare(const void *key, const void *array_member)
+{
+ int age = (intptr_t) key;
+ struct person person = *(struct person *) array_member;
+
+ return (age - person.age);
+}
+
+int
+main()
+{
+ struct person *friend;
+
+ /* Sorted array */
+ struct person friends[6] = {
+ { "paul", 22 },
+ { "anne", 25 },
+ { "fred", 25 },
+ { "mary", 27 },
+ { "mark", 35 },
+ { "bill", 50 }
+ };
+
+ size_t array_size = sizeof(friends) / sizeof(struct person);
+
+ friend = bsearch((void *)22, &friends, array_size, sizeof(struct
person), compare);
+ assert(strcmp(friend->name, "paul") == 0);
+ printf("name: %s\enage: %d\en", friend->name, friend->age);
+
+ friend = bsearch((void *)25, &friends, array_size, sizeof(struct
person), compare);
+ assert(strcmp(friend->name, "fred") == 0 || strcmp(friend->name,
"anne") == 0);
+ printf("name: %s\enage: %d\en", friend->name, friend->age);
+
+ friend = bsearch((void *)30, &friends, array_size, sizeof(struct
person), compare);
+ assert(friend == NULL);
+ printf("friend aged 30 not found\en");
+
+ return (EXIT_SUCCESS);
+}
+.Ed
.Sh SEE ALSO
.Xr db 3 ,
.Xr lsearch 3 ,
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347950 - head/sys/vm
Author: markj
Date: Sat May 18 02:02:14 2019
New Revision: 347950
URL: https://svnweb.freebsd.org/changeset/base/347950
Log:
Use M_NEXTFIT in memguard(9).
memguard(9) wants to avoid reuse of freed addresses for as long as
possible. Previously it maintained a racily updated cursor which was
passed to vmem_xalloc(9) as the minimum address. However, vmem will
not in general return the lowest free address in the arena, so this
trick only really works until the cursor has wrapped around the first
time.
Reported by: alc
Reviewed by: alc
MFC after:1 month
Differential Revision:https://reviews.freebsd.org/D17227
Modified:
head/sys/vm/memguard.c
Modified: head/sys/vm/memguard.c
==
--- head/sys/vm/memguard.c Sat May 18 01:46:38 2019(r347949)
+++ head/sys/vm/memguard.c Sat May 18 02:02:14 2019(r347950)
@@ -102,26 +102,29 @@ SYSCTL_PROC(_vm_memguard, OID_AUTO, desc,
CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, 0, 0,
memguard_sysctl_desc, "A", "Short description of memory type to monitor");
-static vm_offset_t memguard_cursor;
+static int
+memguard_sysctl_mapused(SYSCTL_HANDLER_ARGS)
+{
+ vmem_size_t size;
+
+ size = vmem_size(memguard_arena, VMEM_ALLOC);
+ return (sysctl_handle_long(oidp, &size, sizeof(size), req));
+}
+
static vm_offset_t memguard_base;
static vm_size_t memguard_mapsize;
static vm_size_t memguard_physlimit;
static u_long memguard_wasted;
-static u_long memguard_wrap;
static u_long memguard_succ;
static u_long memguard_fail_kva;
static u_long memguard_fail_pgs;
-SYSCTL_ULONG(_vm_memguard, OID_AUTO, cursor, CTLFLAG_RD,
-&memguard_cursor, 0, "MemGuard cursor");
SYSCTL_ULONG(_vm_memguard, OID_AUTO, mapsize, CTLFLAG_RD,
&memguard_mapsize, 0, "MemGuard private arena size");
SYSCTL_ULONG(_vm_memguard, OID_AUTO, phys_limit, CTLFLAG_RD,
&memguard_physlimit, 0, "Limit on MemGuard memory consumption");
SYSCTL_ULONG(_vm_memguard, OID_AUTO, wasted, CTLFLAG_RD,
&memguard_wasted, 0, "Excess memory used through page promotion");
-SYSCTL_ULONG(_vm_memguard, OID_AUTO, wrapcnt, CTLFLAG_RD,
-&memguard_wrap, 0, "MemGuard cursor wrap count");
SYSCTL_ULONG(_vm_memguard, OID_AUTO, numalloc, CTLFLAG_RD,
&memguard_succ, 0, "Count of successful MemGuard allocations");
SYSCTL_ULONG(_vm_memguard, OID_AUTO, fail_kva, CTLFLAG_RD,
@@ -157,7 +160,7 @@ SYSCTL_ULONG(_vm_memguard, OID_AUTO, frequency_hits, C
/*
* Return a fudged value to be used for vm_kmem_size for allocating
- * the kernel_arena. The memguard memory will be a submap.
+ * the kernel_arena.
*/
unsigned long
memguard_fudge(unsigned long km_size, const struct vm_map *parent_map)
@@ -199,7 +202,8 @@ memguard_fudge(unsigned long km_size, const struct vm_
/*
* Initialize the MemGuard mock allocator. All objects from MemGuard come
- * out of a single VM map (contiguous chunk of address space).
+ * out of a single contiguous chunk of kernel address space that is managed
+ * by a vmem arena.
*/
void
memguard_init(vmem_t *parent)
@@ -209,7 +213,6 @@ memguard_init(vmem_t *parent)
vmem_alloc(parent, memguard_mapsize, M_BESTFIT | M_WAITOK, &base);
vmem_init(memguard_arena, "memguard arena", base, memguard_mapsize,
PAGE_SIZE, 0, M_WAITOK);
- memguard_cursor = base;
memguard_base = base;
printf("MEMGUARD DEBUGGING ALLOCATOR INITIALIZED:\n");
@@ -227,15 +230,15 @@ memguard_sysinit(void)
struct sysctl_oid_list *parent;
parent = SYSCTL_STATIC_CHILDREN(_vm_memguard);
-
- SYSCTL_ADD_UAUTO(NULL, parent, OID_AUTO, "mapstart", CTLFLAG_RD,
- &memguard_base, "MemGuard KVA base");
- SYSCTL_ADD_UAUTO(NULL, parent, OID_AUTO, "maplimit", CTLFLAG_RD,
- &memguard_mapsize, "MemGuard KVA size");
-#if 0
- SYSCTL_ADD_ULONG(NULL, parent, OID_AUTO, "mapused", CTLFLAG_RD,
- &memguard_map->size, "MemGuard KVA used");
-#endif
+ SYSCTL_ADD_UAUTO(NULL, parent, OID_AUTO, "mapstart",
+ CTLFLAG_RD, &memguard_base,
+ "MemGuard KVA base");
+ SYSCTL_ADD_UAUTO(NULL, parent, OID_AUTO, "maplimit",
+ CTLFLAG_RD, &memguard_mapsize,
+ "MemGuard KVA size");
+ SYSCTL_ADD_PROC(NULL, parent, OID_AUTO, "mapused",
+ CTLFLAG_RD | CTLTYPE_ULONG, NULL, 0, memguard_sysctl_mapused, "LU",
+ "MemGuard KVA used");
}
SYSINIT(memguard, SI_SUB_KLD, SI_ORDER_ANY, memguard_sysinit, NULL);
@@ -288,17 +291,16 @@ memguard_alloc(unsigned long req_size, int flags)
{
vm_offset_t addr, origaddr;
u_long size_p, size_v;
- int do_guard, rv;
+ int do_guard, error, rv;
size_p = round_page(req_size);
if (size_p == 0)
return (NULL);
+
/*
* To ensure there are holes on both sides of the allocation,
-* request 2 extra pages of KVA.
svn commit: r347949 - in head: share/man/man9 sys/kern sys/sys
Author: markj
Date: Sat May 18 01:46:38 2019
New Revision: 347949
URL: https://svnweb.freebsd.org/changeset/base/347949
Log:
Implement the M_NEXTFIT allocation strategy for vmem(9).
This is described in the vmem paper: "directs vmem to use the next free
segment after the one previously allocated." The implementation adds a
new boundary tag type, M_CURSOR, which is linked into the segment list
and precedes the segment following the previous M_NEXTFIT allocation.
The cursor is used to locate the next free segment satisfying the
allocation constraints.
This implementation isn't O(1) since busy tags aren't coalesced, and we
may potentially scan the entire segment list during an M_NEXTFIT
allocation.
Reviewed by: alc
MFC after:1 month
Differential Revision:https://reviews.freebsd.org/D17226
Modified:
head/share/man/man9/vmem.9
head/sys/kern/subr_vmem.c
head/sys/sys/malloc.h
Modified: head/share/man/man9/vmem.9
==
--- head/share/man/man9/vmem.9 Sat May 18 00:22:28 2019(r347948)
+++ head/share/man/man9/vmem.9 Sat May 18 01:46:38 2019(r347949)
@@ -27,7 +27,7 @@
.\" $FreeBSD$
.\"
.\"
-.Dd July 12, 2013
+.Dd May 17, 2019
.Dt VMEM 9
.Os
.\"
@@ -95,18 +95,9 @@ The smallest unit of allocation.
The largest size of allocations which can be served by quantum cache.
It is merely a hint and can be ignored.
.It Fa flags
-Combination of
.Xr malloc 9
-wait flag and
-.Nm
-allocation strategy flag:
-.Bl -tag -width M_FIRSTFIT
-.It Dv M_FIRSTFIT
-Prefer allocation performance.
-.It Dv M_BESTFIT
-Prefer space efficiency.
+wait flag.
.El
-.El
.Pp
.\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
.Fn vmem_add
@@ -169,10 +160,16 @@ if the caller does not care.
A bitwise OR of an allocation strategy and a
.Xr malloc 9
wait flag.
-The allocation strategy is one of
-.Dv M_FIRSTFIT
-and
-.Dv M_BESTFIT .
+The allocation strategy is one of:
+.Bl -tag width indent
+.It Dv M_FIRSTFIT
+Prefer allocation performance.
+.It Dv M_BESTFIT
+Prefer space efficiency.
+.It Dv M_NEXTFIT
+Perform an address-ordered search for free addresses, beginning where
+the previous search ended.
+.El
.It Fa addrp
On success, if
.Fa addrp
Modified: head/sys/kern/subr_vmem.c
==
--- head/sys/kern/subr_vmem.c Sat May 18 00:22:28 2019(r347948)
+++ head/sys/kern/subr_vmem.c Sat May 18 01:46:38 2019(r347949)
@@ -89,10 +89,10 @@ int vmem_startup_count(void);
#defineVMEM_QCACHE_IDX_MAX 16
-#defineVMEM_FITMASK(M_BESTFIT | M_FIRSTFIT)
+#defineVMEM_FITMASK(M_BESTFIT | M_FIRSTFIT | M_NEXTFIT)
-#defineVMEM_FLAGS \
-(M_NOWAIT | M_WAITOK | M_USE_RESERVE | M_NOVM | M_BESTFIT | M_FIRSTFIT)
+#defineVMEM_FLAGS (M_NOWAIT | M_WAITOK | M_USE_RESERVE | M_NOVM |
\
+M_BESTFIT | M_FIRSTFIT | M_NEXTFIT)
#defineBT_FLAGS(M_NOWAIT | M_WAITOK | M_USE_RESERVE | M_NOVM)
@@ -120,6 +120,20 @@ typedef struct qcache qcache_t;
#defineVMEM_NAME_MAX 16
+/* boundary tag */
+struct vmem_btag {
+ TAILQ_ENTRY(vmem_btag) bt_seglist;
+ union {
+ LIST_ENTRY(vmem_btag) u_freelist; /* BT_TYPE_FREE */
+ LIST_ENTRY(vmem_btag) u_hashlist; /* BT_TYPE_BUSY */
+ } bt_u;
+#definebt_hashlist bt_u.u_hashlist
+#definebt_freelist bt_u.u_freelist
+ vmem_addr_t bt_start;
+ vmem_size_t bt_size;
+ int bt_type;
+};
+
/* vmem arena */
struct vmem {
struct mtx_padalign vm_lock;
@@ -145,6 +159,7 @@ struct vmem {
vmem_size_t vm_inuse;
vmem_size_t vm_size;
vmem_size_t vm_limit;
+ struct vmem_btagvm_cursor;
/* Used on import. */
vmem_import_t *vm_importfn;
@@ -158,24 +173,11 @@ struct vmem {
qcache_tvm_qcache[VMEM_QCACHE_IDX_MAX];
};
-/* boundary tag */
-struct vmem_btag {
- TAILQ_ENTRY(vmem_btag) bt_seglist;
- union {
- LIST_ENTRY(vmem_btag) u_freelist; /* BT_TYPE_FREE */
- LIST_ENTRY(vmem_btag) u_hashlist; /* BT_TYPE_BUSY */
- } bt_u;
-#definebt_hashlist bt_u.u_hashlist
-#definebt_freelist bt_u.u_freelist
- vmem_addr_t bt_start;
- vmem_size_t bt_size;
- int bt_type;
-};
-
#defineBT_TYPE_SPAN1 /* Allocated from importfn */
#defineBT_TYPE_SPAN_STATIC 2 /* vmem_add() or create. */
#defineBT_TYPE_FREE3 /* Available space. */
#defineBT_TYPE_BUSY
Re: svn commit: r347911 - in head: . share/man/man4 sys/amd64/conf sys/conf sys/dev/ed sys/i386/conf sys/modules sys/modules/ed
On 17 May 2019, at 15:23, Brooks Davis wrote: Author: brooks Date: Fri May 17 15:23:02 2019 New Revision: 347911 URL: https://svnweb.freebsd.org/changeset/base/347911 Log: FCP-101: Remove ed(4). can you please also change the samples in the default rc.conf file which uses ed0? Thanks, /bz ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347948 - in head: sbin/fdisk sys/sys/disk
Author: cem
Date: Sat May 18 00:22:28 2019
New Revision: 347948
URL: https://svnweb.freebsd.org/changeset/base/347948
Log:
Add DragonFly's partition number to fdisk(8) and diskmbr.h
This change doesn't make any attempt to add support for these slices to the
relevent GEOM classes. Just register the number in fdisk and the canonical
list of kernel macros (diskmbr.h).
Obtained from:DragonFlyBSD (794d80aa519b394b3174f20776a) (small
subset of)
Modified:
head/sbin/fdisk/fdisk.c
head/sys/sys/disk/mbr.h
Modified: head/sbin/fdisk/fdisk.c
==
--- head/sbin/fdisk/fdisk.c Fri May 17 22:14:30 2019(r347947)
+++ head/sbin/fdisk/fdisk.c Sat May 18 00:22:28 2019(r347948)
@@ -175,6 +175,7 @@ static const char *const part_types[256] = {
[0x63] = "System V/386 (such as ISC UNIX), GNU HURD or Mach",
[0x64] = "Novell Netware/286 2.xx",
[0x65] = "Novell Netware/386 3.xx",
+ [0x6C] = "DragonFlyBSD",
[0x70] = "DiskSecure Multi-Boot",
[0x75] = "PCIX",
[0x77] = "QNX4.x",
Modified: head/sys/sys/disk/mbr.h
==
--- head/sys/sys/disk/mbr.h Fri May 17 22:14:30 2019(r347947)
+++ head/sys/sys/disk/mbr.h Sat May 18 00:22:28 2019(r347948)
@@ -50,6 +50,7 @@
#defineDOSPTYP_EXTLBA 0x0f/* DOS extended partition */
#defineDOSPTYP_PPCBOOT 0x41/* PReP/CHRP boot partition */
#defineDOSPTYP_LDM 0x42/* Win2k dynamic extended partition */
+#defineDOSPTYP_DFLYBSD 0x6c/* DragonFlyBSD partition type */
#defineDOSPTYP_LINSWP 0x82/* Linux swap partition */
#defineDOSPTYP_LINUX 0x83/* Linux partition */
#defineDOSPTYP_LINLVM 0x8e/* Linux LVM partition */
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347947 - stable/11/sys/x86/x86
Author: kib
Date: Fri May 17 22:14:30 2019
New Revision: 347947
URL: https://svnweb.freebsd.org/changeset/base/347947
Log:
MFC r347625:
Properly announce MD_CLEAR.
Approved by: re (gjb)
Modified:
stable/11/sys/x86/x86/identcpu.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/x86/x86/identcpu.c
==
--- stable/11/sys/x86/x86/identcpu.cFri May 17 21:18:11 2019
(r347946)
+++ stable/11/sys/x86/x86/identcpu.cFri May 17 22:14:30 2019
(r347947)
@@ -991,6 +991,7 @@ printcpuinfo(void)
printf("\n Structured Extended Features3=0x%b",
cpu_stdext_feature3,
"\020"
+ "\013MD_CLEAR"
"\016TSXFA"
"\033IBPB"
"\034STIBP"
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347946 - head/sys/kern
Author: kib
Date: Fri May 17 21:18:11 2019
New Revision: 347946
URL: https://svnweb.freebsd.org/changeset/base/347946
Log:
Grammar fixes for r347690.
Submitted by: alc
MFC after:3 days
Modified:
head/sys/kern/imgact_elf.c
Modified: head/sys/kern/imgact_elf.c
==
--- head/sys/kern/imgact_elf.c Fri May 17 20:59:59 2019(r347945)
+++ head/sys/kern/imgact_elf.c Fri May 17 21:18:11 2019(r347946)
@@ -936,13 +936,13 @@ __elfN(get_interp)(struct image_params *imgp, const El
if (phdr->p_offset > PAGE_SIZE ||
interp_name_len > PAGE_SIZE - phdr->p_offset) {
/*
-* The vnode lock might be needed by pagedaemon to
+* The vnode lock might be needed by the pagedaemon to
* clean pages owned by the vnode. Do not allow sleep
* waiting for memory with the vnode locked, instead
* try non-sleepable allocation first, and if it
* fails, go to the slow path were we drop the lock
-* and do M_WAITOK. Text reference prevents
-* modifications of the vnode content.
+* and do M_WAITOK. A text reference prevents
+* modifications to the vnode content.
*/
interp = malloc(interp_name_len + 1, M_TEMP, M_NOWAIT);
if (interp == NULL) {
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347945 - stable/12/sys/x86/x86
Author: kib
Date: Fri May 17 20:59:59 2019
New Revision: 347945
URL: https://svnweb.freebsd.org/changeset/base/347945
Log:
MFC r347625:
Properly announce MD_CLEAR.
Modified:
stable/12/sys/x86/x86/identcpu.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/x86/x86/identcpu.c
==
--- stable/12/sys/x86/x86/identcpu.cFri May 17 20:29:31 2019
(r347944)
+++ stable/12/sys/x86/x86/identcpu.cFri May 17 20:59:59 2019
(r347945)
@@ -992,6 +992,7 @@ printcpuinfo(void)
printf("\n Structured Extended Features3=0x%b",
cpu_stdext_feature3,
"\020"
+ "\013MD_CLEAR"
"\016TSXFA"
"\033IBPB"
"\034STIBP"
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347944 - head/sys/dev/netmap
Author: vmaffione Date: Fri May 17 20:29:31 2019 New Revision: 347944 URL: https://svnweb.freebsd.org/changeset/base/347944 Log: netmap: align if_ptnet to the changes introduced by r347233 This removes non-functional SCTP checksum offload support. More information in the log message of r347233. MFC after:2 weeks Modified: head/sys/dev/netmap/if_ptnet.c Modified: head/sys/dev/netmap/if_ptnet.c == --- head/sys/dev/netmap/if_ptnet.c Fri May 17 19:57:08 2019 (r347943) +++ head/sys/dev/netmap/if_ptnet.c Fri May 17 20:29:31 2019 (r347944) @@ -68,7 +68,6 @@ #include #include #include -#include #include #include @@ -281,9 +280,8 @@ static inline void ptnet_kick(struct ptnet_queue *pq) #define PTNET_HDR_SIZE sizeof(struct virtio_net_hdr_mrg_rxbuf) #define PTNET_MAX_PKT_SIZE 65536 -#define PTNET_CSUM_OFFLOAD (CSUM_TCP | CSUM_UDP | CSUM_SCTP) -#define PTNET_CSUM_OFFLOAD_IPV6(CSUM_TCP_IPV6 | CSUM_UDP_IPV6 |\ -CSUM_SCTP_IPV6) +#define PTNET_CSUM_OFFLOAD (CSUM_TCP | CSUM_UDP) +#define PTNET_CSUM_OFFLOAD_IPV6(CSUM_TCP_IPV6 | CSUM_UDP_IPV6) #define PTNET_ALL_OFFLOAD (CSUM_TSO | PTNET_CSUM_OFFLOAD |\ PTNET_CSUM_OFFLOAD_IPV6) @@ -1539,9 +1537,6 @@ ptnet_rx_csum_by_offset(struct mbuf *m, uint16_t eth_t m->m_pkthdr.csum_flags |= CSUM_DATA_VALID | CSUM_PSEUDO_HDR; m->m_pkthdr.csum_data = 0x; break; - case offsetof(struct sctphdr, checksum): - m->m_pkthdr.csum_flags |= CSUM_SCTP_VALID; - break; default: /* Here we should increment the rx_csum_bad_offset counter. */ return (1); @@ -1595,11 +1590,6 @@ ptnet_rx_csum_by_parse(struct mbuf *m, uint16_t eth_ty return (1); m->m_pkthdr.csum_flags |= CSUM_DATA_VALID | CSUM_PSEUDO_HDR; m->m_pkthdr.csum_data = 0x; - break; - case IPPROTO_SCTP: - if (__predict_false(m->m_len < offset + sizeof(struct sctphdr))) - return (1); - m->m_pkthdr.csum_flags |= CSUM_SCTP_VALID; break; default: /* ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347943 - head/sys/cddl/dev/dtrace/powerpc
Author: jhibbits
Date: Fri May 17 19:57:08 2019
New Revision: 347943
URL: https://svnweb.freebsd.org/changeset/base/347943
Log:
powerpc/dtrace: Actually fix stack traces
Fix stack unwinding such that requesting N stack frames in lockstat will
actually give you N frames, not anywhere from 0-3 as had been before.
lockstat prints the mutex function instead of the caller as the reported
locker, but the stack frame is detailed enough to find the real caller.
MFC after:2 weeks
Modified:
head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S
head/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c
Modified: head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S
==
--- head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S Fri May 17 19:27:07
2019(r347942)
+++ head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S Fri May 17 19:57:08
2019(r347943)
@@ -179,3 +179,13 @@ ASENTRY_NOPROF(dtrace_caller)
li %r3, -1
blr
END(dtrace_caller)
+
+/*
+greg_t
+dtrace_getfp(void)
+*/
+ASENTRY_NOPROF(dtrace_getfp)
+ mr %r3,%r31
+ blr
+END(dtrace_getfp)
+
Modified: head/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c
==
--- head/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c Fri May 17 19:27:07
2019(r347942)
+++ head/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c Fri May 17 19:57:08
2019(r347943)
@@ -61,8 +61,10 @@
#defineFRAME_OFFSET8
#endif
-#define INKERNEL(x)((x) <= VM_MAX_KERNEL_ADDRESS && \
- (x) >= VM_MIN_KERNEL_ADDRESS)
+#define INKERNEL(x)(((x) <= VM_MAX_KERNEL_ADDRESS && \
+ (x) >= VM_MIN_KERNEL_ADDRESS) || \
+ (PMAP_HAS_DMAP && (x) >= DMAP_BASE_ADDRESS && \
+(x) <= DMAP_MAX_ADDRESS))
static __inline int
dtrace_sp_inkernel(uintptr_t sp)
@@ -70,6 +72,9 @@ dtrace_sp_inkernel(uintptr_t sp)
struct trapframe *frame;
vm_offset_t callpc;
+ /* Not within the kernel, or not aligned. */
+ if (!INKERNEL(sp) || (sp & 0xf) != 0)
+ return (0);
#ifdef __powerpc64__
callpc = *(vm_offset_t *)(sp + RETURN_OFFSET64);
#else
@@ -84,8 +89,6 @@ dtrace_sp_inkernel(uintptr_t sp)
*/
if (callpc + OFFSET == (vm_offset_t) &trapexit ||
callpc + OFFSET == (vm_offset_t) &asttrapexit) {
- if (sp == 0)
- return (0);
frame = (struct trapframe *)(sp + FRAME_OFFSET);
return ((frame->srr1 & PSL_PR) == 0);
@@ -119,6 +122,7 @@ dtrace_next_sp_pc(uintptr_t sp, uintptr_t *nsp, uintpt
*nsp = frame->fixreg[1];
if (pc != NULL)
*pc = frame->srr0;
+ return;
}
if (nsp != NULL)
@@ -127,12 +131,6 @@ dtrace_next_sp_pc(uintptr_t sp, uintptr_t *nsp, uintpt
*pc = callpc;
}
-greg_t
-dtrace_getfp(void)
-{
- return (greg_t)__builtin_frame_address(0);
-}
-
void
dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes,
uint32_t *intrpc)
@@ -148,7 +146,7 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, in
aframes++;
- sp = dtrace_getfp();
+ sp = (uintptr_t)__builtin_frame_address(0);
while (depth < pcstack_limit) {
if (sp <= osp)
@@ -418,7 +416,7 @@ uint64_t
dtrace_getarg(int arg, int aframes)
{
uintptr_t val;
- uintptr_t *fp = (uintptr_t *)dtrace_getfp();
+ uintptr_t *fp = (uintptr_t *)__builtin_frame_address(0);
uintptr_t *stack;
int i;
@@ -432,8 +430,8 @@ dtrace_getarg(int arg, int aframes)
fp = (uintptr_t *)*fp;
/*
-* On ppc32 AIM, and booke, trapexit() is the immediately
following
-* label. On ppc64 AIM trapexit() follows a nop.
+* On ppc32 trapexit() is the immediately following label. On
+* ppc64 AIM trapexit() follows a nop.
*/
#ifdef __powerpc64__
if ((long)(fp[2]) + 4 == (long)trapexit) {
@@ -506,9 +504,7 @@ dtrace_getstackdepth(int aframes)
vm_offset_t callpc;
osp = PAGE_SIZE;
- aframes++;
- sp = dtrace_getfp();
- depth++;
+ sp = (uintptr_t)__builtin_frame_address(0);
for(;;) {
if (sp <= osp)
break;
@@ -516,17 +512,14 @@ dtrace_getstackdepth(int aframes)
if (!dtrace_sp_inkernel(sp))
break;
- if (aframes == 0)
- depth++;
- else
- aframes--;
+ depth++;
osp = sp;
dtrace_next_sp_pc(sp, &sp, NULL);
}
if (depth < aframes)
return (0);
- return (depth);
+ return (depth - aframes);
svn commit: r347942 - in head/sys: dev/veriexec security/mac_veriexec
Author: stevek
Date: Fri May 17 19:27:07 2019
New Revision: 347942
URL: https://svnweb.freebsd.org/changeset/base/347942
Log:
Add a new ioctl for the larger params struct that includes the label.
We need to make the find_veriexec_file() function available publicly, so
rename it to mac_veriexec_metadata_find_file_info() and make it non-static.
Bump the version of the veriexec device interface so user space will know
the labelized version of fingerprint loading is available.
Approved by: sjg
Obtained from:Juniper Networks, Inc.
Differential Revision:https://reviews.freebsd.org/D20295
Modified:
head/sys/dev/veriexec/veriexec_ioctl.h
head/sys/dev/veriexec/verified_exec.c
head/sys/security/mac_veriexec/mac_veriexec.h
head/sys/security/mac_veriexec/mac_veriexec_internal.h
head/sys/security/mac_veriexec/veriexec_metadata.c
Modified: head/sys/dev/veriexec/veriexec_ioctl.h
==
--- head/sys/dev/veriexec/veriexec_ioctl.h Fri May 17 18:25:53 2019
(r347941)
+++ head/sys/dev/veriexec/veriexec_ioctl.h Fri May 17 19:27:07 2019
(r347942)
@@ -46,6 +46,11 @@ struct verified_exec_params {
unsigned char fingerprint[MAXFINGERPRINTLEN];
};
+struct verified_exec_label_params {
+ struct verified_exec_params params;
+ char label[MAXLABELLEN];
+};
+
#define VERIEXEC_LOAD _IOW('S', 0x1, struct verified_exec_params)
#define VERIEXEC_ACTIVE_IO('S', 0x2) /* start checking */
#define VERIEXEC_ENFORCE _IO('S', 0x3) /* fail exec */
@@ -55,6 +60,7 @@ struct verified_exec_params {
#define VERIEXEC_GETSTATE _IOR('S', 0x7, int) /* get state */
#define VERIEXEC_SIGNED_LOAD _IOW('S', 0x8, struct verified_exec_params)
#define VERIEXEC_GETVERSION_IOR('S', 0x9, int) /* get version */
+#define VERIEXEC_LABEL_LOAD_IOW('S', 0xa, struct
verified_exec_label_params)
#define_PATH_DEV_VERIEXEC _PATH_DEV "veriexec"
Modified: head/sys/dev/veriexec/verified_exec.c
==
--- head/sys/dev/veriexec/verified_exec.c Fri May 17 18:25:53 2019
(r347941)
+++ head/sys/dev/veriexec/verified_exec.c Fri May 17 19:27:07 2019
(r347942)
@@ -68,6 +68,7 @@ verifiedexecioctl(struct cdev *dev __unused, u_long cm
{
struct nameidata nid;
struct vattr vattr;
+ struct verified_exec_label_params *lparams;
struct verified_exec_params *params;
int error = 0;
@@ -102,7 +103,12 @@ verifiedexecioctl(struct cdev *dev __unused, u_long cm
if (error)
return (error);
- params = (struct verified_exec_params *)data;
+ lparams = (struct verified_exec_label_params *)data;
+ if (cmd == VERIEXEC_LABEL_LOAD)
+ params = &lparams->params;
+ else
+ params = (struct verified_exec_params *)data;
+
switch (cmd) {
case VERIEXEC_ACTIVE:
mtx_lock(&ve_mutex);
@@ -158,6 +164,7 @@ verifiedexecioctl(struct cdev *dev __unused, u_long cm
return (EPERM); /* no updates when secure */
/* FALLTHROUGH */
+ case VERIEXEC_LABEL_LOAD:
case VERIEXEC_SIGNED_LOAD:
/*
* If we use a loader that will only use a
@@ -176,8 +183,9 @@ verifiedexecioctl(struct cdev *dev __unused, u_long cm
if (mac_veriexec_in_state(VERIEXEC_STATE_LOCKED))
error = EPERM;
else {
+ size_t labellen = 0;
int flags = FREAD;
- int override = (cmd == VERIEXEC_SIGNED_LOAD);
+ int override = (cmd != VERIEXEC_LOAD);
/*
* Get the attributes for the file name passed
@@ -221,13 +229,18 @@ verifiedexecioctl(struct cdev *dev __unused, u_long cm
FINGERPRINT_INVALID);
VOP_UNLOCK(nid.ni_vp, 0);
(void) vn_close(nid.ni_vp, FREAD, td->td_ucred, td);
+ if (params->flags & VERIEXEC_LABEL)
+ labellen = strnlen(lparams->label,
+ sizeof(lparams->label) - 1) + 1;
mtx_lock(&ve_mutex);
error = mac_veriexec_metadata_add_file(
((params->flags & VERIEXEC_FILE) != 0),
vattr.va_fsid, vattr.va_fileid, vattr.va_gen,
- params->fingerprint, params->flags,
- params->fp_type, override);
+ params->fingerprint,
+ (params->flags & VERIEXEC_LABEL) ?
+ lparams->label : NULL, labellen,
+ params->flag
svn commit: r347941 - head/sys/dev/veriexec
Author: stevek
Date: Fri May 17 18:25:53 2019
New Revision: 347941
URL: https://svnweb.freebsd.org/changeset/base/347941
Log:
Add command to get version of the ioctl interface for the veriexec device.
Obtained from:Juniper Networks, Inc.
MFC after:1 week
Modified:
head/sys/dev/veriexec/veriexec_ioctl.h
head/sys/dev/veriexec/verified_exec.c
Modified: head/sys/dev/veriexec/veriexec_ioctl.h
==
--- head/sys/dev/veriexec/veriexec_ioctl.h Fri May 17 18:16:55 2019
(r347940)
+++ head/sys/dev/veriexec/veriexec_ioctl.h Fri May 17 18:25:53 2019
(r347941)
@@ -1,7 +1,7 @@
/*
* $FreeBSD$
*
- * Copyright (c) 2011-2013, 2015, Juniper Networks, Inc.
+ * Copyright (c) 2011-2013, 2015, 2019, Juniper Networks, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,6 +54,7 @@ struct verified_exec_params {
#define VERIEXEC_DEBUG_OFF _IO('S', 0x6) /* reset debug */
#define VERIEXEC_GETSTATE _IOR('S', 0x7, int) /* get state */
#define VERIEXEC_SIGNED_LOAD _IOW('S', 0x8, struct verified_exec_params)
+#define VERIEXEC_GETVERSION_IOR('S', 0x9, int) /* get version */
#define_PATH_DEV_VERIEXEC _PATH_DEV "veriexec"
Modified: head/sys/dev/veriexec/verified_exec.c
==
--- head/sys/dev/veriexec/verified_exec.c Fri May 17 18:16:55 2019
(r347940)
+++ head/sys/dev/veriexec/verified_exec.c Fri May 17 18:25:53 2019
(r347941)
@@ -138,6 +138,16 @@ verifiedexecioctl(struct cdev *dev __unused, u_long cm
error = EINVAL;
mtx_unlock(&ve_mutex);
break;
+ case VERIEXEC_GETVERSION:
+ {
+ int *ip = (int *)data;
+
+ if (ip)
+ *ip = MAC_VERIEXEC_VERSION;
+ else
+ error = EINVAL;
+ }
+ break;
case VERIEXEC_LOCK:
mtx_lock(&ve_mutex);
mac_veriexec_set_state(VERIEXEC_STATE_LOCKED);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347940 - head/share/man/man4
Author: brooks Date: Fri May 17 18:16:55 2019 New Revision: 347940 URL: https://svnweb.freebsd.org/changeset/base/347940 Log: Remove the notice that ae(4) will be removed in FreeBSD 13. Modified: head/share/man/man4/ae.4 Modified: head/share/man/man4/ae.4 == --- head/share/man/man4/ae.4Fri May 17 18:15:47 2019(r347939) +++ head/share/man/man4/ae.4Fri May 17 18:16:55 2019(r347940) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 24, 2018 +.Dd May 17, 2019 .Dt AE 4 .Os .Sh NAME @@ -44,14 +44,6 @@ module at boot time, place the following line in .Bd -literal -offset indent if_ae_load="YES" .Ed -.Sh DEPRECATION NOTICE -The -.Nm -driver is not present in -.Fx 13.0 -and later. -See https://github.com/freebsd/fcp/blob/master/fcp-0101.md for more -information. .Sh DESCRIPTION The .Nm ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347939 - head/sbin/nvmecontrol
Author: scottl Date: Fri May 17 18:15:47 2019 New Revision: 347939 URL: https://svnweb.freebsd.org/changeset/base/347939 Log: Better formatting for the logpage section Modified: head/sbin/nvmecontrol/nvmecontrol.8 Modified: head/sbin/nvmecontrol/nvmecontrol.8 == --- head/sbin/nvmecontrol/nvmecontrol.8 Fri May 17 18:13:43 2019 (r347938) +++ head/sbin/nvmecontrol/nvmecontrol.8 Fri May 17 18:15:47 2019 (r347939) @@ -114,12 +114,26 @@ high-speed storage devices over PCI Express. .Ss logpage The logpage command knows how to print log pages of various types. It also knows about vendor specific log pages from hgst/wdc and intel. -Page 0xc1 for hgst/wdc contains the advanced smart information about -the drive. -Page 0xc1 is read latency stats for intel. -Page 0xc2 is write latency stats for intel. -Page 0xc5 is temperature stats for intel. -Page 0xca is advanced smart information for intel. +Note that some vendors use the same log page numbers for different data. +.Pp +.Bl -tag -compact -width "Page 0x00" +.It Dv Page 0x01 +Drive Error Log +.It Dv Page 0x02 +Health/SMART Data +.It Dv Page 0x03 +Firmware Information +.It Dv Page 0xc1 +Advanced SMART information (WDC/HGST) +.It Dv Page 0xc1 +Read latency stats (Intel) +.It Dv Page 0xc2 +Wite latency stats (Intel) +.It Dv Page 0xc5 +Temperature stats (Intel) +.It Dv Page 0xca +Advanced SMART information (Intel) +.El .Pp Specifying .Fl p ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347938 - head/sys/security/mac_veriexec
Author: stevek Date: Fri May 17 18:13:43 2019 New Revision: 347938 URL: https://svnweb.freebsd.org/changeset/base/347938 Log: Obtain a shared lock instead of exclusive in the MAC/veriexec MAC_VERIEXEC_CHECK_PATH_SYSCALL per-MAC policy system call. When we are checking the status of the fingerprint on a vnode using the per-MAC-policy syscall, we do not need an exclusive lock on the vnode. Even if there is more than one thread requesting the status at the same time, the worst we can end up doing is processing the file more than once. This can potentially be improved in the future with offloading the fingerprint evaluation to a separate thread and blocking until the update completes. But for now the race is acceptable. Obtained from:Juniper Networks, Inc. MFC after:1 week Modified: head/sys/security/mac_veriexec/mac_veriexec.c Modified: head/sys/security/mac_veriexec/mac_veriexec.c == --- head/sys/security/mac_veriexec/mac_veriexec.c Fri May 17 18:10:11 2019(r347937) +++ head/sys/security/mac_veriexec/mac_veriexec.c Fri May 17 18:13:43 2019(r347938) @@ -697,7 +697,8 @@ cleanup_file: break; case MAC_VERIEXEC_CHECK_PATH_SYSCALL: /* Look up the path to get the vnode */ - NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | AUDITVNODE1, + NDINIT(&nd, LOOKUP, + FOLLOW | LOCKLEAF | LOCKSHARED | AUDITVNODE1, UIO_USERSPACE, arg, td); error = namei(&nd); if (error != 0) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347937 - stable/11/stand/defaults
Author: markj Date: Fri May 17 18:10:11 2019 New Revision: 347937 URL: https://svnweb.freebsd.org/changeset/base/347937 Log: MFC r337716: Add microcode update configuration to the default loader.conf. Approved by: re (kib) Modified: stable/11/stand/defaults/loader.conf Directory Properties: stable/11/ (props changed) Modified: stable/11/stand/defaults/loader.conf == --- stable/11/stand/defaults/loader.confFri May 17 18:09:48 2019 (r347936) +++ stable/11/stand/defaults/loader.confFri May 17 18:10:11 2019 (r347937) @@ -52,6 +52,14 @@ ram_blacklist_name="/boot/blacklist.txt" # Set this to ram_blacklist_type="ram_blacklist" # Required for the kernel to find # the blacklist module +### Microcode loading configuration +cpu_microcode_load="NO"# Set this to YES to load and apply a + # microcode update file during boot. +cpu_microcode_name="/boot/firmware/ucode.bin" # Set this to the microcode + # update file path. +cpu_microcode_type="cpu_microcode" # Required for the kernel to find + # the microcode update file. + ### ACPI settings ## acpi_dsdt_load="NO"# DSDT Overriding acpi_dsdt_type="acpi_dsdt" # Don't change this ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347936 - head/sys/security/mac_veriexec
Author: stevek
Date: Fri May 17 18:09:48 2019
New Revision: 347936
URL: https://svnweb.freebsd.org/changeset/base/347936
Log:
sysctls which should be restricted when securelevel is raised should also
be restricted when veriexec is enforced.
Add mpo_system_check_sysctl method to mac_veriexec which does this.
Obtained from:Juniper Networks, Inc.
MFC after:1 week
Modified:
head/sys/security/mac_veriexec/mac_veriexec.c
Modified: head/sys/security/mac_veriexec/mac_veriexec.c
==
--- head/sys/security/mac_veriexec/mac_veriexec.c Fri May 17 18:06:24
2019(r347935)
+++ head/sys/security/mac_veriexec/mac_veriexec.c Fri May 17 18:09:48
2019(r347936)
@@ -1,7 +1,7 @@
/*
* $FreeBSD$
*
- * Copyright (c) 2011, 2012, 2013, 2015, 2016, Juniper Networks, Inc.
+ * Copyright (c) 2011, 2012, 2013, 2015, 2016, 2019 Juniper Networks, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -424,6 +424,23 @@ mac_veriexec_priv_check(struct ucred *cred, int priv)
return (0);
}
+static int
+mac_veriexec_sysctl_check(struct ucred *cred, struct sysctl_oid *oidp,
+void *arg1, int arg2, struct sysctl_req *req)
+{
+ struct sysctl_oid *oid;
+
+ /* If we are not enforcing veriexec, nothing for us to check */
+ if ((mac_veriexec_state & VERIEXEC_STATE_ENFORCE) == 0)
+ return (0);
+
+ oid = oidp;
+ if (oid->oid_kind & CTLFLAG_SECURE) {
+ return (EPERM); /* XXX call mac_veriexec_priv_check? */
+ }
+ return 0;
+}
+
/**
* @internal
* @brief A program is being executed and needs to be validated.
@@ -700,12 +717,13 @@ cleanup_file:
static struct mac_policy_ops mac_veriexec_ops =
{
.mpo_init = mac_veriexec_init,
- .mpo_syscall = mac_veriexec_syscall,
.mpo_kld_check_load = mac_veriexec_kld_check_load,
.mpo_mount_destroy_label = mac_veriexec_mount_destroy_label,
.mpo_mount_init_label = mac_veriexec_mount_init_label,
.mpo_priv_check = mac_veriexec_priv_check,
.mpo_proc_check_debug = mac_veriexec_proc_check_debug,
+ .mpo_syscall = mac_veriexec_syscall,
+ .mpo_system_check_sysctl = mac_veriexec_sysctl_check,
.mpo_vnode_check_exec = mac_veriexec_vnode_check_exec,
.mpo_vnode_check_open = mac_veriexec_vnode_check_open,
.mpo_vnode_check_setmode = mac_veriexec_vnode_check_setmode,
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347935 - head/sys/security/mac_veriexec
Author: stevek
Date: Fri May 17 18:06:24 2019
New Revision: 347935
URL: https://svnweb.freebsd.org/changeset/base/347935
Log:
Fix format strings for some debug messages that could have arguments that
are different types across architectures by using %ju and typecasting to
uintmax_t, where appropriate.
Obtained from:Juniper Networks, Inc.
MFC after:1 week
Modified:
head/sys/security/mac_veriexec/mac_veriexec.c
Modified: head/sys/security/mac_veriexec/mac_veriexec.c
==
--- head/sys/security/mac_veriexec/mac_veriexec.c Fri May 17 18:02:26
2019(r347934)
+++ head/sys/security/mac_veriexec/mac_veriexec.c Fri May 17 18:06:24
2019(r347935)
@@ -193,7 +193,8 @@ mac_veriexec_vfs_mounted(void *arg __unused, struct mo
SLOT_SET(mp->mnt_label, va.va_fsid);
#ifdef MAC_DEBUG
- MAC_VERIEXEC_DBG(3, "set fsid to %u for mount %p", va.va_fsid, mp);
+ MAC_VERIEXEC_DBG(3, "set fsid to %ju for mount %p",
+ (uintmax_t)va.va_fsid, mp);
#endif
}
@@ -216,7 +217,8 @@ mac_veriexec_vfs_unmounted(void *arg __unused, struct
fsid = SLOT(mp->mnt_label);
if (fsid) {
- MAC_VERIEXEC_DBG(3, "fsid %u, cleaning up mount", fsid);
+ MAC_VERIEXEC_DBG(3, "fsid %ju, cleaning up mount",
+ (uintmax_t)fsid);
mac_veriexec_metadata_unmounted(fsid, td);
}
}
@@ -379,9 +381,9 @@ mac_veriexec_kld_check_load(struct ucred *cred, struct
* kldload should fail unless there is a valid fingerprint
* registered.
*/
- MAC_VERIEXEC_DBG(2, "fingerprint status is %d for dev %u, "
- "file %lu.%lu\n", status, va.va_fsid, va.va_fileid,
-va.va_gen);
+ MAC_VERIEXEC_DBG(2, "fingerprint status is %d for dev %ju, "
+ "file %ju.%ju\n", status, (uintmax_t)va.va_fsid,
+ (uintmax_t)va.va_fileid, (uintmax_t)va.va_gen);
return (EAUTH);
}
@@ -492,8 +494,8 @@ mac_veriexec_check_vp(struct ucred *cred, struct vnode
case FINGERPRINT_INDIRECT:
MAC_VERIEXEC_DBG(2,
"attempted write to fingerprinted file for dev "
- "%u, file %lu.%lu\n", va.va_fsid,
- va.va_fileid, va.va_gen);
+ "%ju, file %ju.%ju\n", (uintmax_t)va.va_fsid,
+ (uintmax_t)va.va_fileid, (uintmax_t)va.va_gen);
return (EPERM);
default:
break;
@@ -513,8 +515,9 @@ mac_veriexec_check_vp(struct ucred *cred, struct vnode
* fingerprint registered.
*/
MAC_VERIEXEC_DBG(2, "fingerprint status is %d for dev "
- "%u, file %lu.%lu\n", status, va.va_fsid,
- va.va_fileid, va.va_gen);
+ "%ju, file %ju.%ju\n", status,
+ (uintmax_t)va.va_fsid, (uintmax_t)va.va_fileid,
+ (uintmax_t)va.va_gen);
return (EAUTH);
}
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347934 - head/sys/dev/veriexec
Author: stevek
Date: Fri May 17 18:02:26 2019
New Revision: 347934
URL: https://svnweb.freebsd.org/changeset/base/347934
Log:
Protect commands that are considered dangerous with checks for kmem write
priv. This allows for MAC/veriexec to prevent apps that are not "trusted"
from using these commands.
Obtained from:Juniper Networks, Inc.
MFC after:1 week
Modified:
head/sys/dev/veriexec/verified_exec.c
Modified: head/sys/dev/veriexec/verified_exec.c
==
--- head/sys/dev/veriexec/verified_exec.c Fri May 17 17:50:01 2019
(r347933)
+++ head/sys/dev/veriexec/verified_exec.c Fri May 17 18:02:26 2019
(r347934)
@@ -1,7 +1,7 @@
/*
* $FreeBSD$
*
- * Copyright (c) 2011-2013, 2015, Juniper Networks, Inc.
+ * Copyright (c) 2011-2013, 2015, 2019 Juniper Networks, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -70,6 +71,37 @@ verifiedexecioctl(struct cdev *dev __unused, u_long cm
struct verified_exec_params *params;
int error = 0;
+ /*
+* These commands are considered safe requests for anyone who has
+* permission to access to device node.
+*/
+ switch (cmd) {
+ case VERIEXEC_GETSTATE:
+ {
+ int *ip = (int *)data;
+
+ if (ip)
+ *ip = mac_veriexec_get_state();
+ else
+ error = EINVAL;
+
+ return (error);
+ }
+ break;
+ default:
+ break;
+ }
+
+ /*
+* Anything beyond this point is considered dangerous, so we need to
+* only allow processes that have kmem write privs to do them.
+*
+* MAC/veriexec will grant kmem write privs to "trusted" processes.
+*/
+ error = priv_check(td, PRIV_KMEM_WRITE);
+ if (error)
+ return (error);
+
params = (struct verified_exec_params *)data;
switch (cmd) {
case VERIEXEC_ACTIVE:
@@ -105,16 +137,6 @@ verifiedexecioctl(struct cdev *dev __unused, u_long cm
else
error = EINVAL;
mtx_unlock(&ve_mutex);
- break;
- case VERIEXEC_GETSTATE:
- {
- int *ip = (int *)data;
-
- if (ip)
- *ip = mac_veriexec_get_state();
- else
- error = EINVAL;
- }
break;
case VERIEXEC_LOCK:
mtx_lock(&ve_mutex);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347933 - head/sys/security/mac_veriexec
Author: stevek
Date: Fri May 17 17:50:01 2019
New Revision: 347933
URL: https://svnweb.freebsd.org/changeset/base/347933
Log:
Ensure we have obtained a lock on the process before calling
mac_veriexec_get_executable_flags(). Only try locking/unlocking if the caller
has not already acquired the process lock.
Obtained from:Juniper Networks, Inc.
MFC after:1 week
Modified:
head/sys/security/mac_veriexec/mac_veriexec.c
Modified: head/sys/security/mac_veriexec/mac_veriexec.c
==
--- head/sys/security/mac_veriexec/mac_veriexec.c Fri May 17 17:21:32
2019(r347932)
+++ head/sys/security/mac_veriexec/mac_veriexec.c Fri May 17 17:50:01
2019(r347933)
@@ -823,9 +823,18 @@ mac_veriexec_set_state(int state)
int
mac_veriexec_proc_is_trusted(struct ucred *cred, struct proc *p)
{
- int error, flags;
+ int already_locked, error, flags;
+ /* Make sure we lock the process if we do not already have the lock */
+ already_locked = PROC_LOCKED(p);
+ if (!already_locked)
+ PROC_LOCK(p);
+
error = mac_veriexec_metadata_get_executable_flags(cred, p, &flags, 0);
+
+ /* Unlock the process if we locked it previously */
+ if (!already_locked)
+ PROC_UNLOCK(p);
/* Any errors, deny access */
if (error != 0)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347932 - in head/sys: kern sys x86/include x86/x86
Author: stevek
Date: Fri May 17 17:21:32 2019
New Revision: 347932
URL: https://svnweb.freebsd.org/changeset/base/347932
Log:
Instead of individual conditional statements to look for each hypervisor
type, use a table to make it easier to add more in the future, if needed.
Add VirtualBox detection to the table ("VBoxVBoxVBox" is the hypervisor
vendor string to look for.) Also add VM_GUEST_VBOX to the VM_GUEST
enumeration to indicate VirtualBox.
Save the CPUID base for the hypervisor entry that we detected. Driver code
may need to know about it in order to obtain additional CPUID features.
Approved by: bryanv, jhb
Differential Revision:https://reviews.freebsd.org/D16305
Modified:
head/sys/kern/subr_param.c
head/sys/sys/systm.h
head/sys/x86/include/x86_var.h
head/sys/x86/x86/identcpu.c
Modified: head/sys/kern/subr_param.c
==
--- head/sys/kern/subr_param.c Fri May 17 17:11:01 2019(r347931)
+++ head/sys/kern/subr_param.c Fri May 17 17:21:32 2019(r347932)
@@ -153,6 +153,7 @@ static const char *const vm_guest_sysctl_names[] = {
"vmware",
"kvm",
"bhyve",
+ "vbox",
NULL
};
CTASSERT(nitems(vm_guest_sysctl_names) - 1 == VM_LAST);
Modified: head/sys/sys/systm.h
==
--- head/sys/sys/systm.hFri May 17 17:11:01 2019(r347931)
+++ head/sys/sys/systm.hFri May 17 17:21:32 2019(r347932)
@@ -78,7 +78,8 @@ extern int vm_guest; /* Running as virtual machine gu
* Keep in sync with vm_guest_sysctl_names[].
*/
enum VM_GUEST { VM_GUEST_NO = 0, VM_GUEST_VM, VM_GUEST_XEN, VM_GUEST_HV,
- VM_GUEST_VMWARE, VM_GUEST_KVM, VM_GUEST_BHYVE, VM_LAST };
+ VM_GUEST_VMWARE, VM_GUEST_KVM, VM_GUEST_BHYVE, VM_GUEST_VBOX,
+ VM_LAST };
/*
* These functions need to be declared before the KASSERT macro is invoked in
Modified: head/sys/x86/include/x86_var.h
==
--- head/sys/x86/include/x86_var.h Fri May 17 17:11:01 2019
(r347931)
+++ head/sys/x86/include/x86_var.h Fri May 17 17:21:32 2019
(r347932)
@@ -68,6 +68,7 @@ externu_int cpu_mon_min_size;
extern u_int cpu_mon_max_size;
extern u_int cpu_maxphyaddr;
extern charctx_switch_xsave[];
+extern u_int hv_base;
extern u_int hv_high;
extern charhv_vendor[];
extern charkstack[];
Modified: head/sys/x86/x86/identcpu.c
==
--- head/sys/x86/x86/identcpu.c Fri May 17 17:11:01 2019(r347931)
+++ head/sys/x86/x86/identcpu.c Fri May 17 17:21:32 2019(r347932)
@@ -164,6 +164,7 @@ static int hw_clockrate;
SYSCTL_INT(_hw, OID_AUTO, clockrate, CTLFLAG_RD,
&hw_clockrate, 0, "CPU instruction clock rate");
+u_int hv_base;
u_int hv_high;
char hv_vendor[16];
SYSCTL_STRING(_hw, OID_AUTO, hv_vendor, CTLFLAG_RD | CTLFLAG_MPSAFE, hv_vendor,
@@ -1323,11 +1324,22 @@ static const char *const vm_pnames[] = {
NULL
};
-void
-identify_hypervisor(void)
+static struct {
+ const char *vm_cpuid;
+ int vm_guest;
+} vm_cpuids[] = {
+ { "XENXENXEN", VM_GUEST_XEN }, /* XEN */
+ { "Microsoft Hv", VM_GUEST_HV }, /* Microsoft Hyper-V */
+ { "VMwareVMware", VM_GUEST_VMWARE }, /* VMware VM */
+ { "KVMKVMKVM", VM_GUEST_KVM }, /* KVM */
+ { "bhyve bhyve ", VM_GUEST_BHYVE }, /* bhyve */
+ { "VBoxVBoxVBox", VM_GUEST_VBOX },/* VirtualBox */
+};
+
+static void
+identify_hypervisor_cpuid_base(void)
{
- u_int regs[4];
- char *p;
+ u_int leaf, regs[4];
int i;
/*
@@ -1337,10 +1349,13 @@ identify_hypervisor(void)
* KB1009458: Mechanisms to determine if software is running in
* a VMware virtual machine
* http://kb.vmware.com/kb/1009458
+*
+* Search for a hypervisor that we recognize. If we cannot find
+* a specific hypervisor, return the first information about the
+* hypervisor that we found, as others may be able to use.
*/
- if (cpu_feature2 & CPUID2_HV) {
- vm_guest = VM_GUEST_VM;
- do_cpuid(0x4000, regs);
+ for (leaf = 0x4000; leaf < 0x4001; leaf += 0x100) {
+ do_cpuid(leaf, regs);
/*
* KVM from Linux kernels prior to commit
@@ -1351,23 +1366,52 @@ identify_hypervisor(void)
*/
if (regs[0] == 0 && regs[1] == 0x4b4d564b &&
regs[2] == 0x564b4d56 && regs[3] == 0x004d)
- regs[0] = 0x4001;
+ regs[0] = leaf + 1;
svn commit: r347931 - head/sys/x86/x86
Author: kib Date: Fri May 17 17:11:01 2019 New Revision: 347931 URL: https://svnweb.freebsd.org/changeset/base/347931 Log: Free microcode memory later. With lockless DI, pmap_remove() requires operational thread lock, which is initialized at SI_SUB_RUN_QUEUE for thread0. Move it even later where APs are started, the moment after which other boot memory like trampoline stacks is already being freed. Reported by: gtetlow Sponsored by: The FreeBSD Foundation MFC after:30 days Modified: head/sys/x86/x86/ucode.c Modified: head/sys/x86/x86/ucode.c == --- head/sys/x86/x86/ucode.cFri May 17 17:05:16 2019(r347930) +++ head/sys/x86/x86/ucode.cFri May 17 17:11:01 2019(r347931) @@ -260,7 +260,7 @@ restart: goto restart; } } -SYSINIT(ucode_release, SI_SUB_KMEM + 1, SI_ORDER_ANY, ucode_release, NULL); +SYSINIT(ucode_release, SI_SUB_SMP + 1, SI_ORDER_ANY, ucode_release, NULL); void ucode_load_ap(int cpu) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347930 - head/sys/dev/pci
Author: manu
Date: Fri May 17 17:05:16 2019
New Revision: 347930
URL: https://svnweb.freebsd.org/changeset/base/347930
Log:
pci: ecam: Correctly parse memory and IO region
When activating a resource do not compare the resource id to the adress.
Treat IO region as MEMORY region too.
Submitted by: Tuan Phan (Original Version)
Sponsored by: Ampere Computing, LLC
Differential Revision:https://reviews.freebsd.org/D20214
Modified:
head/sys/dev/pci/pci_host_generic.c
head/sys/dev/pci/pci_host_generic_acpi.c
Modified: head/sys/dev/pci/pci_host_generic.c
==
--- head/sys/dev/pci/pci_host_generic.c Fri May 17 17:04:01 2019
(r347929)
+++ head/sys/dev/pci/pci_host_generic.c Fri May 17 17:05:16 2019
(r347930)
@@ -359,29 +359,30 @@ generic_pcie_activate_resource(device_t dev, device_t
switch (type) {
case SYS_RES_IOPORT:
+ case SYS_RES_MEMORY:
found = 0;
for (i = 0; i < MAX_RANGES_TUPLES; i++) {
pci_base = sc->ranges[i].pci_base;
phys_base = sc->ranges[i].phys_base;
size = sc->ranges[i].size;
- if ((rid > pci_base) && (rid < (pci_base + size))) {
+ if ((rman_get_start(r) >= pci_base) &&
(rman_get_start(r) < (pci_base + size))) {
found = 1;
break;
}
}
if (found) {
- rman_set_start(r, rman_get_start(r) + phys_base);
- rman_set_end(r, rman_get_end(r) + phys_base);
+ rman_set_start(r, rman_get_start(r) - pci_base +
phys_base);
+ rman_set_end(r, rman_get_end(r) - pci_base + phys_base);
res = BUS_ACTIVATE_RESOURCE(device_get_parent(dev),
child, type, rid, r);
} else {
device_printf(dev,
- "Failed to activate IOPORT resource\n");
+ "Failed to activate %s resource\n",
+ type == SYS_RES_IOPORT ? "IOPORT" : "MEMORY");
res = 0;
}
break;
- case SYS_RES_MEMORY:
case SYS_RES_IRQ:
res = BUS_ACTIVATE_RESOURCE(device_get_parent(dev), child,
type, rid, r);
Modified: head/sys/dev/pci/pci_host_generic_acpi.c
==
--- head/sys/dev/pci/pci_host_generic_acpi.cFri May 17 17:04:01 2019
(r347929)
+++ head/sys/dev/pci/pci_host_generic_acpi.cFri May 17 17:05:16 2019
(r347930)
@@ -148,8 +148,6 @@ pci_host_generic_acpi_parse_resource(ACPI_RESOURCE *re
off = res->Data.Address32.Address.TranslationOffset;
break;
case ACPI_RESOURCE_TYPE_ADDRESS64:
- if (res->Data.Address.ResourceType != ACPI_MEMORY_RANGE)
- break;
min = res->Data.Address64.Address.Minimum;
max = res->Data.Address64.Address.Maximum;
off = res->Data.Address64.Address.TranslationOffset;
@@ -293,7 +291,7 @@ pci_host_generic_acpi_attach(device_t dev)
continue; /* empty range element */
if (sc->base.ranges[tuple].flags & FLAG_MEM) {
error = rman_manage_region(&sc->base.mem_rman,
- phys_base, phys_base + size - 1);
+ pci_base, pci_base + size - 1);
} else if (sc->base.ranges[tuple].flags & FLAG_IO) {
error = rman_manage_region(&sc->base.io_rman,
pci_base + PCI_IO_WINDOW_OFFSET,
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347929 - head/sys/dev/pci
Author: manu
Date: Fri May 17 17:04:01 2019
New Revision: 347929
URL: https://svnweb.freebsd.org/changeset/base/347929
Log:
pci: ecam: Do not warn on mismatch of bus_end
We cannot know the bus end number before parsing the MCFG table
so don't set the bus_end before that. If the MCFG table doesn't
exist we will set the configuration base address based on the _CBA
value and set the bus_end to the maximal number allowed by PCI.
Sponsored by: Ampere Computing, LLC
Differential Revision:https://reviews.freebsd.org/D20213
Modified:
head/sys/dev/pci/pci_host_generic_acpi.c
Modified: head/sys/dev/pci/pci_host_generic_acpi.c
==
--- head/sys/dev/pci/pci_host_generic_acpi.cFri May 17 16:41:18 2019
(r347928)
+++ head/sys/dev/pci/pci_host_generic_acpi.cFri May 17 17:04:01 2019
(r347929)
@@ -207,11 +207,7 @@ pci_host_acpi_get_ecam_resource(device_t dev)
mcfg_entry++;
}
if (found) {
- if (mcfg_entry->EndBusNumber < sc->base.bus_end) {
- device_printf(dev, "bus end mismatch! expected
%d found %d.\n",
- sc->base.bus_end,
(int)mcfg_entry->EndBusNumber);
- sc->base.bus_end = mcfg_entry->EndBusNumber;
- }
+ sc->base.bus_end = mcfg_entry->EndBusNumber;
base = mcfg_entry->Address;
} else {
device_printf(dev, "MCFG exists, but does not have bus
%d-%d\n",
@@ -220,9 +216,10 @@ pci_host_acpi_get_ecam_resource(device_t dev)
}
} else {
status = acpi_GetInteger(handle, "_CBA", &val);
- if (ACPI_SUCCESS(status))
+ if (ACPI_SUCCESS(status)) {
base = val;
- else
+ sc->base.bus_end = 255;
+ } else
return (ENXIO);
}
@@ -259,7 +256,6 @@ pci_host_generic_acpi_attach(device_t dev)
device_printf(dev, "No _BBN, using start bus 0\n");
sc->base.bus_start = 0;
}
- sc->base.bus_end = 255;
/* Get PCI Segment (domain) needed for MCFG lookup */
status = acpi_GetInteger(handle, "_SEG", &sc->base.ecam);
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347928 - stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: mav
Date: Fri May 17 16:41:18 2019
New Revision: 347928
URL: https://svnweb.freebsd.org/changeset/base/347928
Log:
MFC r346390: Change the way FreeBSD GID inheritance is hacked.
I believe previous ifdef caused NULL dereference in later zfs_log_create()
on attempt to create file inside directory belonging to ephemeral group
created on illumos, trying to write to log information about GID domain
of the newly created file, inheriting the ephemeral GID.
This patch reuses original illumos SGID code with exception that due to
lack of ID mapping code on FreeBSD ephemeral GID will turn into GID_NOBODY
by another ifdef inside zfs_fuid_map_id().
Sponsored by: iXsystems, Inc.
Modified:
stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
==
--- stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c Fri May
17 15:52:17 2019(r347927)
+++ stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c Fri May
17 16:41:18 2019(r347928)
@@ -1655,7 +1655,9 @@ zfs_acl_ids_create(znode_t *dzp, int flag, vattr_t *va
acl_ids->z_fgid = 0;
}
if (acl_ids->z_fgid == 0) {
+#ifndef __FreeBSD_kernel__
if (dzp->z_mode & S_ISGID) {
+#endif
char*domain;
uint32_trid;
@@ -1674,15 +1676,13 @@ zfs_acl_ids_create(znode_t *dzp, int flag, vattr_t *va
FUID_INDEX(acl_ids->z_fgid),
acl_ids->z_fgid, ZFS_GROUP);
}
+#ifndef __FreeBSD_kernel__
} else {
acl_ids->z_fgid = zfs_fuid_create_cred(zfsvfs,
ZFS_GROUP, cr, &acl_ids->z_fuidp);
-#ifdef __FreeBSD_kernel__
- gid = acl_ids->z_fgid = dzp->z_gid;
-#else
gid = crgetgid(cr);
-#endif
}
+#endif
}
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347927 - in head/sys: arm64/include conf
Author: dougm
Date: Fri May 17 15:52:17 2019
New Revision: 347927
URL: https://svnweb.freebsd.org/changeset/base/347927
Log:
Implement the ffs and fls functions, and their longer counterparts, in
cpufunc, in terms of __builtin_ffs and the like, for arm64
architectures, and use those, rather than the simple libkern
implementations, in building arm64 kernels.
Tested by: greg_unrelenting.technology (earlier version)
Reviewed by: alc
Approved by: kib (mentor)
Differential Revision: https://reviews.freebsd.org/D20250
Modified:
head/sys/arm64/include/cpufunc.h
head/sys/conf/files.arm64
Modified: head/sys/arm64/include/cpufunc.h
==
--- head/sys/arm64/include/cpufunc.hFri May 17 15:44:11 2019
(r347926)
+++ head/sys/arm64/include/cpufunc.hFri May 17 15:52:17 2019
(r347927)
@@ -38,6 +38,63 @@ breakpoint(void)
#ifdef _KERNEL
+#defineHAVE_INLINE_FFS
+
+static __inline __pure2 int
+ffs(int mask)
+{
+
+ return (__builtin_ffs(mask));
+}
+
+#defineHAVE_INLINE_FFSL
+
+static __inline __pure2 int
+ffsl(long mask)
+{
+
+ return (__builtin_ffsl(mask));
+}
+
+#defineHAVE_INLINE_FFSLL
+
+static __inline __pure2 int
+ffsll(long long mask)
+{
+
+ return (__builtin_ffsll(mask));
+}
+
+#defineHAVE_INLINE_FLS
+
+static __inline __pure2 int
+fls(int mask)
+{
+
+ return (mask == 0 ? 0 :
+ 8 * sizeof(mask) - __builtin_clz((u_int)mask));
+}
+
+#defineHAVE_INLINE_FLSL
+
+static __inline __pure2 int
+flsl(long mask)
+{
+
+ return (mask == 0 ? 0 :
+ 8 * sizeof(mask) - __builtin_clzl((u_long)mask));
+}
+
+#defineHAVE_INLINE_FLSLL
+
+static __inline __pure2 int
+flsll(long long mask)
+{
+
+ return (mask == 0 ? 0 :
+ 8 * sizeof(mask) - __builtin_clzll((unsigned long long)mask));
+}
+
#include
void pan_enable(void);
Modified: head/sys/conf/files.arm64
==
--- head/sys/conf/files.arm64 Fri May 17 15:44:11 2019(r347926)
+++ head/sys/conf/files.arm64 Fri May 17 15:52:17 2019(r347927)
@@ -258,12 +258,6 @@ kern/pic_if.m optionalintrng
kern/subr_devmap.c standard
kern/subr_intr.c optionalintrng
libkern/bcmp.c standard
-libkern/ffs.c standard
-libkern/ffsl.c standard
-libkern/ffsll.cstandard
-libkern/fls.c standard
-libkern/flsl.c standard
-libkern/flsll.cstandard
libkern/memcmp.c standard
libkern/memset.c standard
libkern/arm64/crc32c_armv8.S standard
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347926 - head
Author: brooks Date: Fri May 17 15:44:11 2019 New Revision: 347926 URL: https://svnweb.freebsd.org/changeset/base/347926 Log: FCP-101: correct date of device driver removal. Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Fri May 17 15:31:28 2019(r347925) +++ head/ObsoleteFiles.inc Fri May 17 15:44:11 2019(r347926) @@ -38,7 +38,7 @@ # xargs -n1 | sort | uniq -d; # done -# 20190518: Remove obsolete 10 and 10/100 ethernet drivers. +# 20190517: Remove obsolete 10 and 10/100 ethernet drivers. OLD_FILES+=usr/share/man/man4/bm.4 OLD_FILES+=usr/share/man/man4/cs.4 OLD_FILES+=usr/share/man/man4/de.4 ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347925 - head/sys/sys
Author: brooks Date: Fri May 17 15:31:28 2019 New Revision: 347925 URL: https://svnweb.freebsd.org/changeset/base/347925 Log: FCP-101: Bump __FreeBSD_version for device removal. Bump accidentally omitted from r347924 due to a rebase accident. Differential Revision: https://reviews.freebsd.org/D20230 Modified: head/sys/sys/param.h Modified: head/sys/sys/param.h == --- head/sys/sys/param.hFri May 17 15:24:54 2019(r347924) +++ head/sys/sys/param.hFri May 17 15:31:28 2019(r347925) @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1300027 /* Master, propagated to newvers */ +#define __FreeBSD_version 1300028 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347924 - in head/sys: i386/conf sys
Author: brooks Date: Fri May 17 15:24:54 2019 New Revision: 347924 URL: https://svnweb.freebsd.org/changeset/base/347924 Log: FCP-101: Bump __FreeBSD_version for driver removal. Remove gone_by_fcp101_dev macro. Remove orphaned comment. Modified: head/sys/i386/conf/GENERIC head/sys/sys/systm.h Modified: head/sys/i386/conf/GENERIC == --- head/sys/i386/conf/GENERIC Fri May 17 15:24:44 2019(r347923) +++ head/sys/i386/conf/GENERIC Fri May 17 15:24:54 2019(r347924) @@ -263,8 +263,6 @@ device vr # VIA Rhine, Rhine II device vte # DM&P Vortex86 RDC R6040 Fast Ethernet device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') -# ISA Ethernet NICs. pccard NICs included. - # Wireless NIC cards device wlan# 802.11 support optionsIEEE80211_DEBUG # enable debug msgs Modified: head/sys/sys/systm.h == --- head/sys/sys/systm.hFri May 17 15:24:44 2019(r347923) +++ head/sys/sys/systm.hFri May 17 15:24:54 2019(r347924) @@ -575,9 +575,6 @@ void _gone_in_dev(struct device *dev, int major, const #endif #define gone_in(major, msg)__gone_ok(major, msg) _gone_in(major, msg) #define gone_in_dev(dev, major, msg) __gone_ok(major, msg) _gone_in_dev(dev, major, msg) -#definegone_by_fcp101_dev(dev) \ - gone_in_dev((dev), 13, \ - "see https://github.com/freebsd/fcp/blob/master/fcp-0101.md";) __NULLABILITY_PRAGMA_POP ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347923 - in head: . share/man/man4 sys/conf sys/dev/xe sys/i386/conf sys/modules sys/modules/xe
Author: brooks
Date: Fri May 17 15:24:44 2019
New Revision: 347923
URL: https://svnweb.freebsd.org/changeset/base/347923
Log:
FCP-101: Remove xe(4)
Relnotes: yes
FCP: https://github.com/freebsd/fcp/blob/master/fcp-0101.md
Reviewed by: jhb, imp
Differential Revision:https://reviews.freebsd.org/D20230
Deleted:
head/share/man/man4/xe.4
head/sys/dev/xe/
head/sys/modules/xe/
Modified:
head/ObsoleteFiles.inc
head/share/man/man4/Makefile
head/sys/conf/NOTES
head/sys/conf/files
head/sys/i386/conf/GENERIC
head/sys/modules/Makefile
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Fri May 17 15:24:34 2019(r347922)
+++ head/ObsoleteFiles.inc Fri May 17 15:24:44 2019(r347923)
@@ -62,6 +62,8 @@ OLD_FILES+=usr/share/man/man4/txp.4
OLD_FILES+=usr/share/man/man4/if_txp.4
OLD_FILES+=usr/share/man/man4/vx.4
OLD_FILES+=usr/share/man/man4/wb.4
+OLD_FILES+=usr/share/man/man4/xe.4
+OLD_FILES+=usr/share/man/man4/if_xe.4
# 20190513: libcap_sysctl interface change
OLD_FILES+=lib/casper/libcap_sysctl.1
# 20190509: tests/sys/opencrypto requires the net/py-dpkt package.
Modified: head/share/man/man4/Makefile
==
--- head/share/man/man4/MakefileFri May 17 15:24:34 2019
(r347922)
+++ head/share/man/man4/MakefileFri May 17 15:24:44 2019
(r347923)
@@ -563,7 +563,6 @@ MAN=aac.4 \
wmt.4 \
${_wpi.4} \
wsp.4 \
- xe.4 \
${_xen.4} \
xhci.4 \
xl.4 \
@@ -726,7 +725,6 @@ MLINKS+=${_vtnet.4} ${_if_vtnet.4}
MLINKS+=watchdog.4 SW_WATCHDOG.4
MLINKS+=wi.4 if_wi.4
MLINKS+=${_wpi.4} ${_if_wpi.4}
-MLINKS+=xe.4 if_xe.4
MLINKS+=xl.4 if_xl.4
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
Modified: head/sys/conf/NOTES
==
--- head/sys/conf/NOTES Fri May 17 15:24:34 2019(r347922)
+++ head/sys/conf/NOTES Fri May 17 15:24:44 2019(r347923)
@@ -2003,9 +2003,6 @@ devicexmphy # XaQti XMAC II
# wi: Lucent WaveLAN/IEEE 802.11 PCMCIA adapters. Note: this supports both
# the PCMCIA and ISA cards: the ISA card is really a PCMCIA to ISA
# bridge with a PCMCIA adapter plugged into it.
-# xe: Xircom/Intel EtherExpress Pro100/16 PC Card ethernet controller,
-# Accton Fast EtherCard-16, Compaq Netelligent 10/100 PC Card,
-# Toshiba 10/100 Ethernet PC Card, Xircom 16-bit Ethernet + Modem 56
# xl: Support for the 3Com 3c900, 3c905, 3c905B and 3c905C (Fast)
# Etherlink XL cards and integrated controllers. This includes the
# integrated 3c905B-TX chips in certain Dell Optiplex and Dell
@@ -2017,7 +2014,6 @@ devicexmphy # XaQti XMAC II
device an
device wi
-device xe
# PCI Ethernet NICs that use the common MII bus controller code.
device ae # Attansic/Atheros L2 FastEthernet
Modified: head/sys/conf/files
==
--- head/sys/conf/files Fri May 17 15:24:34 2019(r347922)
+++ head/sys/conf/files Fri May 17 15:24:44 2019(r347923)
@@ -3432,8 +3432,6 @@ dev/xdma/xdma_mbuf.c optional xdma
dev/xdma/xdma_queue.c optional xdma
dev/xdma/xdma_sg.c optional xdma
dev/xdma/xdma_sglist.c optional xdma
-dev/xe/if_xe.c optional xe
-dev/xe/if_xe_pccard.c optional xe pccard
dev/xen/balloon/balloon.c optional xenhvm
dev/xen/blkfront/blkfront.coptional xenhvm
dev/xen/blkback/blkback.c optional xenhvm
Modified: head/sys/i386/conf/GENERIC
==
--- head/sys/i386/conf/GENERIC Fri May 17 15:24:34 2019(r347922)
+++ head/sys/i386/conf/GENERIC Fri May 17 15:24:44 2019(r347923)
@@ -264,7 +264,6 @@ device vte # DM&P Vortex86
RDC R6040 Fast Ethernet
device xl # 3Com 3c90x (``Boomerang'',
``Cyclone'')
# ISA Ethernet NICs. pccard NICs included.
-device xe # Xircom pccard Ethernet
# Wireless NIC cards
device wlan# 802.11 support
Modified: head/sys/modules/Makefile
==
--- head/sys/modules/Makefile Fri May 17 15:24:34 2019(r347922)
+++ head/sys/modules/Makefile Fri May 17 15:24:44 2019(r347923)
@@ -387,7 +387,6 @@ SUBDIR= \
${_wpi} \
${_wpifw} \
${_x86bios} \
- ${_xe} \
xl \
xz \
zlib
@@ -610,7 +609,6 @@ _sppp= sppp
_vmware= vmware
_wbwd= wbwd
_wi
svn commit: r347917 - in head: . share/man/man4 sys/conf sys/dev/sn sys/i386/conf sys/modules sys/modules/sn
Author: brooks
Date: Fri May 17 15:23:52 2019
New Revision: 347917
URL: https://svnweb.freebsd.org/changeset/base/347917
Log:
FCP-101: Remove sn(4).
Relnotes: yes
FCP: https://github.com/freebsd/fcp/blob/master/fcp-0101.md
Reviewed by: jhb, imp
Differential Revision:https://reviews.freebsd.org/D20230
Deleted:
head/share/man/man4/sn.4
head/sys/dev/sn/
head/sys/modules/sn/
Modified:
head/ObsoleteFiles.inc
head/share/man/man4/Makefile
head/sys/conf/NOTES
head/sys/conf/files
head/sys/i386/conf/GENERIC
head/sys/modules/Makefile
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Fri May 17 15:23:43 2019(r347916)
+++ head/ObsoleteFiles.inc Fri May 17 15:23:52 2019(r347917)
@@ -52,6 +52,8 @@ OLD_FILES+=usr/share/man/man4/pcn.4
OLD_FILES+=usr/share/man/man4/if_pcn.4
OLD_FILES+=usr/share/man/man4/sf.4
OLD_FILES+=usr/share/man/man4/if_sf.4
+OLD_FILES+=usr/share/man/man4/sn.4
+OLD_FILES+=usr/share/man/man4/if_sn.4
# 20190513: libcap_sysctl interface change
OLD_FILES+=lib/casper/libcap_sysctl.1
# 20190509: tests/sys/opencrypto requires the net/py-dpkt package.
Modified: head/share/man/man4/Makefile
==
--- head/share/man/man4/MakefileFri May 17 15:23:43 2019
(r347916)
+++ head/share/man/man4/MakefileFri May 17 15:23:52 2019
(r347917)
@@ -465,7 +465,6 @@ MAN=aac.4 \
smbus.4 \
smp.4 \
smsc.4 \
- sn.4 \
snd_ad1816.4 \
snd_als4000.4 \
snd_atiixp.4 \
@@ -705,7 +704,6 @@ MLINKS+=sis.4 if_sis.4
MLINKS+=sk.4 if_sk.4
MLINKS+=smp.4 SMP.4
MLINKS+=smsc.4 if_smsc.4
-MLINKS+=sn.4 if_sn.4
MLINKS+=snd_envy24.4 snd_ak452x.4
MLINKS+=snd_sbc.4 snd_sb16.4 \
snd_sbc.4 snd_sb8.4
Modified: head/sys/conf/NOTES
==
--- head/sys/conf/NOTES Fri May 17 15:23:43 2019(r347916)
+++ head/sys/conf/NOTES Fri May 17 15:23:52 2019(r347917)
@@ -1986,8 +1986,6 @@ devicexmphy # XaQti XMAC II
# (also single mode and multimode).
# The driver will autodetect the number of ports on the card and
# attach each one as a separate network interface.
-# sn: Support for ISA and PC Card Ethernet devices using the
-# SMC91C90/92/94/95 chips.
# ste: Sundance Technologies ST201 PCI fast ethernet controller, includes
# the D-Link DFE-550TX.
# stge: Support for gigabit ethernet adapters based on the Sundance/Tamarack
@@ -2028,10 +2026,6 @@ device xmphy # XaQti XMAC II
# Order for ISA devices is important here
-device sn
-hint.sn.0.at="isa"
-hint.sn.0.port="0x300"
-hint.sn.0.irq="10"
device an
device wi
device xe
Modified: head/sys/conf/files
==
--- head/sys/conf/files Fri May 17 15:23:43 2019(r347916)
+++ head/sys/conf/files Fri May 17 15:23:52 2019(r347917)
@@ -3019,9 +3019,6 @@ dev/smbus/smbus.c optional smbus
dev/smbus/smbus_if.m optional smbus
dev/smc/if_smc.c optional smc
dev/smc/if_smc_fdt.c optional smc fdt
-dev/sn/if_sn.c optional sn
-dev/sn/if_sn_isa.c optional sn isa
-dev/sn/if_sn_pccard.c optional sn pccard
dev/snp/snp.c optional snp
dev/sound/clone.c optional sound
dev/sound/unit.c optional sound
Modified: head/sys/i386/conf/GENERIC
==
--- head/sys/i386/conf/GENERIC Fri May 17 15:23:43 2019(r347916)
+++ head/sys/i386/conf/GENERIC Fri May 17 15:23:52 2019(r347917)
@@ -269,7 +269,6 @@ device wb # Winbond
W89C840F
device xl # 3Com 3c90x (``Boomerang'',
``Cyclone'')
# ISA Ethernet NICs. pccard NICs included.
-device sn # SMC's 9000 series of Ethernet chips
device xe # Xircom pccard Ethernet
# Wireless NIC cards
Modified: head/sys/modules/Makefile
==
--- head/sys/modules/Makefile Fri May 17 15:23:43 2019(r347916)
+++ head/sys/modules/Makefile Fri May 17 15:23:52 2019(r347917)
@@ -335,7 +335,6 @@ SUBDIR= \
sk \
${_smartpqi} \
smbfs \
- sn \
snp \
sound \
${_speaker} \
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347922 - in head: . share/man/man4 sys/amd64/conf sys/conf sys/dev/wb sys/i386/conf sys/modules sys/modules/wb sys/sparc64/conf
Author: brooks
Date: Fri May 17 15:24:34 2019
New Revision: 347922
URL: https://svnweb.freebsd.org/changeset/base/347922
Log:
FCP-101: Remove wb(4)
Relnotes: yes
FCP: https://github.com/freebsd/fcp/blob/master/fcp-0101.md
Reviewed by: jhb, imp
Differential Revision:https://reviews.freebsd.org/D20230
Deleted:
head/share/man/man4/wb.4
head/sys/dev/wb/
head/sys/modules/wb/
Modified:
head/ObsoleteFiles.inc
head/share/man/man4/Makefile
head/sys/amd64/conf/GENERIC
head/sys/conf/NOTES
head/sys/conf/files
head/sys/i386/conf/GENERIC
head/sys/modules/Makefile
head/sys/sparc64/conf/GENERIC
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Fri May 17 15:24:26 2019(r347921)
+++ head/ObsoleteFiles.inc Fri May 17 15:24:34 2019(r347922)
@@ -61,6 +61,7 @@ OLD_FILES+=usr/share/man/man4/if_tx.4
OLD_FILES+=usr/share/man/man4/txp.4
OLD_FILES+=usr/share/man/man4/if_txp.4
OLD_FILES+=usr/share/man/man4/vx.4
+OLD_FILES+=usr/share/man/man4/wb.4
# 20190513: libcap_sysctl interface change
OLD_FILES+=lib/casper/libcap_sysctl.1
# 20190509: tests/sys/opencrypto requires the net/py-dpkt package.
Modified: head/share/man/man4/Makefile
==
--- head/share/man/man4/MakefileFri May 17 15:24:26 2019
(r347921)
+++ head/share/man/man4/MakefileFri May 17 15:24:34 2019
(r347922)
@@ -550,7 +550,6 @@ MAN=aac.4 \
vte.4 \
${_vtnet.4} \
watchdog.4 \
- wb.4 \
${_wbwd.4} \
wi.4 \
witness.4 \
@@ -725,7 +724,6 @@ MLINKS+=vr.4 if_vr.4
MLINKS+=vte.4 if_vte.4
MLINKS+=${_vtnet.4} ${_if_vtnet.4}
MLINKS+=watchdog.4 SW_WATCHDOG.4
-MLINKS+=wb.4 if_wb.4
MLINKS+=wi.4 if_wi.4
MLINKS+=${_wpi.4} ${_if_wpi.4}
MLINKS+=xe.4 if_xe.4
Modified: head/sys/amd64/conf/GENERIC
==
--- head/sys/amd64/conf/GENERIC Fri May 17 15:24:26 2019(r347921)
+++ head/sys/amd64/conf/GENERIC Fri May 17 15:24:34 2019(r347922)
@@ -278,7 +278,6 @@ device ste # Sundance
ST201 (D-Link DFE-550TX)
device stge# Sundance/Tamarack TC9021 gigabit
Ethernet
device vge # VIA VT612x gigabit Ethernet
device vr # VIA Rhine, Rhine II
-device wb # Winbond W89C840F
device xl # 3Com 3c90x (``Boomerang'',
``Cyclone'')
# Wireless NIC cards
Modified: head/sys/conf/NOTES
==
--- head/sys/conf/NOTES Fri May 17 15:24:26 2019(r347921)
+++ head/sys/conf/NOTES Fri May 17 15:24:34 2019(r347922)
@@ -2000,9 +2000,6 @@ devicexmphy # XaQti XMAC II
# including the D-Link DFE520TX and D-Link DFE530TX (see 'rl' for
# DFE530TX+), the Hawking Technologies PN102TX, and the AOpen/Acer
ALN-320.
# vte: DM&P Vortex86 RDC R6040 Fast Ethernet
-# wb: Support for fast ethernet adapters based on the Winbond W89C840F chip.
-# Note: this is not the same as the Winbond W89C940F, which is a
-# NE2000 clone.
# wi: Lucent WaveLAN/IEEE 802.11 PCMCIA adapters. Note: this supports both
# the PCMCIA and ISA cards: the ISA card is really a PCMCIA to ISA
# bridge with a PCMCIA adapter plugged into it.
@@ -2054,7 +2051,6 @@ deviceste # Sundance ST201
(D-Link DFE-550TX)
device stge# Sundance/Tamarack TC9021 gigabit Ethernet
device vr # VIA Rhine, Rhine II
device vte # DM&P Vortex86 RDC R6040 Fast Ethernet
-device wb # Winbond W89C840F
device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'')
# PCI/PCI-X/PCIe Ethernet NICs that use iflib infrastructure
Modified: head/sys/conf/files
==
--- head/sys/conf/files Fri May 17 15:24:26 2019(r347921)
+++ head/sys/conf/files Fri May 17 15:24:34 2019(r347922)
@@ -3404,7 +3404,6 @@ dev/vte/if_vte.c optional vte pci
dev/vx/if_vx.c optional vx
dev/vx/if_vx_pci.c optional vx pci
dev/watchdog/watchdog.cstandard
-dev/wb/if_wb.c optional wb pci
dev/wi/if_wi.c optional wi
dev/wi/if_wi_pccard.c optional wi pccard
dev/wi/if_wi_pci.c optional wi pci
Modified: head/sys/i386/conf/GENERIC
==
--- head/sys/i386/conf/GENERIC Fri May 17 15:24:26 2019(r347921)
+++ head/sys/i386/conf/GENERIC Fri May 17 15:24:34 2019(r347922)
@@ -261,7 +
svn commit: r347921 - in head: . share/man/man4/man4.i386 sys/amd64/conf sys/conf sys/dev/vx sys/i386/conf sys/modules sys/modules/vx sys/sparc64/conf
Author: brooks
Date: Fri May 17 15:24:26 2019
New Revision: 347921
URL: https://svnweb.freebsd.org/changeset/base/347921
Log:
FCP-101: Remove vx(4).
Relnotes: yes
FCP: https://github.com/freebsd/fcp/blob/master/fcp-0101.md
Reviewed by: jhb, imp
Differential Revision:https://reviews.freebsd.org/D20230
Deleted:
head/share/man/man4/man4.i386/vx.4
head/sys/dev/vx/
head/sys/modules/vx/
Modified:
head/ObsoleteFiles.inc
head/share/man/man4/man4.i386/Makefile
head/sys/amd64/conf/GENERIC
head/sys/conf/NOTES
head/sys/i386/conf/GENERIC
head/sys/modules/Makefile
head/sys/sparc64/conf/GENERIC
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Fri May 17 15:24:17 2019(r347920)
+++ head/ObsoleteFiles.inc Fri May 17 15:24:26 2019(r347921)
@@ -60,6 +60,7 @@ OLD_FILES+=usr/share/man/man4/tx.4
OLD_FILES+=usr/share/man/man4/if_tx.4
OLD_FILES+=usr/share/man/man4/txp.4
OLD_FILES+=usr/share/man/man4/if_txp.4
+OLD_FILES+=usr/share/man/man4/vx.4
# 20190513: libcap_sysctl interface change
OLD_FILES+=lib/casper/libcap_sysctl.1
# 20190509: tests/sys/opencrypto requires the net/py-dpkt package.
Modified: head/share/man/man4/man4.i386/Makefile
==
--- head/share/man/man4/man4.i386/Makefile Fri May 17 15:24:17 2019
(r347920)
+++ head/share/man/man4/man4.i386/Makefile Fri May 17 15:24:26 2019
(r347921)
@@ -19,8 +19,7 @@ MAN= apm.4 \
pnpbios.4 \
sbni.4 \
smapi.4 \
- vpd.4 \
- vx.4
+ vpd.4
MLINKS=CPU_ELAN.4 CPU_SOEKRIS.4
MLINKS+=pae.4 PAE.4
Modified: head/sys/amd64/conf/GENERIC
==
--- head/sys/amd64/conf/GENERIC Fri May 17 15:24:17 2019(r347920)
+++ head/sys/amd64/conf/GENERIC Fri May 17 15:24:26 2019(r347921)
@@ -247,7 +247,6 @@ device vmx # VMware
VMXNET3 Ethernet
device bxe # Broadcom NetXtreme II
BCM5771X/BCM578XX 10GbE
device le # AMD Am7900 LANCE and Am79C9xx PCnet
device ti # Alteon Networks Tigon I/II gigabit
Ethernet
-device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Ethernet NICs that use the common MII bus controller code.
# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
Modified: head/sys/conf/NOTES
==
--- head/sys/conf/NOTES Fri May 17 15:24:17 2019(r347920)
+++ head/sys/conf/NOTES Fri May 17 15:24:26 2019(r347921)
@@ -2000,7 +2000,6 @@ devicexmphy # XaQti XMAC II
# including the D-Link DFE520TX and D-Link DFE530TX (see 'rl' for
# DFE530TX+), the Hawking Technologies PN102TX, and the AOpen/Acer
ALN-320.
# vte: DM&P Vortex86 RDC R6040 Fast Ethernet
-# vx: 3Com 3C590 and 3C595
# wb: Support for fast ethernet adapters based on the Winbond W89C840F chip.
# Note: this is not the same as the Winbond W89C940F, which is a
# NE2000 clone.
@@ -2073,7 +2072,6 @@ devicele # AMD Am7900 LANCE and
Am79C9xx PCnet
device mxge# Myricom Myri-10G 10GbE NIC
device oce # Emulex 10 GbE (OneConnect Ethernet)
device ti # Alteon Networks Tigon I/II gigabit Ethernet
-device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI IEEE 802.11 Wireless NICs
device ath # Atheros pci/cardbus NIC's
Modified: head/sys/i386/conf/GENERIC
==
--- head/sys/i386/conf/GENERIC Fri May 17 15:24:17 2019(r347920)
+++ head/sys/i386/conf/GENERIC Fri May 17 15:24:26 2019(r347921)
@@ -229,7 +229,6 @@ device vmx # VMware
VMXNET3 Ethernet
device bxe # Broadcom NetXtreme II
BCM5771X/BCM578XX 10GbE
device le # AMD Am7900 LANCE and Am79C9xx PCnet
device ti # Alteon Networks Tigon I/II gigabit
Ethernet
-device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Ethernet NICs that use the common MII bus controller code.
# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
Modified: head/sys/modules/Makefile
==
--- head/sys/modules/Makefile Fri May 17 15:24:17 2019(r347920)
+++ head/sys/modules/Makefile Fri May 17 15:24:26 2019(r347921)
@@ -374,7 +374,6 @@ SUBDIR= \
${_vpo} \
vr \
vte \
- vx \
wb \
${_wbwd} \
svn commit: r347915 - in head: . share/man/man4 sys/amd64/conf sys/conf sys/dev/pcn sys/i386/conf sys/modules sys/modules/pcn sys/sparc64/conf
Author: brooks
Date: Fri May 17 15:23:34 2019
New Revision: 347915
URL: https://svnweb.freebsd.org/changeset/base/347915
Log:
FCP-101: Remove pcn(4).
Relnotes: yes
FCP: https://github.com/freebsd/fcp/blob/master/fcp-0101.md
Reviewed by: jhb, imp
Differential Revision:https://reviews.freebsd.org/D20230
Deleted:
head/share/man/man4/pcn.4
head/sys/dev/pcn/
head/sys/modules/pcn/
Modified:
head/ObsoleteFiles.inc
head/share/man/man4/Makefile
head/sys/amd64/conf/GENERIC
head/sys/conf/NOTES
head/sys/conf/files
head/sys/i386/conf/GENERIC
head/sys/modules/Makefile
head/sys/sparc64/conf/GENERIC
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Fri May 17 15:23:26 2019(r347914)
+++ head/ObsoleteFiles.inc Fri May 17 15:23:34 2019(r347915)
@@ -48,6 +48,8 @@ OLD_FILES+=usr/share/man/man4/if_ed.4
OLD_FILES+=usr/share/man/man4/ep.4
OLD_FILES+=usr/share/man/man4/ex.4
OLD_FILES+=usr/share/man/man4/fe.4
+OLD_FILES+=usr/share/man/man4/pcn.4
+OLD_FILES+=usr/share/man/man4/if_pcn.4
# 20190513: libcap_sysctl interface change
OLD_FILES+=lib/casper/libcap_sysctl.1
# 20190509: tests/sys/opencrypto requires the net/py-dpkt package.
Modified: head/share/man/man4/Makefile
==
--- head/share/man/man4/MakefileFri May 17 15:23:26 2019
(r347914)
+++ head/share/man/man4/MakefileFri May 17 15:23:34 2019
(r347915)
@@ -401,7 +401,6 @@ MAN=aac.4 \
pcib.4 \
pcic.4 \
pcm.4 \
- pcn.4 \
${_pf.4} \
${_pflog.4} \
${_pfsync.4} \
@@ -692,7 +691,6 @@ MLINKS+=ow.4 onewire.4
MLINKS+=pccbb.4 cbb.4
MLINKS+=pcm.4 snd.4 \
pcm.4 sound.4
-MLINKS+=pcn.4 if_pcn.4
MLINKS+=pms.4 pmspcv.4
MLINKS+=ral.4 if_ral.4
MLINKS+=re.4 if_re.4
Modified: head/sys/amd64/conf/GENERIC
==
--- head/sys/amd64/conf/GENERIC Fri May 17 15:23:26 2019(r347914)
+++ head/sys/amd64/conf/GENERIC Fri May 17 15:23:34 2019(r347915)
@@ -271,7 +271,6 @@ device lge # Level 1
LXT1001 gigabit Ethernet
device msk # Marvell/SysKonnect Yukon II Gigabit
Ethernet
device nfe # nVidia nForce MCP on-board Ethernet
device nge # NatSemi DP83820 gigabit Ethernet
-device pcn # AMD Am79C97x PCI 10/100 (precedence
over 'le')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
device sf # Adaptec AIC-6915 (``Starfire'')
Modified: head/sys/conf/NOTES
==
--- head/sys/conf/NOTES Fri May 17 15:23:26 2019(r347914)
+++ head/sys/conf/NOTES Fri May 17 15:23:34 2019(r347915)
@@ -1965,12 +1965,6 @@ device xmphy # XaQti XMAC II
# GigaNIX 1000TA and 1000TPC, the Addtron AEG320T, the Surecom
# EP-320G-TX and the Netgear GA622T.
# oce: Emulex 10 Gbit adapters (OneConnect Ethernet)
-# pcn: Support for PCI fast ethernet adapters based on the AMD Am79c97x
-# PCnet-FAST, PCnet-FAST+, PCnet-FAST III, PCnet-PRO and PCnet-Home
-# chipsets. These can also be handled by the le(4) driver if the
-# pcn(4) driver is left out of the kernel. The le(4) driver does not
-# support the additional features like the MII bus and burst mode of
-# the PCnet-FAST and greater chipsets though.
# ral: Ralink Technology IEEE 802.11 wireless adapter
# re: RealTek 8139C+/8169/816xS/811xS/8101E PCI/PCIe Ethernet adapter
# rl: Support for PCI fast ethernet adapters based on the RealTek 8129/8139
@@ -2072,7 +2066,6 @@ devicemy # Myson Fast Ethernet
(MTD80X, MTD89X)
device nge # NatSemi DP83820 gigabit Ethernet
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
-device pcn # AMD Am79C97x PCI 10/100 NICs
device sf # Adaptec AIC-6915 (``Starfire'')
device sge # Silicon Integrated Systems SiS190/191
device sis # Silicon Integrated Systems SiS 900/SiS 7016
Modified: head/sys/conf/files
==
--- head/sys/conf/files Fri May 17 15:23:26 2019(r347914)
+++ head/sys/conf/files Fri May 17 15:23:34 2019(r347915)
@@ -2563,7 +2563,6 @@ dev/pci/pci_user.coptional pci
dev/pci/pcib_if.m standard
dev/pci/pcib_support.c standard
dev/pci/vga_pci.c optional pci
-dev/pcn/if_pcn.c
svn commit: r347920 - in head: . share/man/man4 sys/amd64/conf sys/conf sys/dev/txp sys/i386/conf sys/modules sys/modules/txp sys/sparc64/conf
Author: brooks Date: Fri May 17 15:24:17 2019 New Revision: 347920 URL: https://svnweb.freebsd.org/changeset/base/347920 Log: FCP-101: Remove txp(4). Relnotes: yes FCP: https://github.com/freebsd/fcp/blob/master/fcp-0101.md Reviewed by: jhb, imp Differential Revision:https://reviews.freebsd.org/D20230 Deleted: head/share/man/man4/txp.4 head/sys/dev/txp/ head/sys/modules/txp/ Modified: head/ObsoleteFiles.inc head/share/man/man4/Makefile head/sys/amd64/conf/GENERIC head/sys/conf/NOTES head/sys/conf/files head/sys/i386/conf/GENERIC head/sys/modules/Makefile head/sys/sparc64/conf/GENERIC Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Fri May 17 15:24:08 2019(r347919) +++ head/ObsoleteFiles.inc Fri May 17 15:24:17 2019(r347920) @@ -58,6 +58,8 @@ OLD_FILES+=usr/share/man/man4/tl.4 OLD_FILES+=usr/share/man/man4/if_tl.4 OLD_FILES+=usr/share/man/man4/tx.4 OLD_FILES+=usr/share/man/man4/if_tx.4 +OLD_FILES+=usr/share/man/man4/txp.4 +OLD_FILES+=usr/share/man/man4/if_txp.4 # 20190513: libcap_sysctl interface change OLD_FILES+=lib/casper/libcap_sysctl.1 # 20190509: tests/sys/opencrypto requires the net/py-dpkt package. Modified: head/share/man/man4/Makefile == --- head/share/man/man4/MakefileFri May 17 15:24:08 2019 (r347919) +++ head/share/man/man4/MakefileFri May 17 15:24:17 2019 (r347920) @@ -524,7 +524,6 @@ MAN=aac.4 \ twa.4 \ twe.4 \ tws.4 \ - txp.4 \ udp.4 \ udplite.4 \ ure.4 \ @@ -716,7 +715,6 @@ MLINKS+=tap.4 if_tap.4 MLINKS+=tdfx.4 tdfx_linux.4 MLINKS+=ti.4 if_ti.4 MLINKS+=tun.4 if_tun.4 -MLINKS+=txp.4 if_txp.4 MLINKS+=ure.4 if_ure.4 MLINKS+=vge.4 if_vge.4 MLINKS+=vlan.4 if_vlan.4 Modified: head/sys/amd64/conf/GENERIC == --- head/sys/amd64/conf/GENERIC Fri May 17 15:24:08 2019(r347919) +++ head/sys/amd64/conf/GENERIC Fri May 17 15:24:17 2019(r347920) @@ -247,7 +247,6 @@ device vmx # VMware VMXNET3 Ethernet device bxe # Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE device le # AMD Am7900 LANCE and Am79C9xx PCnet device ti # Alteon Networks Tigon I/II gigabit Ethernet -device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') # PCI Ethernet NICs that use the common MII bus controller code. Modified: head/sys/conf/NOTES == --- head/sys/conf/NOTES Fri May 17 15:24:08 2019(r347919) +++ head/sys/conf/NOTES Fri May 17 15:24:17 2019(r347920) @@ -1995,7 +1995,6 @@ devicexmphy # XaQti XMAC II # Tigon 1 and Tigon 2 chipsets. This includes the Alteon AceNIC, the # 3Com 3c985, the Netgear GA620 and various others. Note that you will # probably want to bump up kern.ipc.nmbclusters a lot to use this driver. -# txp: Support for 3Com 3cR990 cards with the "Typhoon" chipset # vr: Support for various fast ethernet adapters based on the VIA # Technologies VT3043 `Rhine I' and VT86C100A `Rhine II' chips, # including the D-Link DFE520TX and D-Link DFE530TX (see 'rl' for @@ -2074,7 +2073,6 @@ devicele # AMD Am7900 LANCE and Am79C9xx PCnet device mxge# Myricom Myri-10G 10GbE NIC device oce # Emulex 10 GbE (OneConnect Ethernet) device ti # Alteon Networks Tigon I/II gigabit Ethernet -device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') # PCI IEEE 802.11 Wireless NICs Modified: head/sys/conf/files == --- head/sys/conf/files Fri May 17 15:24:08 2019(r347919) +++ head/sys/conf/files Fri May 17 15:24:17 2019(r347920) @@ -3155,7 +3155,6 @@ dev/tws/tws_cam.c optional tws dev/tws/tws_hdm.c optional tws dev/tws/tws_services.c optional tws dev/tws/tws_user.c optional tws -dev/txp/if_txp.c optional txp dev/uart/uart_bus_acpi.c optional uart acpi dev/uart/uart_bus_ebus.c optional uart ebus dev/uart/uart_bus_fdt.coptional uart fdt Modified: head/sys/i386/conf/GENERIC == --- head/sys/i386/conf/GENERIC Fri May 17 15:24:08 2019(r347919) +++ head/sys/i386/conf/GENERIC Fri May 17 15:24:17 2019(r347920) @@ -229,7 +229,
svn commit: r347914 - in head: . share/man/man4/man4.i386 sys/conf sys/dev/fe sys/i386/conf sys/modules sys/modules/fe
Author: brooks
Date: Fri May 17 15:23:26 2019
New Revision: 347914
URL: https://svnweb.freebsd.org/changeset/base/347914
Log:
FCP-101: Remove fe(4).
Relnotes: yes
FCP: https://github.com/freebsd/fcp/blob/master/fcp-0101.md
Reviewed by: jhb, imp
Differential Revision:https://reviews.freebsd.org/D20230
Deleted:
head/share/man/man4/man4.i386/fe.4
head/sys/dev/fe/
head/sys/modules/fe/
Modified:
head/ObsoleteFiles.inc
head/share/man/man4/man4.i386/Makefile
head/sys/conf/NOTES
head/sys/conf/files
head/sys/i386/conf/GENERIC
head/sys/modules/Makefile
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Fri May 17 15:23:18 2019(r347913)
+++ head/ObsoleteFiles.inc Fri May 17 15:23:26 2019(r347914)
@@ -47,6 +47,7 @@ OLD_FILES+=usr/share/man/man4/ed.4
OLD_FILES+=usr/share/man/man4/if_ed.4
OLD_FILES+=usr/share/man/man4/ep.4
OLD_FILES+=usr/share/man/man4/ex.4
+OLD_FILES+=usr/share/man/man4/fe.4
# 20190513: libcap_sysctl interface change
OLD_FILES+=lib/casper/libcap_sysctl.1
# 20190509: tests/sys/opencrypto requires the net/py-dpkt package.
Modified: head/share/man/man4/man4.i386/Makefile
==
--- head/share/man/man4/man4.i386/Makefile Fri May 17 15:23:18 2019
(r347913)
+++ head/share/man/man4/man4.i386/Makefile Fri May 17 15:23:26 2019
(r347914)
@@ -8,7 +8,6 @@ MAN=apm.4 \
CPU_ELAN.4 \
ctau.4 \
cx.4 \
- fe.4 \
glxiic.4 \
glxsb.4 \
longrun.4 \
Modified: head/sys/conf/NOTES
==
--- head/sys/conf/NOTES Fri May 17 15:23:18 2019(r347913)
+++ head/sys/conf/NOTES Fri May 17 15:23:26 2019(r347914)
@@ -1937,7 +1937,6 @@ devicexmphy # XaQti XMAC II
# LinkSys LNE100TX, LNE100TX V2.0, Jaton XpressNet, Alfa Inc GFC2204,
# KNE110TX.
# em: Intel Pro/1000 Gigabit Ethernet 82542, 82543, 82544 based adapters.
-# fe: Fujitsu MB86960A/MB86965A Ethernet
# fxp: Intel EtherExpress Pro/100B
# (hint of prefer_iomap can be done to prefer I/O instead of Mem mapping)
# gem: Apple GMAC/Sun ERI/Sun GEM
@@ -2040,9 +2039,6 @@ devicexmphy # XaQti XMAC II
# Order for ISA devices is important here
-device fe
-hint.fe.0.at="isa"
-hint.fe.0.port="0x300"
device sn
hint.sn.0.at="isa"
hint.sn.0.port="0x300"
Modified: head/sys/conf/files
==
--- head/sys/conf/files Fri May 17 15:23:18 2019(r347913)
+++ head/sys/conf/files Fri May 17 15:23:26 2019(r347914)
@@ -1703,8 +1703,6 @@ dev/fdt/fdt_static_dtb.S optional fdt fdt_dtb_static \
dependency "${FDT_DTS_FILE:T:R}.dtb"
dev/fdt/simplebus.coptional fdt
dev/fdt/simple_mfd.c optional fdt
-dev/fe/if_fe.c optional fe
-dev/fe/if_fe_pccard.c optional fe pccard
dev/filemon/filemon.c optional filemon
dev/firewire/firewire.coptional firewire
dev/firewire/fwcrom.c optional firewire
Modified: head/sys/i386/conf/GENERIC
==
--- head/sys/i386/conf/GENERIC Fri May 17 15:23:18 2019(r347913)
+++ head/sys/i386/conf/GENERIC Fri May 17 15:23:26 2019(r347914)
@@ -271,7 +271,6 @@ device wb # Winbond
W89C840F
device xl # 3Com 3c90x (``Boomerang'',
``Cyclone'')
# ISA Ethernet NICs. pccard NICs included.
-device fe # Fujitsu MB8696x based cards
device sn # SMC's 9000 series of Ethernet chips
device xe # Xircom pccard Ethernet
Modified: head/sys/modules/Makefile
==
--- head/sys/modules/Makefile Fri May 17 15:23:18 2019(r347913)
+++ head/sys/modules/Makefile Fri May 17 15:23:26 2019(r347914)
@@ -118,7 +118,6 @@ SUBDIR= \
ext2fs \
fdc \
fdescfs \
- ${_fe} \
${_ffec} \
filemon \
firewire \
@@ -599,7 +598,6 @@ _dpms= dpms
_em= em
_et= et
_exca= exca
-_fe= fe
_if_ndis= if_ndis
_io= io
_ix= ix
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347913 - in head: . share/man/man4/man4.i386 sys/conf sys/dev/ex sys/i386/conf sys/modules sys/modules/ex
Author: brooks
Date: Fri May 17 15:23:18 2019
New Revision: 347913
URL: https://svnweb.freebsd.org/changeset/base/347913
Log:
FCP-101: Remove ex(4).
Relnotes: yes
FCP: https://github.com/freebsd/fcp/blob/master/fcp-0101.md
Reviewed by: jhb, imp
Differential Revision:https://reviews.freebsd.org/D20230
Deleted:
head/share/man/man4/man4.i386/ex.4
head/sys/dev/ex/
head/sys/modules/ex/
Modified:
head/ObsoleteFiles.inc
head/share/man/man4/man4.i386/Makefile
head/sys/conf/NOTES
head/sys/conf/files
head/sys/i386/conf/GENERIC
head/sys/modules/Makefile
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Fri May 17 15:23:10 2019(r347912)
+++ head/ObsoleteFiles.inc Fri May 17 15:23:18 2019(r347913)
@@ -46,6 +46,7 @@ OLD_FILES+=usr/share/man/man4/if_de.4
OLD_FILES+=usr/share/man/man4/ed.4
OLD_FILES+=usr/share/man/man4/if_ed.4
OLD_FILES+=usr/share/man/man4/ep.4
+OLD_FILES+=usr/share/man/man4/ex.4
# 20190513: libcap_sysctl interface change
OLD_FILES+=lib/casper/libcap_sysctl.1
# 20190509: tests/sys/opencrypto requires the net/py-dpkt package.
Modified: head/share/man/man4/man4.i386/Makefile
==
--- head/share/man/man4/man4.i386/Makefile Fri May 17 15:23:10 2019
(r347912)
+++ head/share/man/man4/man4.i386/Makefile Fri May 17 15:23:18 2019
(r347913)
@@ -8,7 +8,6 @@ MAN=apm.4 \
CPU_ELAN.4 \
ctau.4 \
cx.4 \
- ex.4 \
fe.4 \
glxiic.4 \
glxsb.4 \
Modified: head/sys/conf/NOTES
==
--- head/sys/conf/NOTES Fri May 17 15:23:10 2019(r347912)
+++ head/sys/conf/NOTES Fri May 17 15:23:18 2019(r347913)
@@ -1937,8 +1937,6 @@ devicexmphy # XaQti XMAC II
# LinkSys LNE100TX, LNE100TX V2.0, Jaton XpressNet, Alfa Inc GFC2204,
# KNE110TX.
# em: Intel Pro/1000 Gigabit Ethernet 82542, 82543, 82544 based adapters.
-# ex: Intel EtherExpress Pro/10 and other i82595-based adapters,
-# Olicom Ethernet PC Card devices.
# fe: Fujitsu MB86960A/MB86965A Ethernet
# fxp: Intel EtherExpress Pro/100B
# (hint of prefer_iomap can be done to prefer I/O instead of Mem mapping)
@@ -2042,7 +2040,6 @@ devicexmphy # XaQti XMAC II
# Order for ISA devices is important here
-device ex
device fe
hint.fe.0.at="isa"
hint.fe.0.port="0x300"
Modified: head/sys/conf/files
==
--- head/sys/conf/files Fri May 17 15:23:10 2019(r347912)
+++ head/sys/conf/files Fri May 17 15:23:18 2019(r347913)
@@ -1664,9 +1664,6 @@ dev/evdev/evdev.c optional evdev
dev/evdev/evdev_mt.c optional evdev
dev/evdev/evdev_utils.coptional evdev
dev/evdev/uinput.c optional evdev uinput
-dev/ex/if_ex.c optional ex
-dev/ex/if_ex_isa.c optional ex isa
-dev/ex/if_ex_pccard.c optional ex pccard
dev/exca/exca.coptional cbb
dev/extres/clk/clk.c optional ext_resources clk fdt
dev/extres/clk/clkdev_if.m optional ext_resources clk fdt
Modified: head/sys/i386/conf/GENERIC
==
--- head/sys/i386/conf/GENERIC Fri May 17 15:23:10 2019(r347912)
+++ head/sys/i386/conf/GENERIC Fri May 17 15:23:18 2019(r347913)
@@ -271,7 +271,6 @@ device wb # Winbond
W89C840F
device xl # 3Com 3c90x (``Boomerang'',
``Cyclone'')
# ISA Ethernet NICs. pccard NICs included.
-device ex # Intel EtherExpress Pro/10 and Pro/10+
device fe # Fujitsu MB8696x based cards
device sn # SMC's 9000 series of Ethernet chips
device xe # Xircom pccard Ethernet
Modified: head/sys/modules/Makefile
==
--- head/sys/modules/Makefile Fri May 17 15:23:10 2019(r347912)
+++ head/sys/modules/Makefile Fri May 17 15:23:18 2019(r347913)
@@ -114,7 +114,6 @@ SUBDIR= \
esp \
${_et} \
evdev \
- ${_ex} \
${_exca} \
ext2fs \
fdc \
@@ -747,7 +746,6 @@ _sbni= sbni
.if ${MK_SOURCELESS_UCODE} != "no"
_ctau= ctau
.endif
-_ex= ex
.endif
.if ${MACHINE_CPUARCH} == "arm"
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-u
svn commit: r347919 - in head: . share/man/man4 sys/amd64/conf sys/conf sys/dev/tx sys/i386/conf sys/modules sys/modules/tx sys/sparc64/conf
Author: brooks Date: Fri May 17 15:24:08 2019 New Revision: 347919 URL: https://svnweb.freebsd.org/changeset/base/347919 Log: FCP-101: Remove tx(4). Relnotes: yes FCP: https://github.com/freebsd/fcp/blob/master/fcp-0101.md Reviewed by: jhb, imp Differential Revision:https://reviews.freebsd.org/D20230 Deleted: head/share/man/man4/tx.4 head/sys/dev/tx/ head/sys/modules/tx/ Modified: head/ObsoleteFiles.inc head/share/man/man4/Makefile head/sys/amd64/conf/GENERIC head/sys/conf/NOTES head/sys/conf/files head/sys/i386/conf/GENERIC head/sys/modules/Makefile head/sys/sparc64/conf/GENERIC Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Fri May 17 15:24:00 2019(r347918) +++ head/ObsoleteFiles.inc Fri May 17 15:24:08 2019(r347919) @@ -56,6 +56,8 @@ OLD_FILES+=usr/share/man/man4/sn.4 OLD_FILES+=usr/share/man/man4/if_sn.4 OLD_FILES+=usr/share/man/man4/tl.4 OLD_FILES+=usr/share/man/man4/if_tl.4 +OLD_FILES+=usr/share/man/man4/tx.4 +OLD_FILES+=usr/share/man/man4/if_tx.4 # 20190513: libcap_sysctl interface change OLD_FILES+=lib/casper/libcap_sysctl.1 # 20190509: tests/sys/opencrypto requires the net/py-dpkt package. Modified: head/share/man/man4/Makefile == --- head/share/man/man4/MakefileFri May 17 15:24:00 2019 (r347918) +++ head/share/man/man4/MakefileFri May 17 15:24:08 2019 (r347919) @@ -524,7 +524,6 @@ MAN=aac.4 \ twa.4 \ twe.4 \ tws.4 \ - tx.4 \ txp.4 \ udp.4 \ udplite.4 \ @@ -717,7 +716,6 @@ MLINKS+=tap.4 if_tap.4 MLINKS+=tdfx.4 tdfx_linux.4 MLINKS+=ti.4 if_ti.4 MLINKS+=tun.4 if_tun.4 -MLINKS+=tx.4 if_tx.4 MLINKS+=txp.4 if_txp.4 MLINKS+=ure.4 if_ure.4 MLINKS+=vge.4 if_vge.4 Modified: head/sys/amd64/conf/GENERIC == --- head/sys/amd64/conf/GENERIC Fri May 17 15:24:00 2019(r347918) +++ head/sys/amd64/conf/GENERIC Fri May 17 15:24:08 2019(r347919) @@ -278,7 +278,6 @@ device sis # Silicon Integrated Systems SiS 900/SiS device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet device ste # Sundance ST201 (D-Link DFE-550TX) device stge# Sundance/Tamarack TC9021 gigabit Ethernet -device tx # SMC EtherPower II (83c170 ``EPIC'') device vge # VIA VT612x gigabit Ethernet device vr # VIA Rhine, Rhine II device wb # Winbond W89C840F Modified: head/sys/conf/NOTES == --- head/sys/conf/NOTES Fri May 17 15:24:00 2019(r347918) +++ head/sys/conf/NOTES Fri May 17 15:24:08 2019(r347919) @@ -1995,7 +1995,6 @@ devicexmphy # XaQti XMAC II # Tigon 1 and Tigon 2 chipsets. This includes the Alteon AceNIC, the # 3Com 3c985, the Netgear GA620 and various others. Note that you will # probably want to bump up kern.ipc.nmbclusters a lot to use this driver. -# tx: SMC 9432 TX, BTX and FTX cards. (SMC EtherPower II series) # txp: Support for 3Com 3cR990 cards with the "Typhoon" chipset # vr: Support for various fast ethernet adapters based on the VIA # Technologies VT3043 `Rhine I' and VT86C100A `Rhine II' chips, @@ -2055,7 +2054,6 @@ devicesis # Silicon Integrated Systems SiS 900/SiS device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet device ste # Sundance ST201 (D-Link DFE-550TX) device stge# Sundance/Tamarack TC9021 gigabit Ethernet -device tx # SMC EtherPower II (83c170 ``EPIC'') device vr # VIA Rhine, Rhine II device vte # DM&P Vortex86 RDC R6040 Fast Ethernet device wb # Winbond W89C840F Modified: head/sys/conf/files == --- head/sys/conf/files Fri May 17 15:24:00 2019(r347918) +++ head/sys/conf/files Fri May 17 15:24:08 2019(r347919) @@ -3155,7 +3155,6 @@ dev/tws/tws_cam.c optional tws dev/tws/tws_hdm.c optional tws dev/tws/tws_services.c optional tws dev/tws/tws_user.c optional tws -dev/tx/if_tx.c optional tx dev/txp/if_txp.c optional txp dev/uart/uart_bus_acpi.c optional uart acpi dev/uart/uart_bus_ebus.c optional uart ebus Modified: head/sys/i386/conf/GENERIC == --- head/sys/i38
svn commit: r347916 - in head: . share/man/man4 sys/amd64/conf sys/conf sys/dev/sf sys/i386/conf sys/modules sys/modules/sf sys/sparc64/conf
Author: brooks
Date: Fri May 17 15:23:43 2019
New Revision: 347916
URL: https://svnweb.freebsd.org/changeset/base/347916
Log:
FCP-101: Remove sf(4).
Relnotes: yes
FCP: https://github.com/freebsd/fcp/blob/master/fcp-0101.md
Reviewed by: jhb, imp
Differential Revision:https://reviews.freebsd.org/D20230
Deleted:
head/share/man/man4/sf.4
head/sys/dev/sf/
head/sys/modules/sf/
Modified:
head/ObsoleteFiles.inc
head/share/man/man4/Makefile
head/sys/amd64/conf/GENERIC
head/sys/conf/NOTES
head/sys/conf/files
head/sys/i386/conf/GENERIC
head/sys/modules/Makefile
head/sys/sparc64/conf/GENERIC
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Fri May 17 15:23:34 2019(r347915)
+++ head/ObsoleteFiles.inc Fri May 17 15:23:43 2019(r347916)
@@ -50,6 +50,8 @@ OLD_FILES+=usr/share/man/man4/ex.4
OLD_FILES+=usr/share/man/man4/fe.4
OLD_FILES+=usr/share/man/man4/pcn.4
OLD_FILES+=usr/share/man/man4/if_pcn.4
+OLD_FILES+=usr/share/man/man4/sf.4
+OLD_FILES+=usr/share/man/man4/if_sf.4
# 20190513: libcap_sysctl interface change
OLD_FILES+=lib/casper/libcap_sysctl.1
# 20190509: tests/sys/opencrypto requires the net/py-dpkt package.
Modified: head/share/man/man4/Makefile
==
--- head/share/man/man4/MakefileFri May 17 15:23:34 2019
(r347915)
+++ head/share/man/man4/MakefileFri May 17 15:23:43 2019
(r347916)
@@ -451,7 +451,6 @@ MAN=aac.4 \
sem.4 \
send.4 \
ses.4 \
- sf.4 \
${_sfxge.4} \
sge.4 \
siba.4 \
@@ -701,7 +700,6 @@ MLINKS+=scsi.4 CAM.4 \
scsi.4 cam.4 \
scsi.4 scbus.4 \
scsi.4 SCSI.4
-MLINKS+=sf.4 if_sf.4
MLINKS+=sge.4 if_sge.4
MLINKS+=sis.4 if_sis.4
MLINKS+=sk.4 if_sk.4
Modified: head/sys/amd64/conf/GENERIC
==
--- head/sys/amd64/conf/GENERIC Fri May 17 15:23:34 2019(r347915)
+++ head/sys/amd64/conf/GENERIC Fri May 17 15:23:43 2019(r347916)
@@ -273,7 +273,6 @@ device nfe # nVidia nForce
MCP on-board Ethernet
device nge # NatSemi DP83820 gigabit Ethernet
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
-device sf # Adaptec AIC-6915 (``Starfire'')
device sge # Silicon Integrated Systems SiS190/191
device sis # Silicon Integrated Systems SiS
900/SiS 7016
device sk # SysKonnect SK-984x & SK-982x gigabit
Ethernet
Modified: head/sys/conf/NOTES
==
--- head/sys/conf/NOTES Fri May 17 15:23:34 2019(r347915)
+++ head/sys/conf/NOTES Fri May 17 15:23:43 2019(r347916)
@@ -1977,11 +1977,6 @@ device xmphy # XaQti XMAC II
# chipset and is supported by this driver, not the 'vr' driver.
# rtwn: RealTek wireless adapters.
# rtwnfw: RealTek wireless firmware.
-# sf: Support for Adaptec Duralink PCI fast ethernet adapters based on the
-# Adaptec AIC-6915 "starfire" controller.
-# This includes dual and quad port cards, as well as one 100baseFX card.
-# Most of these are 64-bit PCI devices, except for one single port
-# card which is 32-bit.
# sge: Silicon Integrated Systems SiS190/191 Fast/Gigabit Ethernet adapter
# sis: Support for NICs based on the Silicon Integrated Systems SiS 900,
# SiS 7016 and NS DP83815 PCI fast ethernet controller chips.
@@ -2066,7 +2061,6 @@ devicemy # Myson Fast Ethernet
(MTD80X, MTD89X)
device nge # NatSemi DP83820 gigabit Ethernet
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
-device sf # Adaptec AIC-6915 (``Starfire'')
device sge # Silicon Integrated Systems SiS190/191
device sis # Silicon Integrated Systems SiS 900/SiS 7016
device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
Modified: head/sys/conf/files
==
--- head/sys/conf/files Fri May 17 15:23:34 2019(r347915)
+++ head/sys/conf/files Fri May 17 15:23:43 2019(r347916)
@@ -3009,7 +3009,6 @@ dev/sdhci/sdhci_fdt_gpio.coptional sdhci fdt gpio
dev/sdhci/sdhci_if.m optional sdhci
dev/sdhci/sdhci_acpi.c optional sdhci acpi
dev/sdhci/sdhci_pci.c optional sdhci pci
-dev/sf/if_sf.c optional sf pci
dev/sge/if_sge.c optional sge pci
dev/
svn commit: r347910 - in head: . share/man/man4 sys/amd64/conf sys/conf sys/dev/de sys/i386/conf sys/modules sys/modules/de sys/sparc64/conf
Author: brooks Date: Fri May 17 15:22:54 2019 New Revision: 347910 URL: https://svnweb.freebsd.org/changeset/base/347910 Log: FCP-101: Remove de(4). Relnotes: yes FCP: https://github.com/freebsd/fcp/blob/master/fcp-0101.md Reviewed by: jhb, imp Differential Revision:https://reviews.freebsd.org/D20230 Deleted: head/share/man/man4/de.4 head/sys/dev/de/ head/sys/modules/de/ Modified: head/ObsoleteFiles.inc head/share/man/man4/Makefile head/sys/amd64/conf/GENERIC head/sys/conf/NOTES head/sys/conf/files head/sys/i386/conf/GENERIC head/sys/modules/Makefile head/sys/sparc64/conf/GENERIC Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Fri May 17 15:22:45 2019(r347909) +++ head/ObsoleteFiles.inc Fri May 17 15:22:54 2019(r347910) @@ -41,6 +41,8 @@ # 20190518: Remove obsolete 10 and 10/100 ethernet drivers. OLD_FILES+=usr/share/man/man4/bm.4 OLD_FILES+=usr/share/man/man4/cs.4 +OLD_FILES+=usr/share/man/man4/de.4 +OLD_FILES+=usr/share/man/man4/if_de.4 # 20190513: libcap_sysctl interface change OLD_FILES+=lib/casper/libcap_sysctl.1 # 20190509: tests/sys/opencrypto requires the net/py-dpkt package. Modified: head/share/man/man4/Makefile == --- head/share/man/man4/MakefileFri May 17 15:22:45 2019 (r347909) +++ head/share/man/man4/MakefileFri May 17 15:22:54 2019 (r347910) @@ -128,7 +128,6 @@ MAN=aac.4 \ dcons.4 \ dcons_crom.4 \ ddb.4 \ - de.4 \ devctl.4 \ disc.4 \ divert.4 \ @@ -627,7 +626,6 @@ MLINKS+=cxgbev.4 if_cxgbev.4 \ cxgbev.4 ccv.4 \ cxgbev.4 if_ccv.4 MLINKS+=dc.4 if_dc.4 -MLINKS+=de.4 if_de.4 MLINKS+=disc.4 if_disc.4 MLINKS+=ed.4 if_ed.4 MLINKS+=edsc.4 if_edsc.4 Modified: head/sys/amd64/conf/GENERIC == --- head/sys/amd64/conf/GENERIC Fri May 17 15:22:45 2019(r347909) +++ head/sys/amd64/conf/GENERIC Fri May 17 15:22:54 2019(r347910) @@ -245,7 +245,6 @@ device vmx # VMware VMXNET3 Ethernet # PCI Ethernet NICs. device bxe # Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE -device de # DEC/Intel DC21x4x (``Tulip'') device le # AMD Am7900 LANCE and Am79C9xx PCnet device ti # Alteon Networks Tigon I/II gigabit Ethernet device txp # 3Com 3cR990 (``Typhoon'') Modified: head/sys/conf/NOTES == --- head/sys/conf/NOTES Fri May 17 15:22:45 2019(r347909) +++ head/sys/conf/NOTES Fri May 17 15:22:54 2019(r347910) @@ -1936,7 +1936,6 @@ devicexmphy # XaQti XMAC II # SVEC PN102-TX, CNet Pro110B, 120A, and 120B, Compex RL100-TX, # LinkSys LNE100TX, LNE100TX V2.0, Jaton XpressNet, Alfa Inc GFC2204, # KNE110TX. -# de: Digital Equipment DC21040 # em: Intel Pro/1000 Gigabit Ethernet 82542, 82543, 82544 based adapters. # ep: 3Com 3C509, 3C529, 3C556, 3C562D, 3C563D, 3C572, 3C574X, 3C579, 3C589 # and PC Card devices using these chipsets. @@ -2108,7 +2107,6 @@ devicecxgb# Chelsio T3 10 Gigabit Ethernet device cxgb_t3fw # Chelsio T3 10 Gigabit Ethernet firmware device cxgbe # Chelsio T4-T6 1/10/25/40/100 Gigabit Ethernet device cxgbev # Chelsio T4-T6 Virtual Functions -device de # DEC/Intel DC21x4x (``Tulip'') device le # AMD Am7900 LANCE and Am79C9xx PCnet device mxge# Myricom Myri-10G 10GbE NIC device oce # Emulex 10 GbE (OneConnect Ethernet) Modified: head/sys/conf/files == --- head/sys/conf/files Fri May 17 15:22:45 2019(r347909) +++ head/sys/conf/files Fri May 17 15:22:54 2019(r347910) @@ -1539,7 +1539,6 @@ dev/dc/pnphy.coptional dc pci dev/dcons/dcons.c optional dcons dev/dcons/dcons_crom.c optional dcons_crom dev/dcons/dcons_os.c optional dcons -dev/de/if_de.c optional de pci dev/dme/if_dme.c optional dme dev/drm2/drm_agpsupport.c optional drm2 dev/drm2/drm_auth.coptional drm2 Modified: head/sys/i386/conf/GENERIC == --- head/sys/i386/conf/GENERIC Fri May 17 15:22:45 2019(r347909) +++ head/sys/i386/conf/GENERIC Fri May 17 15:22:54 2019(r347910) @@ -227,7 +227,6 @@ device vmx
svn commit: r347918 - in head: . share/man/man4 sys/amd64/conf sys/conf sys/dev/tl sys/i386/conf sys/modules sys/modules/tl sys/sparc64/conf
Author: brooks
Date: Fri May 17 15:24:00 2019
New Revision: 347918
URL: https://svnweb.freebsd.org/changeset/base/347918
Log:
FCP-101: Remove tl(4).
Relnotes: yes
FCP: https://github.com/freebsd/fcp/blob/master/fcp-0101.md
Reviewed by: jhb, imp
Differential Revision:https://reviews.freebsd.org/D20230
Deleted:
head/share/man/man4/tl.4
head/sys/dev/tl/
head/sys/modules/tl/
Modified:
head/ObsoleteFiles.inc
head/share/man/man4/Makefile
head/sys/amd64/conf/GENERIC
head/sys/conf/NOTES
head/sys/conf/files
head/sys/i386/conf/GENERIC
head/sys/modules/Makefile
head/sys/sparc64/conf/GENERIC
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Fri May 17 15:23:52 2019(r347917)
+++ head/ObsoleteFiles.inc Fri May 17 15:24:00 2019(r347918)
@@ -54,6 +54,8 @@ OLD_FILES+=usr/share/man/man4/sf.4
OLD_FILES+=usr/share/man/man4/if_sf.4
OLD_FILES+=usr/share/man/man4/sn.4
OLD_FILES+=usr/share/man/man4/if_sn.4
+OLD_FILES+=usr/share/man/man4/tl.4
+OLD_FILES+=usr/share/man/man4/if_tl.4
# 20190513: libcap_sysctl interface change
OLD_FILES+=lib/casper/libcap_sysctl.1
# 20190509: tests/sys/opencrypto requires the net/py-dpkt package.
Modified: head/share/man/man4/Makefile
==
--- head/share/man/man4/MakefileFri May 17 15:23:52 2019
(r347917)
+++ head/share/man/man4/MakefileFri May 17 15:24:00 2019
(r347918)
@@ -517,7 +517,6 @@ MAN=aac.4 \
textdump.4 \
ti.4 \
timecounters.4 \
- tl.4 \
${_tpm.4} \
trm.4 \
tty.4 \
@@ -717,7 +716,6 @@ MLINKS+=syscons.4 sc.4
MLINKS+=tap.4 if_tap.4
MLINKS+=tdfx.4 tdfx_linux.4
MLINKS+=ti.4 if_ti.4
-MLINKS+=tl.4 if_tl.4
MLINKS+=tun.4 if_tun.4
MLINKS+=tx.4 if_tx.4
MLINKS+=txp.4 if_txp.4
Modified: head/sys/amd64/conf/GENERIC
==
--- head/sys/amd64/conf/GENERIC Fri May 17 15:23:52 2019(r347917)
+++ head/sys/amd64/conf/GENERIC Fri May 17 15:24:00 2019(r347918)
@@ -278,7 +278,6 @@ device sis # Silicon
Integrated Systems SiS 900/SiS
device sk # SysKonnect SK-984x & SK-982x gigabit
Ethernet
device ste # Sundance ST201 (D-Link DFE-550TX)
device stge# Sundance/Tamarack TC9021 gigabit
Ethernet
-device tl # Texas Instruments ThunderLAN
device tx # SMC EtherPower II (83c170 ``EPIC'')
device vge # VIA VT612x gigabit Ethernet
device vr # VIA Rhine, Rhine II
Modified: head/sys/conf/NOTES
==
--- head/sys/conf/NOTES Fri May 17 15:23:52 2019(r347917)
+++ head/sys/conf/NOTES Fri May 17 15:24:00 2019(r347918)
@@ -1995,11 +1995,6 @@ device xmphy # XaQti XMAC II
# Tigon 1 and Tigon 2 chipsets. This includes the Alteon AceNIC, the
# 3Com 3c985, the Netgear GA620 and various others. Note that you will
# probably want to bump up kern.ipc.nmbclusters a lot to use this driver.
-# tl: Support for the Texas Instruments TNETE100 series 'ThunderLAN'
-# cards and integrated ethernet controllers. This includes several
-# Compaq Netelligent 10/100 cards and the built-in ethernet controllers
-# in several Compaq Prosignia, Proliant and Deskpro systems. It also
-# supports several Olicom 10Mbps and 10/100 boards.
# tx: SMC 9432 TX, BTX and FTX cards. (SMC EtherPower II series)
# txp: Support for 3Com 3cR990 cards with the "Typhoon" chipset
# vr: Support for various fast ethernet adapters based on the VIA
@@ -2060,7 +2055,6 @@ devicesis # Silicon Integrated
Systems SiS 900/SiS
device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
device ste # Sundance ST201 (D-Link DFE-550TX)
device stge# Sundance/Tamarack TC9021 gigabit Ethernet
-device tl # Texas Instruments ThunderLAN
device tx # SMC EtherPower II (83c170 ``EPIC'')
device vr # VIA Rhine, Rhine II
device vte # DM&P Vortex86 RDC R6040 Fast Ethernet
Modified: head/sys/conf/files
==
--- head/sys/conf/files Fri May 17 15:23:52 2019(r347917)
+++ head/sys/conf/files Fri May 17 15:24:00 2019(r347918)
@@ -3135,7 +3135,6 @@ dev/tcp_log/tcp_log_dev.c optional tcp_blackbox inet |
dev/tdfx/tdfx_linux.c optional tdfx_linux tdfx compat_linux
dev/tdfx/tdfx_pci.coptional tdfx p
svn commit: r347912 - in head: . share/man/man4/man4.i386 sys/conf sys/dev/ep sys/i386/conf sys/modules sys/modules/ep
Author: brooks
Date: Fri May 17 15:23:10 2019
New Revision: 347912
URL: https://svnweb.freebsd.org/changeset/base/347912
Log:
FCP-101: Remove ep(4).
Relnotes: yes
FCP: https://github.com/freebsd/fcp/blob/master/fcp-0101.md
Reviewed by: jhb, imp
Differential Revision:https://reviews.freebsd.org/D20230
Deleted:
head/share/man/man4/man4.i386/ep.4
head/sys/dev/ep/
head/sys/modules/ep/
Modified:
head/ObsoleteFiles.inc
head/share/man/man4/man4.i386/Makefile
head/sys/conf/NOTES
head/sys/conf/files
head/sys/conf/files.i386
head/sys/i386/conf/GENERIC
head/sys/modules/Makefile
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Fri May 17 15:23:02 2019(r347911)
+++ head/ObsoleteFiles.inc Fri May 17 15:23:10 2019(r347912)
@@ -45,6 +45,7 @@ OLD_FILES+=usr/share/man/man4/de.4
OLD_FILES+=usr/share/man/man4/if_de.4
OLD_FILES+=usr/share/man/man4/ed.4
OLD_FILES+=usr/share/man/man4/if_ed.4
+OLD_FILES+=usr/share/man/man4/ep.4
# 20190513: libcap_sysctl interface change
OLD_FILES+=lib/casper/libcap_sysctl.1
# 20190509: tests/sys/opencrypto requires the net/py-dpkt package.
Modified: head/share/man/man4/man4.i386/Makefile
==
--- head/share/man/man4/man4.i386/Makefile Fri May 17 15:23:02 2019
(r347911)
+++ head/share/man/man4/man4.i386/Makefile Fri May 17 15:23:10 2019
(r347912)
@@ -8,7 +8,6 @@ MAN=apm.4 \
CPU_ELAN.4 \
ctau.4 \
cx.4 \
- ep.4 \
ex.4 \
fe.4 \
glxiic.4 \
Modified: head/sys/conf/NOTES
==
--- head/sys/conf/NOTES Fri May 17 15:23:02 2019(r347911)
+++ head/sys/conf/NOTES Fri May 17 15:23:10 2019(r347912)
@@ -1937,8 +1937,6 @@ devicexmphy # XaQti XMAC II
# LinkSys LNE100TX, LNE100TX V2.0, Jaton XpressNet, Alfa Inc GFC2204,
# KNE110TX.
# em: Intel Pro/1000 Gigabit Ethernet 82542, 82543, 82544 based adapters.
-# ep: 3Com 3C509, 3C529, 3C556, 3C562D, 3C563D, 3C572, 3C574X, 3C579, 3C589
-# and PC Card devices using these chipsets.
# ex: Intel EtherExpress Pro/10 and other i82595-based adapters,
# Olicom Ethernet PC Card devices.
# fe: Fujitsu MB86960A/MB86965A Ethernet
@@ -2044,7 +2042,6 @@ devicexmphy # XaQti XMAC II
# Order for ISA devices is important here
-device ep
device ex
device fe
hint.fe.0.at="isa"
Modified: head/sys/conf/files
==
--- head/sys/conf/files Fri May 17 15:23:02 2019(r347911)
+++ head/sys/conf/files Fri May 17 15:23:10 2019(r347912)
@@ -1633,9 +1633,6 @@ dev/ena/ena_sysctl.c optional ena \
compile-with "${NORMAL_C} -I$S/contrib"
contrib/ena-com/ena_com.c optional ena
contrib/ena-com/ena_eth_com.c optional ena
-dev/ep/if_ep.c optional ep
-dev/ep/if_ep_isa.c optional ep isa
-dev/ep/if_ep_pccard.c optional ep pccard
dev/esp/esp_pci.c optional esp pci
dev/esp/ncr53c9x.c optional esp
dev/etherswitch/arswitch/arswitch.coptional arswitch
Modified: head/sys/conf/files.i386
==
--- head/sys/conf/files.i386Fri May 17 15:23:02 2019(r347911)
+++ head/sys/conf/files.i386Fri May 17 15:23:10 2019(r347912)
@@ -199,7 +199,6 @@ dev/ed/if_ed_isa.c optional ed isa
dev/ed/if_ed_wd80x3.c optional ed isa
dev/ed/if_ed_hpp.c optional ed isa ed_hpp
dev/ed/if_ed_sic.c optional ed isa ed_sic
-dev/ep/elink.c optional ep
dev/fb/fb.coptional fb | vga
dev/fb/s3_pci.coptional s3pci
dev/fb/vesa.c optional vga vesa
Modified: head/sys/i386/conf/GENERIC
==
--- head/sys/i386/conf/GENERIC Fri May 17 15:23:02 2019(r347911)
+++ head/sys/i386/conf/GENERIC Fri May 17 15:23:10 2019(r347912)
@@ -272,7 +272,6 @@ device xl # 3Com 3c90x
(``Boomerang'', ``Cyclone'')
# ISA Ethernet NICs. pccard NICs included.
device ex # Intel EtherExpress Pro/10 and Pro/10+
-device ep # Etherlink III based cards
device fe # Fujitsu MB8696x based cards
device sn # SMC's 9000 series of Ethernet chips
device xe # Xircom pccard Ethernet
Modified: head/sys/modules/Makefile
===
svn commit: r347909 - in head: . share/man/man4/man4.i386 sys/conf sys/dev/cs sys/i386/conf sys/modules sys/modules/cs
Author: brooks
Date: Fri May 17 15:22:45 2019
New Revision: 347909
URL: https://svnweb.freebsd.org/changeset/base/347909
Log:
FCP-101: Remove cs(4).
Relnotes: yes
FCP: https://github.com/freebsd/fcp/blob/master/fcp-0101.md
Reviewed by: jhb, imp
Differential Revision:https://reviews.freebsd.org/D20230
Deleted:
head/share/man/man4/man4.i386/cs.4
head/sys/dev/cs/
head/sys/modules/cs/
Modified:
head/ObsoleteFiles.inc
head/share/man/man4/man4.i386/Makefile
head/sys/conf/files
head/sys/i386/conf/GENERIC
head/sys/i386/conf/NOTES
head/sys/modules/Makefile
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Fri May 17 15:20:51 2019(r347908)
+++ head/ObsoleteFiles.inc Fri May 17 15:22:45 2019(r347909)
@@ -40,6 +40,7 @@
# 20190518: Remove obsolete 10 and 10/100 ethernet drivers.
OLD_FILES+=usr/share/man/man4/bm.4
+OLD_FILES+=usr/share/man/man4/cs.4
# 20190513: libcap_sysctl interface change
OLD_FILES+=lib/casper/libcap_sysctl.1
# 20190509: tests/sys/opencrypto requires the net/py-dpkt package.
Modified: head/share/man/man4/man4.i386/Makefile
==
--- head/share/man/man4/man4.i386/Makefile Fri May 17 15:20:51 2019
(r347908)
+++ head/share/man/man4/man4.i386/Makefile Fri May 17 15:22:45 2019
(r347909)
@@ -6,7 +6,6 @@ MAN=apm.4 \
ce.4 \
cp.4 \
CPU_ELAN.4 \
- cs.4 \
ctau.4 \
cx.4 \
ep.4 \
Modified: head/sys/conf/files
==
--- head/sys/conf/files Fri May 17 15:20:51 2019(r347908)
+++ head/sys/conf/files Fri May 17 15:22:45 2019(r347909)
@@ -1358,9 +1358,6 @@ dev/ciss/ciss.c optional ciss
dev/cmx/cmx.c optional cmx
dev/cmx/cmx_pccard.c optional cmx pccard
dev/cpufreq/ichss.coptional cpufreq pci
-dev/cs/if_cs.c optional cs
-dev/cs/if_cs_isa.c optional cs isa
-dev/cs/if_cs_pccard.c optional cs pccard
dev/cxgb/cxgb_main.c optional cxgb pci \
compile-with "${NORMAL_C} -I$S/dev/cxgb"
dev/cxgb/cxgb_sge.coptional cxgb pci \
Modified: head/sys/i386/conf/GENERIC
==
--- head/sys/i386/conf/GENERIC Fri May 17 15:20:51 2019(r347908)
+++ head/sys/i386/conf/GENERIC Fri May 17 15:22:45 2019(r347909)
@@ -272,7 +272,6 @@ device wb # Winbond
W89C840F
device xl # 3Com 3c90x (``Boomerang'',
``Cyclone'')
# ISA Ethernet NICs. pccard NICs included.
-device cs # Crystal Semiconductor CS89x0 NIC
# 'device ed' requires 'device miibus'
device ed # NE[12]000, SMC Ultra, 3c503, DS8390
cards
device ex # Intel EtherExpress Pro/10 and Pro/10+
Modified: head/sys/i386/conf/NOTES
==
--- head/sys/i386/conf/NOTESFri May 17 15:20:51 2019(r347908)
+++ head/sys/i386/conf/NOTESFri May 17 15:22:45 2019(r347909)
@@ -502,7 +502,6 @@ device cpufreq
# V.35/RS-232/RS-530/RS-449/X.21/G.703/E1/E3/T3/STS-1
# serial adaptor (requires sppp (default), or NETGRAPH if
# NETGRAPH_CRONYX is configured)
-# cs: IBM Etherjet and other Crystal Semi CS89x0-based adapters
# ctau: Cronyx Tau sync dual port V.35/RS-232/RS-530/RS-449/X.21/G.703/E1
# serial adaptor (requires sppp (default), or NETGRAPH if
# NETGRAPH_CRONYX is configured)
@@ -529,7 +528,6 @@ device cpufreq
device bxe # Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE
device ce
device cp
-device cs # Crystal Semiconductor CS89x0 NIC
hint.cs.0.at="isa"
hint.cs.0.port="0x300"
device ctau
Modified: head/sys/modules/Makefile
==
--- head/sys/modules/Makefile Fri May 17 15:20:51 2019(r347908)
+++ head/sys/modules/Makefile Fri May 17 15:22:45 2019(r347909)
@@ -98,7 +98,6 @@ SUBDIR= \
${_cpufreq} \
${_crypto} \
${_cryptodev} \
- ${_cs} \
${_ctau} \
ctl \
${_cxgb} \
@@ -600,7 +599,6 @@ _cardbus= cardbus
_cbb= cbb
_cpuctl= cpuctl
_cpufreq= cpufreq
-_cs= cs
_dpms= dpms
_ed= ed
_em= em
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347911 - in head: . share/man/man4 sys/amd64/conf sys/conf sys/dev/ed sys/i386/conf sys/modules sys/modules/ed
Author: brooks
Date: Fri May 17 15:23:02 2019
New Revision: 347911
URL: https://svnweb.freebsd.org/changeset/base/347911
Log:
FCP-101: Remove ed(4).
Relnotes: yes
FCP: https://github.com/freebsd/fcp/blob/master/fcp-0101.md
Reviewed by: jhb, imp
Differential Revision:https://reviews.freebsd.org/D20230
Deleted:
head/share/man/man4/ed.4
head/sys/dev/ed/
head/sys/modules/ed/
Modified:
head/ObsoleteFiles.inc
head/share/man/man4/Makefile
head/sys/amd64/conf/NOTES
head/sys/conf/files
head/sys/i386/conf/GENERIC
head/sys/i386/conf/NOTES
head/sys/modules/Makefile
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Fri May 17 15:22:54 2019(r347910)
+++ head/ObsoleteFiles.inc Fri May 17 15:23:02 2019(r347911)
@@ -43,6 +43,8 @@ OLD_FILES+=usr/share/man/man4/bm.4
OLD_FILES+=usr/share/man/man4/cs.4
OLD_FILES+=usr/share/man/man4/de.4
OLD_FILES+=usr/share/man/man4/if_de.4
+OLD_FILES+=usr/share/man/man4/ed.4
+OLD_FILES+=usr/share/man/man4/if_ed.4
# 20190513: libcap_sysctl interface change
OLD_FILES+=lib/casper/libcap_sysctl.1
# 20190509: tests/sys/opencrypto requires the net/py-dpkt package.
Modified: head/share/man/man4/Makefile
==
--- head/share/man/man4/MakefileFri May 17 15:22:54 2019
(r347910)
+++ head/share/man/man4/MakefileFri May 17 15:23:02 2019
(r347911)
@@ -136,7 +136,6 @@ MAN=aac.4 \
ds3231.4 \
${_dtrace_provs} \
dummynet.4 \
- ed.4 \
edsc.4 \
ehci.4 \
em.4 \
@@ -627,7 +626,6 @@ MLINKS+=cxgbev.4 if_cxgbev.4 \
cxgbev.4 if_ccv.4
MLINKS+=dc.4 if_dc.4
MLINKS+=disc.4 if_disc.4
-MLINKS+=ed.4 if_ed.4
MLINKS+=edsc.4 if_edsc.4
MLINKS+=em.4 if_em.4
MLINKS+=enc.4 if_enc.4
Modified: head/sys/amd64/conf/NOTES
==
--- head/sys/amd64/conf/NOTES Fri May 17 15:22:54 2019(r347910)
+++ head/sys/amd64/conf/NOTES Fri May 17 15:23:02 2019(r347911)
@@ -292,9 +292,6 @@ device cpufreq
# bxe: Broadcom NetXtreme II (BCM5771X/BCM578XX) PCIe 10Gb Ethernet
# adapters.
-# ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
-# HP PC Lan+, various PC Card devices
-# (requires miibus)
# ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter
# Requires the ipw firmware module
# iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters
@@ -312,7 +309,6 @@ device cpufreq
# Requires the wpi firmware module
device bxe # Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE
-device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards
optionsED_3C503
optionsED_HPP
optionsED_SIC
Modified: head/sys/conf/files
==
--- head/sys/conf/files Fri May 17 15:22:54 2019(r347910)
+++ head/sys/conf/files Fri May 17 15:23:02 2019(r347911)
@@ -1583,11 +1583,6 @@ dev/drm2/ttm/ttm_execbuf_util.c optional drm2
dev/drm2/ttm/ttm_memory.c optional drm2
dev/drm2/ttm/ttm_page_alloc.c optional drm2
dev/drm2/ttm/ttm_bo_vm.c optional drm2
-dev/ed/if_ed.c optional ed
-dev/ed/if_ed_novell.c optional ed
-dev/ed/if_ed_rtl80x9.c optional ed
-dev/ed/if_ed_pccard.c optional ed pccard
-dev/ed/if_ed_pci.c optional ed pci
dev/efidev/efidev.coptional efirt
dev/efidev/efirt.c optional efirt
dev/efidev/efirtc.coptional efirt
Modified: head/sys/i386/conf/GENERIC
==
--- head/sys/i386/conf/GENERIC Fri May 17 15:22:54 2019(r347910)
+++ head/sys/i386/conf/GENERIC Fri May 17 15:23:02 2019(r347911)
@@ -271,8 +271,6 @@ device wb # Winbond
W89C840F
device xl # 3Com 3c90x (``Boomerang'',
``Cyclone'')
# ISA Ethernet NICs. pccard NICs included.
-# 'device ed' requires 'device miibus'
-device ed # NE[12]000, SMC Ultra, 3c503, DS8390
cards
device ex # Intel EtherExpress Pro/10 and Pro/10+
device ep # Etherlink III based cards
device fe # Fujitsu MB8696x based cards
Modified: head/sys/i386/conf/NOTES
==
--- head/sys/i386/conf/NOTESFri May 17 15:22:54 2019(r347910)
+++ head/sys/i386/conf/NOTESFri May 17 15:23:02 2019(r347911)
@@ -505,9 +505,6 @@ device cpufreq
# ctau: Cronyx Tau sync dual port V.35/RS-232/RS-530/RS-449/X.21/G.7
svn commit: r347908 - in head: . share/man/man4/man4.powerpc sys/conf sys/dev/bm sys/modules sys/modules/bm sys/powerpc/conf
Author: brooks
Date: Fri May 17 15:20:51 2019
New Revision: 347908
URL: https://svnweb.freebsd.org/changeset/base/347908
Log:
FCP-101: Remove bm(4).
Relnotes: yes
FCP: https://github.com/freebsd/fcp/blob/master/fcp-0101.md
Reviewed by: jhb, imp
Differential Revision:https://reviews.freebsd.org/D20230
Deleted:
head/share/man/man4/man4.powerpc/bm.4
head/sys/dev/bm/
head/sys/modules/bm/
Modified:
head/ObsoleteFiles.inc
head/share/man/man4/man4.powerpc/Makefile
head/sys/conf/files.powerpc
head/sys/modules/Makefile
head/sys/powerpc/conf/GENERIC
head/sys/powerpc/conf/NOTES
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Fri May 17 15:19:12 2019(r347907)
+++ head/ObsoleteFiles.inc Fri May 17 15:20:51 2019(r347908)
@@ -39,6 +39,7 @@
# done
# 20190518: Remove obsolete 10 and 10/100 ethernet drivers.
+OLD_FILES+=usr/share/man/man4/bm.4
# 20190513: libcap_sysctl interface change
OLD_FILES+=lib/casper/libcap_sysctl.1
# 20190509: tests/sys/opencrypto requires the net/py-dpkt package.
Modified: head/share/man/man4/man4.powerpc/Makefile
==
--- head/share/man/man4/man4.powerpc/Makefile Fri May 17 15:19:12 2019
(r347907)
+++ head/share/man/man4/man4.powerpc/Makefile Fri May 17 15:20:51 2019
(r347908)
@@ -6,7 +6,6 @@ MAN=adb.4 \
akbd.4 \
abtn.4 \
ams.4 \
- bm.4 \
cuda.4 \
dtsec.4 \
llan.4 \
Modified: head/sys/conf/files.powerpc
==
--- head/sys/conf/files.powerpc Fri May 17 15:19:12 2019(r347907)
+++ head/sys/conf/files.powerpc Fri May 17 15:20:51 2019(r347908)
@@ -22,7 +22,6 @@ cddl/dev/dtrace/powerpc/dtrace_subr.c optional dtrace
cddl/dev/fbt/powerpc/fbt_isa.c optional dtrace_fbt | dtraceall
compile-with "${FBT_C}"
crypto/blowfish/bf_enc.c optionalcrypto | ipsec | ipsec_support
crypto/des/des_enc.c optionalcrypto | ipsec | ipsec_support
| netsmb
-dev/bm/if_bm.c optionalbm powermac
dev/adb/adb_bus.c optionaladb
dev/adb/adb_kbd.c optionaladb
dev/adb/adb_mouse.coptionaladb
Modified: head/sys/modules/Makefile
==
--- head/sys/modules/Makefile Fri May 17 15:19:12 2019(r347907)
+++ head/sys/modules/Makefile Fri May 17 15:20:51 2019(r347908)
@@ -68,7 +68,6 @@ SUBDIR= \
${_bios} \
${_bktr} \
${_blake2} \
- ${_bm} \
bnxt \
bridgestp \
bwi \
@@ -766,7 +765,6 @@ _cpsw= cpsw
.if ${MACHINE_CPUARCH} == "powerpc"
_agp= agp
_an= an
-_bm= bm
_cardbus= cardbus
_cbb= cbb
_cfi= cfi
Modified: head/sys/powerpc/conf/GENERIC
==
--- head/sys/powerpc/conf/GENERIC Fri May 17 15:19:12 2019
(r347907)
+++ head/sys/powerpc/conf/GENERIC Fri May 17 15:20:51 2019
(r347908)
@@ -155,7 +155,6 @@ device fwe # Ethernet over
FireWire (non-standard!)
# PCI Ethernet NICs that use the common MII bus controller code.
device miibus # MII bus support
device bge # Broadcom BCM570xx Gigabit Ethernet
-device bm # Apple BMAC Ethernet
device gem # Sun GEM/Sun ERI/Apple GMAC
device dc # DEC/Intel 21143 and various workalikes
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
Modified: head/sys/powerpc/conf/NOTES
==
--- head/sys/powerpc/conf/NOTES Fri May 17 15:19:12 2019(r347907)
+++ head/sys/powerpc/conf/NOTES Fri May 17 15:20:51 2019(r347908)
@@ -54,7 +54,6 @@ devicecpufreq
# Standard busses
device agp
-device bm # Apple BMAC (Big Mac Ethernet)
device glc # Sony Playstation 3 Ethernet
device kiic# Apple Keywest I2C Controller
device ofwd# Open Firmware disks
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347907 - head
Author: brooks Date: Fri May 17 15:19:12 2019 New Revision: 347907 URL: https://svnweb.freebsd.org/changeset/base/347907 Log: FCP-101: remove obsolete 10 and 10/100 Ethernet drivers. Initial commit adding comment to ObsoleteFiles. Each driver will be removed in a seperate commit to allow later reverts if required. FCP: https://github.com/freebsd/fcp/blob/master/fcp-0101.md Reviewed by: jhb, imp Differential Revision:https://reviews.freebsd.org/D20230 Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Fri May 17 14:29:56 2019(r347906) +++ head/ObsoleteFiles.inc Fri May 17 15:19:12 2019(r347907) @@ -38,6 +38,7 @@ # xargs -n1 | sort | uniq -d; # done +# 20190518: Remove obsolete 10 and 10/100 ethernet drivers. # 20190513: libcap_sysctl interface change OLD_FILES+=lib/casper/libcap_sysctl.1 # 20190509: tests/sys/opencrypto requires the net/py-dpkt package. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347906 - stable/12/sys/dev/isp
Author: ken
Date: Fri May 17 14:29:56 2019
New Revision: 347906
URL: https://svnweb.freebsd.org/changeset/base/347906
Log:
MFC r345008:
r345008 | ken | 2019-03-11 10:21:14 -0400 (Mon, 11 Mar 2019) | 59 lines
Fix CRN resets in the isp(4) driver in certain situations.
The Command Reference Number (CRN) is part of the FC-Tape features
that we enable when talking to tape drives. It starts at 1, and
goes to 255 and wraps around to 1. There are a number of reset
type conditions that result in the CRN getting reset to 1. These
are detailed in section 4.10 (table 8) of the FCP-4r02b specification.
One of the conditions is when a PRLI (Process Login) is sent by
the initiator, and the Establish Image Pair bit is set in Word 0
of the PRLI.
Previously, the isp(4) driver core sent a notification via
isp_async() that the target had changed or stayed in place, but
there was no indication of whether a PRLI was sent and whether the
Establish Image Pair bit was set.
The result of this was that in some situations, notably
switching back and forth between a direct connection and a switch
connection to a tape drive, the isp(4) driver would fail to reset
the CRN in situations that require it according to the spec. When
the CRN isn't reset in a situation that requires it, the tape drive
then rejects every subsequent command that is sent to the drive.
It is assuming that the commands are being sent out of order.
So, modify the isp(4) driver to include Word 0 of the PRLI command
when it sends isp_async() notifications of target changes. Look at
the Establish Image Pair bit, and reset the CRN if that bit is set.
With this change, I am able to switch a tape drive back and forth
between a direct connection and a switch connection, and the isp(4)
driver resets the CRN when it should.
sys/dev/isp_stds.h:
Add bit definitions for PRLI Word 0.
sys/dev/ispmbox.h:
Add PRLI Word 0 to the port database type, isp_pdb_t.
sys/dev/ispvar.h
Add PRLI Word 0 to fcportdb_t.
sys/dev/isp.c:
Populate the new prli_word0 parameter in the port database.
In isp_pdb_add_update(), add a check to see if the
Establish Image Pair bit is set in PRLI Word 0. If it is,
then that is an additional reason to create a change
notification.
sys/dev/isp_freebsd.c:
In isp_async(), if the device changed or stayed, look at
PRLI Word 0 to see if the Establish Image Pair bit is set.
If it is, reset the CRN if we haven't already.
Sponsored by: Spectra Logic
Differential Revision:https://reviews.freebsd.org/D19472
Modified:
stable/12/sys/dev/isp/isp.c
stable/12/sys/dev/isp/isp_freebsd.c
stable/12/sys/dev/isp/isp_stds.h
stable/12/sys/dev/isp/ispmbox.h
stable/12/sys/dev/isp/ispvar.h
Modified: stable/12/sys/dev/isp/isp.c
==
--- stable/12/sys/dev/isp/isp.c Fri May 17 14:09:33 2019(r347905)
+++ stable/12/sys/dev/isp/isp.c Fri May 17 14:29:56 2019(r347906)
@@ -2791,6 +2791,7 @@ isp_getpdb(ispsoftc_t *isp, int chan, uint16_t id, isp
if (IS_24XX(isp)) {
isp_get_pdb_24xx(isp, isp->isp_iocb, &un.bill);
pdb->handle = un.bill.pdb_handle;
+ pdb->prli_word0 = un.bill.pdb_prli_svc0;
pdb->prli_word3 = un.bill.pdb_prli_svc3;
pdb->portid = BITS2WORD_24XX(un.bill.pdb_portid_bits);
ISP_MEMCPY(pdb->portname, un.bill.pdb_portname, 8);
@@ -2807,6 +2808,7 @@ isp_getpdb(ispsoftc_t *isp, int chan, uint16_t id, isp
} else {
isp_get_pdb_21xx(isp, isp->isp_iocb, &un.fred);
pdb->handle = un.fred.pdb_loopid;
+ pdb->prli_word0 = un.fred.pdb_prli_svc0;
pdb->prli_word3 = un.fred.pdb_prli_svc3;
pdb->portid = BITS2WORD(un.fred.pdb_portid_bits);
ISP_MEMCPY(pdb->portname, un.fred.pdb_portname, 8);
@@ -3196,6 +3198,7 @@ isp_pdb_sync(ispsoftc_t *isp, int chan)
lp->state = FC_PORTDB_STATE_VALID;
isp_async(isp, ISPASYNC_DEV_CHANGED, chan, lp);
lp->portid = lp->new_portid;
+ lp->prli_word0 = lp->new_prli_word0;
lp->prli_word3 = lp->new_prli_word3;
break;
case FC_PORTDB_STATE_VALID:
@@ -3247,7 +3250,8 @@ isp_pdb_add_update(ispsoftc_t *isp, int chan, isp_pdb_
/* Old device, nothing new. */
if (lp->portid == pdb->portid &&
lp->handle == pdb->handle &&
- lp->prli_
svn commit: r347905 - stable/12/sys/conf
Author: markj
Date: Fri May 17 14:09:33 2019
New Revision: 347905
URL: https://svnweb.freebsd.org/changeset/base/347905
Log:
MFC r347569:
Remove redundant -Wl uses from the kernel's LDFLAGS.
Modified:
stable/12/sys/conf/kern.pre.mk
stable/12/sys/conf/kmod.mk
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/conf/kern.pre.mk
==
--- stable/12/sys/conf/kern.pre.mk Fri May 17 14:08:58 2019
(r347904)
+++ stable/12/sys/conf/kern.pre.mk Fri May 17 14:09:33 2019
(r347905)
@@ -118,7 +118,7 @@ DEFINED_PROF= ${PROF}
CFLAGS+= ${CONF_CFLAGS}
.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mbuild-id}
-LDFLAGS+= -Wl,--build-id=sha1
+LDFLAGS+= --build-id=sha1
.endif
.if (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
@@ -127,11 +127,11 @@ LDFLAGS+= -Wl,--build-id=sha1
.error amd64/arm64/i386 kernel requires linker ifunc support
.endif
.if ${MACHINE_CPUARCH} == "amd64"
-LDFLAGS+= -Wl,-z max-page-size=2097152
+LDFLAGS+= -z max-page-size=2097152
.if ${LINKER_TYPE} != "lld"
-LDFLAGS+= -Wl,-z common-page-size=4096
+LDFLAGS+= -z common-page-size=4096
.else
-LDFLAGS+= -Wl,-z -Wl,ifunc-noplt
+LDFLAGS+= -z ifunc-noplt
.endif
.endif
Modified: stable/12/sys/conf/kmod.mk
==
--- stable/12/sys/conf/kmod.mk Fri May 17 14:08:58 2019(r347904)
+++ stable/12/sys/conf/kmod.mk Fri May 17 14:09:33 2019(r347905)
@@ -138,7 +138,7 @@ CFLAGS+=-fno-common
LDFLAGS+= -d -warn-common
.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mbuild-id}
-LDFLAGS+= -Wl,--build-id=sha1
+LDFLAGS+= --build-id=sha1
.endif
CFLAGS+= ${DEBUG_FLAGS}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347904 - stable/12/sys/amd64/amd64
Author: markj Date: Fri May 17 14:08:58 2019 New Revision: 347904 URL: https://svnweb.freebsd.org/changeset/base/347904 Log: MFC r347564: Fix formatting. Modified: stable/12/sys/amd64/amd64/trap.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/amd64/amd64/trap.c == --- stable/12/sys/amd64/amd64/trap.cFri May 17 13:08:12 2019 (r347903) +++ stable/12/sys/amd64/amd64/trap.cFri May 17 14:08:58 2019 (r347904) @@ -904,8 +904,8 @@ trap_fatal(frame, eva) code & PGEX_U ? "user" : "supervisor", code & PGEX_W ? "write" : "read", code & PGEX_I ? "instruction" : "data", - code & PGEX_PK ? " prot key" : " ", - code & PGEX_SGX ? " SGX" : " ", + code & PGEX_PK ? " prot key" : "", + code & PGEX_SGX ? " SGX" : "", code & PGEX_RSV ? "reserved bits in PTE" : code & PGEX_P ? "protection violation" : "page not present"); } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347903 - head/sys/dev/bge
Author: tychon
Date: Fri May 17 13:08:12 2019
New Revision: 347903
URL: https://svnweb.freebsd.org/changeset/base/347903
Log:
Remove unused define.
Sponsored by: Dell EMC Isilon
Modified:
head/sys/dev/bge/if_bgereg.h
Modified: head/sys/dev/bge/if_bgereg.h
==
--- head/sys/dev/bge/if_bgereg.hFri May 17 08:25:31 2019
(r347902)
+++ head/sys/dev/bge/if_bgereg.hFri May 17 13:08:12 2019
(r347903)
@@ -3073,11 +3073,3 @@ struct bge_softc {
#defineBGE_LOCK_ASSERT(_sc)mtx_assert(&(_sc)->bge_mtx, MA_OWNED)
#defineBGE_UNLOCK(_sc) mtx_unlock(&(_sc)->bge_mtx)
#defineBGE_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->bge_mtx)
-
-#ifdef BUS_SPACE_MAXADDR
-#if (BUS_SPACE_MAXADDR > 0x)
-#defineBGE_DMA_BOUNDARY(0x1)
-#else
-#defineBGE_DMA_BOUNDARY0
-#endif
-#endif
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347902 - stable/12/sys/netinet
Author: tuexen
Date: Fri May 17 08:25:31 2019
New Revision: 347902
URL: https://svnweb.freebsd.org/changeset/base/347902
Log:
MFC r347382:
Receiver side DSACK implemenation.
This adds initial support for RFC 2883.
This was submitted by Richard Scheffeneffer.
MFC r347407:
Don't use C++ style comments.
Thanks to ngie@ for reporting the issue.
Modified:
stable/12/sys/netinet/tcp_input.c
stable/12/sys/netinet/tcp_sack.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/netinet/tcp_input.c
==
--- stable/12/sys/netinet/tcp_input.c Fri May 17 08:21:27 2019
(r347901)
+++ stable/12/sys/netinet/tcp_input.c Fri May 17 08:25:31 2019
(r347902)
@@ -2278,6 +2278,17 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, stru
TCPSTAT_INC(tcps_rcvpartduppack);
TCPSTAT_ADD(tcps_rcvpartdupbyte, todrop);
}
+ /*
+* DSACK - add SACK block for dropped range
+*/
+ if (tp->t_flags & TF_SACK_PERMIT) {
+ tcp_update_sack_list(tp, th->th_seq, th->th_seq+tlen);
+ /*
+* ACK now, as the next in-sequence segment
+* will clear the DSACK block again
+*/
+ tp->t_flags |= TF_ACKNOW;
+ }
drop_hdrlen += todrop; /* drop from the top afterwards */
th->th_seq += todrop;
tlen -= todrop;
@@ -3006,6 +3017,8 @@ dodata:
/* XXX */
if ((tlen || (thflags & TH_FIN) || tfo_syn) &&
TCPS_HAVERCVDFIN(tp->t_state) == 0) {
tcp_seq save_start = th->th_seq;
+ tcp_seq save_rnxt = tp->rcv_nxt;
+ int save_tlen = tlen;
m_adj(m, drop_hdrlen); /* delayed header drop */
/*
* Insert segment which includes th into TCP reassembly queue
@@ -3045,11 +3058,34 @@ dodata:
/* XXX */
* m_adj() doesn't actually frees any mbufs
* when trimming from the head.
*/
- thflags = tcp_reass(tp, th, &save_start, &tlen, m);
+ tcp_seq temp = save_start;
+ thflags = tcp_reass(tp, th, &temp, &tlen, m);
tp->t_flags |= TF_ACKNOW;
}
- if (tlen > 0 && (tp->t_flags & TF_SACK_PERMIT))
- tcp_update_sack_list(tp, save_start, save_start + tlen);
+ if (tp->t_flags & TF_SACK_PERMIT) {
+ if (((tlen == 0) && (save_tlen > 0) &&
+ (SEQ_LT(save_start, save_rnxt {
+ /*
+* DSACK actually handled in the fastpath
+* above.
+*/
+ tcp_update_sack_list(tp, save_start, save_start
+ save_tlen);
+ } else
+ if ((tlen > 0) && SEQ_GT(tp->rcv_nxt, save_rnxt)) {
+ /*
+* Cleaning sackblks by using zero length
+* update.
+*/
+ tcp_update_sack_list(tp, save_start,
save_start);
+ } else
+ if ((tlen > 0) && (tlen >= save_tlen)) {
+ /* Update of sackblks. */
+ tcp_update_sack_list(tp, save_start, save_start
+ save_tlen);
+ } else
+ if (tlen > 0) {
+ tcp_update_sack_list(tp, save_start,
save_start+tlen);
+ }
+ }
#if 0
/*
* Note the amount of data that peer has sent into
Modified: stable/12/sys/netinet/tcp_sack.c
==
--- stable/12/sys/netinet/tcp_sack.cFri May 17 08:21:27 2019
(r347901)
+++ stable/12/sys/netinet/tcp_sack.cFri May 17 08:25:31 2019
(r347902)
@@ -168,7 +168,7 @@ tcp_update_sack_list(struct tcpcb *tp, tcp_seq rcv_sta
INP_WLOCK_ASSERT(tp->t_inpcb);
/* Check arguments. */
- KASSERT(SEQ_LT(rcv_start, rcv_end), ("rcv_start < rcv_end"));
+ KASSERT(SEQ_LEQ(rcv_start, rcv_end), ("rcv_start <= rcv_end"));
/* SACK block for the received segment. */
head_blk.start = rcv_start;
@@ -193,12 +193,54 @@ tcp_update_sack_list(struct tcpcb *tp, tcp_seq rcv_sta
* Merge this SACK block into head_blk. This SACK
svn commit: r347901 - stable/12/sys/netinet/cc
Author: tuexen Date: Fri May 17 08:21:27 2019 New Revision: 347901 URL: https://svnweb.freebsd.org/changeset/base/347901 Log: MFC r347381: Prevent cwnd to collapse down to 1 MSS after exiting recovery. This is descrined in RFC 6582, which updates RFC 3782. Modified: stable/12/sys/netinet/cc/cc_cubic.c stable/12/sys/netinet/cc/cc_htcp.c stable/12/sys/netinet/cc/cc_newreno.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/netinet/cc/cc_cubic.c == --- stable/12/sys/netinet/cc/cc_cubic.c Fri May 17 08:19:43 2019 (r347900) +++ stable/12/sys/netinet/cc/cc_cubic.c Fri May 17 08:21:27 2019 (r347901) @@ -324,7 +324,12 @@ cubic_post_recovery(struct cc_var *ccv) pipe = CCV(ccv, snd_max) - ccv->curack; if (pipe < CCV(ccv, snd_ssthresh)) - CCV(ccv, snd_cwnd) = pipe + CCV(ccv, t_maxseg); + /* +* Ensure that cwnd does not collapse to 1 MSS under +* adverse conditions. Implements RFC6582 +*/ + CCV(ccv, snd_cwnd) = max(pipe, CCV(ccv, t_maxseg)) + + CCV(ccv, t_maxseg); else /* Update cwnd based on beta and adjusted max_cwnd. */ CCV(ccv, snd_cwnd) = max(1, ((CUBIC_BETA * Modified: stable/12/sys/netinet/cc/cc_htcp.c == --- stable/12/sys/netinet/cc/cc_htcp.c Fri May 17 08:19:43 2019 (r347900) +++ stable/12/sys/netinet/cc/cc_htcp.c Fri May 17 08:21:27 2019 (r347901) @@ -366,7 +366,12 @@ htcp_post_recovery(struct cc_var *ccv) pipe = CCV(ccv, snd_max) - ccv->curack; if (pipe < CCV(ccv, snd_ssthresh)) - CCV(ccv, snd_cwnd) = pipe + CCV(ccv, t_maxseg); + /* +* Ensure that cwnd down not collape to 1 MSS under +* adverse conditions. Implements RFC6582 +*/ + CCV(ccv, snd_cwnd) = max(pipe, CCV(ccv, t_maxseg)) + + CCV(ccv, t_maxseg); else CCV(ccv, snd_cwnd) = max(1, ((htcp_data->beta * htcp_data->prev_cwnd / CCV(ccv, t_maxseg)) Modified: stable/12/sys/netinet/cc/cc_newreno.c == --- stable/12/sys/netinet/cc/cc_newreno.c Fri May 17 08:19:43 2019 (r347900) +++ stable/12/sys/netinet/cc/cc_newreno.c Fri May 17 08:21:27 2019 (r347901) @@ -299,7 +299,12 @@ newreno_post_recovery(struct cc_var *ccv) pipe = CCV(ccv, snd_max) - ccv->curack; if (pipe < CCV(ccv, snd_ssthresh)) - CCV(ccv, snd_cwnd) = pipe + CCV(ccv, t_maxseg); + /* +* Ensure that cwnd does not collapse to 1 MSS under +* adverse conditons. Implements RFC6582 +*/ + CCV(ccv, snd_cwnd) = max(pipe, CCV(ccv, t_maxseg)) + + CCV(ccv, t_maxseg); else CCV(ccv, snd_cwnd) = CCV(ccv, snd_ssthresh); } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347900 - stable/12/sys/dev/virtio/network
Author: tuexen
Date: Fri May 17 08:19:43 2019
New Revision: 347900
URL: https://svnweb.freebsd.org/changeset/base/347900
Log:
MFC r347233:
Remove non-functional SCTP checksum offload support for virtio.
Checksum offloading for SCTP is not currently specified for virtio.
If the hypervisor announces checksum offloading support, it means TCP
and UDP checksum offload. If an SCTP packet is sent and the host announced
checksum offload support, the hypervisor inserts the IP checksum (16-bit)
at the correct offset, but this is not the right checksum, which is a CRC32c.
This results in all outgoing packets having the wrong checksum and therefore
breaking SCTP based communications.
This patch removes SCTP checksum offloading support from the virtio
network interface.
Thanks to Felix Weinrank for making me aware of the issue.
Modified:
stable/12/sys/dev/virtio/network/if_vtnet.c
stable/12/sys/dev/virtio/network/if_vtnetvar.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/dev/virtio/network/if_vtnet.c
==
--- stable/12/sys/dev/virtio/network/if_vtnet.c Fri May 17 00:02:35 2019
(r347899)
+++ stable/12/sys/dev/virtio/network/if_vtnet.c Fri May 17 08:19:43 2019
(r347900)
@@ -69,7 +69,6 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-#include
#include
#include
@@ -1525,9 +1524,6 @@ vtnet_rxq_csum_by_offset(struct vtnet_rxq *rxq, struct
m->m_pkthdr.csum_flags |= CSUM_DATA_VALID | CSUM_PSEUDO_HDR;
m->m_pkthdr.csum_data = 0x;
break;
- case offsetof(struct sctphdr, checksum):
- m->m_pkthdr.csum_flags |= CSUM_SCTP_VALID;
- break;
default:
sc->vtnet_stats.rx_csum_bad_offset++;
return (1);
@@ -1584,11 +1580,6 @@ vtnet_rxq_csum_by_parse(struct vtnet_rxq *rxq, struct
return (1);
m->m_pkthdr.csum_flags |= CSUM_DATA_VALID | CSUM_PSEUDO_HDR;
m->m_pkthdr.csum_data = 0x;
- break;
- case IPPROTO_SCTP:
- if (__predict_false(m->m_len < offset + sizeof(struct sctphdr)))
- return (1);
- m->m_pkthdr.csum_flags |= CSUM_SCTP_VALID;
break;
default:
/*
Modified: stable/12/sys/dev/virtio/network/if_vtnetvar.h
==
--- stable/12/sys/dev/virtio/network/if_vtnetvar.h Fri May 17 00:02:35
2019(r347899)
+++ stable/12/sys/dev/virtio/network/if_vtnetvar.h Fri May 17 08:19:43
2019(r347900)
@@ -268,8 +268,8 @@ struct vtnet_mac_filter {
CTASSERT(sizeof(struct vtnet_mac_filter) <= PAGE_SIZE);
#define VTNET_TX_TIMEOUT 5
-#define VTNET_CSUM_OFFLOAD (CSUM_TCP | CSUM_UDP | CSUM_SCTP)
-#define VTNET_CSUM_OFFLOAD_IPV6(CSUM_TCP_IPV6 | CSUM_UDP_IPV6 |
CSUM_SCTP_IPV6)
+#define VTNET_CSUM_OFFLOAD (CSUM_TCP | CSUM_UDP)
+#define VTNET_CSUM_OFFLOAD_IPV6(CSUM_TCP_IPV6 | CSUM_UDP_IPV6)
#define VTNET_CSUM_ALL_OFFLOAD \
(VTNET_CSUM_OFFLOAD | VTNET_CSUM_OFFLOAD_IPV6 | CSUM_TSO)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r347638 - in head: . etc lib/libc/gen
On Thu, May 16, 2019 at 08:05:29AM -0700, Conrad Meyer wrote: > Hi Brad, > > Can you revert this? It seems to break every config-management tool > we have (mergemaster, etcupdate, beinstall ...). +1. > The commit message describes what was changed, but not *why* you > thought it was a good idea. > > > Added: > > head/lib/libc/gen/group > > - copied unchanged from r347637, head/etc/group > > head/lib/libc/gen/master.passwd > > - copied unchanged from r347637, head/etc/master.passwd What was wrong with etc/? What can be more logical than this? libc/gen/ makes so no sense. ./danfe ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
