Re: svn commit: r238973 - head/sys/x86/x86
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 08/01/2012 10:32, Konstantin Belousov wrote: It should have been the text Forced commit? :) - -- I am only one, but I am one. I cannot do everything, but I can do something. And I will not let what I cannot do interfere with what I can do. -- Edward Everett Hale, (1822 - 1909) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.19 (FreeBSD) iQEcBAEBCAAGBQJQH210AAoJEFzGhvEaGryEQ/8H/jTrpM5C8TiyxU4A3wTieeUx 1IlDUpRaiLO65u6iWE2/NcxstL2QOnBHNmuIDSZ3MCDf7ytlH8XuDkEA0kj54zlK /evgsR4wP9us53lWtLPG4PUcKtjU0iZ10lP4iGENbdP/5pf/pbT1sZ7NDqeXajT/ RrwiIipgdCwZRqQ9MaU/3EUUH1gA40Y7Wohm6gRT0rFEBOHagjpIpOW1oPPmNSjE TJW30JDJXkccCn3BGjcPA93zhPcW1Hg+O6Ekr88gTp2SdGDgHhI6O27j/2zN/xgZ GjFHVlynA4p3a+e9sfi4j0b3jLVaoz5vyaWPJmeHfKpP02wxUL9l44AF/ErodpA= =GiTg -END PGP SIGNATURE- ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r238622 - head/etc/rc.d
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
On 08/02/2012 20:58, Hiroki Sato wrote:
Doug Barton do...@freebsd.org wrote in
501af66a.8020...@freebsd.org:
do On 8/2/2012 2:25 PM, Maksim Yevmenkin wrote: do On Thu, Aug
2, 2012 at 1:55 PM, Hiroki Sato h...@freebsd.org wrote: do do
Just curious, why ip6addrctl_enable=NO is not enough here? do
do Because the behavior of the script for =NO is to prefer v4.
No, when ip6addrctl_enable=NO the rc.d/ip6addtctl script will be
simply ignored. No rule will be installed in that case.
I wondered about that, but the script has an explicit case for it.
do I would do like to eliminate yes/no/none keywords in
$ip6addrctl_policy because do such keywords are vague. If we
need the empty rule for some reason, do empty would be a
better name for the policy, I think. do do Personally I think
that the established meanings of yes and no are do well
understood, but I wouldn't object to emitting a warning for them
to do help the user make a more explicit selection.
I do not think ip6addrctl_policy={yes|no} is meaningful.
Aside from my argument that the script is poorly named, and the whole
interface is badly designed ... I think users who would say yes here
would expect that IPv6 would be preferred, and no to mean it would
not be. That is in fact what happens now, so in that sense at least
things seem to be meaningful. :)
do While we're at it, the way that the current script replicates
the test do for checkyesno in case is bogus, and should be
changed. I had fixed this do in the change set that you(hrs)
backed out. To stick with the structure do of the current script,
something like this would work: do do
http://people.freebsd.org/~dougb/ip6addrctl.diff do do That also
brings in the warning described above.
I think additional warnings are not needed because a warning will
be displayed when ipv6_prefer={yes|no} is defined. I have no
objection to use checkyesno() itself to check if the variable is
defined as yes or no.
There is a warning in the script already, I just made it consistent;
and you were the one who suggested warnings for yes/no. But as you
know I'm prohibited from making changes to that code, so you have my
patch, do with it as you will.
Doug
- --
I am only one, but I am one. I cannot do everything, but I can do
something. And I will not let what I cannot do interfere with what
I can do.
-- Edward Everett Hale, (1822 - 1909)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (FreeBSD)
iQEcBAEBCAAGBQJQH3E0AAoJEFzGhvEaGryENTMH/R6HW7J8+2BLJEwor+VyFWUH
da9d+wrp7GSmBjY2dFko+6Z8A3McIqZDTJ9TdTKerilOMBpZkhT86ZUk1eOldBPp
rMKmMcZlK5Z/8s6l1qGGAFbfX7MFq+qQU6d8xo730o5ldRmBQhhmgH0pAZOLF2Iv
4HI1njrJ56KUnDERh0LhrJ+A5n62JyO1ML/YgGFeU5qvDevomDygmrU+zWhTftLJ
0ACW1YVyK5d8Sg5J44s66nbjMeNk1PXpdVN0CA/n03bryoI39S7kLl1iVInQ99MA
afK8UMV8TTbYd7KOlY091NaBny0K2U7LTY7iprMQ2cHE9DaXHewu3X4FFW9eXoY=
=UNRQ
-END PGP SIGNATURE-
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r238622 - head/etc/rc.d
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 08/02/2012 22:28, Hiroki Sato wrote: John Hay j...@meraka.org.za wrote in 20120803042301.ga78...@zibbi.meraka.csir.co.za: jh While you guys are here, may I add a request that we go back to prefering jh IPv6 when IPv6 addresses are enabled. That is the way it was from FBSD-4 jh up to FBSD-8. 9 is a big POLA here. Actually all that used to be needed was ipv6_enable. I modified the rc.d code for this prior to 9-release to make it compatible with the old knobs (aka, expected behavior), but hrs overruled me and installed his version instead. jh The world is past World IPv6 Launch jh and I think people expect that if they configure IPv6 addresses, that jh would be prefered. If you configure IPv6 addresses and do not want them jh prefered, you are the odd one out and should have to do something. I agree. My proposal was that if an interface is configured for IPv4 it should get the same treatment for IPv6. That is, if it's set up for DHCP in IPv4 then it should automatically do SLAAC/RA in IPv6; and if it's statically configured in v4, the user should have to configure it in v6 as well (either with a static definition or by explicitly enabling RA). I wanted to move to a model where you could simply say ifconfig_em0=auto and have it DTRT. jh Otherwise when in the future are we going to change it? IPv4-preferred was chosen as the default because difference of the loopback performance was large. I am a big fun to make FreeBSD IPv6-capable by default and prefer IPv6, but the concern was a possible negative impact for people who are using only IPv4. Hiroki, you and Bjoern made the same argument over 2 years ago. Are you saying that nothing has been done to improve this in that whole time? If this is such an important problem, why hasn't it been addressed? So, can we change it for 10.X now? We cannot use whether IPv6 address is configured because ::1 is always configured in GENERIC kernel. The change will be IPv6-preferred if the kernel has INET6 support. Aren't those 2 ways to say the same thing? There is no v6 address configured on lo0 if there is no INET6 in the kernel. In the current regime I think it would be sufficient to prefer v6 if the user has configured an interface with it (see below). I did this in my version of the code that you reverted, so you can crib from that if you need to. Preferring IPv6 addresses has needed a knob in rc.conf even in 4.x: 4.X: ipv6_enable=YES Until you introduced the changes in 9, it was not necessary to configure the address if you were using RA. Now even with RA it's necessary to do ifconfig_em0_ipv6=inet6 accept_rtadv ipv6_ifconfig_em0=2001:db8::1 prefixlen 64 9.X and later: ip6addrctl_policy=ipv6_prefer ifconfig_em0_ipv6=inet6 2001:db8::1 prefixlen 64 and if we change the default to ipv6_prefer, ip6addrctl_policy= line will be unnecessary. But it will still be necessary to configure the interface. John, In regards to your desire for this to work automatically, we're not there yet. We don't currently have a good way to build v6 into the kernel, and configure interfaces with it, but not actually *use* v6 unless we get a network. What you described was the end goal of the changes I put in, which were ultimately reverted. Doug - -- I am only one, but I am one. I cannot do everything, but I can do something. And I will not let what I cannot do interfere with what I can do. -- Edward Everett Hale, (1822 - 1909) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.19 (FreeBSD) iQEcBAEBCAAGBQJQH3cJAAoJEFzGhvEaGryEgkIIAIOEDh1f2pFXusK0bqytMJIo +6A+ZGNRXkNttXDX53XQxpxQ4MO4zhQIazWV5a8IpbnkIQfAU91st/7oNREPbrr4 18AU4XGlrij5biyhL7BmmP29h5AjHQ4M++WqUxltT64xQ3wTS6HEWCqtrT+CV18S zQK+OBCatU43Fc90FibFMA1N1WVsGpo7C2XCyDBhplwEBld3f4vuS4kBWx9XNGKu aeKqpCgT/XL2PzHlo/YRDHTYU2GiKEFuYyesZBhfLbBw3eFpNl31U8CGT4BzRVy+ +v0n1mfJqup6ApdPeKtOtviUW+5iEEQNf2dnHxKTvihBQ8pSJUqPWeMFalpbEDk= =f8Es -END PGP SIGNATURE- ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239087 - head/tools/tools/bootparttest
Author: ae Date: Mon Aug 6 08:39:29 2012 New Revision: 239087 URL: http://svn.freebsd.org/changeset/base/239087 Log: Add to the debug output the offset from the parent partitioning scheme. Modified: head/tools/tools/bootparttest/bootparttest.c Modified: head/tools/tools/bootparttest/bootparttest.c == --- head/tools/tools/bootparttest/bootparttest.cMon Aug 6 07:20:25 2012(r239086) +++ head/tools/tools/bootparttest/bootparttest.cMon Aug 6 08:39:29 2012(r239087) @@ -54,8 +54,8 @@ diskread(void *arg, void *buf, size_t bl struct disk *dp; dp = (struct disk *)arg; - printf(%s: read %d blocks from the offset %jd\n, dp-name, - blocks, offset); + printf(%s: read %d blocks from the offset %jd [+%jd]\n, dp-name, + blocks, offset, dp-offset); if (offset = dp-mediasize / dp-sectorsize) return (-1); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239088 - head/sys/boot/common
Author: ae Date: Mon Aug 6 08:54:06 2012 New Revision: 239088 URL: http://svn.freebsd.org/changeset/base/239088 Log: Fix start offset calculation for the EBR partitions. Modified: head/sys/boot/common/part.c Modified: head/sys/boot/common/part.c == --- head/sys/boot/common/part.c Mon Aug 6 08:39:29 2012(r239087) +++ head/sys/boot/common/part.c Mon Aug 6 08:54:06 2012(r239088) @@ -389,7 +389,7 @@ ptable_ebrread(struct ptable *table, voi entry = malloc(sizeof(*entry)); if (entry == NULL) break; - entry-part.start = e1-part.start + start; + entry-part.start = offset + start; entry-part.end = entry-part.start + end - 1; entry-part.index = index++; entry-part.type = mbr_parttype(dp[0].dp_typ); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239089 - head/sys/dev/esp
Author: marius
Date: Mon Aug 6 08:58:54 2012
New Revision: 239089
URL: http://svn.freebsd.org/changeset/base/239089
Log:
- Merge from NetBSD:
When issuing a non-DMA command, make sure to set the remaining length of
command to be transferred via DMA (sc_cmdlen) to zero up-front, otherwise
we might get confused on command competition interrupt (no DMA active but
still data left to transfer).
- Implement handling of MSG_IGN_WIDE_RESIDUE which some targets produce, as
just rejecting these leads to a resend and disconnect loop.
Reported and tested by: mjacob
MFC after:3 days
Modified:
head/sys/dev/esp/ncr53c9x.c
Modified: head/sys/dev/esp/ncr53c9x.c
==
--- head/sys/dev/esp/ncr53c9x.c Mon Aug 6 08:54:06 2012(r239088)
+++ head/sys/dev/esp/ncr53c9x.c Mon Aug 6 08:58:54 2012(r239089)
@@ -26,7 +26,7 @@
*
*/
-/* $NetBSD: ncr53c9x.c,v 1.143 2011/07/31 18:39:00 jakllsch Exp $ */
+/* $NetBSD: ncr53c9x.c,v 1.145 2012/06/18 21:23:56 martin Exp $*/
/*-
* Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -256,7 +256,7 @@ ncr53c9x_attach(struct ncr53c9x_softc *s
return (EINVAL);
}
- device_printf(sc-sc_dev, %s, %dMHz, SCSI ID %d\n,
+ device_printf(sc-sc_dev, %s, %d MHz, SCSI ID %d\n,
ncr53c9x_variant_names[sc-sc_rev], sc-sc_freq, sc-sc_id);
sc-sc_ntarg = (sc-sc_rev == NCR_VARIANT_FAS366) ? 16 : 8;
@@ -890,11 +890,8 @@ ncr53c9x_select(struct ncr53c9x_softc *s
sc-sc_cmdp = cmd;
error = NCRDMA_SETUP(sc, sc-sc_cmdp, sc-sc_cmdlen, 0,
dmasize);
- if (error != 0) {
- sc-sc_cmdlen = 0;
- sc-sc_cmdp = NULL;
+ if (error != 0)
goto cmd;
- }
/* Program the SCSI counter. */
NCR_SET_COUNT(sc, dmasize);
@@ -920,6 +917,7 @@ cmd:
*/
/* Now get the command into the FIFO. */
+ sc-sc_cmdlen = 0;
ncr53c9x_wrfifo(sc, cmd, clen);
/* And get the target's attention. */
@@ -1771,7 +1769,7 @@ ncr53c9x_msgin(struct ncr53c9x_softc *sc
struct ncr53c9x_linfo *li;
struct ncr53c9x_tinfo *ti;
uint8_t *pb;
- int lun, plen;
+ int len, lun;
NCR_LOCK_ASSERT(sc, MA_OWNED);
@@ -1818,15 +1816,15 @@ ncr53c9x_msgin(struct ncr53c9x_softc *sc
*/
case NCR_RESELECTED:
pb = sc-sc_imess + 1;
- plen = sc-sc_imlen - 1;
+ len = sc-sc_imlen - 1;
break;
default:
pb = sc-sc_imess;
- plen = sc-sc_imlen;
+ len = sc-sc_imlen;
}
- if (__verify_msg_format(pb, plen))
+ if (__verify_msg_format(pb, len))
goto gotit;
}
@@ -1963,6 +1961,29 @@ gotit:
sc-sc_dleft = ecb-dleft;
break;
+ case MSG_IGN_WIDE_RESIDUE:
+ NCR_MSGS((ignore wide residue (%d bytes),
+ sc-sc_imess[1]));
+ if (sc-sc_imess[1] != 1) {
+ xpt_print_path(ecb-ccb-ccb_h.path);
+ printf(unexpected MESSAGE IGNORE WIDE
+ RESIDUE (%d bytes); sending REJECT\n,
+ sc-sc_imess[1]);
+ goto reject;
+ }
+ /*
+* If there was a last transfer of an even number of
+* bytes, wipe the done memory and adjust by one
+* byte (sc-sc_imess[1]).
+*/
+ len = sc-sc_dleft - ecb-dleft;
+ if (len != 0 (len 1) == 0) {
+ ecb-flags = ~ECB_TENTATIVE_DONE;
+ sc-sc_dp = (char *)sc-sc_dp - 1;
+ sc-sc_dleft--;
+ }
+ break;
+
case MSG_EXTENDED:
NCR_MSGS((extended(%x) , sc-sc_imess[2]));
switch (sc-sc_imess[2]) {
@@ -2272,6 +2293,7 @@ cmd:
/*
* XXX FIFO size
*/
+ sc-sc_cmdlen = 0;
ncr53c9x_flushfifo(sc);
ncr53c9x_wrfifo(sc, sc-sc_omp, sc-sc_omlen);
NCRCMD(sc, NCRCMD_TRANS);
@@ -2811,9 +2833,10 @@ again:
* (Timing problems?)
*/
if (sc-sc_features NCR_F_DMASELECT) {
- if (sc-sc_cmdlen == 0)
+
svn commit: r239090 - head/share/man/man4
Author: glebius Date: Mon Aug 6 08:59:39 2012 New Revision: 239090 URL: http://svn.freebsd.org/changeset/base/239090 Log: Add supported device. Modified: head/share/man/man4/umodem.4 Modified: head/share/man/man4/umodem.4 == --- head/share/man/man4/umodem.4Mon Aug 6 08:58:54 2012 (r239089) +++ head/share/man/man4/umodem.4Mon Aug 6 08:59:39 2012 (r239090) @@ -29,7 +29,7 @@ .\ .\ $FreeBSD$ .\ -.Dd November 20, 2011 +.Dd August 6, 2012 .Dt UMODEM 4 .Os .Sh NAME @@ -92,6 +92,8 @@ Yamaha Broadband Wireless Router RTW65b ELSA MicroLink 56k USB modem .It Sony Ericsson W810i phone +.It +Sonim XP5300 Force .El .Sh SEE ALSO .Xr tty 4 , ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239091 - head/sys/netinet
Author: tuexen Date: Mon Aug 6 10:50:23 2012 New Revision: 239091 URL: http://svn.freebsd.org/changeset/base/239091 Log: Fix a bug found by dim@: Don't use an uninitilized variable, if INVARIANTS is on and an illegal packet with destination 0 is received. MFC after:3 days X-MFC with: 238003 Modified: head/sys/netinet/sctp_input.c Modified: head/sys/netinet/sctp_input.c == --- head/sys/netinet/sctp_input.c Mon Aug 6 08:59:39 2012 (r239090) +++ head/sys/netinet/sctp_input.c Mon Aug 6 10:50:23 2012 (r239091) @@ -5600,7 +5600,7 @@ sctp_common_input_processing(struct mbuf struct mbuf *m = *mm; int un_sent; int cnt_ctrl_ready = 0; - struct sctp_inpcb *inp, *inp_decr = NULL; + struct sctp_inpcb *inp = NULL, *inp_decr = NULL; struct sctp_tcb *stcb = NULL; struct sctp_nets *net = NULL; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239092 - head/sys/netinet/ipfw
Author: luigi
Date: Mon Aug 6 10:50:43 2012
New Revision: 239092
URL: http://svn.freebsd.org/changeset/base/239092
Log:
use FREE_PKT instead of m_freem to free an mbuf.
The former is the standard form used in ipfw/dummynet, so that
it is easier to remap it to different memory managers depending
on the platform.
Modified:
head/sys/netinet/ipfw/ip_fw_log.c
Modified: head/sys/netinet/ipfw/ip_fw_log.c
==
--- head/sys/netinet/ipfw/ip_fw_log.c Mon Aug 6 10:50:23 2012
(r239091)
+++ head/sys/netinet/ipfw/ip_fw_log.c Mon Aug 6 10:50:43 2012
(r239092)
@@ -115,7 +115,7 @@ ipfw_log_output(struct ifnet *ifp, struc
struct sockaddr *dst, struct route *ro)
{
if (m != NULL)
- m_freem(m);
+ FREE_PKT(m);
return EINVAL;
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239093 - head/sys/netinet/ipfw
Author: luigi
Date: Mon Aug 6 11:02:23 2012
New Revision: 239093
URL: http://svn.freebsd.org/changeset/base/239093
Log:
move functions outside the SYSBEGIN/SYSEND block
(SYSBEGIN/SYSEND are specific to ipfw/dummynet and are used to
emulate sysctl on platforms that do not have them, and they work
by creating an array which contains all the sysctl-ed symbols.)
Modified:
head/sys/netinet/ipfw/ip_dn_io.c
Modified: head/sys/netinet/ipfw/ip_dn_io.c
==
--- head/sys/netinet/ipfw/ip_dn_io.cMon Aug 6 10:50:43 2012
(r239092)
+++ head/sys/netinet/ipfw/ip_dn_io.cMon Aug 6 11:02:23 2012
(r239093)
@@ -98,17 +98,11 @@ extern void (*bridge_dn_p)(struct mbuf *
#ifdef SYSCTL_NODE
-SYSBEGIN(f4)
-
-SYSCTL_DECL(_net_inet);
-SYSCTL_DECL(_net_inet_ip);
-static SYSCTL_NODE(_net_inet_ip, OID_AUTO, dummynet, CTLFLAG_RW, 0,
Dummynet);
-
-/* wrapper to pass dn_cfg fields to SYSCTL_* */
-//#define DC(x)((VNET_NAME(_base_dn_cfg).x))
-#define DC(x) ((dn_cfg.x))
-/* parameters */
-
+/*
+ * Because of the way the SYSBEGIN/SYSEND macros work on other
+ * platforms, there should not be functions between them.
+ * So keep the handlers outside the block.
+ */
static int
sysctl_hash_size(SYSCTL_HANDLER_ARGS)
{
@@ -124,10 +118,6 @@ sysctl_hash_size(SYSCTL_HANDLER_ARGS)
return (0);
}
-SYSCTL_PROC(_net_inet_ip_dummynet, OID_AUTO, hash_size,
-CTLTYPE_INT | CTLFLAG_RW, 0, 0, sysctl_hash_size,
-I, Default hash table size);
-
static int
sysctl_limits(SYSCTL_HANDLER_ARGS)
{
@@ -154,6 +144,23 @@ sysctl_limits(SYSCTL_HANDLER_ARGS)
return (0);
}
+SYSBEGIN(f4)
+
+SYSCTL_DECL(_net_inet);
+SYSCTL_DECL(_net_inet_ip);
+static SYSCTL_NODE(_net_inet_ip, OID_AUTO, dummynet, CTLFLAG_RW, 0,
Dummynet);
+
+/* wrapper to pass dn_cfg fields to SYSCTL_* */
+//#define DC(x)((VNET_NAME(_base_dn_cfg).x))
+#define DC(x) ((dn_cfg.x))
+/* parameters */
+
+
+SYSCTL_PROC(_net_inet_ip_dummynet, OID_AUTO, hash_size,
+CTLTYPE_INT | CTLFLAG_RW, 0, 0, sysctl_hash_size,
+I, Default hash table size);
+
+
SYSCTL_PROC(_net_inet_ip_dummynet, OID_AUTO, pipe_slot_limit,
CTLTYPE_LONG | CTLFLAG_RW, 0, 1, sysctl_limits,
L, Upper limit in slots for pipe queue.);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r239066 - head/sys/boot/i386/libi386
On Sunday, August 05, 2012 10:37:49 am Andrey V. Elsukov wrote:
Author: ae
Date: Sun Aug 5 14:37:48 2012
New Revision: 239066
URL: http://svn.freebsd.org/changeset/base/239066
Log:
Add offset field to the i386_devdesc structure to be compatible with
disk_devdesc structure. Update biosdisk driver to the new disk API.
Modified:
head/sys/boot/i386/libi386/Makefile
head/sys/boot/i386/libi386/biosdisk.c
head/sys/boot/i386/libi386/devicename.c
head/sys/boot/i386/libi386/libi386.h
Modified: head/sys/boot/i386/libi386/biosdisk.c
==
--- head/sys/boot/i386/libi386/biosdisk.c Sun Aug 5 14:11:42 2012
(r239065)
+++ head/sys/boot/i386/libi386/biosdisk.c Sun Aug 5 14:37:48 2012
(r239066)
struct devsw biosdisk = {
-disk,
-DEVT_DISK,
-bd_init,
-bd_strategy,
-bd_open,
-bd_close,
-noioctl,
-bd_print,
-NULL
+ disk,
+ DEVT_DISK,
+ bd_init,
+ bd_strategy,
+ bd_open,
+ bd_close,
+ bd_ioctl,
+ bd_print,
+ NULL
};
You should not have mixed style changes in with code changes. This makes the
diff far harder to review and destroys history. I asked you to not do this
before. *sigh*
--
John Baldwin
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r239076 - head/sys/dev/puc
On Sunday, August 05, 2012 3:37:19 pm Eitan Adler wrote: Author: eadler Date: Sun Aug 5 19:37:18 2012 New Revision: 239076 URL: http://svn.freebsd.org/changeset/base/239076 Log: Add support for SIIG Cyber Serial Dual PCI 16C850 Submitted by: David Boyd david.b...@insightbb.com Approved by:cperciva MFC after: 3 days Do you have a PR? For pucdata commits we always want the details about the new card logged in a PR so it is easier to track down details about a particular entry in the future if needed. -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r239073 - in head/sys/boot/userboot: . test userboot
On Sunday, August 05, 2012 1:04:58 pm Andrey V. Elsukov wrote: Author: ae Date: Sun Aug 5 17:04:58 2012 New Revision: 239073 URL: http://svn.freebsd.org/changeset/base/239073 Log: Bump USERBOOT_VERSION. Requested by: dfr Modified: head/sys/boot/userboot/test/test.c head/sys/boot/userboot/userboot.h head/sys/boot/userboot/userboot/main.c Modified: head/sys/boot/userboot/test/test.c == --- head/sys/boot/userboot/test/test.cSun Aug 5 16:59:02 2012 (r239072) +++ head/sys/boot/userboot/test/test.cSun Aug 5 17:04:58 2012 (r239073) @@ -450,5 +450,5 @@ main(int argc, char** argv) term.c_lflag = ~(ICANON|ECHO); tcsetattr(0, TCSAFLUSH, term); - func(cb, NULL, USERBOOT_VERSION_1, disk_fd = 0); + func(cb, NULL, USERBOOT_VERSION_2, disk_fd = 0); } Modified: head/sys/boot/userboot/userboot.h == --- head/sys/boot/userboot/userboot.h Sun Aug 5 16:59:02 2012 (r239072) +++ head/sys/boot/userboot/userboot.h Sun Aug 5 17:04:58 2012 (r239073) @@ -30,6 +30,7 @@ * USERBOOT interface versions */ #define USERBOOT_VERSION_1 1 +#define USERBOOT_VERSION_2 2 /* * Exit codes from the loader Modified: head/sys/boot/userboot/userboot/main.c == --- head/sys/boot/userboot/userboot/main.cSun Aug 5 16:59:02 2012 (r239072) +++ head/sys/boot/userboot/userboot/main.cSun Aug 5 17:04:58 2012 (r239073) @@ -36,6 +36,8 @@ __FBSDID($FreeBSD$); #include disk.h #include libuserboot.h +#define USERBOOT_VERSIONUSERBOOT_VERSION_2 + struct loader_callbacks_v1 *callbacks; void *callbacks_arg; Should this be called loader_callbacks_v2 now? -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r238973 - head/sys/x86/x86
On Mon, Aug 06, 2012 at 12:08:36AM -0700, Doug Barton wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 08/01/2012 10:32, Konstantin Belousov wrote: It should have been the text Forced commit? :) Try 'svn log sys/x86/x86/tsc.c | more' -- Steve ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r238973 - head/sys/x86/x86
On 08/06/2012 07:12 AM, Steve Kargl wrote: On Mon, Aug 06, 2012 at 12:08:36AM -0700, Doug Barton wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 08/01/2012 10:32, Konstantin Belousov wrote: It should have been the text Forced commit? :) Try 'svn log sys/x86/x86/tsc.c | more' Awesome. :) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239095 - head/sys/kern
Author: kan
Date: Mon Aug 6 16:37:43 2012
New Revision: 239095
URL: http://svn.freebsd.org/changeset/base/239095
Log:
Do not add handler to event handlers list until ithread is created.
In rare event when fast and ithread interrupts share the same vector
and the fast handler was registered first, we can end up trying to
schedule the ithread that is not created yet. The kernel built with
INVARIANTS then triggers an assertion.
Change the order to create the ithread first and only then add the
handler that needs it to the interrupt event handlers list.
Reviewed by: jhb
Modified:
head/sys/kern/kern_intr.c
Modified: head/sys/kern/kern_intr.c
==
--- head/sys/kern/kern_intr.c Mon Aug 6 15:22:11 2012(r239094)
+++ head/sys/kern/kern_intr.c Mon Aug 6 16:37:43 2012(r239095)
@@ -545,17 +545,6 @@ intr_event_add_handler(struct intr_event
}
}
- /* Add the new handler to the event in priority order. */
- TAILQ_FOREACH(temp_ih, ie-ie_handlers, ih_next) {
- if (temp_ih-ih_pri ih-ih_pri)
- break;
- }
- if (temp_ih == NULL)
- TAILQ_INSERT_TAIL(ie-ie_handlers, ih, ih_next);
- else
- TAILQ_INSERT_BEFORE(temp_ih, ih, ih_next);
- intr_event_update(ie);
-
/* Create a thread if we need one. */
while (ie-ie_thread == NULL handler != NULL) {
if (ie-ie_flags IE_ADDING_THREAD)
@@ -572,6 +561,18 @@ intr_event_add_handler(struct intr_event
wakeup(ie);
}
}
+
+ /* Add the new handler to the event in priority order. */
+ TAILQ_FOREACH(temp_ih, ie-ie_handlers, ih_next) {
+ if (temp_ih-ih_pri ih-ih_pri)
+ break;
+ }
+ if (temp_ih == NULL)
+ TAILQ_INSERT_TAIL(ie-ie_handlers, ih, ih_next);
+ else
+ TAILQ_INSERT_BEFORE(temp_ih, ih, ih_next);
+ intr_event_update(ie);
+
CTR3(KTR_INTR, %s: added %s to %s, __func__, ih-ih_name,
ie-ie_name);
mtx_unlock(ie-ie_lock);
@@ -618,23 +619,12 @@ intr_event_add_handler(struct intr_event
}
}
- /* Add the new handler to the event in priority order. */
- TAILQ_FOREACH(temp_ih, ie-ie_handlers, ih_next) {
- if (temp_ih-ih_pri ih-ih_pri)
- break;
- }
- if (temp_ih == NULL)
- TAILQ_INSERT_TAIL(ie-ie_handlers, ih, ih_next);
- else
- TAILQ_INSERT_BEFORE(temp_ih, ih, ih_next);
- intr_event_update(ie);
-
/* For filtered handlers, create a private ithread to run on. */
- if (filter != NULL handler != NULL) {
+ if (filter != NULL handler != NULL) {
mtx_unlock(ie-ie_lock);
- it = ithread_create(intr: newborn, ih);
+ it = ithread_create(intr: newborn, ih);
mtx_lock(ie-ie_lock);
- it-it_event = ie;
+ it-it_event = ie;
ih-ih_thread = it;
ithread_update(it); /* XXX - do we really need this?!?!? */
} else { /* Create the global per-event thread if we need one. */
@@ -654,6 +644,18 @@ intr_event_add_handler(struct intr_event
}
}
}
+
+ /* Add the new handler to the event in priority order. */
+ TAILQ_FOREACH(temp_ih, ie-ie_handlers, ih_next) {
+ if (temp_ih-ih_pri ih-ih_pri)
+ break;
+ }
+ if (temp_ih == NULL)
+ TAILQ_INSERT_TAIL(ie-ie_handlers, ih, ih_next);
+ else
+ TAILQ_INSERT_BEFORE(temp_ih, ih, ih_next);
+ intr_event_update(ie);
+
CTR3(KTR_INTR, %s: added %s to %s, __func__, ih-ih_name,
ie-ie_name);
mtx_unlock(ie-ie_lock);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r239076 - head/sys/dev/puc
On 6 August 2012 05:09, John Baldwin j...@freebsd.org wrote: Do you have a PR? For pucdata commits we always want the details about the new card logged in a PR so it is easier to track down details about a particular entry in the future if needed. No, I had a mailing list post: (http://docs.freebsd.org/cgi/getmsg.cgi?fetch=48206+0+current/freebsd-current). I'll make sure to wait for the PR next time. -- Eitan Adler Source Ports committer X11, Bugbusting teams ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239099 - head/lib/libpam/modules/pam_krb5
Author: dim Date: Mon Aug 6 18:40:14 2012 New Revision: 239099 URL: http://svn.freebsd.org/changeset/base/239099 Log: Fix two instances in pam_krb5(8), where the variable 'princ_name' could be used uninitialized. Found by: clang 3.2 Reviewed by: des MFC after:1 week Modified: head/lib/libpam/modules/pam_krb5/pam_krb5.c Modified: head/lib/libpam/modules/pam_krb5/pam_krb5.c == --- head/lib/libpam/modules/pam_krb5/pam_krb5.c Mon Aug 6 17:58:58 2012 (r239098) +++ head/lib/libpam/modules/pam_krb5/pam_krb5.c Mon Aug 6 18:40:14 2012 (r239099) @@ -338,11 +338,11 @@ cleanup: PAM_LOG(Done cleanup); cleanup2: krb5_free_principal(pam_context, princ); - PAM_LOG(Done cleanup2); -cleanup3: if (princ_name) free(princ_name); + PAM_LOG(Done cleanup2); +cleanup3: krb5_free_context(pam_context); PAM_LOG(Done cleanup3); @@ -805,11 +805,11 @@ cleanup: PAM_LOG(Done cleanup); cleanup2: krb5_free_principal(pam_context, princ); - PAM_LOG(Done cleanup2); -cleanup3: if (princ_name) free(princ_name); + PAM_LOG(Done cleanup2); +cleanup3: krb5_free_context(pam_context); PAM_LOG(Done cleanup3); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239100 - head/lib/libpam/modules/pam_unix
Author: dim
Date: Mon Aug 6 18:44:59 2012
New Revision: 239100
URL: http://svn.freebsd.org/changeset/base/239100
Log:
Fix an instance in pam_krb5(8), where the variable 'user' could be used
uninitialized.
Found by: clang 3.2
Reviewed by: des
MFC after:1 week
Modified:
head/lib/libpam/modules/pam_unix/pam_unix.c
Modified: head/lib/libpam/modules/pam_unix/pam_unix.c
==
--- head/lib/libpam/modules/pam_unix/pam_unix.c Mon Aug 6 18:40:14 2012
(r239099)
+++ head/lib/libpam/modules/pam_unix/pam_unix.c Mon Aug 6 18:44:59 2012
(r239100)
@@ -94,13 +94,13 @@ pam_sm_authenticate(pam_handle_t *pamh,
const char *pass, *user, *realpw, *prompt;
if (openpam_get_option(pamh, PAM_OPT_AUTH_AS_SELF)) {
- pwd = getpwnam(getlogin());
+ user = getlogin();
} else {
retval = pam_get_user(pamh, user, NULL);
if (retval != PAM_SUCCESS)
return (retval);
- pwd = getpwnam(user);
}
+ pwd = getpwnam(user);
PAM_LOG(Got user: %s, user);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239101 - head/sys/dev/cxgb/ulp/iw_cxgb
Author: dim Date: Mon Aug 6 18:51:14 2012 New Revision: 239101 URL: http://svn.freebsd.org/changeset/base/239101 Log: In cxgb(4), in function iwch_reregister_phys_mem(), initialize the 'npages' variable to zero, to avoid using it uninitialized in certain cases. Found by: clang Reviewed by: np MFC after:1 week Modified: head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c Modified: head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c == --- head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.cMon Aug 6 18:44:59 2012(r239100) +++ head/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.cMon Aug 6 18:51:14 2012(r239101) @@ -487,7 +487,7 @@ static int iwch_reregister_phys_mem(stru __be64 *page_list = NULL; int shift = 0; u64 total_size; - int npages; + int npages = 0; int ret; CTR3(KTR_IW_CXGB, %s ib_mr %p ib_pd %p, __FUNCTION__, mr, pd); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239102 - head/sys/dev/cxgbe/firmware
Author: dim
Date: Mon Aug 6 18:54:17 2012
New Revision: 239102
URL: http://svn.freebsd.org/changeset/base/239102
Log:
In sys/dev/cxgbe/firmware/t4fw_interface.h, change the enum
'fw_hdr_intfver' into an anonymous enum, which avoids a clang 3.2
warning about all the enum values being the same value.
Reviewed by: np
MFC after:1 week
Modified:
head/sys/dev/cxgbe/firmware/t4fw_interface.h
Modified: head/sys/dev/cxgbe/firmware/t4fw_interface.h
==
--- head/sys/dev/cxgbe/firmware/t4fw_interface.hMon Aug 6 18:51:14
2012(r239101)
+++ head/sys/dev/cxgbe/firmware/t4fw_interface.hMon Aug 6 18:54:17
2012(r239102)
@@ -7413,7 +7413,7 @@ enum fw_hdr_chip {
#define G_FW_HDR_FW_VER_BUILD(x) \
(((x) S_FW_HDR_FW_VER_BUILD) M_FW_HDR_FW_VER_BUILD)
-enum fw_hdr_intfver {
+enum {
FW_HDR_INTFVER_NIC = 0x00,
FW_HDR_INTFVER_VNIC = 0x00,
FW_HDR_INTFVER_OFLD = 0x00,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r239100 - head/lib/libpam/modules/pam_unix
On 2012-08-06 20:44, Dimitry Andric wrote: Author: dim Date: Mon Aug 6 18:44:59 2012 New Revision: 239100 URL: http://svn.freebsd.org/changeset/base/239100 Log: Fix an instance in pam_krb5(8), where the variable 'user' could be used uninitialized. Ehm, this was obviously meant as pam_unix instead, sorry. :) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239103 - head/sys/dev/pci
Author: jhb Date: Mon Aug 6 19:49:57 2012 New Revision: 239103 URL: http://svn.freebsd.org/changeset/base/239103 Log: Explicitly enable busmastering on PCI-PCI bridges. Transactions initiated on the secondary side of a bridge will not be propagated to the primary bus unless this is enabled. Busmastering is not enabled by default (we have relied on firmware to set this bit to date). The OS needs to set it for any bridges not configured by system firmware. Tested by:Steve Polyack korvus comcast net MFC after:2 weeks Modified: head/sys/dev/pci/pci_pci.c Modified: head/sys/dev/pci/pci_pci.c == --- head/sys/dev/pci/pci_pci.c Mon Aug 6 18:54:17 2012(r239102) +++ head/sys/dev/pci/pci_pci.c Mon Aug 6 19:49:57 2012(r239103) @@ -683,6 +683,13 @@ pcib_attach_common(device_t dev) * would be more widely routed than absolutely necessary. We could * then do a walk of the tree later and fix it. */ + +/* + * Always enable busmastering on bridges so that transactions + * initiated on the secondary bus are passed through to the + * primary bus. + */ +pci_enable_busmaster(dev); } int ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239104 - head/sys/dev/aic7xxx
Author: dim Date: Mon Aug 6 20:01:32 2012 New Revision: 239104 URL: http://svn.freebsd.org/changeset/base/239104 Log: In sys/dev/aic7xxx/aic79xx_osm.c, function ahd_attach(), initialize the 'path' variable to NULL, to avoid using it uninitialized in certain cases. Found by: clang MFC after:1 week Modified: head/sys/dev/aic7xxx/aic79xx_osm.c Modified: head/sys/dev/aic7xxx/aic79xx_osm.c == --- head/sys/dev/aic7xxx/aic79xx_osm.c Mon Aug 6 19:49:57 2012 (r239103) +++ head/sys/dev/aic7xxx/aic79xx_osm.c Mon Aug 6 20:01:32 2012 (r239104) @@ -222,6 +222,7 @@ ahd_attach(struct ahd_softc *ahd) count = 0; devq = NULL; sim = NULL; + path = NULL; /* * Create a thread to perform all recovery. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239105 - head/sys/dev/e1000
Author: jfv
Date: Mon Aug 6 20:44:05 2012
New Revision: 239105
URL: http://svn.freebsd.org/changeset/base/239105
Log:
Correct the mq_start routine to avoid out-of-order
packet delivery, always enqueue when possible. Also
correct the DEPLETED test as multiple bits might be
set. Thanks to Randall Stewart for the changes!
Modified:
head/sys/dev/e1000/if_igb.c
Modified: head/sys/dev/e1000/if_igb.c
==
--- head/sys/dev/e1000/if_igb.c Mon Aug 6 20:01:32 2012(r239104)
+++ head/sys/dev/e1000/if_igb.c Mon Aug 6 20:44:05 2012(r239105)
@@ -100,7 +100,7 @@ int igb_display_debug_stats = 0;
/*
* Driver version:
*/
-char igb_driver_version[] = version - 2.3.4;
+char igb_driver_version[] = version - 2.3.5;
/*
@@ -961,7 +961,15 @@ igb_mq_start(struct ifnet *ifp, struct m
que = adapter-queues[i];
if (((txr-queue_status IGB_QUEUE_DEPLETED) == 0)
IGB_TX_TRYLOCK(txr)) {
- err = igb_mq_start_locked(ifp, txr, m);
+ struct mbuf *pm = NULL;
+ /*
+ ** Try to queue first to avoid
+ ** out-of-order delivery, but
+ ** settle for it if that fails
+ */
+ if (m drbr_enqueue(ifp, txr-br, m))
+ pm = m;
+ err = igb_mq_start_locked(ifp, txr, pm);
IGB_TX_UNLOCK(txr);
} else {
err = drbr_enqueue(ifp, txr-br, m);
@@ -981,7 +989,7 @@ igb_mq_start_locked(struct ifnet *ifp, s
IGB_TX_LOCK_ASSERT(txr);
if (((ifp-if_drv_flags IFF_DRV_RUNNING) == 0) ||
- (txr-queue_status == IGB_QUEUE_DEPLETED) ||
+ (txr-queue_status IGB_QUEUE_DEPLETED) ||
adapter-link_active == 0) {
if (m != NULL)
err = drbr_enqueue(ifp, txr-br, m);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239106 - head/sbin/ggate/shared
Author: dim
Date: Mon Aug 6 21:02:40 2012
New Revision: 239106
URL: http://svn.freebsd.org/changeset/base/239106
Log:
Make sure the compiler knows g_gate_xvlog() and g_gate_xlog() do not
return. This silences a warning from clang 3.2 about uninitialized use
of the variable 'mediasize' in sbin/ggate/shared/ggate.c.
Reviewed by: pjd
MFC after:1 week
Modified:
head/sbin/ggate/shared/ggate.h
Modified: head/sbin/ggate/shared/ggate.h
==
--- head/sbin/ggate/shared/ggate.h Mon Aug 6 20:44:05 2012
(r239105)
+++ head/sbin/ggate/shared/ggate.h Mon Aug 6 21:02:40 2012
(r239106)
@@ -95,8 +95,8 @@ struct g_gate_hdr {
void g_gate_vlog(int priority, const char *message, va_list ap);
void g_gate_log(int priority, const char *message, ...);
-void g_gate_xvlog(const char *message, va_list ap);
-void g_gate_xlog(const char *message, ...);
+void g_gate_xvlog(const char *message, va_list ap) __dead2;
+void g_gate_xlog(const char *message, ...) __dead2;
off_t g_gate_mediasize(int fd);
unsigned g_gate_sectorsize(int fd);
void g_gate_open_device(void);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239107 - head/sys/conf
Author: brooks
Date: Mon Aug 6 21:24:43 2012
New Revision: 239107
URL: http://svn.freebsd.org/changeset/base/239107
Log:
MFP4 change 214967:
Make the process of embedding MDROOT images less perilous by
makeing the target that links kernel and embedding the image
depend on the image. This means, if the image doesn't exist you
find out before you try to boot from it and that if you change
the image you don't have to touch some random source file to
cause a rebuild.
Don't hide that we're embedding the image.
Modified:
head/sys/conf/kern.post.mk
Modified: head/sys/conf/kern.post.mk
==
--- head/sys/conf/kern.post.mk Mon Aug 6 21:02:40 2012(r239106)
+++ head/sys/conf/kern.post.mk Mon Aug 6 21:24:43 2012(r239107)
@@ -121,7 +121,7 @@ gdbinit:
.endif
.endif
-${FULLKERNEL}: ${SYSTEM_DEP} vers.o
+${FULLKERNEL}: ${SYSTEM_DEP} vers.o ${MFS_IMAGE}
@rm -f ${.TARGET}
@echo linking ${.TARGET}
${SYSTEM_LD}
@@ -133,7 +133,7 @@ ${FULLKERNEL}: ${SYSTEM_DEP} vers.o
.endif
${SYSTEM_LD_TAIL}
.if defined(MFS_IMAGE)
- @sh ${S}/tools/embed_mfs.sh ${FULLKERNEL} ${MFS_IMAGE}
+ sh ${S}/tools/embed_mfs.sh ${FULLKERNEL} ${MFS_IMAGE}
.endif
.if !exists(${.OBJDIR}/.depend)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r239107 - head/sys/conf
On Mon, Aug 06, 2012 at 09:24:43PM +, Brooks Davis wrote: Author: brooks Date: Mon Aug 6 21:24:43 2012 New Revision: 239107 URL: http://svn.freebsd.org/changeset/base/239107 Log: MFP4 change 214967: Make the process of embedding MDROOT images less perilous by makeing the target that links kernel and embedding the image depend on the image. This means, if the image doesn't exist you find out before you try to boot from it and that if you change the image you don't have to touch some random source file to cause a rebuild. Don't hide that we're embedding the image. This commit message should have also included: Sponsored by: DARPA/AFRL -- Brooks pgpSUcqw0HXXE.pgp Description: PGP signature
svn commit: r239108 - releng/7.4 releng/7.4/contrib/bind9/lib/dns releng/7.4/sys/conf releng/8.1 releng/8.1/contrib/bind9/lib/dns releng/8.1/sys/conf releng/8.2 releng/8.2/contrib/bind9/lib/dns rel...
Author: simon Date: Mon Aug 6 21:33:11 2012 New Revision: 239108 URL: http://svn.freebsd.org/changeset/base/239108 Log: Fix named(8) DNSSEC validation Denial of Service. Security: FreeBSD-SA-12:05.bind Security: CVE-2012-3817 Obtained from:ISC Approved by: so (simon) Modified: stable/7/contrib/bind9/lib/dns/resolver.c Changes in other areas also in this revision: Modified: releng/7.4/UPDATING releng/7.4/contrib/bind9/lib/dns/resolver.c releng/7.4/sys/conf/newvers.sh releng/8.1/UPDATING releng/8.1/contrib/bind9/lib/dns/resolver.c releng/8.1/sys/conf/newvers.sh releng/8.2/UPDATING releng/8.2/contrib/bind9/lib/dns/resolver.c releng/8.2/sys/conf/newvers.sh releng/8.3/UPDATING releng/8.3/contrib/bind9/lib/dns/resolver.c releng/8.3/sys/conf/newvers.sh releng/9.0/UPDATING releng/9.0/contrib/bind9/lib/dns/resolver.c releng/9.0/sys/conf/newvers.sh Modified: stable/7/contrib/bind9/lib/dns/resolver.c == --- stable/7/contrib/bind9/lib/dns/resolver.c Mon Aug 6 21:24:43 2012 (r239107) +++ stable/7/contrib/bind9/lib/dns/resolver.c Mon Aug 6 21:33:11 2012 (r239108) @@ -7620,6 +7620,7 @@ dns_resolver_addbadcache(dns_resolver_t } bad-type = type; bad-hashval = hashval; + bad-expire = *expire; isc_buffer_init(buffer, bad + 1, name-length); dns_name_init(bad-name, NULL); dns_name_copy(name, bad-name, buffer); @@ -7631,8 +7632,8 @@ dns_resolver_addbadcache(dns_resolver_t if (resolver-badcount resolver-badhash * 2 resolver-badhash DNS_BADCACHE_SIZE) resizehash(resolver, now, ISC_FALSE); - } - bad-expire = *expire; + } else + bad-expire = *expire; cleanup: UNLOCK(resolver-lock); } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239108 - releng/7.4 releng/7.4/contrib/bind9/lib/dns releng/7.4/sys/conf releng/8.1 releng/8.1/contrib/bind9/lib/dns releng/8.1/sys/conf releng/8.2 releng/8.2/contrib/bind9/lib/dns rel...
Author: simon
Date: Mon Aug 6 21:33:11 2012
New Revision: 239108
URL: http://svn.freebsd.org/changeset/base/239108
Log:
Fix named(8) DNSSEC validation Denial of Service.
Security: FreeBSD-SA-12:05.bind
Security: CVE-2012-3817
Obtained from:ISC
Approved by: so (simon)
Modified:
releng/7.4/UPDATING
releng/7.4/contrib/bind9/lib/dns/resolver.c
releng/7.4/sys/conf/newvers.sh
releng/8.1/UPDATING
releng/8.1/contrib/bind9/lib/dns/resolver.c
releng/8.1/sys/conf/newvers.sh
releng/8.2/UPDATING
releng/8.2/contrib/bind9/lib/dns/resolver.c
releng/8.2/sys/conf/newvers.sh
releng/8.3/UPDATING
releng/8.3/contrib/bind9/lib/dns/resolver.c
releng/8.3/sys/conf/newvers.sh
releng/9.0/UPDATING
releng/9.0/contrib/bind9/lib/dns/resolver.c
releng/9.0/sys/conf/newvers.sh
Changes in other areas also in this revision:
Modified:
stable/7/contrib/bind9/lib/dns/resolver.c
Modified: releng/7.4/UPDATING
==
--- releng/7.4/UPDATING Mon Aug 6 21:24:43 2012(r239107)
+++ releng/7.4/UPDATING Mon Aug 6 21:33:11 2012(r239108)
@@ -8,6 +8,9 @@ Items affecting the ports and packages s
/usr/ports/UPDATING. Please read that file before running
portupgrade.
+20120806: p10 FreeBSD-SA-12:05.bind
+ Fix named(8) DNSSEC validation Denial of Service.
+
20120612: p9 FreeBSD-SA-12:03.bind
FreeBSD-SA-12:04.sysret
Fix a problem where zero-length RDATA fields can cause named to crash.
Modified: releng/7.4/contrib/bind9/lib/dns/resolver.c
==
--- releng/7.4/contrib/bind9/lib/dns/resolver.c Mon Aug 6 21:24:43 2012
(r239107)
+++ releng/7.4/contrib/bind9/lib/dns/resolver.c Mon Aug 6 21:33:11 2012
(r239108)
@@ -7622,6 +7622,7 @@ dns_resolver_addbadcache(dns_resolver_t
}
bad-type = type;
bad-hashval = hashval;
+ bad-expire = *expire;
isc_buffer_init(buffer, bad + 1, name-length);
dns_name_init(bad-name, NULL);
dns_name_copy(name, bad-name, buffer);
@@ -7633,8 +7634,8 @@ dns_resolver_addbadcache(dns_resolver_t
if (resolver-badcount resolver-badhash * 2
resolver-badhash DNS_BADCACHE_SIZE)
resizehash(resolver, now, ISC_FALSE);
- }
- bad-expire = *expire;
+ } else
+ bad-expire = *expire;
cleanup:
UNLOCK(resolver-lock);
}
Modified: releng/7.4/sys/conf/newvers.sh
==
--- releng/7.4/sys/conf/newvers.sh Mon Aug 6 21:24:43 2012
(r239107)
+++ releng/7.4/sys/conf/newvers.sh Mon Aug 6 21:33:11 2012
(r239108)
@@ -32,7 +32,7 @@
TYPE=FreeBSD
REVISION=7.4
-BRANCH=RELEASE-p9
+BRANCH=RELEASE-p10
if [ X${BRANCH_OVERRIDE} != X ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
Modified: releng/8.1/UPDATING
==
--- releng/8.1/UPDATING Mon Aug 6 21:24:43 2012(r239107)
+++ releng/8.1/UPDATING Mon Aug 6 21:33:11 2012(r239108)
@@ -16,6 +16,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
sun4v support still needs work to become production ready.
+20120806: p13 FreeBSD-SA-12:05.bind
+ Fix named(8) DNSSEC validation Denial of Service.
+
20120618: p12 FreeBSD-SA-12:04.sysret
Correct patch for FreeBSD-SA-12:04.sysret.
Modified: releng/8.1/contrib/bind9/lib/dns/resolver.c
==
--- releng/8.1/contrib/bind9/lib/dns/resolver.c Mon Aug 6 21:24:43 2012
(r239107)
+++ releng/8.1/contrib/bind9/lib/dns/resolver.c Mon Aug 6 21:33:11 2012
(r239108)
@@ -7929,6 +7929,7 @@ dns_resolver_addbadcache(dns_resolver_t
}
bad-type = type;
bad-hashval = hashval;
+ bad-expire = *expire;
isc_buffer_init(buffer, bad + 1, name-length);
dns_name_init(bad-name, NULL);
dns_name_copy(name, bad-name, buffer);
@@ -7940,8 +7941,8 @@ dns_resolver_addbadcache(dns_resolver_t
if (resolver-badcount resolver-badhash * 2
resolver-badhash DNS_BADCACHE_SIZE)
resizehash(resolver, now, ISC_FALSE);
- }
- bad-expire = *expire;
+ } else
+ bad-expire = *expire;
cleanup:
UNLOCK(resolver-lock);
}
Modified: releng/8.1/sys/conf/newvers.sh
==
--- releng/8.1/sys/conf/newvers.sh Mon Aug 6 21:24:43 2012
(r239107)
+++ releng/8.1/sys/conf/newvers.sh Mon Aug 6 21:33:11 2012
(r239108
svn commit: r239109 - in head: share/man/man4 sys/dev/e1000
Author: jfv
Date: Mon Aug 6 22:43:49 2012
New Revision: 239109
URL: http://svn.freebsd.org/changeset/base/239109
Log:
Make the polling interface in igb able to handle
multiqueue, and correct the rxdone handling. Update
the polling man page to include igb as well.
Thanks to Mark Johnston for these changes.
Modified:
head/share/man/man4/polling.4
head/sys/dev/e1000/if_igb.c
Modified: head/share/man/man4/polling.4
==
--- head/share/man/man4/polling.4 Mon Aug 6 21:33:11 2012
(r239108)
+++ head/share/man/man4/polling.4 Mon Aug 6 22:43:49 2012
(r239109)
@@ -184,6 +184,7 @@ As of this writing, the
.Xr fwe 4 ,
.Xr fwip 4 ,
.Xr fxp 4 ,
+.Xr igb 4 ,
.Xr ixgb 4 ,
.Xr nfe 4 ,
.Xr nge 4 ,
Modified: head/sys/dev/e1000/if_igb.c
==
--- head/sys/dev/e1000/if_igb.c Mon Aug 6 21:33:11 2012(r239108)
+++ head/sys/dev/e1000/if_igb.c Mon Aug 6 22:43:49 2012(r239109)
@@ -1502,12 +1502,6 @@ igb_irq_fast(void *arg)
}
#ifdef DEVICE_POLLING
-/*
- *
- * Legacy polling routine : if using this code you MUST be sure that
- * multiqueue is not defined, ie, set igb_num_queues to 1.
- *
- */
#if __FreeBSD_version = 80
#define POLL_RETURN_COUNT(a) (a)
static int
@@ -1518,8 +1512,8 @@ static void
igb_poll(struct ifnet *ifp, enum poll_cmd cmd, int count)
{
struct adapter *adapter = ifp-if_softc;
- struct igb_queue*que = adapter-queues;
- struct tx_ring *txr = adapter-tx_rings;
+ struct igb_queue*que;
+ struct tx_ring *txr;
u32 reg_icr, rx_done = 0;
u32 loop = IGB_MAX_LOOP;
boolmore;
@@ -1541,20 +1535,26 @@ igb_poll(struct ifnet *ifp, enum poll_cm
}
IGB_CORE_UNLOCK(adapter);
- igb_rxeof(que, count, rx_done);
+ for (int i = 0; i adapter-num_queues; i++) {
+ que = adapter-queues[i];
+ txr = que-txr;
- IGB_TX_LOCK(txr);
- do {
- more = igb_txeof(txr);
- } while (loop-- more);
+ igb_rxeof(que, count, rx_done);
+
+ IGB_TX_LOCK(txr);
+ do {
+ more = igb_txeof(txr);
+ } while (loop-- more);
#if __FreeBSD_version = 80
- if (!drbr_empty(ifp, txr-br))
- igb_mq_start_locked(ifp, txr, NULL);
+ if (!drbr_empty(ifp, txr-br))
+ igb_mq_start_locked(ifp, txr, NULL);
#else
- if (!IFQ_DRV_IS_EMPTY(ifp-if_snd))
- igb_start_locked(txr, ifp);
+ if (!IFQ_DRV_IS_EMPTY(ifp-if_snd))
+ igb_start_locked(txr, ifp);
#endif
- IGB_TX_UNLOCK(txr);
+ IGB_TX_UNLOCK(txr);
+ }
+
return POLL_RETURN_COUNT(rx_done);
}
#endif /* DEVICE_POLLING */
@@ -4901,7 +4901,7 @@ next_desc:
}
if (done != NULL)
- *done = rxdone;
+ *done += rxdone;
IGB_RX_UNLOCK(rxr);
return ((staterr E1000_RXD_STAT_DD) ? TRUE : FALSE);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239110 - head/sys/dev/bce
Author: davide Date: Mon Aug 6 22:53:24 2012 New Revision: 239110 URL: http://svn.freebsd.org/changeset/base/239110 Log: Remove a spurious bace which cause build fail in case BCE_DEBUG option is turned on. Reviewed by: delphij Approved by: gnn (mentor) Sponsored by: Google Summer of Code 2012 MFC after:1 week Modified: head/sys/dev/bce/if_bce.c Modified: head/sys/dev/bce/if_bce.c == --- head/sys/dev/bce/if_bce.c Mon Aug 6 22:43:49 2012(r239109) +++ head/sys/dev/bce/if_bce.c Mon Aug 6 22:53:24 2012(r239110) @@ -10513,7 +10513,7 @@ bce_dump_ftqs(struct bce_softc *sc) (BCE_HC_STAT_GEN_SEL_0_GEN_SEL_0_CPQ_VALID_CNT8) | (BCE_HC_STAT_GEN_SEL_0_GEN_SEL_0_MGMQ_VALID_CNT); - if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) + if (BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) val = val | (BCE_HC_STAT_GEN_SEL_0_GEN_SEL_0_RV2PCSQ_VALID_CNT_XI 24); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239111 - head/sys/dev/ath
Author: adrian
Date: Mon Aug 6 22:54:10 2012
New Revision: 239111
URL: http://svn.freebsd.org/changeset/base/239111
Log:
Remove unnecessary debugging printf()s.
Modified:
head/sys/dev/ath/if_ath_rx.c
head/sys/dev/ath/if_ath_rx_edma.c
Modified: head/sys/dev/ath/if_ath_rx.c
==
--- head/sys/dev/ath/if_ath_rx.cMon Aug 6 22:53:24 2012
(r239110)
+++ head/sys/dev/ath/if_ath_rx.cMon Aug 6 22:54:10 2012
(r239111)
@@ -1072,8 +1072,6 @@ ath_legacy_dma_rxsetup(struct ath_softc
{
int error;
- device_printf(sc-sc_dev, %s: called\n, __func__);
-
error = ath_descdma_setup(sc, sc-sc_rxdma, sc-sc_rxbuf,
rx, sizeof(struct ath_desc), ath_rxbuf, 1);
if (error != 0)
@@ -1086,8 +1084,6 @@ static int
ath_legacy_dma_rxteardown(struct ath_softc *sc)
{
- device_printf(sc-sc_dev, %s: called\n, __func__);
-
if (sc-sc_rxdma.dd_desc_len != 0)
ath_descdma_cleanup(sc, sc-sc_rxdma, sc-sc_rxbuf);
return (0);
Modified: head/sys/dev/ath/if_ath_rx_edma.c
==
--- head/sys/dev/ath/if_ath_rx_edma.c Mon Aug 6 22:53:24 2012
(r239110)
+++ head/sys/dev/ath/if_ath_rx_edma.c Mon Aug 6 22:54:10 2012
(r239111)
@@ -507,8 +507,6 @@ ath_edma_rxbuf_init(struct ath_softc *sc
ATH_RX_LOCK_ASSERT(sc);
-// device_printf(sc-sc_dev, %s: called; bf=%p\n, __func__, bf);
-
m = m_getm(NULL, sc-sc_edma_bufsize, M_DONTWAIT, MT_DATA);
if (! m)
return (ENOBUFS); /* XXX ?*/
@@ -799,8 +797,6 @@ static int
ath_edma_dma_rxteardown(struct ath_softc *sc)
{
- device_printf(sc-sc_dev, %s: called\n, __func__);
-
ATH_RX_LOCK(sc);
ath_edma_rxfifo_flush(sc, HAL_RX_QUEUE_HP);
ath_edma_rxfifo_free(sc, HAL_RX_QUEUE_HP);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r239077 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
On 2012-Aug-05 22:52:46 +0200, Marius Strobl mar...@freebsd.org wrote: Bascially, options ZFS is available on at least amd64, i386, pc98, powerpc64 and sparc64. At least in theory. In practise, it's not usable because: powerpc). However, this causes linking the kernel to fail due to some symbols being defined multiple times: ... I currently can't remember the details but the fix seemed non-trivial to me, short of creating something like LINT-ZFS kernel config files similar to the LINT-VIMAGE etc we have. The underlying problem is that there are 2 zlib's in the kernel tree. One is in sys/cddl/contrib/opensolaris/uts/common/zmod/ and the other is sys/net/zlib.c. The real fix is to get rid of one of them and use the remaining one for all subsystems that want zlib. I agree that merging them is non-trivial because they are based on different versions of zlib (1.2.3 1.0.4, respectively) and the original files have been munged is different ways. (And there's a third inflate(9) based on unzip-5.12 in sys/kern/inflate.c, as well as another complete zlib-1.2.7 in lib/libz) -- Peter Jeremy pgpe3zgXf4fZa.pgp Description: PGP signature
Re: svn commit: r239100 - head/lib/libpam/modules/pam_unix
On Mon, Aug 06, 2012 at 09:01:05PM +0200, Dimitry Andric wrote: On 2012-08-06 20:44, Dimitry Andric wrote: Author: dim Date: Mon Aug 6 18:44:59 2012 New Revision: 239100 URL: http://svn.freebsd.org/changeset/base/239100 Log: Fix an instance in pam_krb5(8), where the variable 'user' could be used uninitialized. Ehm, this was obviously meant as pam_unix instead, sorry. :) Could you please look at misc/170373 while you are there? -- http://ache.vniz.net/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239120 - head/sys/dev/ath
Author: adrian Date: Tue Aug 7 00:42:46 2012 New Revision: 239120 URL: http://svn.freebsd.org/changeset/base/239120 Log: Correct re-initialise the link pointer to be the final descriptor in the last buffer. This fixes traffic stalls that were occuring with stuck beacon events. PR: kern/170433 Modified: head/sys/dev/ath/if_ath_tx.c Modified: head/sys/dev/ath/if_ath_tx.c == --- head/sys/dev/ath/if_ath_tx.cTue Aug 7 00:34:15 2012 (r239119) +++ head/sys/dev/ath/if_ath_tx.cTue Aug 7 00:42:46 2012 (r239120) @@ -751,7 +751,7 @@ ath_legacy_tx_dma_restart(struct ath_sof return; ath_hal_puttxbuf(ah, txq-axq_qnum, bf-bf_daddr); - ath_hal_gettxdesclinkptr(ah, bf-bf_lastds, txq-axq_link); + ath_hal_gettxdesclinkptr(ah, bf_last-bf_lastds, txq-axq_link); ath_hal_txstart(ah, txq-axq_qnum); } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239121 - head/sys/vm
Author: alc
Date: Tue Aug 7 04:48:14 2012
New Revision: 239121
URL: http://svn.freebsd.org/changeset/base/239121
Log:
Never sleep on busy pages in vm_pageout_launder(), always skip them. Long
ago, sleeping on busy pages in vm_pageout_launder() made sense. The call
to vm_pageout_flush() specified asynchronous I/O and sleeping on busy pages
blocked vm_pageout_launder() until the flush had completed. However, in
CVS revision 1.35 of vm/vm_contig.c, the call to vm_pageout_flush() was
changed to request synchronous I/O, but the sleep on busy pages was not
removed.
Modified:
head/sys/vm/vm_pageout.c
Modified: head/sys/vm/vm_pageout.c
==
--- head/sys/vm/vm_pageout.cTue Aug 7 00:42:46 2012(r239120)
+++ head/sys/vm/vm_pageout.cTue Aug 7 04:48:14 2012(r239121)
@@ -586,23 +586,14 @@ vm_pageout_launder(int queue, int tries,
continue;
}
object = m-object;
- if (!VM_OBJECT_TRYLOCK(object)
+ if ((!VM_OBJECT_TRYLOCK(object)
(!vm_pageout_fallback_object_lock(m, next) ||
- m-hold_count != 0)) {
+ m-hold_count != 0)) || (m-oflags VPO_BUSY) != 0 ||
+ m-busy != 0) {
vm_page_unlock(m);
VM_OBJECT_UNLOCK(object);
continue;
}
- if ((m-oflags VPO_BUSY) != 0 || m-busy != 0) {
- if (tries == 0) {
- vm_page_unlock(m);
- VM_OBJECT_UNLOCK(object);
- continue;
- }
- vm_page_sleep(m, vpctw0);
- VM_OBJECT_UNLOCK(object);
- return (FALSE);
- }
vm_page_test_dirty(m);
if (m-dirty == 0)
pmap_remove_all(m);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r239123 - head/sys/amd64/amd64
Author: pluknet Date: Tue Aug 7 05:46:36 2012 New Revision: 239123 URL: http://svn.freebsd.org/changeset/base/239123 Log: Remove duplicate header inclusion of sys/sysent.h Discussed with: bz Modified: head/sys/amd64/amd64/elf_machdep.c Modified: head/sys/amd64/amd64/elf_machdep.c == --- head/sys/amd64/amd64/elf_machdep.c Tue Aug 7 05:03:53 2012 (r239122) +++ head/sys/amd64/amd64/elf_machdep.c Tue Aug 7 05:46:36 2012 (r239123) @@ -36,7 +36,6 @@ __FBSDID($FreeBSD$); #include sys/sysent.h #include sys/imgact_elf.h #include sys/syscall.h -#include sys/sysent.h #include sys/signalvar.h #include sys/vnode.h ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
