* [PATCH 3/6] b44: add parameter
From: Gary Zambrano @ 2006-06-16 19:19 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev
This patch adds a parameter to init_hw() to not completely initialize
the nic for wol.
Signed-off-by: Gary Zambrano <zambrano@broadcom.com>
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 73ca729..12fc67a 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -101,7 +101,7 @@ MODULE_DEVICE_TABLE(pci, b44_pci_tbl);
static void b44_halt(struct b44 *);
static void b44_init_rings(struct b44 *);
-static void b44_init_hw(struct b44 *);
+static void b44_init_hw(struct b44 *, int);
static int dma_desc_align_mask;
static int dma_desc_sync_size;
@@ -873,7 +873,7 @@ static int b44_poll(struct net_device *n
spin_lock_irq(&bp->lock);
b44_halt(bp);
b44_init_rings(bp);
- b44_init_hw(bp);
+ b44_init_hw(bp, 1);
netif_wake_queue(bp->dev);
spin_unlock_irq(&bp->lock);
done = 1;
@@ -942,7 +942,7 @@ static void b44_tx_timeout(struct net_de
b44_halt(bp);
b44_init_rings(bp);
- b44_init_hw(bp);
+ b44_init_hw(bp, 1);
spin_unlock_irq(&bp->lock);
@@ -1059,7 +1059,7 @@ static int b44_change_mtu(struct net_dev
b44_halt(bp);
dev->mtu = new_mtu;
b44_init_rings(bp);
- b44_init_hw(bp);
+ b44_init_hw(bp, 1);
spin_unlock_irq(&bp->lock);
b44_enable_ints(bp);
@@ -1356,13 +1356,15 @@ static int b44_set_mac_addr(struct net_d
* packet processing. Invoked with bp->lock held.
*/
static void __b44_set_rx_mode(struct net_device *);
-static void b44_init_hw(struct b44 *bp)
+static void b44_init_hw(struct b44 *bp, int full_reset)
{
u32 val;
b44_chip_reset(bp);
- b44_phy_reset(bp);
- b44_setup_phy(bp);
+ if (full_reset) {
+ b44_phy_reset(bp);
+ b44_setup_phy(bp);
+ }
/* Enable CRC32, set proper LED modes and power on PHY */
bw32(bp, B44_MAC_CTRL, MAC_CTRL_CRC32_ENAB | MAC_CTRL_PHY_LEDCTRL);
@@ -1376,16 +1378,21 @@ static void b44_init_hw(struct b44 *bp)
bw32(bp, B44_TXMAXLEN, bp->dev->mtu + ETH_HLEN + 8 + RX_HEADER_LEN);
bw32(bp, B44_TX_WMARK, 56); /* XXX magic */
- bw32(bp, B44_DMATX_CTRL, DMATX_CTRL_ENABLE);
- bw32(bp, B44_DMATX_ADDR, bp->tx_ring_dma + bp->dma_offset);
- bw32(bp, B44_DMARX_CTRL, (DMARX_CTRL_ENABLE |
- (bp->rx_offset << DMARX_CTRL_ROSHIFT)));
- bw32(bp, B44_DMARX_ADDR, bp->rx_ring_dma + bp->dma_offset);
+ if (full_reset) {
+ bw32(bp, B44_DMATX_CTRL, DMATX_CTRL_ENABLE);
+ bw32(bp, B44_DMATX_ADDR, bp->tx_ring_dma + bp->dma_offset);
+ bw32(bp, B44_DMARX_CTRL, (DMARX_CTRL_ENABLE |
+ (bp->rx_offset << DMARX_CTRL_ROSHIFT)));
+ bw32(bp, B44_DMARX_ADDR, bp->rx_ring_dma + bp->dma_offset);
- bw32(bp, B44_DMARX_PTR, bp->rx_pending);
- bp->rx_prod = bp->rx_pending;
+ bw32(bp, B44_DMARX_PTR, bp->rx_pending);
+ bp->rx_prod = bp->rx_pending;
- bw32(bp, B44_MIB_CTRL, MIB_CTRL_CLR_ON_READ);
+ bw32(bp, B44_MIB_CTRL, MIB_CTRL_CLR_ON_READ);
+ } else {
+ bw32(bp, B44_DMARX_CTRL, (DMARX_CTRL_ENABLE |
+ (bp->rx_offset << DMARX_CTRL_ROSHIFT)));
+ }
val = br32(bp, B44_ENET_CTRL);
bw32(bp, B44_ENET_CTRL, (val | ENET_CTRL_ENABLE));
@@ -1401,7 +1408,7 @@ static int b44_open(struct net_device *d
goto out;
b44_init_rings(bp);
- b44_init_hw(bp);
+ b44_init_hw(bp, 1);
b44_check_phy(bp);
@@ -1511,7 +1518,7 @@ static int b44_close(struct net_device *
netif_poll_enable(dev);
if (bp->flags & B44_FLAG_WOL_ENABLE) {
- b44_init_hw(bp);
+ b44_init_hw(bp, 0);
b44_setup_wol(bp);
}
@@ -1786,7 +1793,7 @@ static int b44_set_ringparam(struct net_
b44_halt(bp);
b44_init_rings(bp);
- b44_init_hw(bp);
+ b44_init_hw(bp, 1);
netif_wake_queue(bp->dev);
spin_unlock_irq(&bp->lock);
@@ -1829,7 +1836,7 @@ static int b44_set_pauseparam(struct net
if (bp->flags & B44_FLAG_PAUSE_AUTO) {
b44_halt(bp);
b44_init_rings(bp);
- b44_init_hw(bp);
+ b44_init_hw(bp, 1);
} else {
__b44_set_flow_ctrl(bp, bp->flags);
}
@@ -2188,7 +2195,7 @@ static int b44_suspend(struct pci_dev *p
free_irq(dev->irq, dev);
if (bp->flags & B44_FLAG_WOL_ENABLE) {
- b44_init_hw(bp);
+ b44_init_hw(bp, 0);
b44_setup_wol(bp);
}
pci_disable_device(pdev);
@@ -2213,7 +2220,7 @@ static int b44_resume(struct pci_dev *pd
spin_lock_irq(&bp->lock);
b44_init_rings(bp);
- b44_init_hw(bp);
+ b44_init_hw(bp, 1);
netif_device_attach(bp->dev);
spin_unlock_irq(&bp->lock);
^ permalink raw reply related
* [PATCH 4/6] b44: add wol for old nic
From: Gary Zambrano @ 2006-06-16 19:19 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev
This patch adds wol support for the older 440x nics that use pattern matching.
This patch is a redo thanks to feedback from Michael Chan and Francois Romieu.
Signed-off-by: Gary Zambrano <zambrano@broadcom.com>
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 12fc67a..98c0675 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -75,6 +75,15 @@
/* minimum number of free TX descriptors required to wake up TX process */
#define B44_TX_WAKEUP_THRESH (B44_TX_RING_SIZE / 4)
+/* b44 internal pattern match filter info */
+#define B44_PATTERN_BASE 0x400
+#define B44_PATTERN_SIZE 0x80
+#define B44_PMASK_BASE 0x600
+#define B44_PMASK_SIZE 0x10
+#define B44_MAX_PATTERNS 16
+#define B44_ETHIPV6UDP_HLEN 62
+#define B44_ETHIPV4UDP_HLEN 42
+
static char version[] __devinitdata =
DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
@@ -1457,6 +1466,103 @@ static void b44_poll_controller(struct n
}
#endif
+static void bwfilter_table(struct b44 *bp, u8 *pp, u32 bytes, u32 table_offset)
+{
+ u32 i;
+ u32 *pattern = (u32 *) pp;
+
+ for (i = 0; i < bytes; i += sizeof(u32)) {
+ bw32(bp, B44_FILT_ADDR, table_offset + i);
+ bw32(bp, B44_FILT_DATA, pattern[i / sizeof(u32)]);
+ }
+}
+
+static int b44_magic_pattern(u8 *macaddr, u8 *ppattern, u8 *pmask, int offset)
+{
+ int magicsync = 6;
+ int k, j, len = offset;
+ int ethaddr_bytes = ETH_ALEN;
+
+ memset(ppattern + offset, 0xff, magicsync);
+ for (j = 0; j < magicsync; j++)
+ set_bit(len++, (unsigned long *) pmask);
+
+ for (j = 0; j < B44_MAX_PATTERNS; j++) {
+ if ((B44_PATTERN_SIZE - len) >= ETH_ALEN)
+ ethaddr_bytes = ETH_ALEN;
+ else
+ ethaddr_bytes = B44_PATTERN_SIZE - len;
+ if (ethaddr_bytes <=0)
+ break;
+ for (k = 0; k< ethaddr_bytes; k++) {
+ ppattern[offset + magicsync +
+ (j * ETH_ALEN) + k] = macaddr[k];
+ len++;
+ set_bit(len, (unsigned long *) pmask);
+ }
+ }
+ return len - 1;
+}
+
+/* Setup magic packet patterns in the b44 WOL
+ * pattern matching filter.
+ */
+static void b44_setup_pseudo_magicp(struct b44 *bp)
+{
+
+ u32 val;
+ int plen0, plen1, plen2;
+ u8 *pwol_pattern;
+ u8 pwol_mask[B44_PMASK_SIZE];
+
+ pwol_pattern = kmalloc(B44_PATTERN_SIZE, GFP_KERNEL);
+ if (!pwol_pattern) {
+ printk(KERN_ERR PFX "Memory not available for WOL\n");
+ return;
+ }
+
+ /* Ipv4 magic packet pattern - pattern 0.*/
+ memset(pwol_pattern, 0, B44_PATTERN_SIZE);
+ memset(pwol_mask, 0, B44_PMASK_SIZE);
+ plen0 = b44_magic_pattern(bp->dev->dev_addr, pwol_pattern, pwol_mask,
+ B44_ETHIPV4UDP_HLEN);
+
+ bwfilter_table(bp, pwol_pattern, B44_PATTERN_SIZE, B44_PATTERN_BASE);
+ bwfilter_table(bp, pwol_mask, B44_PMASK_SIZE, B44_PMASK_BASE);
+
+ /* Raw ethernet II magic packet pattern - pattern 1 */
+ memset(pwol_pattern, 0, B44_PATTERN_SIZE);
+ memset(pwol_mask, 0, B44_PMASK_SIZE);
+ plen1 = b44_magic_pattern(bp->dev->dev_addr, pwol_pattern, pwol_mask,
+ ETH_HLEN);
+
+ bwfilter_table(bp, pwol_pattern, B44_PATTERN_SIZE,
+ B44_PATTERN_BASE + B44_PATTERN_SIZE);
+ bwfilter_table(bp, pwol_mask, B44_PMASK_SIZE,
+ B44_PMASK_BASE + B44_PMASK_SIZE);
+
+ /* Ipv6 magic packet pattern - pattern 2 */
+ memset(pwol_pattern, 0, B44_PATTERN_SIZE);
+ memset(pwol_mask, 0, B44_PMASK_SIZE);
+ plen2 = b44_magic_pattern(bp->dev->dev_addr, pwol_pattern, pwol_mask,
+ B44_ETHIPV6UDP_HLEN);
+
+ bwfilter_table(bp, pwol_pattern, B44_PATTERN_SIZE,
+ B44_PATTERN_BASE + B44_PATTERN_SIZE + B44_PATTERN_SIZE);
+ bwfilter_table(bp, pwol_mask, B44_PMASK_SIZE,
+ B44_PMASK_BASE + B44_PMASK_SIZE + B44_PMASK_SIZE);
+
+ kfree(pwol_pattern);
+
+ /* set these pattern's lengths: one less than each real length */
+ val = plen0 | (plen1 << 8) | (plen2 << 16) | WKUP_LEN_ENABLE_THREE;
+ bw32(bp, B44_WKUP_LEN, val);
+
+ /* enable wakeup pattern matching */
+ val = br32(bp, B44_DEVCTRL);
+ bw32(bp, B44_DEVCTRL, val | DEVCTRL_PFE);
+
+}
static void b44_setup_wol(struct b44 *bp)
{
@@ -1482,7 +1588,9 @@ static void b44_setup_wol(struct b44 *bp
val = br32(bp, B44_DEVCTRL);
bw32(bp, B44_DEVCTRL, val | DEVCTRL_MPM | DEVCTRL_PFE);
- }
+ } else {
+ b44_setup_pseudo_magicp(bp);
+ }
val = br32(bp, B44_SBTMSLOW);
bw32(bp, B44_SBTMSLOW, val | SBTMSLOW_PE);
diff --git a/drivers/net/b44.h b/drivers/net/b44.h
index 1f47777..4944507 100644
--- a/drivers/net/b44.h
+++ b/drivers/net/b44.h
@@ -24,6 +24,9 @@
#define WKUP_LEN_P3_MASK 0x7f000000 /* Pattern 3 */
#define WKUP_LEN_P3_SHIFT 24
#define WKUP_LEN_D3 0x80000000
+#define WKUP_LEN_DISABLE 0x80808080
+#define WKUP_LEN_ENABLE_TWO 0x80800000
+#define WKUP_LEN_ENABLE_THREE 0x80000000
#define B44_ISTAT 0x0020UL /* Interrupt Status */
#define ISTAT_LS 0x00000020 /* Link Change (B0 only) */
#define ISTAT_PME 0x00000040 /* Power Management Event */
^ permalink raw reply related
* [PATCH 6/6] b44: update b44 Kconfig entry
From: Gary Zambrano @ 2006-06-16 19:19 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev
Deleted "EXPERIMENTAL" from b44 entry in Kconfig.
Signed-off-by: Gary Zambrano <zambrano@broadcom.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index bdaaad8..4e57785 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1359,8 +1359,8 @@ config APRICOT
called apricot.
config B44
- tristate "Broadcom 4400 ethernet support (EXPERIMENTAL)"
- depends on NET_PCI && PCI && EXPERIMENTAL
+ tristate "Broadcom 4400 ethernet support"
+ depends on NET_PCI && PCI
select MII
help
If you have a network (Ethernet) controller of this type, say Y and
^ permalink raw reply related
* [PATCH 5/6] b44: update version to 1.01
From: Gary Zambrano @ 2006-06-16 19:19 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev
Update the driver version to 1.01
Signed-off-by: Gary Zambrano <zambrano@broadcom.com>
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 98c0675..a7e4ba5 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -29,8 +29,8 @@
#define DRV_MODULE_NAME "b44"
#define PFX DRV_MODULE_NAME ": "
-#define DRV_MODULE_VERSION "1.00"
-#define DRV_MODULE_RELDATE "Apr 7, 2006"
+#define DRV_MODULE_VERSION "1.01"
+#define DRV_MODULE_RELDATE "Jun 16, 2006"
#define B44_DEF_MSG_ENABLE \
(NETIF_MSG_DRV | \
^ permalink raw reply related
* [PATCH] bcm43xx: enable shared key authentication
From: Daniel Drake @ 2006-06-16 19:50 UTC (permalink / raw)
To: linville; +Cc: netdev, mb
I recently patched softmac to enable shared key authentication. This small patch
will enable crazy or unfortunate bcm43xx users to use this new capability.
Signed-off-by: Daniel Drake <dsd@gentoo.org>
Index: linux/drivers/net/wireless/bcm43xx/bcm43xx_main.c
===================================================================
--- linux.orig/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ linux/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -3599,6 +3599,10 @@ static void bcm43xx_ieee80211_set_securi
secinfo->encrypt = sec->encrypt;
dprintk(KERN_INFO PFX " .encrypt = %d\n", sec->encrypt);
}
+ if (sec->flags & SEC_AUTH_MODE) {
+ secinfo->auth_mode = sec->auth_mode;
+ dprintk(KERN_INFO PFX " .auth_mode = %d\n", sec->auth_mode);
+ }
if (bcm->initialized && !bcm->ieee->host_encrypt) {
if (secinfo->enabled) {
/* upload WEP keys to hardware */
^ permalink raw reply
* Re: [PATCH] bcm43xx: enable shared key authentication
From: Michael Buesch @ 2006-06-16 20:18 UTC (permalink / raw)
To: linville; +Cc: Daniel Drake, netdev
In-Reply-To: <20060616195022.E73CD8A3591@zog.reactivated.net>
On Friday 16 June 2006 21:50, Daniel Drake wrote:
> I recently patched softmac to enable shared key authentication. This small patch
> will enable crazy or unfortunate bcm43xx users to use this new capability.
>
> Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: Michael Buesch <mb@bu3sch.de>
> Index: linux/drivers/net/wireless/bcm43xx/bcm43xx_main.c
> ===================================================================
> --- linux.orig/drivers/net/wireless/bcm43xx/bcm43xx_main.c
> +++ linux/drivers/net/wireless/bcm43xx/bcm43xx_main.c
> @@ -3599,6 +3599,10 @@ static void bcm43xx_ieee80211_set_securi
> secinfo->encrypt = sec->encrypt;
> dprintk(KERN_INFO PFX " .encrypt = %d\n", sec->encrypt);
> }
> + if (sec->flags & SEC_AUTH_MODE) {
> + secinfo->auth_mode = sec->auth_mode;
> + dprintk(KERN_INFO PFX " .auth_mode = %d\n", sec->auth_mode);
> + }
> if (bcm->initialized && !bcm->ieee->host_encrypt) {
> if (secinfo->enabled) {
> /* upload WEP keys to hardware */
>
--
Greetings Michael.
^ permalink raw reply
* Re: tg3 timeouts with 2.6.17-rc6
From: Juergen Kreileder @ 2006-06-16 21:20 UTC (permalink / raw)
To: Michael Chan; +Cc: linux-kernel, netdev
In-Reply-To: <1551EAE59135BE47B544934E30FC4FC041BD16@NT-IRVA-0751.brcm.ad.broadcom.com>
Michael Chan <mchan@broadcom.com> writes:
> Juergen Kreileder
>
>> I'm seeing frequent network timeouts on my PowerMac G5 Quad with
>> 2.6.17-rc6. The timeouts are easily reproducible with moderate
>> network traffic, e.g. by using bittorrent.
>>
>
> Did this use to work with an older kernel or older tg3 driver? If
> yes, what version?
Works fine with 2.6.16 and earlier.
> Please also provide the full tg3 probing output during modprobe and
> ifconfig up. Thanks.
,----
| tg3.c:v3.58 (May 22, 2006)
| eth0: Tigon3 [partno(BCM95780) rev 8003 PHY(5780)] (PCIX:133MHz:64-bit) 10/100/1000BaseT Ethernet 00:14:51:66:ff:b2
| eth0: RXcsums[1] LinkChgREG[0] MIirq[0] ASF[0] Split[0] WireSpeed[1] TSOcap[1]
| eth0: dma_rwctrl[76144000] dma_mask[40-bit]
| eth1: Tigon3 [partno(BCM95780) rev 8003 PHY(5780)] (PCIX:133MHz:64-bit) 10/100/1000BaseT Ethernet 00:14:51:66:ff:b3
| eth1: RXcsums[1] LinkChgREG[0] MIirq[0] ASF[0] Split[0] WireSpeed[1] TSOcap[1]
| eth1: dma_rwctrl[76144000] dma_mask[40-bit]
| [...]
| tg3: lan0: Link is up at 1000 Mbps, full duplex.
| tg3: lan0: Flow control is on for TX and on for RX.
`----
eth0 and eth1 get renamed to lan0 and lan1 by udev. eth0/lan0 is
connected to a Gigabit switch eth1/lan1 is not connected.
Both interface are controlled by ifplugd (using SIOCETHTOOL for link
beat detection).
Let me know if you need more debugging output.
Juergen
--
Juergen Kreileder, Blackdown Java-Linux Team
http://blog.blackdown.de/
^ permalink raw reply
* Re: tg3 timeouts with 2.6.17-rc6
From: Michael Chan @ 2006-06-16 21:42 UTC (permalink / raw)
To: Juergen Kreileder; +Cc: linux-kernel, netdev
In-Reply-To: <87k67glrvl.fsf@blackdown.de>
On Fri, 2006-06-16 at 23:20 +0200, Juergen Kreileder wrote:
> Michael Chan <mchan@broadcom.com> writes:
>
> >
> > Did this use to work with an older kernel or older tg3 driver? If
> > yes, what version?
>
> Works fine with 2.6.16 and earlier.
>
> > Please also provide the full tg3 probing output during modprobe and
> > ifconfig up. Thanks.
>
Looking at the patch history since 2.6.16, the only patch that could
have an impact is the one that enables TSO by default.
Please try turning TSO off to see if it makes a difference:
ethtool -K eth0 tso off
^ permalink raw reply
* Re: tg3 timeouts with 2.6.17-rc6
From: Juergen Kreileder @ 2006-06-17 0:05 UTC (permalink / raw)
To: Michael Chan; +Cc: linux-kernel, netdev
In-Reply-To: <1150494161.26368.39.camel@rh4>
Michael Chan <mchan@broadcom.com> writes:
> On Fri, 2006-06-16 at 23:20 +0200, Juergen Kreileder wrote:
>> Michael Chan <mchan@broadcom.com> writes:
>>
>>>
>>> Did this use to work with an older kernel or older tg3 driver? If
>>> yes, what version?
>>
>> Works fine with 2.6.16 and earlier.
>>
>>> Please also provide the full tg3 probing output during modprobe
>>> and ifconfig up. Thanks.
>>
> Looking at the patch history since 2.6.16, the only patch that could
> have an impact is the one that enables TSO by default.
>
> Please try turning TSO off to see if it makes a difference:
>
> ethtool -K eth0 tso off
Seems to work fine with TSO disabled.
Juergen
--
Juergen Kreileder, Blackdown Java-Linux Team
http://blog.blackdown.de/
^ permalink raw reply
* Re: tg3 timeouts with 2.6.17-rc6
From: Michael Chan @ 2006-06-17 1:27 UTC (permalink / raw)
To: Juergen Kreileder; +Cc: linux-kernel, netdev
In-Reply-To: <87bqsslk9e.fsf@blackdown.de>
On Sat, 2006-06-17 at 02:05 +0200, Juergen Kreileder wrote:
> Michael Chan <mchan@broadcom.com> writes:
> > Please try turning TSO off to see if it makes a difference:
> >
> > ethtool -K eth0 tso off
>
> Seems to work fine with TSO disabled.
>
Thanks for the information. We'll look into it. If possible, please send
me (using private email) an ethereal trace of a sample of the packets
sent by the tg3 chip right before the NETDEV_WATCHDOG timeout.
In the meantime, I wonder if we should disable TSO by default on the
5780 chip for 2.6.17.
^ permalink raw reply
* Re: tg3 timeouts with 2.6.17-rc6
From: David Miller @ 2006-06-17 2:51 UTC (permalink / raw)
To: mchan; +Cc: jk, linux-kernel, netdev
In-Reply-To: <1150507652.26368.46.camel@rh4>
From: "Michael Chan" <mchan@broadcom.com>
Date: Fri, 16 Jun 2006 18:27:32 -0700
> In the meantime, I wonder if we should disable TSO by default on the
> 5780 chip for 2.6.17.
Sounds reasonable. Would we disable it for all chips that set
TG3_FLG2_5780_CLASS or a specific variant?
^ permalink raw reply
* Re: [PATCH 1/6][SCTP]: Limit association max_retrans setting in setsockopt
From: David Miller @ 2006-06-17 2:53 UTC (permalink / raw)
To: sri; +Cc: netdev, lksctp-developers
In-Reply-To: <1150411572.6028.31.camel@w-sridhar2.beaverton.ibm.com>
From: Sridhar Samudrala <sri@us.ibm.com>
Date: Thu, 15 Jun 2006 15:46:12 -0700
> Please apply the following 6 SCTP patches to 2.6 tree.
Thanks Sridhar, I'll try to apply these soon.
^ permalink raw reply
* Re: [ETHTOOL]: Fix UFO typo
From: David Miller @ 2006-06-17 2:53 UTC (permalink / raw)
To: herbert; +Cc: netdev
In-Reply-To: <20060616063905.GA32669@gondor.apana.org.au>
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Fri, 16 Jun 2006 16:39:05 +1000
> [ETHTOOL]: Fix UFO typo
>
> The function ethtool_get_ufo was referring to ETHTOOL_GTSO instead of
> ETHTOOL_GUFO.
>
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Good catch Herbert, I'll apply this as soon as I get a chance.
^ permalink raw reply
* Re: tg3 timeouts with 2.6.17-rc6
From: Michael Chan @ 2006-06-17 3:37 UTC (permalink / raw)
To: David Miller; +Cc: jk, linux-kernel, netdev
David Miller wrote:
> From: "Michael Chan" <mchan@broadcom.com>
> Date: Fri, 16 Jun 2006 18:27:32 -0700
>
> > In the meantime, I wonder if we should disable TSO by default on the
> > 5780 chip for 2.6.17.
>
> Sounds reasonable. Would we disable it for all chips that set
> TG3_FLG2_5780_CLASS or a specific variant?
>
Yes, let's disable it for all TG3_FLG2_5780_CLASS chips for now
until we figure out what's going on.
^ permalink raw reply
* updated [Patch 1/1] AF_UNIX Datagram getpeersec
From: Catherine Zhang @ 2006-06-17 3:54 UTC (permalink / raw)
To: netdev, davem, jmorris, chrisw, herbert, sds, tjaeger, akpm
Cc: latten, sergeh, gcwilson, czhang.us
Hi,
Enclosed please find the updated AF_UNIX patch, incorporating comments from
James, Stephen, Dave, Chris, Andrew and others.
The patch is now built upon the newly added SELinux functions exported in
selinux/exports.c, which are also used by the auditing subsystem. One
function, selinux_get_socket_sid(), is added to the list of exported
functions by this patch.
I have tested it with three configurations: with SELinux, w/o SELinux,
and allmodconfig.
As always, comments are appreciated!
thanks,
Catherine
---
From: cxzhang@watson.ibm.com
This patch implements an API whereby an application can determine the
label of its peer's Unix datagram sockets via the auxiliary data mechanism of
recvmsg.
Patch purpose:
This patch enables a security-aware application to retrieve the
security context of the peer of a Unix datagram socket. The application
can then use this security context to determine the security context for
processing on behalf of the peer who sent the packet.
Patch design and implementation:
The design and implementation is very similar to the UDP case for INET
sockets. Basically we build upon the existing Unix domain socket API for
retrieving user credentials. Linux offers the API for obtaining user
credentials via ancillary messages (i.e., out of band/control messages
that are bundled together with a normal message). To retrieve the security
context, the application first indicates to the kernel such desire by
setting the SO_PASSSEC option via getsockopt. Then the application
retrieves the security context using the auxiliary data mechanism.
An example server application for Unix datagram socket should look like this:
toggle = 1;
toggle_len = sizeof(toggle);
setsockopt(sockfd, SOL_SOCKET, SO_PASSSEC, &toggle, &toggle_len);
recvmsg(sockfd, &msg_hdr, 0);
if (msg_hdr.msg_controllen > sizeof(struct cmsghdr)) {
cmsg_hdr = CMSG_FIRSTHDR(&msg_hdr);
if (cmsg_hdr->cmsg_len <= CMSG_LEN(sizeof(scontext)) &&
cmsg_hdr->cmsg_level == SOL_SOCKET &&
cmsg_hdr->cmsg_type == SCM_SECURITY) {
memcpy(&scontext, CMSG_DATA(cmsg_hdr), sizeof(scontext));
}
}
sock_setsockopt is enhanced with a new socket option SOCK_PASSSEC to allow
a server socket to receive security context of the peer.
Testing:
We have tested the patch by setting up Unix datagram client and server
applications. We verified that the server can retrieve the security context
using the auxiliary data mechanism of recvmsg.
---
include/asm-alpha/socket.h | 1 +
include/asm-arm/socket.h | 1 +
include/asm-arm26/socket.h | 1 +
include/asm-cris/socket.h | 1 +
include/asm-frv/socket.h | 1 +
include/asm-h8300/socket.h | 1 +
include/asm-i386/socket.h | 1 +
include/asm-ia64/socket.h | 1 +
include/asm-m32r/socket.h | 1 +
include/asm-m68k/socket.h | 1 +
include/asm-mips/socket.h | 1 +
include/asm-parisc/socket.h | 1 +
include/asm-powerpc/socket.h | 1 +
include/asm-s390/socket.h | 1 +
include/asm-sh/socket.h | 1 +
include/asm-sparc/socket.h | 1 +
include/asm-sparc64/socket.h | 1 +
include/asm-v850/socket.h | 1 +
include/asm-x86_64/socket.h | 1 +
include/asm-xtensa/socket.h | 1 +
include/linux/net.h | 1 +
include/net/af_unix.h | 2 ++
include/net/scm.h | 13 +++++++++++++
net/core/sock.c | 11 +++++++++++
net/unix/af_unix.c | 2 ++
security/selinux/exports.c | 11 +++++++++++
security/selinux/include/security.h | 2 +-
security/selinux/ss/services.c | 4 ++--
28 files changed, 63 insertions(+), 3 deletions(-)
diff -puN include/asm-i386/socket.h~lsm-secpeer-unix include/asm-i386/socket.h
--- linux-2.6.17-rc6-mm2/include/asm-i386/socket.h~lsm-secpeer-unix 2006-06-12 17:56:06.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/asm-i386/socket.h 2006-06-13 15:45:34.000000000 -0400
@@ -48,5 +48,6 @@
#define SO_ACCEPTCONN 30
#define SO_PEERSEC 31
+#define SO_PASSSEC 34
#endif /* _ASM_SOCKET_H */
diff -puN include/asm-x86_64/socket.h~lsm-secpeer-unix include/asm-x86_64/socket.h
--- linux-2.6.17-rc6-mm2/include/asm-x86_64/socket.h~lsm-secpeer-unix 2006-06-12 17:56:06.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/asm-x86_64/socket.h 2006-06-13 15:45:34.000000000 -0400
@@ -48,5 +48,6 @@
#define SO_ACCEPTCONN 30
#define SO_PEERSEC 31
+#define SO_PASSSEC 34
#endif /* _ASM_SOCKET_H */
diff -puN include/asm-ia64/socket.h~lsm-secpeer-unix include/asm-ia64/socket.h
--- linux-2.6.17-rc6-mm2/include/asm-ia64/socket.h~lsm-secpeer-unix 2006-06-12 17:56:06.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/asm-ia64/socket.h 2006-06-13 15:45:34.000000000 -0400
@@ -57,5 +57,6 @@
#define SO_ACCEPTCONN 30
#define SO_PEERSEC 31
+#define SO_PASSSEC 34
#endif /* _ASM_IA64_SOCKET_H */
diff -puN include/asm-powerpc/socket.h~lsm-secpeer-unix include/asm-powerpc/socket.h
--- linux-2.6.17-rc6-mm2/include/asm-powerpc/socket.h~lsm-secpeer-unix 2006-06-12 17:56:06.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/asm-powerpc/socket.h 2006-06-13 15:45:34.000000000 -0400
@@ -55,5 +55,6 @@
#define SO_ACCEPTCONN 30
#define SO_PEERSEC 31
+#define SO_PASSSEC 34
#endif /* _ASM_POWERPC_SOCKET_H */
diff -puN include/asm-h8300/socket.h~lsm-secpeer-unix include/asm-h8300/socket.h
--- linux-2.6.17-rc6-mm2/include/asm-h8300/socket.h~lsm-secpeer-unix 2006-06-12 17:56:06.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/asm-h8300/socket.h 2006-06-13 15:45:34.000000000 -0400
@@ -48,5 +48,6 @@
#define SO_ACCEPTCONN 30
#define SO_PEERSEC 31
+#define SO_PASSSEC 34
#endif /* _ASM_SOCKET_H */
diff -puN include/asm-s390/socket.h~lsm-secpeer-unix include/asm-s390/socket.h
--- linux-2.6.17-rc6-mm2/include/asm-s390/socket.h~lsm-secpeer-unix 2006-06-12 17:56:06.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/asm-s390/socket.h 2006-06-13 15:45:34.000000000 -0400
@@ -56,5 +56,6 @@
#define SO_ACCEPTCONN 30
#define SO_PEERSEC 31
+#define SO_PASSSEC 34
#endif /* _ASM_SOCKET_H */
diff -puN include/asm-mips/socket.h~lsm-secpeer-unix include/asm-mips/socket.h
--- linux-2.6.17-rc6-mm2/include/asm-mips/socket.h~lsm-secpeer-unix 2006-06-12 17:56:06.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/asm-mips/socket.h 2006-06-13 15:45:34.000000000 -0400
@@ -69,6 +69,7 @@ To add: #define SO_REUSEPORT 0x0200 /* A
#define SO_PEERSEC 30
#define SO_SNDBUFFORCE 31
#define SO_RCVBUFFORCE 33
+#define SO_PASSSEC 34
#ifdef __KERNEL__
diff -puN include/asm-alpha/socket.h~lsm-secpeer-unix include/asm-alpha/socket.h
--- linux-2.6.17-rc6-mm2/include/asm-alpha/socket.h~lsm-secpeer-unix 2006-06-12 17:56:06.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/asm-alpha/socket.h 2006-06-16 16:02:55.000000000 -0400
@@ -51,6 +51,7 @@
#define SCM_TIMESTAMP SO_TIMESTAMP
#define SO_PEERSEC 30
+#define SO_PASSSEC 34
/* Security levels - as per NRL IPv6 - don't actually do anything */
#define SO_SECURITY_AUTHENTICATION 19
diff -puN include/asm-v850/socket.h~lsm-secpeer-unix include/asm-v850/socket.h
--- linux-2.6.17-rc6-mm2/include/asm-v850/socket.h~lsm-secpeer-unix 2006-06-12 17:56:06.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/asm-v850/socket.h 2006-06-13 15:45:34.000000000 -0400
@@ -48,5 +48,6 @@
#define SO_ACCEPTCONN 30
#define SO_PEERSEC 31
+#define SO_PASSSEC 34
#endif /* __V850_SOCKET_H__ */
diff -puN include/asm-sh/socket.h~lsm-secpeer-unix include/asm-sh/socket.h
--- linux-2.6.17-rc6-mm2/include/asm-sh/socket.h~lsm-secpeer-unix 2006-06-12 17:56:06.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/asm-sh/socket.h 2006-06-13 15:45:34.000000000 -0400
@@ -48,5 +48,6 @@
#define SO_ACCEPTCONN 30
#define SO_PEERSEC 31
+#define SO_PASSSEC 34
#endif /* __ASM_SH_SOCKET_H */
diff -puN include/asm-m68k/socket.h~lsm-secpeer-unix include/asm-m68k/socket.h
--- linux-2.6.17-rc6-mm2/include/asm-m68k/socket.h~lsm-secpeer-unix 2006-06-12 17:56:06.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/asm-m68k/socket.h 2006-06-13 15:45:34.000000000 -0400
@@ -48,5 +48,6 @@
#define SO_ACCEPTCONN 30
#define SO_PEERSEC 31
+#define SO_PASSSEC 34
#endif /* _ASM_SOCKET_H */
diff -puN include/asm-arm/socket.h~lsm-secpeer-unix include/asm-arm/socket.h
--- linux-2.6.17-rc6-mm2/include/asm-arm/socket.h~lsm-secpeer-unix 2006-06-12 17:56:06.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/asm-arm/socket.h 2006-06-13 15:45:34.000000000 -0400
@@ -48,5 +48,6 @@
#define SO_ACCEPTCONN 30
#define SO_PEERSEC 31
+#define SO_PASSSEC 34
#endif /* _ASM_SOCKET_H */
diff -puN include/asm-cris/socket.h~lsm-secpeer-unix include/asm-cris/socket.h
--- linux-2.6.17-rc6-mm2/include/asm-cris/socket.h~lsm-secpeer-unix 2006-06-12 17:56:06.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/asm-cris/socket.h 2006-06-13 15:45:34.000000000 -0400
@@ -50,6 +50,7 @@
#define SO_ACCEPTCONN 30
#define SO_PEERSEC 31
+#define SO_PASSSEC 34
#endif /* _ASM_SOCKET_H */
diff -puN include/asm-arm26/socket.h~lsm-secpeer-unix include/asm-arm26/socket.h
--- linux-2.6.17-rc6-mm2/include/asm-arm26/socket.h~lsm-secpeer-unix 2006-06-12 17:56:06.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/asm-arm26/socket.h 2006-06-13 15:45:34.000000000 -0400
@@ -48,5 +48,6 @@
#define SO_ACCEPTCONN 30
#define SO_PEERSEC 31
+#define SO_PASSSEC 34
#endif /* _ASM_SOCKET_H */
diff -puN include/asm-frv/socket.h~lsm-secpeer-unix include/asm-frv/socket.h
--- linux-2.6.17-rc6-mm2/include/asm-frv/socket.h~lsm-secpeer-unix 2006-06-12 17:56:07.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/asm-frv/socket.h 2006-06-13 15:45:34.000000000 -0400
@@ -48,6 +48,7 @@
#define SO_ACCEPTCONN 30
#define SO_PEERSEC 31
+#define SO_PASSSEC 34
#endif /* _ASM_SOCKET_H */
diff -puN include/asm-xtensa/socket.h~lsm-secpeer-unix include/asm-xtensa/socket.h
--- linux-2.6.17-rc6-mm2/include/asm-xtensa/socket.h~lsm-secpeer-unix 2006-06-12 17:56:07.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/asm-xtensa/socket.h 2006-06-13 15:45:34.000000000 -0400
@@ -59,5 +59,6 @@
#define SO_ACCEPTCONN 30
#define SO_PEERSEC 31
+#define SO_PASSSEC 34
#endif /* _XTENSA_SOCKET_H */
diff -puN include/asm-m32r/socket.h~lsm-secpeer-unix include/asm-m32r/socket.h
--- linux-2.6.17-rc6-mm2/include/asm-m32r/socket.h~lsm-secpeer-unix 2006-06-12 17:56:07.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/asm-m32r/socket.h 2006-06-13 15:45:34.000000000 -0400
@@ -48,5 +48,6 @@
#define SO_ACCEPTCONN 30
#define SO_PEERSEC 31
+#define SO_PASSSEC 34
#endif /* _ASM_M32R_SOCKET_H */
diff -puN include/asm-parisc/socket.h~lsm-secpeer-unix include/asm-parisc/socket.h
--- linux-2.6.17-rc6-mm2/include/asm-parisc/socket.h~lsm-secpeer-unix 2006-06-12 17:56:07.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/asm-parisc/socket.h 2006-06-13 15:45:34.000000000 -0400
@@ -48,5 +48,6 @@
#define SO_ACCEPTCONN 0x401c
#define SO_PEERSEC 0x401d
+#define SO_PASSSEC 0x401e
#endif /* _ASM_SOCKET_H */
diff -puN include/asm-sparc/socket.h~lsm-secpeer-unix include/asm-sparc/socket.h
--- linux-2.6.17-rc6-mm2/include/asm-sparc/socket.h~lsm-secpeer-unix 2006-06-12 17:56:07.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/asm-sparc/socket.h 2006-06-13 15:45:34.000000000 -0400
@@ -48,6 +48,7 @@
#define SCM_TIMESTAMP SO_TIMESTAMP
#define SO_PEERSEC 0x001e
+#define SO_PASSSEC 0x001f
/* Security levels - as per NRL IPv6 - don't actually do anything */
#define SO_SECURITY_AUTHENTICATION 0x5001
diff -puN include/asm-sparc64/socket.h~lsm-secpeer-unix include/asm-sparc64/socket.h
--- linux-2.6.17-rc6-mm2/include/asm-sparc64/socket.h~lsm-secpeer-unix 2006-06-12 17:56:07.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/asm-sparc64/socket.h 2006-06-13 15:45:34.000000000 -0400
@@ -48,6 +48,7 @@
#define SCM_TIMESTAMP SO_TIMESTAMP
#define SO_PEERSEC 0x001e
+#define SO_PASSSEC 0x001f
/* Security levels - as per NRL IPv6 - don't actually do anything */
#define SO_SECURITY_AUTHENTICATION 0x5001
diff -puN include/linux/net.h~lsm-secpeer-unix include/linux/net.h
--- linux-2.6.17-rc6-mm2/include/linux/net.h~lsm-secpeer-unix 2006-06-12 17:56:07.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/linux/net.h 2006-06-13 15:45:34.000000000 -0400
@@ -61,6 +61,7 @@ typedef enum {
#define SOCK_ASYNC_WAITDATA 1
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
+#define SOCK_PASSSEC 4
#ifndef ARCH_HAS_SOCKET_TYPES
/**
diff -puN include/net/af_unix.h~lsm-secpeer-unix include/net/af_unix.h
--- linux-2.6.17-rc6-mm2/include/net/af_unix.h~lsm-secpeer-unix 2006-06-12 17:56:07.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/net/af_unix.h 2006-06-13 15:45:34.000000000 -0400
@@ -53,10 +53,12 @@ struct unix_address {
struct unix_skb_parms {
struct ucred creds; /* Skb credentials */
struct scm_fp_list *fp; /* Passed files */
+ u32 sid; /* Security ID */
};
#define UNIXCB(skb) (*(struct unix_skb_parms*)&((skb)->cb))
#define UNIXCREDS(skb) (&UNIXCB((skb)).creds)
+#define UNIXSID(skb) (&UNIXCB((skb)).sid)
#define unix_state_rlock(s) spin_lock(&unix_sk(s)->lock)
#define unix_state_runlock(s) spin_unlock(&unix_sk(s)->lock)
diff -puN include/net/scm.h~lsm-secpeer-unix include/net/scm.h
--- linux-2.6.17-rc6-mm2/include/net/scm.h~lsm-secpeer-unix 2006-06-12 17:56:07.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/include/net/scm.h 2006-06-16 13:58:16.000000000 -0400
@@ -3,6 +3,8 @@
#include <linux/limits.h>
#include <linux/net.h>
+#include <linux/security.h>
+#include <linux/selinux.h>
/* Well, we should have at least one descriptor open
* to accept passed FDs 8)
@@ -19,6 +21,7 @@ struct scm_cookie
{
struct ucred creds; /* Skb credentials */
struct scm_fp_list *fp; /* Passed files */
+ u32 sid; /* Passed security ID */
unsigned long seq; /* Connection seqno */
};
@@ -42,6 +45,7 @@ static __inline__ int scm_send(struct so
scm->creds.gid = p->gid;
scm->creds.pid = p->tgid;
scm->fp = NULL;
+ selinux_get_sock_sid(sock, &scm->sid);
scm->seq = 0;
if (msg->msg_controllen <= 0)
return 0;
@@ -51,6 +55,9 @@ static __inline__ int scm_send(struct so
static __inline__ void scm_recv(struct socket *sock, struct msghdr *msg,
struct scm_cookie *scm, int flags)
{
+ char *scontext;
+ int scontext_len, err;
+
if (!msg->msg_control)
{
if (test_bit(SOCK_PASSCRED, &sock->flags) || scm->fp)
@@ -62,6 +69,12 @@ static __inline__ void scm_recv(struct s
if (test_bit(SOCK_PASSCRED, &sock->flags))
put_cmsg(msg, SOL_SOCKET, SCM_CREDENTIALS, sizeof(scm->creds), &scm->creds);
+ if (test_bit(SOCK_PASSSEC, &sock->flags)) {
+ err = selinux_ctxid_to_string(scm->sid, &scontext, &scontext_len);
+ if (!err)
+ put_cmsg(msg, SOL_SOCKET, SCM_SECURITY, scontext_len, scontext);
+ }
+
if (!scm->fp)
return;
diff -puN net/core/sock.c~lsm-secpeer-unix net/core/sock.c
--- linux-2.6.17-rc6-mm2/net/core/sock.c~lsm-secpeer-unix 2006-06-12 17:56:07.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/net/core/sock.c 2006-06-13 15:45:34.000000000 -0400
@@ -565,6 +565,13 @@ set_rcvbuf:
ret = -ENONET;
break;
+ case SO_PASSSEC:
+ if (valbool)
+ set_bit(SOCK_PASSSEC, &sock->flags);
+ else
+ clear_bit(SOCK_PASSSEC, &sock->flags);
+ break;
+
/* We implement the SO_SNDLOWAT etc to
not be settable (1003.1g 5.3) */
default:
@@ -723,6 +730,10 @@ int sock_getsockopt(struct socket *sock,
v.val = sk->sk_state == TCP_LISTEN;
break;
+ case SO_PASSSEC:
+ v.val = test_bit(SOCK_PASSSEC, &sock->flags) ? 1 : 0;
+ break;
+
case SO_PEERSEC:
return security_socket_getpeersec_stream(sock, optval, optlen, len);
diff -puN net/unix/af_unix.c~lsm-secpeer-unix net/unix/af_unix.c
--- linux-2.6.17-rc6-mm2/net/unix/af_unix.c~lsm-secpeer-unix 2006-06-12 17:56:07.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/net/unix/af_unix.c 2006-06-13 15:45:34.000000000 -0400
@@ -1290,6 +1290,7 @@ static int unix_dgram_sendmsg(struct kio
memcpy(UNIXCREDS(skb), &siocb->scm->creds, sizeof(struct ucred));
if (siocb->scm->fp)
unix_attach_fds(siocb->scm, skb);
+ memcpy(UNIXSID(skb), &siocb->scm->sid, sizeof(u32));
skb->h.raw = skb->data;
err = memcpy_fromiovec(skb_put(skb,len), msg->msg_iov, len);
@@ -1570,6 +1571,7 @@ static int unix_dgram_recvmsg(struct kio
memset(&tmp_scm, 0, sizeof(tmp_scm));
}
siocb->scm->creds = *UNIXCREDS(skb);
+ siocb->scm->sid = *UNIXSID(skb);
if (!(flags & MSG_PEEK))
{
diff -puN security/selinux/include/security.h~lsm-secpeer-unix security/selinux/include/security.h
--- linux-2.6.17-rc6-mm2/security/selinux/include/security.h~lsm-secpeer-unix 2006-06-12 17:56:07.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/security/selinux/include/security.h 2006-06-13 15:45:34.000000000 -0400
@@ -58,7 +58,7 @@ int security_change_sid(u32 ssid, u32 ts
int security_sid_to_context(u32 sid, char **scontext,
u32 *scontext_len);
-int security_context_to_sid(char *scontext, u32 scontext_len,
+int security_context_to_sid(const char *scontext, u32 scontext_len,
u32 *out_sid);
int security_context_to_sid_default(char *scontext, u32 scontext_len, u32 *out_sid, u32 def_sid);
diff -puN security/selinux/ss/services.c~lsm-secpeer-unix security/selinux/ss/services.c
--- linux-2.6.17-rc6-mm2/security/selinux/ss/services.c~lsm-secpeer-unix 2006-06-12 17:56:07.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/security/selinux/ss/services.c 2006-06-13 15:45:34.000000000 -0400
@@ -623,7 +623,7 @@ out:
}
-static int security_context_to_sid_core(char *scontext, u32 scontext_len, u32 *sid, u32 def_sid)
+static int security_context_to_sid_core(const char *scontext, u32 scontext_len, u32 *sid, u32 def_sid)
{
char *scontext2;
struct context context;
@@ -749,7 +749,7 @@ out:
* Returns -%EINVAL if the context is invalid, -%ENOMEM if insufficient
* memory is available, or 0 on success.
*/
-int security_context_to_sid(char *scontext, u32 scontext_len, u32 *sid)
+int security_context_to_sid(const char *scontext, u32 scontext_len, u32 *sid)
{
return security_context_to_sid_core(scontext, scontext_len,
sid, SECSID_NULL);
diff -puN security/selinux/exports.c~lsm-secpeer-unix security/selinux/exports.c
--- linux-2.6.17-rc6-mm2/security/selinux/exports.c~lsm-secpeer-unix 2006-06-16 16:18:48.000000000 -0400
+++ linux-2.6.17-rc6-mm2-cxzhang/security/selinux/exports.c 2006-06-16 16:18:25.000000000 -0400
@@ -17,6 +17,7 @@
#include <linux/selinux.h>
#include <linux/fs.h>
#include <linux/ipc.h>
+#include <net/sock.h>
#include "security.h"
#include "objsec.h"
@@ -72,6 +73,16 @@ void selinux_get_task_sid(struct task_st
*sid = 0;
}
+void selinux_get_sock_sid(const struct socket *sock, u32 *sid)
+{
+ if (selinux_enabled) {
+ const struct inode *inode = SOCK_INODE(sock);
+ selinux_get_inode_sid(inode, sid);
+ return;
+ }
+ *sid = 0;
+}
+
int selinux_string_to_sid(char *str, u32 *sid)
{
if (selinux_enabled)
_
^ permalink raw reply
* Re: [PATCH v2 4/7] AMSO1100 Memory Management.
From: Nick Piggin @ 2006-06-17 3:59 UTC (permalink / raw)
To: Tom Tucker
Cc: Andrew Morton, Steve Wise, rdreier, mshefty, linux-kernel, netdev,
openib-general
In-Reply-To: <1150128349.22704.20.camel@trinity.ogc.int>
Tom Tucker wrote:
> On Thu, 2006-06-08 at 01:17 -0700, Andrew Morton wrote:
>
>>On Wed, 07 Jun 2006 15:06:55 -0500
>>Steve Wise <swise@opengridcomputing.com> wrote:
>>
>>
>>>+void c2_free(struct c2_alloc *alloc, u32 obj)
>>>+{
>>>+ spin_lock(&alloc->lock);
>>>+ clear_bit(obj, alloc->table);
>>>+ spin_unlock(&alloc->lock);
>>>+}
>>
>>The spinlock is unneeded here.
>
>
> Good point.
Really?
clear_bit does not give you any memory ordering, so you can have
the situation where another CPU sees the bit cleared, but this
CPU still has stores pending to whatever it is being freed. Or
any number of other nasty memory ordering badness.
I'd just use the spinlocks, and prepend the clear_bit with a
double underscore (so you get the non-atomic version), if that
is appropriate.
The spinlocks nicely handle all the memory ordering issues, and
serve to document concurrency issues. If you need every last bit
of performance and scalability, that's OK, but you need comments
and I suspect you'd need more memory barriers.
--
SUSE Labs, Novell Inc.
Send instant messages to your online friends http://au.messenger.yahoo.com
^ permalink raw reply
* Re: updated [Patch 1/1] AF_UNIX Datagram getpeersec
From: Stephen Hemminger @ 2006-06-17 4:16 UTC (permalink / raw)
To: Catherine Zhang
Cc: netdev, davem, jmorris, chrisw, herbert, sds, tjaeger, akpm,
latten, sergeh, gcwilson, czhang.us
In-Reply-To: <20060617035440.GA28169@jiayuguan.watson.ibm.com>
O
>
> +void selinux_get_sock_sid(const struct socket *sock, u32 *sid)
> +{
> + if (selinux_enabled) {
> + const struct inode *inode = SOCK_INODE(sock);
> + selinux_get_inode_sid(inode, sid);
> + return;
> + }
> + *sid = 0;
> +}
> +
This is so short, it would make sense to put it in scm.h
and why not have it return the value instead of call by reference?
Same goes for selinux_get_inode_sid
static inline void selinux_get_sock_sid(const struct socket *sock, u32 *sid)
{
if (selinux_enabled)
selinux_get_inode_sid(SOCK_INODE(sock), sid);
else
*sid = 0;
}
or
static inline u32 selinux_get_sock_sid(const struct socket *sock)
{
return selinux_enabled ? selinux_get_inode_sid(SOCK_INODE(sid)) : 0;
}
^ permalink raw reply
* Re: [Ubuntu PATCH] Make tulip driver not handle Davicom NICs
From: Jamie Lenehan @ 2006-06-17 5:43 UTC (permalink / raw)
To: Randy Dunlap; +Cc: netdev, akpm, val_henson
In-Reply-To: <44909A78.4@oracle.com>
On Wed, Jun 14, 2006 at 04:23:36PM -0700, Randy Dunlap wrote:
> Make tulip driver not handle Davicom NICs, let dmfe take over"
>
> Reference: https://launchpad.net/bugs/48287
> Source URL of Patch:
> http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commitdiff;h=1804482911a71bee9114cae1c2079507a38e9e7f
The dmfe driver doesn't work on sparc64. My sparc64 Sun Netra X1's have
Davicom NICs and they work fine with the tulip driver. It'd be nice to have
only one driver handling these things that works for both. I'll see if I
fugure out why dmfe doesn't work on sparc64.
aviendha:~# /sbin/modprobe dmfe
dmfe: Davicom DM9xxx net driver, version 1.36.4 (2002-01-17)
eth0: Davicom DM9102 at pci0000:00:05.0, 00:00:00:00:00:00, irq 7098496.
eth1: Davicom DM9102 at pci0000:00:0c.0, 00:00:00:00:00:00, irq 7097792.
aviendha:~# /sbin/ifup eth0
SABRE0: PCI SERR signal asserted.
SABRE0: PCI bus error, PCI_STATUS[caa0]
eth0: Tx timeout - resetting
SABRE0: PCI SERR signal asserted.
SABRE0: PCI bus error, PCI_STATUS[caa0]
eth0: Tx timeout - resetting
SABRE0: PCI SERR signal asserted.
SABRE0: PCI bus error, PCI_STATUS[caa0]
eth0: Tx timeout - resetting
aviendha:~# /sbin/ifdown eth0
aviendha:~# /sbin/rmmod dmfe
aviendha:~# /sbin/modprobe tulip
Linux Tulip driver version 1.1.13 (May 11, 2002)
tulip0: Old style EEPROM with no media selection information.
tulip0: MII transceiver #1 config 3100 status 7829 advertising 01e1.
eth0: Davicom DM9102/DM9102A rev 49 at 000001fe02010100, EEPROM not present, 00:03:BA:06:30:E1, IRQ 7098496.
tulip1: Old style EEPROM with no media selection information.
tulip1: MII transceiver #1 config 1000 status 7809 advertising 01e1.
eth1: Davicom DM9102/DM9102A rev 49 at 000001fe02010000, EEPROM not present, 00:03:BA:06:30:E0, IRQ 7097792.
aviendha:~# /sbin/ifup eth0
aviendha:~# ping -c 1 172.20.0.1
PING 172.20.0.1 (172.20.0.1) 56(84) bytes of data.
64 bytes from 172.20.0.1: icmp_seq=1 ttl=64 time=3.02 ms
--- 172.20.0.1 ping statistics ---
1 packets transmitted, 1 received, 0% packet loss, time 0ms
rtt min/avg/max/mdev = 3.021/3.021/3.021/0.000 ms
aviendha:~# uname -a
Linux aviendha.twibble.org 2.6.15-rc4 #12 Sat Dec 3 21:44:21 EST 2005 sparc64 GNU/Linux
aviendha:~# lspci -vxns 00:0c.0
0000:00:0c.0 0200: 1282:9102 (rev 31)
Flags: bus master, medium devsel, latency 160, IRQ 006c4dc0
I/O ports at 0000000002010000 [size=256]
[virtual] Memory at 000001ff00000000 (32-bit, non-prefetchable) [size=256]
Expansion ROM at 0000000000040000 [disabled] [size=256K]
Capabilities: [50] Power Management version 2
00: 82 12 02 91 47 01 10 02 31 00 00 02 00 a0 00 00
10: 01 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00
20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
30: 00 00 04 00 50 00 00 00 00 00 00 00 00 01 14 28
aviendha:~#
...
--
Jamie Lenehan <lenehan@twibble.org>
^ permalink raw reply
* Re: updated [Patch 1/1] AF_UNIX Datagram getpeersec
From: Xiaolan Zhang @ 2006-06-17 6:47 UTC (permalink / raw)
To: Stephen Hemminger
Cc: akpm, chrisw, Catherine Zhang, czhang.us, davem, George Wilson,
herbert, jmorris, latten, netdev, sds, Serge E Hallyn, tjaeger
In-Reply-To: <20060616211603.14547a1d@localhost.localdomain>
Hi, Stephen,
It appears that selinux_enabled is defined inside selinux module and not
visible to the rest of the kernel...
thanks,
Catherine
Stephen Hemminger <shemminger@osdl.org> wrote on 06/17/2006 12:16:03 AM:
> O
> >
> > +void selinux_get_sock_sid(const struct socket *sock, u32 *sid)
> > +{
> > + if (selinux_enabled) {
> > + const struct inode *inode = SOCK_INODE(sock);
> > + selinux_get_inode_sid(inode, sid);
> > + return;
> > + }
> > + *sid = 0;
> > +}
> > +
>
> This is so short, it would make sense to put it in scm.h
> and why not have it return the value instead of call by reference?
> Same goes for selinux_get_inode_sid
>
> static inline void selinux_get_sock_sid(const struct socket *sock, u32
*sid)
> {
> if (selinux_enabled)
> selinux_get_inode_sid(SOCK_INODE(sock), sid);
> else
> *sid = 0;
> }
>
> or
> static inline u32 selinux_get_sock_sid(const struct socket *sock)
> {
> return selinux_enabled ? selinux_get_inode_sid(SOCK_INODE(sid)) : 0;
> }
^ permalink raw reply
* New Now you have chance to do it Relax with
From: Patricia @ 2006-06-17 7:37 UTC (permalink / raw)
To: newbie
Hello,
Most quality products for anyone who wants to become a champion in bed
Order now and benefit from lowest costs and convenient shipment
World famous brands which keep men happy all over the world
Enter here: http://www.unpraiselk.com
We thank you for your interest!
^ permalink raw reply
* Re: Linux 2.6 Vs linux 2.4 routing
From: Krzysztof Oledzki @ 2006-06-17 10:33 UTC (permalink / raw)
To: Mayuresh Chitale; +Cc: netdev, linux-net
In-Reply-To: <d096a3ee0606161141n3c481ed9kfcbf70af7393affa@mail.gmail.com>
[-- Attachment #1: Type: TEXT/PLAIN, Size: 955 bytes --]
On Sat, 17 Jun 2006, Mayuresh Chitale wrote:
> Hi All,
Hi,
> I am doing a routing test using linux 2.4 and linux 2.6 kernel on our
> board. I am using 2.4.31 and 2.6.16.17 for comparison.
>
> I have ported the bsp and drivers from 2.4 to 2.6 and am using a
> smartbits tester which pumps traffic at high rates and at varying
> packet sizes.
>
> On 2.4, the test goes fine ie I get meaningful values. But on 2.6
> kernel, routing begins and continues for sometime before it completely
> stops. The smartbits configuration is identical in both the cases.
>
> I have noticed same problem with dlink and 3com cards which is causing
> me to suspect that there is some probem with 2.6 routing.
>
> Has anyone seen a similar problem ?
> Any inputs on this would be appreciated.
Did you enable IRQBALANCE in 2.6?
$ zcat /proc/config.gz |grep IRQBALANCE
If so, please try to disable it.
Best regards,
Krzysztof Olędzki
^ permalink raw reply
* [PATCH 2.6.17 fix] bcm43xx: workaround init_board vs. IRQ race
From: Michael Buesch @ 2006-06-17 13:19 UTC (permalink / raw)
To: linville; +Cc: bcm43xx-dev, netdev, linux-kernel
Hi John,
Please try to push this for 2.6.17, as it is a crash fix.
--
Place the Init-vs-IRQ workaround before any card register
access, because we might not have the wireless core mapped
at all times in init. So this will result in a Machine Check
caused by a bus error.
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Index: wireless-2.6/drivers/net/wireless/bcm43xx/bcm43xx_main.c
===================================================================
--- wireless-2.6.orig/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2006-06-17 15:06:38.000000000 +0200
+++ wireless-2.6/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2006-06-17 15:17:49.000000000 +0200
@@ -1885,6 +1885,15 @@
spin_lock(&bcm->irq_lock);
+ /* Only accept IRQs, if we are initialized properly.
+ * This avoids an RX race while initializing.
+ * We should probably not enable IRQs before we are initialized
+ * completely, but some careful work is needed to fix this. I think it
+ * is best to stay with this cheap workaround for now... .
+ */
+ if (unlikely(bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED))
+ goto out;
+
reason = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON);
if (reason == 0xffffffff) {
/* irq not for us (shared irq) */
@@ -1906,19 +1915,11 @@
bcm43xx_interrupt_ack(bcm, reason);
- /* Only accept IRQs, if we are initialized properly.
- * This avoids an RX race while initializing.
- * We should probably not enable IRQs before we are initialized
- * completely, but some careful work is needed to fix this. I think it
- * is best to stay with this cheap workaround for now... .
- */
- if (likely(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED)) {
- /* disable all IRQs. They are enabled again in the bottom half. */
- bcm->irq_savedstate = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);
- /* save the reason code and call our bottom half. */
- bcm->irq_reason = reason;
- tasklet_schedule(&bcm->isr_tasklet);
- }
+ /* disable all IRQs. They are enabled again in the bottom half. */
+ bcm->irq_savedstate = bcm43xx_interrupt_disable(bcm, BCM43xx_IRQ_ALL);
+ /* save the reason code and call our bottom half. */
+ bcm->irq_reason = reason;
+ tasklet_schedule(&bcm->isr_tasklet);
out:
mmiowb();
^ permalink raw reply
* Fwd: Your letter
From: Benny Higgins @ 2006-06-17 15:45 UTC (permalink / raw)
To: netdev
-S''ensationall r'evoolution in m''edicine!
-E'n'l'a'r'g'e your p''e'n'i's up to 10 cm or up to 4 i'nches!
-It's h'e'r'b'a'l solution what hasn't side e'ffect, but has 100% g'uaranted results!
-Don't lose your chance and but know wihtout d'oubts, you will be i'mpressed with results!
Clisk here: http://posmonsters.info
liturgy simon funeral chaparral slug cutlet jot strike alcoholism ritual
syntax aerobacter electorate error cruel airway codify micronesia shire
daly bristle condemnatory betrothal dyke fibrin kleenex condensate paginate ambiguity phone
liquid nicotinamide circulate the curvature heckle squawbush enunciable
cowherd copernicus axle numinous run copy moist paradigm
shimmy copter barnett wolcott drier mode scandinavia caliper
^ permalink raw reply
* Re: [RFC PATCH 1/2] Hardware button support for Wireless cards: radiobtn
From: Ivo van Doorn @ 2006-06-17 15:05 UTC (permalink / raw)
To: Stefan Rompf; +Cc: Francois Romieu, netdev, rt2400-devel
In-Reply-To: <200606041214.45999.stefan@loplof.de>
[-- Attachment #1: Type: text/plain, Size: 14016 bytes --]
> > Except for the bluetooth radio key (which should be supported by the
> > radiobtn interface as well) the other buttons have support through already
> > excisting input devices if I am correct.
>
> You are wrong for quite a bunch of laptop models. That's why I pointed you to
> the wistron_btns driver. Alternatively, look at the acerhk driver
> (http://www2.informatik.hu-berlin.de/~tauber/acerhk/). Many systems have a
> number of additional buttons that need to be handled by a special driver, all
> sent to userspace, and just one of them to trigger the wireless card. Other
> models just handle the button in ACPI and generate an additional ACPI event.
>
> Looking at the RT2400-driver, I see what you want to accomplish: Take the view
> of the WLAN card on the hardware controlled button enable/disable and
> generate events on it. However, in many cases it is another driver (see
> above) that sets or clears this state, and this should be the instance to
> send the input event.
>
> Note that I do not have objections against the driver being included in the
> kernel - it just does not qualify as generic radiobutton support, but I know
> it's hard to find a good name ;-)
>
> Looking at the code only: There should be an additional non-polling interface
> for drivers that can generate events on the own.
Sorry for the late reply, but I have been quite busy with other things lately.
I have created an updated patch, that is more generic than the previous.
I have also renamed it to "laptopkey".
With this approach more buttons can be registered,
it includes the optional field to report an update of the key status
to the driver that registered it, and it supports for non-polling keys.
By default all events will go over the default input device, but a driver
can choose to create additional input devices.
Signed-off-by Ivo van Doorn <IvDoorn@gmail.com>
---
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 4bad588..097ae8c 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -79,4 +79,12 @@ config HP_SDC_RTC
Say Y here if you want to support the built-in real time clock
of the HP SDC controller.
+config LAPTOPKEY
+ tristate "Laptop keys support"
+ help
+ Say Y here if you have laptop with additional keys like hardware
+ wireless or bluetooth radio control, or other (programmable) keys.
+ This driver will create an input device to which other hardware
+ drivers can register their keys to.
+
endif
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 415c491..e691fab 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -11,3 +11,4 @@ obj-$(CONFIG_INPUT_UINPUT) += uinput.o
obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o
obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o
obj-$(CONFIG_INPUT_IXP4XX_BEEPER) += ixp4xx-beeper.o
+obj-$(CONFIG_LAPTOPKEY) += laptopkey.o
diff --git a/drivers/input/misc/laptopkey.c b/drivers/input/misc/laptopkey.c
new file mode 100644
index 0000000..7731554
--- /dev/null
+++ b/drivers/input/misc/laptopkey.c
@@ -0,0 +1,231 @@
+/*
+ Copyright (C) 2006 Ivo van Doorn
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the
+ Free Software Foundation, Inc.,
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/laptopkey.h>
+
+MODULE_AUTHOR("Ivo van Doorn <IvDoorn@gmail.com>");
+MODULE_VERSION("1.0");
+MODULE_DESCRIPTION("Laptop keys support");
+MODULE_LICENSE("GPL");
+
+/*
+ * Default laptop_key_device structure.
+ */
+static struct laptop_key_device default_keydev = {
+ .dev_name = "laptopbtn",
+ .delay = 100,
+};
+
+void laptopkey_key_event(struct laptop_key *key, int status)
+{
+ /*
+ * Check if the hardware needs to be informed of
+ * the status change.
+ */
+ if (key->key_event)
+ key->key_event(key->data, status);
+
+ /*
+ * Send input event to userspace.
+ */
+ input_report_key(key->keydev->input_dev, key->key, status);
+ input_sync(key->keydev->input_dev);
+
+}
+
+static void laptopkey_poll(unsigned long data)
+{
+ struct laptop_key_device *keydev = (struct laptop_key_device *)data;
+ struct laptop_key *key;
+ struct list_head *entry;
+ int status;
+
+ list_for_each(entry, &keydev->list){
+ key = list_entry(entry, struct laptop_key, entry);
+
+ /*
+ * Check if this key requires polling.
+ * Otherwise just skip this key,
+ * and move to the next one.
+ */
+ if (!key->key_poll)
+ continue;
+
+ /*
+ * Poll the status, and report a key event
+ * when the status has changed.
+ */
+ status = !!key->key_poll(key->data);
+ if (status != key->current_status) {
+ laptopkey_key_event(key, status);
+ key->current_status = status;
+ }
+ }
+
+ /*
+ * Check if the polling can continue.
+ */
+ if (keydev->delay == 0)
+ return;
+
+ mod_timer(&keydev->timer, jiffies + msecs_to_jiffies(keydev->delay));
+}
+
+void laptopkey_dev_add_key(struct laptop_key_device *keydev,
+ struct laptop_key *key)
+{
+ /*
+ * If polling is enabled, obtain the initial
+ * status from the polling functions, otherwise
+ * set it to 0.
+ */
+ if (key->key_poll)
+ key->current_status = key->key_poll(key->data);
+ else
+ key->current_status = 0;
+
+ /*
+ * Add key to key device.
+ */
+ key->keydev = keydev;
+ list_add(&key->entry, &keydev->list);
+
+ /*
+ * Add key to the input device.
+ */
+ set_bit(key->key, keydev->input_dev->keybit);
+}
+
+void laptopkey_dev_del_key(struct laptop_key_device *keydev,
+ struct laptop_key *key)
+{
+ /*
+ * Remove list from device.
+ */
+ list_del(&key->entry);
+
+ /*
+ * Remove key to the input device.
+ */
+ clear_bit(key->key, keydev->input_dev->keybit);
+}
+
+void laptopkey_add_key(struct laptop_key *key)
+{
+ laptopkey_dev_add_key(&default_keydev, key);
+}
+
+void laptopkey_del_key(struct laptop_key *key)
+{
+ laptopkey_dev_del_key(&default_keydev, key);
+}
+
+int laptopkey_register_device(struct laptop_key_device *keydev)
+{
+ int status;
+
+ /*
+ * Create the input device
+ */
+ keydev->input_dev = input_allocate_device();
+ if (!keydev->input_dev) {
+ printk(KERN_ERR "Failed to allocate input device %s.\n",
+ keydev->dev_name);
+ return -ENOMEM;
+ }
+
+ /*
+ * Initialize the input device
+ */
+ keydev->input_dev->name = "Laptop keys";
+ keydev->input_dev->phys = keydev->dev_name;
+ keydev->input_dev->id.bustype = BUS_HOST;
+
+ /*
+ * Register the input device
+ */
+ status = input_register_device(keydev->input_dev);
+ if (status) {
+ printk(KERN_ERR "Failed to register input device %s.\n",
+ keydev->dev_name);
+ input_free_device(keydev->input_dev);
+ return status;
+ }
+
+ /*
+ * Initialize list head.
+ */
+ INIT_LIST_HEAD(&keydev->list);
+
+ /*
+ * Initialize timer.
+ */
+ init_timer(&keydev->timer);
+ keydev->timer.function = laptopkey_poll;
+ keydev->timer.data = (unsigned long)keydev;
+ keydev->timer.expires = jiffies + msecs_to_jiffies(keydev->delay);
+ add_timer(&keydev->timer);
+
+ printk(KERN_INFO "Created new %s: %s.\n",
+ keydev->input_dev->name, keydev->input_dev->phys);
+
+ return 0;
+}
+
+void laptopkey_unregister_device(struct laptop_key_device *keydev)
+{
+ /*
+ * Clear the delay field before deleting the timer,
+ * to prevent the scheduled work to rearm itself.
+ */
+ keydev->delay = 0;
+ del_timer_sync(&keydev->timer);
+
+ /*
+ * Remove input device.
+ */
+ input_unregister_device(keydev->input_dev);
+ input_free_device(keydev->input_dev);
+}
+
+static int __init radiobtn_init(void)
+{
+ printk(KERN_INFO "Loading radio button driver.\n");
+ return laptopkey_register_device(&default_keydev);
+}
+
+static void __exit radiobtn_exit(void)
+{
+ laptopkey_unregister_device(&default_keydev);
+ printk(KERN_INFO "Unloading radio button driver.\n");
+}
+
+EXPORT_SYMBOL(laptopkey_add_key);
+EXPORT_SYMBOL(laptopkey_del_key);
+EXPORT_SYMBOL(laptopkey_register_device);
+EXPORT_SYMBOL(laptopkey_unregister_device);
+EXPORT_SYMBOL(laptopkey_dev_add_key);
+EXPORT_SYMBOL(laptopkey_dev_del_key);
+EXPORT_SYMBOL(laptopkey_key_event);
+
+module_init(radiobtn_init);
+module_exit(radiobtn_exit);
diff --git a/include/linux/laptopkey.h b/include/linux/laptopkey.h
new file mode 100644
index 0000000..063ecf5
--- /dev/null
+++ b/include/linux/laptopkey.h
@@ -0,0 +1,131 @@
+/*
+ Copyright (C) 2006 Ivo van Doorn
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the
+ Free Software Foundation, Inc.,
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/*
+ Laptop keys support
+
+ INTRODUCTION
+ Laptops are quite often equiped with additional hardware keys.
+ This includes the radio keys for wireless and bluetooth devices,
+ but also other (programmable) keys.
+ This driver will create a generic layer between hardware and
+ userspace. Drivers can add keys to the input device for
+ frequent polling and reporting the status to userspace.
+
+ INPUT DEVICES
+ When loading this driver the main input device is directly created.
+ When desired drivers can also register a new laptop_key_device
+ which creates a new input device to which the laptop keys can be
+ registered.
+
+ POLLING
+ In the laptop_key_device structure the delay is set, this delay
+ is used to determine the polling interval in which each key will be
+ polled for its status. When the key_poll field is not set, the
+ key will not be polled.
+
+ STATUS REPORTING
+ When the status has changed, an input event will be send to userspace.
+ The key field will be used as reported key in that input event.
+ When the status of the key has changed, this event will also be send to
+ the driver that registered the key when the key_event field has been
+ set. It is also possible for keys to skip the polling and inform
+ this driver of the event directly.
+ */
+
+#ifndef LAPTOPKEY_H
+#define LAPTOPKEY_H
+
+#include <linux/input.h>
+#include <linux/list.h>
+
+/**
+ * struct laptop_key_device - laptop key device structure
+ * @dev_name: Name of the input device.
+ * @delay: When polling is required for any of the keys,
+ * this polling delay (in ms) will be used.
+ * @list: All laptop keys are part of a linked list.
+ * This field should not be touched by any driver.
+ * @input_dev: This is the input device created for this laptop_key_device.
+ * This field should not be touched by any driver.
+ * @timer: The timer structure for the frequent polling of the keys.
+ * This field should not be touched by any driver.
+ */
+struct laptop_key_device {
+ const char *dev_name;
+
+ unsigned int delay;
+
+ struct list_head list;
+
+ struct input_dev *input_dev;
+
+ struct timer_list timer;
+};
+
+/**
+ * struct laptop_key - laptop key structure
+ * @key: Key type that is send to userspace.
+ * should be any of the KEY_* defines from <linux/input.h>
+ * @data: private data that is send as argument with the
+ * functions key_poll and key_event.
+ * @current_status: Current status of the button is stored here.
+ * @key_poll: This function is used to determine the current state
+ * of the key. This field only needs to be set when polling is required.
+ * @key_event: This function is used when the key status has changed, it will
+ * then send the new key status as argument to inform the hardware
+ * of the change. This field is only required when the hardware needs to
+ * be informed of the change.
+ * @keydev: laptop_key_device structure this key is attached to.
+ * This field should not be touched by any driver.
+ * @entry: All laptop keys are part of a linked list. This field should not
+ * be touched by any driver.
+ */
+struct laptop_key {
+ unsigned int key;
+ unsigned long data;
+ int current_status;
+
+ int (*key_poll)(unsigned long data);
+ void (*key_event)(unsigned long data, int status);
+
+ struct laptop_key_device *keydev;
+ struct list_head entry;
+};
+
+/*
+ * Functions when using the main input device.
+ */
+void laptopkey_add_key(struct laptop_key *);
+void laptopkey_del_key(struct laptop_key *);
+
+/*
+ * Functions when using a seperate input device.
+ */
+int laptopkey_register_device(struct laptop_key_device *);
+void laptopkey_unregister_device(struct laptop_key_device *);
+void laptopkey_dev_add_key(struct laptop_key_device *, struct laptop_key *);
+void laptopkey_dev_del_key(struct laptop_key_device *, struct laptop_key *);
+
+/*
+ * Manually report a key event.
+ */
+void laptopkey_key_event(struct laptop_key *, int status);
+
+#endif /* LAPTOPKEY_H */
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply related
* Re: updated [Patch 1/1] AF_UNIX Datagram getpeersec
From: James Morris @ 2006-06-17 15:46 UTC (permalink / raw)
To: Xiaolan Zhang
Cc: Stephen Hemminger, akpm, chrisw, Catherine Zhang, czhang.us,
davem, George Wilson, herbert, jmorris, latten, netdev, sds,
Serge E Hallyn, tjaeger
In-Reply-To: <OF42C27083.DD6A539B-ON85257190.00252DFB-85257190.0025456C@us.ibm.com>
On Sat, 17 Jun 2006, Xiaolan Zhang wrote:
> Hi, Stephen,
>
> It appears that selinux_enabled is defined inside selinux module and not
> visible to the rest of the kernel...
Yes, these are SELinux API functions, they belong in
security/selinux/exports.c
But what about Stephens question on the return value?
>
> thanks,
> Catherine
>
> Stephen Hemminger <shemminger@osdl.org> wrote on 06/17/2006 12:16:03 AM:
>
> > O
> > >
> > > +void selinux_get_sock_sid(const struct socket *sock, u32 *sid)
> > > +{
> > > + if (selinux_enabled) {
> > > + const struct inode *inode = SOCK_INODE(sock);
> > > + selinux_get_inode_sid(inode, sid);
> > > + return;
> > > + }
> > > + *sid = 0;
> > > +}
> > > +
> >
> > This is so short, it would make sense to put it in scm.h
> > and why not have it return the value instead of call by reference?
> > Same goes for selinux_get_inode_sid
> >
> > static inline void selinux_get_sock_sid(const struct socket *sock, u32
> *sid)
> > {
> > if (selinux_enabled)
> > selinux_get_inode_sid(SOCK_INODE(sock), sid);
> > else
> > *sid = 0;
> > }
> >
> > or
> > static inline u32 selinux_get_sock_sid(const struct socket *sock)
> > {
> > return selinux_enabled ? selinux_get_inode_sid(SOCK_INODE(sid)) : 0;
> > }
>
> -
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
James Morris
<jmorris@namei.org>
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox