* Re: [PATCH 1/3] ipv6: remove some useless RCU read lock
From: David Miller @ 2012-09-10 20:31 UTC (permalink / raw)
To: amwang; +Cc: netdev
In-Reply-To: <1347281326-26890-1-git-send-email-amwang@redhat.com>
From: Cong Wang <amwang@redhat.com>
Date: Mon, 10 Sep 2012 20:48:44 +0800
> After this commit:
> commit 97cac0821af4474ec4ba3a9e7a36b98ed9b6db88
> Author: David S. Miller <davem@davemloft.net>
> Date: Mon Jul 2 22:43:47 2012 -0700
>
> ipv6: Store route neighbour in rt6_info struct.
>
> we no longer use RCU to protect route neighbour.
>
> Cc: "David S. Miller" <davem@davemloft.net>
> Signed-off-by: Cong Wang <amwang@redhat.com>
Applied to net-next, thanks.
^ permalink raw reply
* Re: [PATCH 2/3] ipv6, route: remove BACKTRACK() macro
From: David Miller @ 2012-09-10 20:32 UTC (permalink / raw)
To: amwang; +Cc: netdev
In-Reply-To: <1347281326-26890-2-git-send-email-amwang@redhat.com>
From: Cong Wang <amwang@redhat.com>
Date: Mon, 10 Sep 2012 20:48:45 +0800
> It doesn't save any code, nor it helps readability.
>
> Signed-off-by: Cong Wang <amwang@redhat.com>
I'm not applying this.
Having two copies of the same exact logic means we will accumulate
bugs in the future if someone fixes the problem only in one
copy.
^ permalink raw reply
* Re: [PATCH 3/3] fib6: remove some useless empty lines and comments
From: David Miller @ 2012-09-10 20:33 UTC (permalink / raw)
To: amwang; +Cc: netdev
In-Reply-To: <1347281326-26890-3-git-send-email-amwang@redhat.com>
From: Cong Wang <amwang@redhat.com>
Date: Mon, 10 Sep 2012 20:48:46 +0800
> There are too many empty lines in this source file,
> remove the useless ones, together with some useless
> comments.
>
> Signed-off-by: Cong Wang <amwang@redhat.com>
This patch is of zero value, please find something more useful to work
on and contribute, I'm not applying this.
^ permalink raw reply
* Re: [net PATCH 6/7] bnx2x: fix self-test
From: David Miller @ 2012-09-10 20:38 UTC (permalink / raw)
To: yuvalmin; +Cc: netdev, eilong, dmitry
In-Reply-To: <1347292135-30250-7-git-send-email-yuvalmin@broadcom.com>
From: "Yuval Mintz" <yuvalmin@broadcom.com>
Date: Mon, 10 Sep 2012 18:48:54 +0300
> From: Dmitry Kravkov <dmitry@broadcom.com>
>
> Under traffic, there are several registers that when read (e.g., via
> 'ethtool -t') may cause the chip to stall.
> This patch corrects the registers read in such flows.
>
> Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
> Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
> Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
You cannot change the size of layout of the register dump without
updating the ethtool register dump version advertised by the
driver.
You're currently the register dump version to zero.
^ permalink raw reply
* Re: [net-next PATCH 0/5] Energy Efficient Ethernet patch series
From: David Miller @ 2012-09-10 20:42 UTC (permalink / raw)
To: yuvalmin; +Cc: netdev, eilong
In-Reply-To: <1347292268-30348-1-git-send-email-yuvalmin@broadcom.com>
From: "Yuval Mintz" <yuvalmin@broadcom.com>
Date: Mon, 10 Sep 2012 18:51:03 +0300
> This patch series contains various EEE changes, the most significant being
> the addition of EEE support for devices with 4-ports, as well as replacing the
> auto-grEEEn feature with native EEE (802.3az) for boards with 54618SE phys.
>
> Please consider applying this patch series to 'net-next'.
All applied, thanks.
^ permalink raw reply
* Re: [PATCH 1/1] [PATCH] net: qmi_wwan: fix Gobi device probing for un2430
From: David Miller @ 2012-09-10 20:43 UTC (permalink / raw)
To: pierre.sauter; +Cc: gregkh, netdev, bjorn
In-Reply-To: <1347296579-15692-1-git-send-email-pierre.sauter@gmail.com>
From: pierre.sauter@gmail.com
Date: Mon, 10 Sep 2012 19:02:59 +0200
> From: Pierre Sauter <pierre.sauter@gmail.com>
>
> HP un2430 is a Gobi 3000 device. It was mistakenly treated as Gobi 1000
> in patch b9f90eb2740203ff2592efe640409ad48335d1c2.
>
> I own this device and qmi_wwan works again with this fix.
>
> Signed-off-by: Pierre Sauter <pierre.sauter@gmail.com>
Bjorn, ACK/NACK?
> ---
> drivers/net/usb/qmi_wwan.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
> index adfab3f..17b8f3e 100644
> --- a/drivers/net/usb/qmi_wwan.c
> +++ b/drivers/net/usb/qmi_wwan.c
> @@ -398,7 +398,6 @@ static const struct usb_device_id products[] = {
> /* 4. Gobi 1000 devices */
> {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */
> {QMI_GOBI1K_DEVICE(0x03f0, 0x1f1d)}, /* HP un2400 Gobi Modem Device */
> - {QMI_GOBI1K_DEVICE(0x03f0, 0x371d)}, /* HP un2430 Mobile Broadband Module */
> {QMI_GOBI1K_DEVICE(0x04da, 0x250d)}, /* Panasonic Gobi Modem device */
> {QMI_GOBI1K_DEVICE(0x413c, 0x8172)}, /* Dell Gobi Modem device */
> {QMI_GOBI1K_DEVICE(0x1410, 0xa001)}, /* Novatel Gobi Modem device */
> @@ -440,6 +439,7 @@ static const struct usb_device_id products[] = {
> {QMI_GOBI_DEVICE(0x16d8, 0x8002)}, /* CMDTech Gobi 2000 Modem device (VU922) */
> {QMI_GOBI_DEVICE(0x05c6, 0x9205)}, /* Gobi 2000 Modem device */
> {QMI_GOBI_DEVICE(0x1199, 0x9013)}, /* Sierra Wireless Gobi 3000 Modem device (MC8355) */
> + {QMI_GOBI_DEVICE(0x03f0, 0x371d)}, /* HP un2430 Mobile Broadband Module */
> {QMI_GOBI_DEVICE(0x1199, 0x9015)}, /* Sierra Wireless Gobi 3000 Modem device */
> {QMI_GOBI_DEVICE(0x1199, 0x9019)}, /* Sierra Wireless Gobi 3000 Modem device */
> {QMI_GOBI_DEVICE(0x1199, 0x901b)}, /* Sierra Wireless MC7770 */
> --
> 1.7.10.4
>
> --
> 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
>
^ permalink raw reply
* Re: [PATCH -next] net: fix net/core/sock.c build error
From: David Miller @ 2012-09-10 20:45 UTC (permalink / raw)
To: rdunlap; +Cc: sfr, linux-next, linux-kernel, netdev
In-Reply-To: <504E1193.4060809@xenotime.net>
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Mon, 10 Sep 2012 09:13:07 -0700
> From: Randy Dunlap <rdunlap@xenotime.net>
>
> Fix net/core/sock.c build error when CONFIG_INET is not enabled:
>
> net/built-in.o: In function `sock_edemux':
> (.text+0xd396): undefined reference to `inet_twsk_put'
>
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Applied to 'net', thanks Randy.
^ permalink raw reply
* [PATCH net-next] x86 bpf_jit: support MOD operation
From: Eric Dumazet @ 2012-09-10 20:48 UTC (permalink / raw)
To: David Miller; +Cc: ak, gbakos, netdev
In-Reply-To: <20120910.154537.639794042526369471.davem@davemloft.net>
From: Eric Dumazet <edumazet@google.com>
commit b6069a9570 (filter: add MOD operation) added generic
support for modulus operation in BPF.
This patch brings JIT support for x86_64
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: George Bakos <gbakos@alpinista.org>
---
arch/x86/net/bpf_jit_comp.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 33643a8..106c578 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -280,6 +280,31 @@ void bpf_jit_compile(struct sk_filter *fp)
}
EMIT4(0x31, 0xd2, 0xf7, 0xf3); /* xor %edx,%edx; div %ebx */
break;
+ case BPF_S_ALU_MOD_X: /* A %= X; */
+ seen |= SEEN_XREG;
+ EMIT2(0x85, 0xdb); /* test %ebx,%ebx */
+ if (pc_ret0 > 0) {
+ /* addrs[pc_ret0 - 1] is start address of target
+ * (addrs[i] - 6) is the address following this jmp
+ * ("xor %edx,%edx; div %ebx;mov %edx,%eax" being 6 bytes long)
+ */
+ EMIT_COND_JMP(X86_JE, addrs[pc_ret0 - 1] -
+ (addrs[i] - 6));
+ } else {
+ EMIT_COND_JMP(X86_JNE, 2 + 5);
+ CLEAR_A();
+ EMIT1_off32(0xe9, cleanup_addr - (addrs[i] - 6)); /* jmp .+off32 */
+ }
+ EMIT2(0x31, 0xd2); /* xor %edx,%edx */
+ EMIT2(0xf7, 0xf3); /* div %ebx */
+ EMIT2(0x89, 0xd0); /* mov %edx,%eax */
+ break;
+ case BPF_S_ALU_MOD_K: /* A %= K; */
+ EMIT2(0x31, 0xd2); /* xor %edx,%edx */
+ EMIT1(0xb9);EMIT(K, 4); /* mov imm32,%ecx */
+ EMIT2(0xf7, 0xf1); /* div %ecx */
+ EMIT2(0x89, 0xd0); /* mov %edx,%eax */
+ break;
case BPF_S_ALU_DIV_K: /* A = reciprocal_divide(A, K); */
EMIT3(0x48, 0x69, 0xc0); /* imul imm32,%rax,%rax */
EMIT(K, 4);
^ permalink raw reply related
* Re: [PATCH 0/5] dev_<level> and dynamic_debug cleanups
From: Jason Baron @ 2012-09-10 20:56 UTC (permalink / raw)
To: Joe Perches
Cc: Andrew Morton, netdev, Greg Kroah-Hartman, David S. Miller,
Jim Cromie, Kay Sievers, linux-kernel
In-Reply-To: <1347069350.13424.28.camel@joe2Laptop>
On Fri, Sep 07, 2012 at 06:55:50PM -0700, Joe Perches wrote:
> On Fri, 2012-09-07 at 11:35 -0400, Jason Baron wrote:
> > If nobody else thinks this patch is better, let's at least add a comment in
> > __dev_printk() and __netdev_printk() to fix dynamic debug, if these are changed.
>
> Or maybe make dynamic_emit_prefix a public function
> and move the __dynamic_<foo>_printk functions to
> nearby the __<foo>_printk functions so it's easier to
> see that changing one requires the other to change.
>
ok, that makes sense to me.
Thanks,
-Jason
^ permalink raw reply
* Re: [PATCH net-next] x86 bpf_jit: support MOD operation
From: David Miller @ 2012-09-10 21:09 UTC (permalink / raw)
To: eric.dumazet; +Cc: ak, gbakos, netdev
In-Reply-To: <1347310113.13103.8.camel@edumazet-glaptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 10 Sep 2012 22:48:33 +0200
> From: Eric Dumazet <edumazet@google.com>
>
> commit b6069a9570 (filter: add MOD operation) added generic
> support for modulus operation in BPF.
>
> This patch brings JIT support for x86_64
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
Applied, thanks Eric.
^ permalink raw reply
* Re: zero length sg in scatterwalk_start.
From: Horia Geanta @ 2012-09-10 21:48 UTC (permalink / raw)
To: Dave Jones; +Cc: netdev, Fedora Kernel Team, sergei.litvinenko, herbert
In-Reply-To: <20120910191208.GA20865@redhat.com>
On 9/10/2012 10:12 PM, Dave Jones wrote:
> Sergei (Cc'd) just filed this against our 3.6rc4 kernel
>
> It's falling over on the
>
> BUG_ON(!sg->length);
>
> in scatterwalk_start
AFAICT, this is the same issue as the one reported here:
http://lkml.org/lkml/2012/9/9/23
Could you please try the fix proposed:
http://lkml.org/lkml/2012/9/9/97
and hopefully provide your Tested-by ?
Horia
>
> Dave
>
> On Mon, Sep 10, 2012 at 06:41:07PM +0000, bugzilla@redhat.com wrote:
> > https://bugzilla.redhat.com/show_bug.cgi?id=855961
> >
> > Description of problem:
> >
> > Message with diagnostic and openswan stop to work
> >
> > Version-Release number of selected component (if applicable):
> > kernel-3.6.0-0.rc4.git2.1.fc18.i686
> > openswan-2.6.38-3.fc18.i686
> >
> >
> > Steps to Reproduce:
> > 1. Install f18 to KVM
> > 2. install openswan
> > 3. prepare configuration on Host and kvm guest:
> >
> > conn fedora18
> > #----------------------------------
> > left=10.x.x.100
> > leftrsasigkey=0sAQPHXz0 ...
> > #----------------------------------
> > right=10.x.x.18
> > rightrsasigkey=0sAQOi...
> > #----------------------------------
> > type=transport
> > keyingtries=%forever
> > auth=esp
> > ike=aes256-sha1-modp1024
> > esp=aes256-sha1
> > authby=rsasig
> > keyexchange=ike
> > disablearrivalcheck=yes
> > pfs=no
> > compress=no
> > #-----------------------------
> > auto=add
> >
> > 4. run from host: ipsec auto --up fedora18
> >
> > Actual results:
> >
> > Message ... and ipsec service is not accessible any more. Guest do not crash
> > and stil work (accessible by ssh).
> >
> > Expected results:
> > ipsec start and work
> >
> >
> > [ 105.063277] ------------[ cut here ]------------
> > [ 105.063281] kernel BUG at crypto/scatterwalk.c:37!
> > [ 105.063283] invalid opcode: 0000 [#1] SMP
> > [ 105.063286] Modules linked in: authenc rmd160 crypto_null camellia_generic lzo cast6 cast5 deflate zlib_deflate cts gcm ccm serpent_sse2_i586 xts serpent_generic lrw gf128mul glue_helper blowfish_generic blowfish_common twofish_generic twofish_i586 twofish_common xcbc sha512_generic des_generic geode_aes ah6 ah4 esp6 esp4 xfrm4_mode_beet xfrm4_tunnel tunnel4 xfrm4_mode_tunnel xfrm4_mode_transport xfrm6_mode_transport xfrm6_mode_ro xfrm6_mode_beet xfrm6_mode_tunnel ipcomp ipcomp6 xfrm6_tunnel tunnel6 xfrm_ipcomp af_key lockd sunrpc bnep bluetooth rfkill ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 xt_state nf_conntrack ip6table_filter ip6_tables ppdev microcode virtio_net i2c_piix4 parport_pc i2c_core parport uinput virtio_blk
> > [ 105.063327] Pid: 995, comm: cryptomgr_test Not tainted 3.6.0-0.rc4.git2.1.fc18.i686 #1 Bochs Bochs
> > [ 105.063329] EIP: 0060:[<c06829e9>] EFLAGS: 00010246 CPU: 0
> > [ 105.063363] EIP is at scatterwalk_start+0x19/0x20
> > [ 105.063365] EAX: f334bbe0 EBX: f286a5d8 ECX: 00000000 EDX: f286a5d8
> > [ 105.063367] ESI: 00000020 EDI: 00000000 EBP: f334bbd0 ESP: f334bbd0
> > [ 105.063368] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
> > [ 105.063372] CR0: 8005003b CR2: 45cb04bc CR3: 00ede000 CR4: 000006d0
> > [ 105.063381] DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000
> > [ 105.063386] DR6: ffff0ff0 DR7: 00000400
> > [ 105.063388] Process cryptomgr_test (pid: 995, ti=f334a000 task=f26e5640 task.ti=f334a000)
> > [ 105.063389] Stack:
> > [ 105.063390] f334bbf4 c0682bfa f334bbe0 f286a640 f286a5d8 f80851a3 f286a5a0 f286a5d8
> > [ 105.063395] f3378a50 f334bc38 f80859db 00000014 00000001 f2bd5000 00000000 87654321
> > [ 105.063400] 00000668 f54cdc80 00000200 00000000 00000000 f286a5d8 00000020 f286a678
> > [ 105.063406] Call Trace:
> > [ 105.063409] [<c0682bfa>] scatterwalk_map_and_copy+0x2a/0xa0
> > [ 105.063413] [<f80851a3>] ? crypto_authenc_ahash+0x63/0x80 [authenc]
> > [ 105.063416] [<f80859db>] crypto_authenc_genicv+0xdb/0x330 [authenc]
> > [ 105.063419] [<f8085dbc>] crypto_authenc_encrypt+0x8c/0xa0 [authenc]
> > [ 105.063422] [<c068a48a>] test_aead+0x5aa/0xd40
> > [ 105.063432] [<c047e685>] ? local_clock+0x65/0x70
> > [ 105.063444] [<c055d239>] ? deactivate_slab+0x419/0x540
> > [ 105.063449] [<c04a7f84>] ? trace_hardirqs_on_caller+0xf4/0x180
> > [ 105.063451] [<c04a801b>] ? trace_hardirqs_on+0xb/0x10
> > [ 105.063455] [<c068113d>] ? __crypto_alloc_tfm+0x3d/0x150
> > [ 105.063457] [<c068113d>] ? __crypto_alloc_tfm+0x3d/0x150
> > [ 105.063460] [<c055e2eb>] ? __kmalloc+0x11b/0x290
> > [ 105.063463] [<c068121f>] ? __crypto_alloc_tfm+0x11f/0x150
> > [ 105.063466] [<c0681bcd>] ? crypto_spawn_tfm+0x3d/0x70
> > [ 105.063468] [<c068f6d2>] ? crypto_cbc_init_tfm+0x22/0x40
> > [ 105.063471] [<c06811de>] ? __crypto_alloc_tfm+0xde/0x150
> > [ 105.063473] [<c0681bcd>] ? crypto_spawn_tfm+0x3d/0x70
> > [ 105.063476] [<c0685022>] ? skcipher_geniv_init+0x22/0x40
> > [ 105.063478] [<c0685edb>] ? async_chainiv_init+0x7b/0x90
> > [ 105.063481] [<c06811de>] ? __crypto_alloc_tfm+0xde/0x150
> > [ 105.063484] [<c068ac68>] alg_test_aead+0x48/0xa0
> > [ 105.063487] [<c068992e>] ? alg_find_test+0x2e/0x60
> > [ 105.063489] [<c0689a06>] alg_test+0xa6/0x270
> > [ 105.063511] [<c09fb836>] ? _raw_spin_unlock_irqrestore+0x36/0x70
> > [ 105.063514] [<c04a7f84>] ? trace_hardirqs_on_caller+0xf4/0x180
> > [ 105.063517] [<c04a801b>] ? trace_hardirqs_on+0xb/0x10
> > [ 105.063519] [<c06886c0>] ? cryptomgr_probe+0xb0/0xb0
> > [ 105.063522] [<c0688701>] cryptomgr_test+0x41/0x50
> > [ 105.063525] [<c046640d>] kthread+0x7d/0x90
> > [ 105.063528] [<c0466390>] ? __init_kthread_worker+0x60/0x60
> > [ 105.063532] [<c0a03502>] kernel_thread_helper+0x6/0x10
> > [ 105.063533] Code: c3 90 31 f6 83 c4 08 89 f0 5b 5e 5f 5d c3 66 90 66 90 55 89 e5 3e 8d 74 26 00 89 10 8b 4a 0c 85 c9 74 08 8b 52 08 5d 89 50 04 c3 <0f> 0b 90 8d 74 26 00 55 89 e5 53 3e 8d 74 26 00 89 c3 8b 00 81
> > [ 105.063565] EIP: [<c06829e9>] scatterwalk_start+0x19/0x20 SS:ESP 0068:f334bbd0
> > [ 105.063570] ---[ end trace 5057a14544445946 ]---
> > [ 105.063573] BUG: sleeping function called from invalid context at kernel/rwsem.c:20
> > [ 105.063574] in_atomic(): 1, irqs_disabled(): 0, pid: 995, name: cryptomgr_test
> > [ 105.063575] INFO: lockdep is turned off.
> > [ 105.063577] Pid: 995, comm: cryptomgr_test Tainted: G D 3.6.0-0.rc4.git2.1.fc18.i686 #1
> > [ 105.063578] Call Trace:
> > [ 105.063581] [<c0475227>] __might_sleep+0x167/0x210
> > [ 105.063584] [<c09f9230>] down_read+0x20/0x8b
> > [ 105.063587] [<c046e6ef>] ? __validate_process_creds+0x6f/0xd0
> > [ 105.063590] [<c0457f6e>] exit_signals+0x1e/0x110
> > [ 105.063595] [<c0446cef>] do_exit+0x9f/0xa10
> > [ 105.063597] [<c0443b11>] ? kmsg_dump+0x21/0x210
> > [ 105.063600] [<c0443c80>] ? kmsg_dump+0x190/0x210
> > [ 105.063602] [<c0443c94>] ? kmsg_dump+0x1a4/0x210
> > [ 105.063605] [<c0443b11>] ? kmsg_dump+0x21/0x210
> > [ 105.063607] [<c09fc92a>] oops_end+0x8a/0xd0
> > [ 105.063611] [<c04061d4>] die+0x54/0x80
> > [ 105.063613] [<c09fc366>] do_trap+0x96/0xd0
> > [ 105.063616] [<c0403b70>] ? do_bounds+0x90/0x90
> > [ 105.063618] [<c0403c16>] do_invalid_op+0xa6/0xb0
> > [ 105.063620] [<c06829e9>] ? scatterwalk_start+0x19/0x20
> > [ 105.063623] [<c068c1ed>] ? hmac_final+0x8d/0xa0
> > [ 105.063625] [<c0687d67>] ? crypto_shash_final+0x27/0xa0
> > [ 105.063628] [<c0688173>] ? shash_ahash_finup+0x73/0x80
> > [ 105.063637] [<c06c8dc8>] ? trace_hardirqs_off_thunk+0xc/0x14
> > [ 105.063640] [<c09fc0f8>] error_code+0x6c/0x74
> > [ 105.063643] [<c06800d8>] ? devcgroup_seq_read+0x2a8/0x2f0
> > [ 105.063645] [<c06829e9>] ? scatterwalk_start+0x19/0x20
> > [ 105.063648] [<c0682bfa>] scatterwalk_map_and_copy+0x2a/0xa0
> > [ 105.063651] [<f80851a3>] ? crypto_authenc_ahash+0x63/0x80 [authenc]
> > [ 105.063653] [<f80859db>] crypto_authenc_genicv+0xdb/0x330 [authenc]
> > [ 105.063656] [<f8085dbc>] crypto_authenc_encrypt+0x8c/0xa0 [authenc]
> > [ 105.063659] [<c068a48a>] test_aead+0x5aa/0xd40
> > [ 105.063661] [<c047e685>] ? local_clock+0x65/0x70
> > [ 105.063664] [<c055d239>] ? deactivate_slab+0x419/0x540
> > [ 105.063667] [<c04a7f84>] ? trace_hardirqs_on_caller+0xf4/0x180
> > [ 105.063670] [<c04a801b>] ? trace_hardirqs_on+0xb/0x10
> > [ 105.063672] [<c068113d>] ? __crypto_alloc_tfm+0x3d/0x150
> > [ 105.063675] [<c068113d>] ? __crypto_alloc_tfm+0x3d/0x150
> > [ 105.063678] [<c055e2eb>] ? __kmalloc+0x11b/0x290
> > [ 105.063681] [<c068121f>] ? __crypto_alloc_tfm+0x11f/0x150
> > [ 105.063683] [<c0681bcd>] ? crypto_spawn_tfm+0x3d/0x70
> > [ 105.063685] [<c068f6d2>] ? crypto_cbc_init_tfm+0x22/0x40
> > [ 105.063688] [<c06811de>] ? __crypto_alloc_tfm+0xde/0x150
> > [ 105.063690] [<c0681bcd>] ? crypto_spawn_tfm+0x3d/0x70
> > [ 105.063693] [<c0685022>] ? skcipher_geniv_init+0x22/0x40
> > [ 105.063695] [<c0685edb>] ? async_chainiv_init+0x7b/0x90
> > [ 105.063698] [<c06811de>] ? __crypto_alloc_tfm+0xde/0x150
> > [ 105.063701] [<c068ac68>] alg_test_aead+0x48/0xa0
> > [ 105.063703] [<c068992e>] ? alg_find_test+0x2e/0x60
> > [ 105.063706] [<c0689a06>] alg_test+0xa6/0x270
> > [ 105.063709] [<c09fb836>] ? _raw_spin_unlock_irqrestore+0x36/0x70
> > [ 105.063711] [<c04a7f84>] ? trace_hardirqs_on_caller+0xf4/0x180
> > [ 105.063713] [<c04a801b>] ? trace_hardirqs_on+0xb/0x10
> > [ 105.063716] [<c06886c0>] ? cryptomgr_probe+0xb0/0xb0
> > [ 105.063718] [<c0688701>] cryptomgr_test+0x41/0x50
> > [ 105.063721] [<c046640d>] kthread+0x7d/0x90
> > [ 105.063724] [<c0466390>] ? __init_kthread_worker+0x60/0x60
> > [ 105.063726] [<c0a03502>] kernel_thread_helper+0x6/0x10
> > [ 105.063728] note: cryptomgr_test[995] exited with preempt_count 1
^ permalink raw reply
* Re: [PATCH 1/2] iproute2: add libgenl files
From: Julian Anastasov @ 2012-09-10 21:54 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev
In-Reply-To: <20120910095518.59ddae61@nehalam.linuxnetplumber.net>
Hello,
On Mon, 10 Sep 2012, Stephen Hemminger wrote:
> On Sat, 8 Sep 2012 12:48:24 +0300
> Julian Anastasov <ja@ssi.bg> wrote:
>
> > +
> > +#define GENL_INIT_REQUEST(req, family, hdrsize, ver, cmd_, flags) \
> > + do { \
> > + memset(&req, 0, sizeof(req)); \
> > + req.n.nlmsg_type = family; \
> > + req.n.nlmsg_flags = flags; \
> > + req.n.nlmsg_len = NLMSG_LENGTH(GENL_HDRLEN + hdrsize); \
> > + req.g.cmd = cmd_; \
> > + req.g.version = ver; \
> > + } while (0)
> > +
>
> Why not an inline function, macro code is error prone.
The problem is that we define every request with
its own structure in GENL_DEFINE_REQUEST. We can use init
func instead of macro only if we define some base structure,
for example:
struct genl_header_base {
struct nlmsghdr n;
struct genlmsghdr g;
};
But then we will have new prefix when accessing
request fields (b.): b.n... and b.g... It will go to all places
that use addattr_*, eg. addattr_l(&req.b.n, sizeof(req), ...)
and such places can be many if there are many attributes.
#define GENL_DEFINE_REQUEST(req, hdrsize, bufsiz) \
struct { \
struct genl_header_base b; \
char buf[NLMSG_ALIGN(hdrsize) + bufsiz]; \
} req
int genl_init_request(struct genl_header_base *b,
b_size, family, hdrsize, ver, cmd_, flags)
Do you prefer this new variant? There will be many
places like req.n that will be changed like req.b.n.
I'll rename libgenl_ to genl_ when we decide what
to do with the request structure.
Regards
--
Julian Anastasov <ja@ssi.bg>
^ permalink raw reply
* Re: [PATCH] scsi_netlink: Remove dead and buggy code
From: James Bottomley @ 2012-09-10 22:07 UTC (permalink / raw)
To: David Miller; +Cc: ebiederm, netdev, James.Smart, linux-scsi
In-Reply-To: <20120910.150700.1197774171539303770.davem@davemloft.net>
On Mon, 2012-09-10 at 15:07 -0400, David Miller wrote:
> From: ebiederm@xmission.com (Eric W. Biederman)
> Date: Fri, 07 Sep 2012 15:39:21 -0700
>
> >
> > The scsi netlink code confuses the netlink port id with a process id,
> > going so far as to read NETLINK_CREDS(skb)->pid instead of the correct
> > NETLINK_CB(skb).pid. Fortunately it does not matter because nothing
> > registers to respond to scsi netlink requests.
> >
> > The only interesting use of the scsi_netlink interface is
> > fc_host_post_vendor_event which sends a netlink multicast message.
> >
> > Since nothing registers to handle scsi netlink messages kill all of the
> > registration logic, while retaining the same error handling behavior
> > preserving the userspace visible behavior and removing all of the
> > confused code that thought a netlink port id was a process id.
> >
> > This was tested with a kernel allyesconfig build which had no problems.
> >
> > Cc: James Bottomley <James.Bottomley@parallels.com>
> > Cc: James Smart <James.Smart@Emulex.Com>
> > Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
>
> James et al., please review and ACK.
I'll defer to the decision of James Smart and the other FC contributors,
since the FC transport class is really the only one using a netlink
interface.
James
^ permalink raw reply
* Re: [PATCH net-next] r8169: use unlimited DMA burst for TX
From: Francois Romieu @ 2012-09-10 21:55 UTC (permalink / raw)
To: David Miller; +Cc: mschmidt, netdev, hayeswang, nic_swsd, ivecera
In-Reply-To: <20120910.155046.568702072740433838.davem@davemloft.net>
David Miller <davem@davemloft.net> :
[...]
> I really need Francois et al. to take a look at this before even thinking
> about applying it.
Hayes tweaked RX_DMA_BURST to an unlimited value one year ago (see
4f6b00e5f139d7be3ca8371b769778f94fa549dd). Other than that, both
RX_DMA_BURST and TX_DMA_BURST have been set at the same (6 i.e. 1024 bytes)
value since the driver was added to the kernel tree.
Realtek's own 8169 driver uses unlimited bursts as well. However their 810x
driver doesn't (whence differing from the kernel driver after 4f6b00).
The current situation is a bit messy to say the least but it does not seem
to match any problem report. I don't have any special "don't".
Hayes, should we:
- mimic Realtek's 8168, 8169 and 810x drivers ?
- always set TX_DMA_BURST at the max value ?
- do something different (per chipset) ?
Thanks.
--
Ueimor
^ permalink raw reply
* Re: [PATCH 1/2] iproute2: add libgenl files
From: Stephen Hemminger @ 2012-09-10 22:42 UTC (permalink / raw)
To: Julian Anastasov; +Cc: netdev
In-Reply-To: <alpine.LFD.2.00.1209110021150.2010@ja.ssi.bg>
On Tue, 11 Sep 2012 00:54:00 +0300 (EEST)
Julian Anastasov <ja@ssi.bg> wrote:
> > Why not an inline function, macro code is error prone.
>
> The problem is that we define every request with
> its own structure in GENL_DEFINE_REQUEST. We can use init
> func instead of macro only if we define some base structure,
> for example:
>
> struct genl_header_base {
> struct nlmsghdr n;
> struct genlmsghdr g;
> };
Ok, that makes sense. I prefer C99 style initializers
in general. Maybe:
#define GENL_INIT_REQUEST(family, hdrsize, ver, cmd_, flags) { \
.req = { \
.n = { \
.nlmsg_type = (family), \
.nlmsg_flags = (flags), \
.nlmsg_len = NLMSG_LENGTH(GENL_HDRLEN + (hdrsize)), \
} \
.g = { \
.cmd = (cmd), \
.version = (ver), \
} \
}
Or merge GENL_DEFINE_REQUEST and GENL_INIT_REQUEST.
These are all nits, and not that important, just want to make it as simple
as possible. So if you like it okay as it was, we can just use that.
^ permalink raw reply
* RE: [net-next 0/6][pull request] Intel Wired LAN Driver Updates
From: Vick, Matthew @ 2012-09-10 22:58 UTC (permalink / raw)
To: Richard Cochran, Kirsher, Jeffrey T
Cc: davem@davemloft.net, netdev@vger.kernel.org, gospo@redhat.com,
sassmann@redhat.com
In-Reply-To: <20120906081315.GF2550@netboy.at.omicron.at>
> -----Original Message-----
> From: netdev-owner@vger.kernel.org [mailto:netdev-
> owner@vger.kernel.org] On Behalf Of Richard Cochran
> Sent: Thursday, September 06, 2012 1:13 AM
> To: Kirsher, Jeffrey T
> Cc: davem@davemloft.net; netdev@vger.kernel.org; gospo@redhat.com;
> sassmann@redhat.com
> Subject: Re: [net-next 0/6][pull request] Intel Wired LAN Driver
> Updates
>
> On Wed, Sep 05, 2012 at 04:35:00PM -0700, Jeff Kirsher wrote:
> >
> > Matthew Vick (6):
> > igb: Tidy up wrapping for CONFIG_IGB_PTP.
> > igb: Update PTP function names/variables and locations.
> > igb: Correct PTP support query from ethtool.
> > igb: Store the MAC address in the name in the PTP struct.
>
> These four still look like unnecessary churn to me, and possibly the
> wrong direction WRT time stamping in the 82580.
(I apologize for the delayed response--I was out of the office. I've read through the discussions and will respond here in the interest of brevity.)
I still fail to see how they're churn. I'm making the code make sense for what is actually supported today. I understand that, theoretically, some of this work may be reverted if/when we pull out hardware timestamping as a separate feature from the PTP support in the driver, but I don't think we should leave it general because someone someday might get around to doing something with it. It's confusing and more difficult to maintain for no benefit. It should be part of the development effort to generalize and consolidate where possible when adding a feature.
> > igb: Prevent dropped Tx timestamps via work items and interrupts.
> > igb: Add 1588 support to I210/I211.
>
> But these two look important, so I don't know what to say.
>
> Sorry,
> Richard
Those two are definitely important. :)
Cheers,
Matthew
^ permalink raw reply
* [RFC PATCH 1/5] libfcoe, fcoe: Allow user to set a ctlr's mode
From: Robert Love @ 2012-09-10 22:59 UTC (permalink / raw)
To: netdev, gregkh, linux-scsi, bprakash; +Cc: devel
In-Reply-To: <20120910225908.13140.97277.stgit@fritz>
This patch makes the 'mode' attribute of a
fcoe_ctlr_device writale. This allows the user
to store the mode with with the ctlr will be in.
Possible modes would be 'Fabric', or 'VN2VN'.
The default mode for a fcoe_ctlr{,_device} is 'Fabric'.
Drivers must implement the set_fcoe_ctlr_mode routine
to support this feature.
libfcoe offers an exported routine to set a fcoe_ctlr's
mode.
Signed-off-by: Robert Love <robert.w.love@intel.com>
---
Documentation/ABI/testing/sysfs-bus-fcoe | 8 ++++
drivers/scsi/fcoe/fcoe_ctlr.c | 22 +++++++++++
drivers/scsi/fcoe/fcoe_sysfs.c | 61 +++++++++++++++++++++++++++++-
include/scsi/fcoe_sysfs.h | 1
include/scsi/libfcoe.h | 1
5 files changed, 91 insertions(+), 2 deletions(-)
diff --git a/Documentation/ABI/testing/sysfs-bus-fcoe b/Documentation/ABI/testing/sysfs-bus-fcoe
index 469d09c..1b06ec1 100644
--- a/Documentation/ABI/testing/sysfs-bus-fcoe
+++ b/Documentation/ABI/testing/sysfs-bus-fcoe
@@ -9,6 +9,14 @@ Attributes:
this value will change the dev_loss_tmo for all
FCFs discovered by this controller.
+ mode: Display or change the FCoE Controller's mode. Possible
+ modes are 'Fabric' and 'VN2VN'. If a FCoE Controller
+ is started in 'Fabric' mode then FIP FCF discovery is
+ initiated and ultimately a fabric login is attempted.
+ If a FCoE Controller is started in 'VN2VN' mode then
+ FIP VN2VN discovery and login is performed. A FCoE
+ Controller only supports one mode at a time.
+
lesb_link_fail: Link Error Status Block (LESB) link failure count.
lesb_vlink_fail: Link Error Status Block (LESB) virtual link
diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
index d68d572..bd899bf 100644
--- a/drivers/scsi/fcoe/fcoe_ctlr.c
+++ b/drivers/scsi/fcoe/fcoe_ctlr.c
@@ -2884,3 +2884,25 @@ void fcoe_ctlr_get_fip_mode(struct fcoe_ctlr_device *ctlr_dev)
mutex_unlock(&ctlr->ctlr_mutex);
}
EXPORT_SYMBOL(fcoe_ctlr_get_fip_mode);
+
+void fcoe_ctlr_set_fip_mode(struct fcoe_ctlr_device *ctlr_dev)
+{
+ struct fcoe_ctlr *ctlr = fcoe_ctlr_device_priv(ctlr_dev);
+
+ mutex_lock(&ctlr->ctlr_mutex);
+ switch (ctlr_dev->mode) {
+ case FIP_CONN_TYPE_VN2VN:
+ ctlr->mode = FIP_MODE_VN2VN;
+ break;
+ case FIP_CONN_TYPE_FABRIC:
+ default:
+ ctlr->mode = FIP_MODE_FABRIC;
+ break;
+ }
+
+ /* TODO: Probably need to restart the state machine */
+
+ mutex_unlock(&ctlr->ctlr_mutex);
+
+}
+EXPORT_SYMBOL(fcoe_ctlr_set_fip_mode);
diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
index 2bc1631..3fbc556 100644
--- a/drivers/scsi/fcoe/fcoe_sysfs.c
+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
@@ -21,6 +21,7 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/etherdevice.h>
+#include <linux/ctype.h>
#include <scsi/fcoe_sysfs.h>
@@ -40,6 +41,46 @@ MODULE_PARM_DESC(fcf_dev_loss_tmo,
" insulate the loss of a fcf. Once this value is"
" exceeded, the fcf is removed.");
+#define FCOE_MAX_MODENAME_LEN 20
+struct fcoe_ctlr_mode_table {
+ char *modename;
+ enum fip_conn_type mode;
+};
+
+const struct fcoe_ctlr_mode_table ctlr_mode_tbl[] = {
+ { "fabric", FIP_CONN_TYPE_FABRIC},
+ { "vn2vn", FIP_CONN_TYPE_VN2VN},
+ { NULL, -1},
+};
+
+static enum fip_conn_type fcoe_parse_mode(const char *buf,
+ const struct fcoe_ctlr_mode_table *tbl)
+{
+ int modeint = -1, i, rv;
+ char *p, modestr[FCOE_MAX_MODENAME_LEN + 1] = { 0, };
+
+ for (p = (char *)buf; *p; p++)
+ if (!(isdigit(*p) || isspace(*p)))
+ break;
+
+ if (*p)
+ rv = sscanf(buf, "%20s", modestr);
+ else
+ rv = sscanf(buf, "%d", &modeint);
+
+ if (!rv)
+ return FIP_CONN_TYPE_UNKNOWN;
+
+ for (i = 0; tbl[i].modename; i++) {
+ if (modeint == tbl[i].mode)
+ return tbl[i].mode;
+ if (strcmp(modestr, tbl[i].modename) == 0)
+ return tbl[i].mode;
+ }
+
+ return FIP_CONN_TYPE_UNKNOWN;
+}
+
/*
* These are used by the fcoe_*_show_function routines, they
* are intentionally placed in the .c file as they're not intended
@@ -273,8 +314,24 @@ static ssize_t show_ctlr_mode(struct device *dev,
return snprintf(buf, FCOE_CTLR_MODE_MAX_NAMELEN,
"%s\n", name);
}
-static FCOE_DEVICE_ATTR(ctlr, mode, S_IRUGO,
- show_ctlr_mode, NULL);
+
+static ssize_t store_ctlr_mode(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ struct fcoe_ctlr_device *ctlr = dev_to_ctlr(dev);
+
+ if (!ctlr->f->set_fcoe_ctlr_mode)
+ return -EINVAL;
+
+ ctlr->mode = fcoe_parse_mode(buf, ctlr_mode_tbl);
+ ctlr->f->set_fcoe_ctlr_mode(ctlr);
+
+ return count;
+}
+
+static FCOE_DEVICE_ATTR(ctlr, mode, S_IRUGO | S_IWUSR,
+ show_ctlr_mode, store_ctlr_mode);
static ssize_t
store_private_fcoe_ctlr_fcf_dev_loss_tmo(struct device *dev,
diff --git a/include/scsi/fcoe_sysfs.h b/include/scsi/fcoe_sysfs.h
index 604cb9b..421ae67 100644
--- a/include/scsi/fcoe_sysfs.h
+++ b/include/scsi/fcoe_sysfs.h
@@ -35,6 +35,7 @@ struct fcoe_sysfs_function_template {
void (*get_fcoe_ctlr_err_block)(struct fcoe_ctlr_device *);
void (*get_fcoe_ctlr_fcs_error)(struct fcoe_ctlr_device *);
void (*get_fcoe_ctlr_mode)(struct fcoe_ctlr_device *);
+ void (*set_fcoe_ctlr_mode)(struct fcoe_ctlr_device *);
void (*get_fcoe_fcf_selected)(struct fcoe_fcf_device *);
void (*get_fcoe_fcf_vlan_id)(struct fcoe_fcf_device *);
};
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index 22b07cc..20533cc 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -359,6 +359,7 @@ int fcoe_get_paged_crc_eof(struct sk_buff *skb, int tlen,
/* FCoE Sysfs helpers */
void fcoe_fcf_get_selected(struct fcoe_fcf_device *);
void fcoe_ctlr_get_fip_mode(struct fcoe_ctlr_device *);
+void fcoe_ctlr_set_fip_mode(struct fcoe_ctlr_device *);
/**
* struct netdev_list
^ permalink raw reply related
* [RFC PATCH 2/5] libfcoe: Create new libfcoe control interfaces
From: Robert Love @ 2012-09-10 22:59 UTC (permalink / raw)
To: netdev, gregkh, linux-scsi, bprakash; +Cc: devel
In-Reply-To: <20120910225908.13140.97277.stgit@fritz>
This patch is the first in a series that will remove
libfcoe's create, destroy, enable and disable module
parameters and replace them with interface files in
the new /sys/bus/fcoe subsystem.
Old layout:
/sys/module/libfcoe/parameters/{create,destroy,enable,disable,vn2vn_create}
New layout:
/sys/bus/fcoe/ctlr_{create,destroy}
/sys/bus/fcoe/ctlr_X/{enable,disable,start}
This patch moves fcoe drivers to the following
initialization sequence-
1) create/alloc
2) configure
3) start
A control sysfs interface at /sys/bus/fcoe/ctlr_create
is added. Writing the interface name to this file
will allocate memory and create a sysfs entry for a
new fcoe_ctlr_device. The user may then tune the interface in
any desired way. After configuration the user will
echo any value into the /sys/bus/fcoe/devices/ctlr_X/start
interface to proceed with logging in.
VN2VN logins will still use the module parameters.
A follow up patch to this one will make the 'mode'
attribute of the fcoe_ctlr_device writable. Which will
allow a user to change the ctlr's mode to 'VN2VN'.
Signed-off-by: Robert Love <robert.w.love@intel.com>
---
Documentation/ABI/testing/sysfs-bus-fcoe | 43 ++++++++++++
drivers/scsi/fcoe/fcoe.h | 9 +++
drivers/scsi/fcoe/fcoe_ctlr.c | 2 -
drivers/scsi/fcoe/fcoe_sysfs.c | 78 ++++++++++++++++++++++
drivers/scsi/fcoe/fcoe_transport.c | 105 +++++++++++++++++++++++++++++-
include/scsi/fcoe_sysfs.h | 4 +
include/scsi/libfcoe.h | 14 ++++
7 files changed, 250 insertions(+), 5 deletions(-)
diff --git a/Documentation/ABI/testing/sysfs-bus-fcoe b/Documentation/ABI/testing/sysfs-bus-fcoe
index 1b06ec1..242d4a1 100644
--- a/Documentation/ABI/testing/sysfs-bus-fcoe
+++ b/Documentation/ABI/testing/sysfs-bus-fcoe
@@ -1,8 +1,37 @@
+What: /sys/bus/fcoe/
+Date: August 2012
+KernelVersion: TBD
+Contact: Robert Love <robert.w.love@intel.com>, devel@open-fcoe.org
+Description: The FCoE bus. Attributes in this directory are control interfaces.
+Attributes:
+
+ ctlr_create: 'FCoE Controller' instance creation interface. Writing an
+ <ifname> to this file will allocate and populate sysfs with a
+ fcoe_ctlr_device (ctlr_X). The user can then configure any
+ per-port settings and finally write to the fcoe_ctlr_device's
+ 'start' attribute to begin the kernel's discovery and login
+ process.
+
+ ctlr_destroy: 'FCoE Controller' instance removal interface. Writing a
+ fcoe_ctlr_device's sysfs name to this file will log the
+ fcoe_ctlr_device out of the fabric or otherwise connected
+ FCoE devices. It will also free all kernel memory allocated
+ for this fcoe_ctlr_device and any structures associated
+ with it, this includes the scsi_host.
+
What: /sys/bus/fcoe/ctlr_X
Date: March 2012
KernelVersion: TBD
Contact: Robert Love <robert.w.love@intel.com>, devel@open-fcoe.org
-Description: 'FCoE Controller' instances on the fcoe bus
+Description: 'FCoE Controller' instances on the fcoe bus.
+
+ The FCoE Controller now has a three stage creation process.
+ 1) Write interface name to ctlr_create 2) Configure the FCoE
+ Controller (ctlr_X) 3) Write anything to the FCoE
+ Controller's 'start' file to begin discovery and login. The
+ FCoE Controller is destroyed by writing it's name, i.e. ctlr_X
+ to the ctlr_delete file.
+
Attributes:
fcf_dev_loss_tmo: Device loss timeout peroid (see below). Changing
@@ -17,6 +46,18 @@ Attributes:
FIP VN2VN discovery and login is performed. A FCoE
Controller only supports one mode at a time.
+ start: Start the FCoE controller.
+
+ disable: Allow FCoE controller's that support disabling
+ to be disabled when any value is written to this
+ file. This attribute is only displayed if the
+ driver supports it.
+
+ enable: Allow FCoE controller's that support enabling
+ to be enabled when any value is written to this
+ file. This attribute is only displayed if the
+ driver supports it.
+
lesb_link_fail: Link Error Status Block (LESB) link failure count.
lesb_vlink_fail: Link Error Status Block (LESB) virtual link
diff --git a/drivers/scsi/fcoe/fcoe.h b/drivers/scsi/fcoe/fcoe.h
index a624add..e984627 100644
--- a/drivers/scsi/fcoe/fcoe.h
+++ b/drivers/scsi/fcoe/fcoe.h
@@ -22,6 +22,7 @@
#include <linux/skbuff.h>
#include <linux/kthread.h>
+#include <scsi/libfc.h>
#define FCOE_MAX_QUEUE_DEPTH 256
#define FCOE_MIN_QUEUE_DEPTH 32
@@ -99,4 +100,12 @@ static inline struct net_device *fcoe_netdev(const struct fc_lport *lport)
((struct fcoe_port *)lport_priv(lport))->priv)->netdev;
}
+struct net_device *fcoe_ctlr_to_netdev(
+ const struct fcoe_ctlr_device *ctlr_dev)
+{
+ struct fcoe_ctlr *ctlr = fcoe_ctlr_device_priv(ctlr_dev);
+ struct fc_lport *lport = ctlr->lp;
+ return fcoe_netdev(lport);
+}
+
#endif /* _FCOE_H_ */
diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
index bd899bf..ccb92323 100644
--- a/drivers/scsi/fcoe/fcoe_ctlr.c
+++ b/drivers/scsi/fcoe/fcoe_ctlr.c
@@ -147,7 +147,7 @@ static void fcoe_ctlr_map_dest(struct fcoe_ctlr *fip)
*/
void fcoe_ctlr_init(struct fcoe_ctlr *fip, enum fip_state mode)
{
- fcoe_ctlr_set_state(fip, FIP_ST_LINK_WAIT);
+ fcoe_ctlr_set_state(fip, FIP_ST_DISABLED);
fip->mode = mode;
INIT_LIST_HEAD(&fip->fcfs);
mutex_init(&fip->ctlr_mutex);
diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
index 3fbc556..d2f8cf9 100644
--- a/drivers/scsi/fcoe/fcoe_sysfs.c
+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
@@ -24,6 +24,7 @@
#include <linux/ctype.h>
#include <scsi/fcoe_sysfs.h>
+#include <scsi/libfcoe.h>
static atomic_t ctlr_num;
static atomic_t fcf_num;
@@ -41,6 +42,9 @@ MODULE_PARM_DESC(fcf_dev_loss_tmo,
" insulate the loss of a fcf. Once this value is"
" exceeded, the fcf is removed.");
+BUS_ATTR(ctlr_create, S_IWUSR, NULL, fcoe_ctlr_create_store);
+BUS_ATTR(ctlr_destroy, S_IWUSR, NULL, fcoe_ctlr_destroy_store);
+
#define FCOE_MAX_MODENAME_LEN 20
struct fcoe_ctlr_mode_table {
char *modename;
@@ -333,6 +337,65 @@ static ssize_t store_ctlr_mode(struct device *dev,
static FCOE_DEVICE_ATTR(ctlr, mode, S_IRUGO | S_IWUSR,
show_ctlr_mode, store_ctlr_mode);
+static ssize_t store_ctlr_start(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ struct fcoe_ctlr_device *ctlr = dev_to_ctlr(dev);
+ int rc;
+
+ if (ctlr->started == 1)
+ return -EINVAL;
+
+ rc = ctlr->f->set_fcoe_ctlr_start(ctlr);
+ if (rc)
+ return rc;
+
+ ctlr->started = 1;
+
+ return count;
+}
+static FCOE_DEVICE_ATTR(ctlr, start, S_IWUSR,
+ NULL, store_ctlr_start);
+
+static ssize_t store_ctlr_enable(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ struct fcoe_ctlr_device *ctlr = dev_to_ctlr(dev);
+ int rc;
+
+ if (ctlr->started == 1)
+ return -EINVAL;
+
+ rc = ctlr->f->set_fcoe_ctlr_enable(ctlr);
+ if (rc)
+ return rc;
+
+ return count;
+}
+static FCOE_DEVICE_ATTR(ctlr, enable, S_IWUSR,
+ NULL, store_ctlr_enable);
+
+static ssize_t store_ctlr_disable(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ struct fcoe_ctlr_device *ctlr = dev_to_ctlr(dev);
+ int rc;
+
+ if (ctlr->started == 1)
+ return -EINVAL;
+
+ rc = ctlr->f->set_fcoe_ctlr_disable(ctlr);
+ if (rc)
+ return rc;
+
+ return count;
+}
+static FCOE_DEVICE_ATTR(ctlr, disable, S_IWUSR,
+ NULL, store_ctlr_disable);
+
static ssize_t
store_private_fcoe_ctlr_fcf_dev_loss_tmo(struct device *dev,
struct device_attribute *attr,
@@ -416,6 +479,9 @@ static struct attribute_group fcoe_ctlr_lesb_attr_group = {
static struct attribute *fcoe_ctlr_attrs[] = {
&device_attr_fcoe_ctlr_fcf_dev_loss_tmo.attr,
+ &device_attr_fcoe_ctlr_start.attr,
+ &device_attr_fcoe_ctlr_enable.attr,
+ &device_attr_fcoe_ctlr_disable.attr,
&device_attr_fcoe_ctlr_mode.attr,
NULL,
};
@@ -880,6 +946,18 @@ int __init fcoe_sysfs_setup(void)
if (error)
return error;
+ error = bus_create_file(&fcoe_bus_type, &bus_attr_ctlr_create);
+ if (error) {
+ bus_unregister(&fcoe_bus_type);
+ return error;
+ }
+
+ error = bus_create_file(&fcoe_bus_type, &bus_attr_ctlr_destroy);
+ if (error) {
+ bus_unregister(&fcoe_bus_type);
+ return error;
+ }
+
return 0;
}
diff --git a/drivers/scsi/fcoe/fcoe_transport.c b/drivers/scsi/fcoe/fcoe_transport.c
index b46f43d..8e50d9a 100644
--- a/drivers/scsi/fcoe/fcoe_transport.c
+++ b/drivers/scsi/fcoe/fcoe_transport.c
@@ -515,9 +515,8 @@ static int __exit fcoe_transport_exit(void)
return 0;
}
-
static int fcoe_add_netdev_mapping(struct net_device *netdev,
- struct fcoe_transport *ft)
+ struct fcoe_transport *ft)
{
struct fcoe_netdev_mapping *nm;
@@ -627,6 +626,108 @@ static int libfcoe_device_notification(struct notifier_block *notifier,
return NOTIFY_OK;
}
+ssize_t fcoe_ctlr_create_store(struct bus_type *bus,
+ const char *buf, size_t count)
+{
+ struct net_device *netdev = NULL;
+ struct fcoe_transport *ft = NULL;
+ struct fcoe_ctlr_device *ctlr_dev = NULL;
+ int rc = -ENODEV;
+ int err;
+
+ mutex_lock(&ft_mutex);
+
+ netdev = fcoe_if_to_netdev(buf);
+ if (!netdev) {
+ LIBFCOE_TRANSPORT_DBG("Invalid device %s.\n", buf);
+ rc = -ENODEV;
+ goto out_nodev;
+ }
+
+ ft = fcoe_netdev_map_lookup(netdev);
+ if (ft) {
+ LIBFCOE_TRANSPORT_DBG("transport %s already has existing "
+ "FCoE instance on %s.\n",
+ ft->name, netdev->name);
+ rc = -EEXIST;
+ goto out_putdev;
+ }
+
+ ft = fcoe_transport_lookup(netdev);
+ if (!ft) {
+ LIBFCOE_TRANSPORT_DBG("no FCoE transport found for %s.\n",
+ netdev->name);
+ rc = -ENODEV;
+ goto out_putdev;
+ }
+
+ /* pass to transport create */
+ err = ft->alloc ? ft->alloc(netdev) : -ENODEV;
+ if (err) {
+ fcoe_del_netdev_mapping(netdev);
+ rc = -ENOMEM;
+ goto out_putdev;
+ }
+
+ err = fcoe_add_netdev_mapping(netdev, ft);
+ if (err) {
+ LIBFCOE_TRANSPORT_DBG("failed to add new netdev mapping "
+ "for FCoE transport %s for %s.\n",
+ ft->name, netdev->name);
+ rc = -ENODEV;
+ goto out_putdev;
+ }
+
+ LIBFCOE_TRANSPORT_DBG("transport %s %s to create fcoe on %s.\n",
+ ft->name, (ctlr_dev) ? "succeeded" : "failed",
+ netdev->name);
+
+out_putdev:
+ dev_put(netdev);
+out_nodev:
+ mutex_unlock(&ft_mutex);
+ return rc;
+}
+
+ssize_t fcoe_ctlr_destroy_store(struct bus_type *bus,
+ const char *buf, size_t count)
+{
+ int rc = -ENODEV;
+ struct net_device *netdev = NULL;
+ struct fcoe_transport *ft = NULL;
+
+ mutex_lock(&ft_mutex);
+
+ netdev = fcoe_if_to_netdev(buf);
+ if (!netdev) {
+ LIBFCOE_TRANSPORT_DBG("invalid device %s.\n", buf);
+ goto out_nodev;
+ }
+
+ ft = fcoe_netdev_map_lookup(netdev);
+ if (!ft) {
+ LIBFCOE_TRANSPORT_DBG("no FCoE transport found for %s.\n",
+ netdev->name);
+ goto out_putdev;
+ }
+
+ /* pass to transport destroy */
+ rc = ft->destroy(netdev);
+ if (rc)
+ goto out_putdev;
+
+ fcoe_del_netdev_mapping(netdev);
+ LIBFCOE_TRANSPORT_DBG("transport %s %s to destroy fcoe on %s.\n",
+ ft->name, (rc) ? "failed" : "succeeded",
+ netdev->name);
+ rc = count; /* required for successful return */
+out_putdev:
+ dev_put(netdev);
+out_nodev:
+ mutex_unlock(&ft_mutex);
+ return rc;
+}
+EXPORT_SYMBOL(fcoe_ctlr_destroy_store);
/**
* fcoe_transport_create() - Create a fcoe interface
diff --git a/include/scsi/fcoe_sysfs.h b/include/scsi/fcoe_sysfs.h
index 421ae67..8c5ea70 100644
--- a/include/scsi/fcoe_sysfs.h
+++ b/include/scsi/fcoe_sysfs.h
@@ -36,6 +36,9 @@ struct fcoe_sysfs_function_template {
void (*get_fcoe_ctlr_fcs_error)(struct fcoe_ctlr_device *);
void (*get_fcoe_ctlr_mode)(struct fcoe_ctlr_device *);
void (*set_fcoe_ctlr_mode)(struct fcoe_ctlr_device *);
+ int (*set_fcoe_ctlr_start)(struct fcoe_ctlr_device *);
+ int (*set_fcoe_ctlr_enable)(struct fcoe_ctlr_device *);
+ int (*set_fcoe_ctlr_disable)(struct fcoe_ctlr_device *);
void (*get_fcoe_fcf_selected)(struct fcoe_fcf_device *);
void (*get_fcoe_fcf_vlan_id)(struct fcoe_fcf_device *);
};
@@ -64,6 +67,7 @@ struct fcoe_ctlr_device {
int fcf_dev_loss_tmo;
enum fip_conn_type mode;
+ u8 started:1;
/* expected in host order for displaying */
struct fcoe_fc_els_lesb lesb;
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index 20533cc..b19a489 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -289,8 +289,11 @@ static inline bool is_fip_mode(struct fcoe_ctlr *fip)
* @attached: whether this transport is already attached
* @list: list linkage to all attached transports
* @match: handler to allow the transport driver to match up a given netdev
+ * @alloc: handler to allocate per-instance FCoE structures
+ * (no discovery or login)
* @create: handler to sysfs entry of create for FCoE instances
- * @destroy: handler to sysfs entry of destroy for FCoE instances
+ * @destroy: handler to delete per-instance FCoE structures
+ * (frees all memory)
* @enable: handler to sysfs entry of enable for FCoE instances
* @disable: handler to sysfs entry of disable for FCoE instances
*/
@@ -299,6 +302,7 @@ struct fcoe_transport {
bool attached;
struct list_head list;
bool (*match) (struct net_device *device);
+ int (*alloc) (struct net_device *device);
int (*create) (struct net_device *device, enum fip_state fip_mode);
int (*destroy) (struct net_device *device);
int (*enable) (struct net_device *device);
@@ -375,4 +379,12 @@ struct fcoe_netdev_mapping {
int fcoe_transport_attach(struct fcoe_transport *ft);
int fcoe_transport_detach(struct fcoe_transport *ft);
+/* sysfs store handler for ctrl_control interface */
+ssize_t fcoe_ctlr_create_store(struct bus_type *bus,
+ const char *buf, size_t count);
+ssize_t fcoe_ctlr_destroy_store(struct bus_type *bus,
+ const char *buf, size_t count);
+
#endif /* _LIBFCOE_H */
+
+
^ permalink raw reply related
* [RFC PATCH 3/5] fcoe: Use new fcoe_sysfs control interface
From: Robert Love @ 2012-09-10 22:59 UTC (permalink / raw)
To: netdev, gregkh, linux-scsi, bprakash; +Cc: devel
In-Reply-To: <20120910225908.13140.97277.stgit@fritz>
Convert fcoe to use the new fcoe_sysfs create, delete,
enable, disable, start and mode.
Signed-off-by: Robert Love <robert.w.love@intel.com>
---
drivers/scsi/fcoe/fcoe.c | 229 +++++++++++++++++++++++-----------------------
1 file changed, 115 insertions(+), 114 deletions(-)
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index fe30b1b..fe9ce98 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -112,10 +112,10 @@ static int fcoe_dcb_app_notification(struct notifier_block *notifier,
ulong event, void *ptr);
static bool fcoe_match(struct net_device *netdev);
-static int fcoe_create(struct net_device *netdev, enum fip_state fip_mode);
+static int fcoe_start(struct fcoe_ctlr_device *cdev);
static int fcoe_destroy(struct net_device *netdev);
-static int fcoe_enable(struct net_device *netdev);
-static int fcoe_disable(struct net_device *netdev);
+static int fcoe_enable(struct fcoe_ctlr_device *cdev);
+static int fcoe_disable(struct fcoe_ctlr_device *cdev);
static struct fc_seq *fcoe_elsct_send(struct fc_lport *,
u32 did, struct fc_frame *,
@@ -155,6 +155,10 @@ static void fcoe_ctlr_get_lesb(struct fcoe_ctlr_device *);
static void fcoe_fcf_get_vlan_id(struct fcoe_fcf_device *);
static struct fcoe_sysfs_function_template fcoe_sysfs_templ = {
+ .set_fcoe_ctlr_mode = fcoe_ctlr_set_fip_mode,
+ .set_fcoe_ctlr_start = fcoe_start,
+ .set_fcoe_ctlr_enable = fcoe_enable,
+ .set_fcoe_ctlr_disable = fcoe_disable,
.get_fcoe_ctlr_mode = fcoe_ctlr_get_fip_mode,
.get_fcoe_ctlr_link_fail = fcoe_ctlr_get_lesb,
.get_fcoe_ctlr_vlink_fail = fcoe_ctlr_get_lesb,
@@ -2034,105 +2038,6 @@ out:
}
/**
- * fcoe_disable() - Disables a FCoE interface
- * @netdev : The net_device object the Ethernet interface to create on
- *
- * Called from fcoe transport.
- *
- * Returns: 0 for success
- */
-static int fcoe_disable(struct net_device *netdev)
-{
- struct fcoe_ctlr *ctlr;
- struct fcoe_interface *fcoe;
- int rc = 0;
-
- mutex_lock(&fcoe_config_mutex);
-
- rtnl_lock();
- fcoe = fcoe_hostlist_lookup_port(netdev);
- rtnl_unlock();
-
- if (fcoe) {
- ctlr = fcoe_to_ctlr(fcoe);
- fcoe_ctlr_link_down(ctlr);
- fcoe_clean_pending_queue(ctlr->lp);
- } else
- rc = -ENODEV;
-
- mutex_unlock(&fcoe_config_mutex);
- return rc;
-}
-
-/**
- * fcoe_enable() - Enables a FCoE interface
- * @netdev : The net_device object the Ethernet interface to create on
- *
- * Called from fcoe transport.
- *
- * Returns: 0 for success
- */
-static int fcoe_enable(struct net_device *netdev)
-{
- struct fcoe_ctlr *ctlr;
- struct fcoe_interface *fcoe;
- int rc = 0;
-
- mutex_lock(&fcoe_config_mutex);
- rtnl_lock();
- fcoe = fcoe_hostlist_lookup_port(netdev);
- rtnl_unlock();
-
- if (!fcoe) {
- rc = -ENODEV;
- goto out;
- }
-
- ctlr = fcoe_to_ctlr(fcoe);
-
- if (!fcoe_link_ok(ctlr->lp))
- fcoe_ctlr_link_up(ctlr);
-
-out:
- mutex_unlock(&fcoe_config_mutex);
- return rc;
-}
-
-/**
- * fcoe_destroy() - Destroy a FCoE interface
- * @netdev : The net_device object the Ethernet interface to create on
- *
- * Called from fcoe transport
- *
- * Returns: 0 for success
- */
-static int fcoe_destroy(struct net_device *netdev)
-{
- struct fcoe_ctlr *ctlr;
- struct fcoe_interface *fcoe;
- struct fc_lport *lport;
- struct fcoe_port *port;
- int rc = 0;
-
- mutex_lock(&fcoe_config_mutex);
- rtnl_lock();
- fcoe = fcoe_hostlist_lookup_port(netdev);
- if (!fcoe) {
- rc = -ENODEV;
- goto out_nodev;
- }
- ctlr = fcoe_to_ctlr(fcoe);
- lport = ctlr->lp;
- port = lport_priv(lport);
- list_del(&fcoe->list);
- queue_work(fcoe_wq, &port->destroy_work);
-out_nodev:
- rtnl_unlock();
- mutex_unlock(&fcoe_config_mutex);
- return rc;
-}
-
-/**
* fcoe_destroy_work() - Destroy a FCoE port in a deferred work context
* @work: Handle to the FCoE port to be destroyed
*/
@@ -2207,18 +2112,17 @@ static void fcoe_dcb_create(struct fcoe_interface *fcoe)
}
/**
- * fcoe_create() - Create a fcoe interface
+ * fcoe_alloc() - Allocate memory for a fcoe interface
* @netdev : The net_device object the Ethernet interface to create on
- * @fip_mode: The FIP mode for this creation
*
* Called from fcoe transport
*
* Returns: 0 for success
*/
-static int fcoe_create(struct net_device *netdev, enum fip_state fip_mode)
+static int fcoe_alloc(struct net_device *netdev)
{
int rc = 0;
- struct fcoe_ctlr_device *ctlr_dev;
+ struct fcoe_ctlr_device *ctlr_dev = NULL;
struct fcoe_ctlr *ctlr;
struct fcoe_interface *fcoe;
struct fc_lport *lport;
@@ -2232,7 +2136,10 @@ static int fcoe_create(struct net_device *netdev, enum fip_state fip_mode)
goto out_nodev;
}
- fcoe = fcoe_interface_create(netdev, fip_mode);
+ /*
+ * Create the interface with the default 'Fabric' mode.
+ */
+ fcoe = fcoe_interface_create(netdev, FIP_MODE_FABRIC);
if (IS_ERR(fcoe)) {
rc = PTR_ERR(fcoe);
goto out_nodev;
@@ -2250,14 +2157,36 @@ static int fcoe_create(struct net_device *netdev, enum fip_state fip_mode)
goto out_nortnl;
}
+ /* add to lports list */
+ fcoe_hostlist_add(lport);
+
/* Make this the "master" N_Port */
ctlr->lp = lport;
/* setup DCB priority attributes. */
fcoe_dcb_create(fcoe);
- /* add to lports list */
- fcoe_hostlist_add(lport);
+out_nodev:
+ rtnl_unlock();
+out_nortnl:
+ mutex_unlock(&fcoe_config_mutex);
+ return rc;
+}
+
+/**
+ * fcoe_start() - Start the controller on a fcoe interface
+ * @cdev : The FCoE Controller Device to start
+ *
+ * Returns: 0 for success
+ */
+int fcoe_start(struct fcoe_ctlr_device *cdev)
+{
+ struct fcoe_ctlr *ctlr = fcoe_ctlr_device_priv(cdev);
+ struct fc_lport *lport = ctlr->lp;
+ int rc = 0;
+
+ mutex_lock(&fcoe_config_mutex);
+ rtnl_lock();
/* start FIP Discovery and FLOGI */
lport->boot_time = jiffies;
@@ -2269,14 +2198,88 @@ static int fcoe_create(struct net_device *netdev, enum fip_state fip_mode)
return rc;
}
-out_nodev:
rtnl_unlock();
-out_nortnl:
mutex_unlock(&fcoe_config_mutex);
+
return rc;
}
/**
+ * fcoe_destroy() - Destroy the controller on a fcoe interface
+ * @netdev: The netdevice associated with the controller to destroy
+ *
+ * Called from fcoe transport
+ *
+ * Returns: 0 for success
+ */
+int fcoe_destroy(struct net_device *netdev)
+{
+ struct fcoe_ctlr *ctlr;
+ struct fcoe_interface *fcoe;
+ struct fcoe_port *port;
+ int rc = 0;
+
+ mutex_lock(&fcoe_config_mutex);
+ rtnl_lock();
+
+ fcoe = fcoe_hostlist_lookup_port(netdev);
+ if (!fcoe) {
+ rc = -ENODEV;
+ goto out_nodev;
+ }
+
+ ctlr = fcoe_to_ctlr(fcoe);
+ port = lport_priv(ctlr->lp);
+ list_del(&fcoe->list);
+ queue_work(fcoe_wq, &port->destroy_work);
+
+out_nodev:
+ rtnl_unlock();
+ mutex_unlock(&fcoe_config_mutex);
+ return 0;
+}
+
+/**
+ * fcoe_enable() - Enable the controller on a fcoe interface
+ * @cdev : The FCoE Controller Device to enable
+ *
+ * Returns: 0 for success
+ */
+int fcoe_enable(struct fcoe_ctlr_device *cdev)
+{
+ struct fcoe_ctlr *ctlr = fcoe_ctlr_device_priv(cdev);
+
+ mutex_lock(&fcoe_config_mutex);
+
+ if (!fcoe_link_ok(ctlr->lp))
+ fcoe_ctlr_link_up(ctlr);
+
+ mutex_unlock(&fcoe_config_mutex);
+
+ return 0;
+}
+
+/**
+ * fcoe_disable() - Disable the controller on a fcoe interface
+ * @cdev : The FCoE Controller Device to disable
+ *
+ * Returns: 0 for success
+ */
+int fcoe_disable(struct fcoe_ctlr_device *cdev)
+{
+ struct fcoe_ctlr *ctlr = fcoe_ctlr_device_priv(cdev);
+
+ mutex_lock(&fcoe_config_mutex);
+
+ fcoe_ctlr_link_down(ctlr);
+ fcoe_clean_pending_queue(ctlr->lp);
+
+ mutex_unlock(&fcoe_config_mutex);
+
+ return 0;
+}
+
+/**
* fcoe_link_speed_update() - Update the supported and actual link speeds
* @lport: The local port to update speeds for
*
@@ -2453,10 +2456,8 @@ static struct fcoe_transport fcoe_sw_transport = {
.attached = false,
.list = LIST_HEAD_INIT(fcoe_sw_transport.list),
.match = fcoe_match,
- .create = fcoe_create,
+ .alloc = fcoe_alloc,
.destroy = fcoe_destroy,
- .enable = fcoe_enable,
- .disable = fcoe_disable,
};
/**
^ permalink raw reply related
* [RFC PATCH 4/5] bnx2fc: Use new fcoe_sysfs control interface
From: Robert Love @ 2012-09-10 22:59 UTC (permalink / raw)
To: netdev, gregkh, linux-scsi, bprakash; +Cc: devel
In-Reply-To: <20120910225908.13140.97277.stgit@fritz>
Convert bnx2fc to use the new fcoe_sysfs create, delete,
enable, disable, start and mode.
bnx2fc doesn't support VN2VN. bnx2fc will not initialize
the set_fcoe_ctlr_mode routine and therefore its instances
will always be in FABRIC mode. There was previously an
explicit check for the ctlr's mode, but this is no longer
needed because not implementing set_fcoe_ctlr_mode implies
that the ctlr cannot change from the FABRIC mode.
Signed-off-by: Robert Love <robert.w.love@intel.com>
---
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 98 +++++++++++++++++++++++--------------
1 file changed, 60 insertions(+), 38 deletions(-)
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index f52f668f..560c8c8 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -56,11 +56,12 @@ static struct scsi_host_template bnx2fc_shost_template;
static struct fc_function_template bnx2fc_transport_function;
static struct fcoe_sysfs_function_template bnx2fc_fcoe_sysfs_templ;
static struct fc_function_template bnx2fc_vport_xport_function;
-static int bnx2fc_create(struct net_device *netdev, enum fip_state fip_mode);
+
+static int bnx2fc_start(struct fcoe_ctlr_device *);
+static int bnx2fc_enable(struct fcoe_ctlr_device *);
+static int bnx2fc_disable(struct fcoe_ctlr_device *);
+
static void __bnx2fc_destroy(struct bnx2fc_interface *interface);
-static int bnx2fc_destroy(struct net_device *net_device);
-static int bnx2fc_enable(struct net_device *netdev);
-static int bnx2fc_disable(struct net_device *netdev);
static void bnx2fc_recv_frame(struct sk_buff *skb);
@@ -1594,8 +1595,7 @@ static void __bnx2fc_destroy(struct bnx2fc_interface *interface)
/**
* bnx2fc_destroy - Destroy a bnx2fc FCoE interface
*
- * @buffer: The name of the Ethernet interface to be destroyed
- * @kp: The associated kernel parameter
+ * @netdev: The name of the Ethernet interface to be destroyed
*
* Called from sysfs.
*
@@ -1954,10 +1954,11 @@ static void bnx2fc_ulp_init(struct cnic_dev *dev)
}
-static int bnx2fc_disable(struct net_device *netdev)
+static int bnx2fc_disable(struct fcoe_ctlr_device *cdev)
{
+ struct fcoe_ctlr *ctlr = fcoe_ctlr_device_priv(cdev);
+ struct net_device *netdev = bnx2fc_netdev(ctlr->lp);
struct bnx2fc_interface *interface;
- struct fcoe_ctlr *ctlr;
int rc = 0;
rtnl_lock();
@@ -1980,10 +1981,11 @@ static int bnx2fc_disable(struct net_device *netdev)
}
-static int bnx2fc_enable(struct net_device *netdev)
+static int bnx2fc_enable(struct fcoe_ctlr_device *cdev)
{
+ struct fcoe_ctlr *ctlr = fcoe_ctlr_device_priv(cdev);
+ struct net_device *netdev = bnx2fc_netdev(ctlr->lp);
struct bnx2fc_interface *interface;
- struct fcoe_ctlr *ctlr;
int rc = 0;
rtnl_lock();
@@ -2005,17 +2007,17 @@ static int bnx2fc_enable(struct net_device *netdev)
}
/**
- * bnx2fc_create - Create bnx2fc FCoE interface
+ * bnx2fc_alloc - Alocate a bnx2fc FCoE interface
*
- * @buffer: The name of Ethernet interface to create on
- * @kp: The associated kernel param
+ * @netdev: The name of Ethernet interface to allocate on
*
* Called from sysfs.
*
* Returns: 0 for success
*/
-static int bnx2fc_create(struct net_device *netdev, enum fip_state fip_mode)
+static int bnx2fc_alloc(struct net_device *netdev)
{
+ struct fcoe_ctlr_device *cdev;
struct fcoe_ctlr *ctlr;
struct bnx2fc_interface *interface;
struct bnx2fc_hba *hba;
@@ -2025,12 +2027,6 @@ static int bnx2fc_create(struct net_device *netdev, enum fip_state fip_mode)
int rc = 0;
int vlan_id;
- BNX2FC_MISC_DBG("Entered bnx2fc_create\n");
- if (fip_mode != FIP_MODE_FABRIC) {
- printk(KERN_ERR "fip mode not FABRIC\n");
- return -EIO;
- }
-
rtnl_lock();
mutex_lock(&bnx2fc_dev_lock);
@@ -2077,13 +2073,17 @@ static int bnx2fc_create(struct net_device *netdev, enum fip_state fip_mode)
goto netdev_err;
}
- interface = bnx2fc_interface_create(hba, netdev, fip_mode);
+ /*
+ * Create the interface with the default 'Fabric' mode.
+ */
+ interface = bnx2fc_interface_create(hba, netdev, FIP_MODE_FABRIC);
if (!interface) {
printk(KERN_ERR PFX "bnx2fc_interface_create failed\n");
goto ifput_err;
}
ctlr = bnx2fc_to_ctlr(interface);
+ cdev = fcoe_ctlr_to_ctlr_dev(ctlr);
interface->vlan_id = vlan_id;
interface->vlan_enabled = 1;
@@ -2106,20 +2106,6 @@ static int bnx2fc_create(struct net_device *netdev, enum fip_state fip_mode)
/* Add interface to if_list */
list_add_tail(&interface->list, &if_list);
- lport->boot_time = jiffies;
-
- /* Make this master N_port */
- ctlr->lp = lport;
-
- if (!bnx2fc_link_ok(lport)) {
- fcoe_ctlr_link_up(ctlr);
- fc_host_port_type(lport->host) = FC_PORTTYPE_NPORT;
- set_bit(ADAPTER_STATE_READY, &interface->hba->adapter_state);
- }
-
- BNX2FC_HBA_DBG(lport, "create: START DISC\n");
- bnx2fc_start_disc(interface);
- interface->enabled = true;
/*
* Release from kref_init in bnx2fc_interface_setup, on success
* lport should be holding a reference taken in bnx2fc_if_create
@@ -2128,6 +2114,7 @@ static int bnx2fc_create(struct net_device *netdev, enum fip_state fip_mode)
/* put netdev that was held while calling dev_get_by_name */
mutex_unlock(&bnx2fc_dev_lock);
rtnl_unlock();
+
return 0;
if_create_err:
@@ -2145,6 +2132,40 @@ mod_err:
}
/**
+ * bnx2fc_alloc - Alocate a bnx2fc FCoE interface
+ *
+ * @cdev: The FCoE Controller Device to start
+ *
+ * Called from sysfs.
+ *
+ * Returns: 0 for success
+ */
+static int bnx2fc_start(struct fcoe_ctlr_device *cdev)
+{
+ struct fcoe_ctlr *ctlr = fcoe_ctlr_device_priv(cdev);
+ struct fc_lport *lport = ctlr->lp;
+ struct fcoe_port *port = lport_priv(lport);
+ struct bnx2fc_interface *interface = port->priv;
+
+ lport->boot_time = jiffies;
+
+ /* Make this master N_port */
+ ctlr->lp = lport;
+
+ if (!bnx2fc_link_ok(lport)) {
+ fcoe_ctlr_link_up(ctlr);
+ fc_host_port_type(lport->host) = FC_PORTTYPE_NPORT;
+ set_bit(ADAPTER_STATE_READY, &interface->hba->adapter_state);
+ }
+
+ BNX2FC_HBA_DBG(lport, "create: START DISC\n");
+ bnx2fc_start_disc(interface);
+ interface->enabled = true;
+
+ return 0;
+}
+
+/**
* bnx2fc_find_hba_for_cnic - maps cnic instance to bnx2fc hba instance
*
* @cnic: Pointer to cnic device instance
@@ -2271,10 +2292,8 @@ static struct fcoe_transport bnx2fc_transport = {
.attached = false,
.list = LIST_HEAD_INIT(bnx2fc_transport.list),
.match = bnx2fc_match,
- .create = bnx2fc_create,
+ .alloc = bnx2fc_alloc,
.destroy = bnx2fc_destroy,
- .enable = bnx2fc_enable,
- .disable = bnx2fc_disable,
};
/**
@@ -2514,6 +2533,9 @@ module_init(bnx2fc_mod_init);
module_exit(bnx2fc_mod_exit);
static struct fcoe_sysfs_function_template bnx2fc_fcoe_sysfs_templ = {
+ .set_fcoe_ctlr_start = bnx2fc_start,
+ .set_fcoe_ctlr_enable = bnx2fc_enable,
+ .set_fcoe_ctlr_disable = bnx2fc_disable,
.get_fcoe_ctlr_mode = fcoe_ctlr_get_fip_mode,
.get_fcoe_ctlr_link_fail = bnx2fc_ctlr_get_lesb,
.get_fcoe_ctlr_vlink_fail = bnx2fc_ctlr_get_lesb,
^ permalink raw reply related
* [RFC PATCH 0/5] Reorganize libfcoe control interfaces
From: Robert Love @ 2012-09-10 22:59 UTC (permalink / raw)
To: netdev, gregkh, linux-scsi, bprakash; +Cc: devel
The following series implements a move from using module parameters
as control interfaces to /sys/bus/fcoe based interfaces. A sysfs infrastructure
was added to the kernel a few cycles ago, this series builds on that work.
It moves the create, vn2vn_create, destroy, enable and disable interfaces
from /sys/module/libfcoe/parameters/ to various places under /sys/bus/fcoe/.
These interfaces simply are not module configurations- they are control
interfaces.
A second goal of this series is to change the initialization sequence for
a FCoE device. The result of this series is that interfaces created using
libfcoe.ko interfaces (i.e. fcoe.ko or bnx2fc.ko) will have the following
starting steps-
1) Create/alloc the port
- Allocate kernel memory and create per-instance sysfs devices
- No discovery or login
2) Configure the port
- Change mode, set ddp_min, etc...
3) Start the port
- Begins discovery and/or login (depending on mode)
4) Destroy the port
- Logout and free all memory
I'm looking for feedback on using sysfs files as control interfaces that
the user (application) would write interface names to. I modeled this
series off of the bonding sysfs interface, but it was suggested to me that
it might not be a good example. I belive bonding uses two values per-file
a '+' or a '-" to add or delete and then the ifname apended. I am simply
writing the ifname to the ctlr_create or ctlr_destroy.
Series compiled and tested against v3.5. libfcoe.ko compile warning fixed
upstream after v3.5, anyone who compiles this can ignore section mismatch
warning. Also note that a modified fcoemon is needed to use the fcoe system
service against this kernel modification. I'd be happy to provide that
fcoemon code on request.
---
Robert Love (5):
libfcoe, fcoe: Allow user to set a ctlr's mode
libfcoe: Create new libfcoe control interfaces
fcoe: Use new fcoe_sysfs control interface
bnx2fc: Use new fcoe_sysfs control interface
libfcoe, fcoe: Remove libfcoe module parameters
Documentation/ABI/testing/sysfs-bus-fcoe | 51 +++++++
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 98 ++++++++-----
drivers/scsi/fcoe/fcoe.c | 229 +++++++++++++++---------------
drivers/scsi/fcoe/fcoe.h | 9 +
drivers/scsi/fcoe/fcoe_ctlr.c | 24 +++
drivers/scsi/fcoe/fcoe_sysfs.c | 139 ++++++++++++++++++
drivers/scsi/fcoe/fcoe_transport.c | 174 ++++-------------------
include/scsi/fcoe_sysfs.h | 5 +
include/scsi/libfcoe.h | 20 ++-
9 files changed, 445 insertions(+), 304 deletions(-)
--
Thanks, //Rob
^ permalink raw reply
* [RFC PATCH 5/5] libfcoe, fcoe: Remove libfcoe module parameters
From: Robert Love @ 2012-09-10 22:59 UTC (permalink / raw)
To: netdev, gregkh, linux-scsi, bprakash; +Cc: devel
In-Reply-To: <20120910225908.13140.97277.stgit@fritz>
This patch removes the create, create_vn2vn, destroy,
enable and disable module parameters. Previous patches
have added these interfaces to the fcoe_sysfs layout
and these misplaced interfaces are no longer necessary.
Signed-off-by: Robert Love <robert.w.love@intel.com>
---
drivers/scsi/fcoe/fcoe_transport.c | 211 ------------------------------------
include/scsi/libfcoe.h | 7 -
2 files changed, 1 insertion(+), 217 deletions(-)
diff --git a/drivers/scsi/fcoe/fcoe_transport.c b/drivers/scsi/fcoe/fcoe_transport.c
index 8e50d9a..f9e6e67 100644
--- a/drivers/scsi/fcoe/fcoe_transport.c
+++ b/drivers/scsi/fcoe/fcoe_transport.c
@@ -32,15 +32,11 @@ MODULE_AUTHOR("Open-FCoE.org");
MODULE_DESCRIPTION("FIP discovery protocol and FCoE transport for FCoE HBAs");
MODULE_LICENSE("GPL v2");
-static int fcoe_transport_create(const char *, struct kernel_param *);
-static int fcoe_transport_destroy(const char *, struct kernel_param *);
static int fcoe_transport_show(char *buffer, const struct kernel_param *kp);
static struct fcoe_transport *fcoe_transport_lookup(struct net_device *device);
static struct fcoe_transport *fcoe_netdev_map_lookup(struct net_device *device);
-static int fcoe_transport_enable(const char *, struct kernel_param *);
-static int fcoe_transport_disable(const char *, struct kernel_param *);
static int libfcoe_device_notification(struct notifier_block *notifier,
- ulong event, void *ptr);
+ ulong event, void *ptr);
static LIST_HEAD(fcoe_transports);
static DEFINE_MUTEX(ft_mutex);
@@ -55,29 +51,6 @@ module_param_call(show, NULL, fcoe_transport_show, NULL, S_IRUSR);
__MODULE_PARM_TYPE(show, "string");
MODULE_PARM_DESC(show, " Show attached FCoE transports");
-module_param_call(create, fcoe_transport_create, NULL,
- (void *)FIP_MODE_FABRIC, S_IWUSR);
-__MODULE_PARM_TYPE(create, "string");
-MODULE_PARM_DESC(create, " Creates fcoe instance on a ethernet interface");
-
-module_param_call(create_vn2vn, fcoe_transport_create, NULL,
- (void *)FIP_MODE_VN2VN, S_IWUSR);
-__MODULE_PARM_TYPE(create_vn2vn, "string");
-MODULE_PARM_DESC(create_vn2vn, " Creates a VN_node to VN_node FCoE instance "
- "on an Ethernet interface");
-
-module_param_call(destroy, fcoe_transport_destroy, NULL, NULL, S_IWUSR);
-__MODULE_PARM_TYPE(destroy, "string");
-MODULE_PARM_DESC(destroy, " Destroys fcoe instance on a ethernet interface");
-
-module_param_call(enable, fcoe_transport_enable, NULL, NULL, S_IWUSR);
-__MODULE_PARM_TYPE(enable, "string");
-MODULE_PARM_DESC(enable, " Enables fcoe on a ethernet interface.");
-
-module_param_call(disable, fcoe_transport_disable, NULL, NULL, S_IWUSR);
-__MODULE_PARM_TYPE(disable, "string");
-MODULE_PARM_DESC(disable, " Disables fcoe on a ethernet interface.");
-
/* notification function for packets from net device */
static struct notifier_block libfcoe_notifier = {
.notifier_call = libfcoe_device_notification,
@@ -730,188 +703,6 @@ out_nodev:
EXPORT_SYMBOL(fcoe_ctlr_destroy_store);
/**
- * fcoe_transport_create() - Create a fcoe interface
- * @buffer: The name of the Ethernet interface to create on
- * @kp: The associated kernel param
- *
- * Called from sysfs. This holds the ft_mutex while calling the
- * registered fcoe transport's create function.
- *
- * Returns: 0 for success
- */
-static int fcoe_transport_create(const char *buffer, struct kernel_param *kp)
-{
- int rc = -ENODEV;
- struct net_device *netdev = NULL;
- struct fcoe_transport *ft = NULL;
- enum fip_state fip_mode = (enum fip_state)(long)kp->arg;
-
- mutex_lock(&ft_mutex);
-
- netdev = fcoe_if_to_netdev(buffer);
- if (!netdev) {
- LIBFCOE_TRANSPORT_DBG("Invalid device %s.\n", buffer);
- goto out_nodev;
- }
-
- ft = fcoe_netdev_map_lookup(netdev);
- if (ft) {
- LIBFCOE_TRANSPORT_DBG("transport %s already has existing "
- "FCoE instance on %s.\n",
- ft->name, netdev->name);
- rc = -EEXIST;
- goto out_putdev;
- }
-
- ft = fcoe_transport_lookup(netdev);
- if (!ft) {
- LIBFCOE_TRANSPORT_DBG("no FCoE transport found for %s.\n",
- netdev->name);
- goto out_putdev;
- }
-
- rc = fcoe_add_netdev_mapping(netdev, ft);
- if (rc) {
- LIBFCOE_TRANSPORT_DBG("failed to add new netdev mapping "
- "for FCoE transport %s for %s.\n",
- ft->name, netdev->name);
- goto out_putdev;
- }
-
- /* pass to transport create */
- rc = ft->create ? ft->create(netdev, fip_mode) : -ENODEV;
- if (rc)
- fcoe_del_netdev_mapping(netdev);
-
- LIBFCOE_TRANSPORT_DBG("transport %s %s to create fcoe on %s.\n",
- ft->name, (rc) ? "failed" : "succeeded",
- netdev->name);
-
-out_putdev:
- dev_put(netdev);
-out_nodev:
- mutex_unlock(&ft_mutex);
- return rc;
-}
-
-/**
- * fcoe_transport_destroy() - Destroy a FCoE interface
- * @buffer: The name of the Ethernet interface to be destroyed
- * @kp: The associated kernel parameter
- *
- * Called from sysfs. This holds the ft_mutex while calling the
- * registered fcoe transport's destroy function.
- *
- * Returns: 0 for success
- */
-static int fcoe_transport_destroy(const char *buffer, struct kernel_param *kp)
-{
- int rc = -ENODEV;
- struct net_device *netdev = NULL;
- struct fcoe_transport *ft = NULL;
-
- mutex_lock(&ft_mutex);
-
- netdev = fcoe_if_to_netdev(buffer);
- if (!netdev) {
- LIBFCOE_TRANSPORT_DBG("invalid device %s.\n", buffer);
- goto out_nodev;
- }
-
- ft = fcoe_netdev_map_lookup(netdev);
- if (!ft) {
- LIBFCOE_TRANSPORT_DBG("no FCoE transport found for %s.\n",
- netdev->name);
- goto out_putdev;
- }
-
- /* pass to transport destroy */
- rc = ft->destroy ? ft->destroy(netdev) : -ENODEV;
- fcoe_del_netdev_mapping(netdev);
- LIBFCOE_TRANSPORT_DBG("transport %s %s to destroy fcoe on %s.\n",
- ft->name, (rc) ? "failed" : "succeeded",
- netdev->name);
-
-out_putdev:
- dev_put(netdev);
-out_nodev:
- mutex_unlock(&ft_mutex);
- return rc;
-}
-
-/**
- * fcoe_transport_disable() - Disables a FCoE interface
- * @buffer: The name of the Ethernet interface to be disabled
- * @kp: The associated kernel parameter
- *
- * Called from sysfs.
- *
- * Returns: 0 for success
- */
-static int fcoe_transport_disable(const char *buffer, struct kernel_param *kp)
-{
- int rc = -ENODEV;
- struct net_device *netdev = NULL;
- struct fcoe_transport *ft = NULL;
-
- mutex_lock(&ft_mutex);
-
- netdev = fcoe_if_to_netdev(buffer);
- if (!netdev)
- goto out_nodev;
-
- ft = fcoe_netdev_map_lookup(netdev);
- if (!ft)
- goto out_putdev;
-
- rc = ft->disable ? ft->disable(netdev) : -ENODEV;
-
-out_putdev:
- dev_put(netdev);
-out_nodev:
- mutex_unlock(&ft_mutex);
-
- if (rc == -ERESTARTSYS)
- return restart_syscall();
- else
- return rc;
-}
-
-/**
- * fcoe_transport_enable() - Enables a FCoE interface
- * @buffer: The name of the Ethernet interface to be enabled
- * @kp: The associated kernel parameter
- *
- * Called from sysfs.
- *
- * Returns: 0 for success
- */
-static int fcoe_transport_enable(const char *buffer, struct kernel_param *kp)
-{
- int rc = -ENODEV;
- struct net_device *netdev = NULL;
- struct fcoe_transport *ft = NULL;
-
- mutex_lock(&ft_mutex);
-
- netdev = fcoe_if_to_netdev(buffer);
- if (!netdev)
- goto out_nodev;
-
- ft = fcoe_netdev_map_lookup(netdev);
- if (!ft)
- goto out_putdev;
-
- rc = ft->enable ? ft->enable(netdev) : -ENODEV;
-
-out_putdev:
- dev_put(netdev);
-out_nodev:
- mutex_unlock(&ft_mutex);
- return rc;
-}
-
-/**
* libfcoe_init() - Initialization routine for libfcoe.ko
*/
static int __init libfcoe_init(void)
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index b19a489..af2e444 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -291,11 +291,7 @@ static inline bool is_fip_mode(struct fcoe_ctlr *fip)
* @match: handler to allow the transport driver to match up a given netdev
* @alloc: handler to allocate per-instance FCoE structures
* (no discovery or login)
- * @create: handler to sysfs entry of create for FCoE instances
* @destroy: handler to delete per-instance FCoE structures
- * (frees all memory)
- * @enable: handler to sysfs entry of enable for FCoE instances
- * @disable: handler to sysfs entry of disable for FCoE instances
*/
struct fcoe_transport {
char name[IFNAMSIZ];
@@ -303,10 +299,7 @@ struct fcoe_transport {
struct list_head list;
bool (*match) (struct net_device *device);
int (*alloc) (struct net_device *device);
- int (*create) (struct net_device *device, enum fip_state fip_mode);
int (*destroy) (struct net_device *device);
- int (*enable) (struct net_device *device);
- int (*disable) (struct net_device *device);
};
/**
^ permalink raw reply related
* Re: [RFC PATCH 1/5] libfcoe, fcoe: Allow user to set a ctlr's mode
From: Greg KH @ 2012-09-10 23:12 UTC (permalink / raw)
To: Robert Love; +Cc: netdev, linux-scsi, bprakash, devel
In-Reply-To: <20120910225914.13140.22190.stgit@fritz>
On Mon, Sep 10, 2012 at 03:59:14PM -0700, Robert Love wrote:
> This patch makes the 'mode' attribute of a
> fcoe_ctlr_device writale. This allows the user
> to store the mode with with the ctlr will be in.
>
> Possible modes would be 'Fabric', or 'VN2VN'.
>
> The default mode for a fcoe_ctlr{,_device} is 'Fabric'.
> Drivers must implement the set_fcoe_ctlr_mode routine
> to support this feature.
>
> libfcoe offers an exported routine to set a fcoe_ctlr's
> mode.
>
> Signed-off-by: Robert Love <robert.w.love@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
^ permalink raw reply
* Re: [RFC PATCH 0/5] Reorganize libfcoe control interfaces
From: Bhanu Prakash Gollapudi @ 2012-09-11 0:05 UTC (permalink / raw)
To: Robert Love; +Cc: netdev, gregkh, linux-scsi, devel
In-Reply-To: <20120910225908.13140.97277.stgit@fritz>
On 9/10/2012 3:59 PM, Robert Love wrote:
> The following series implements a move from using module parameters
> as control interfaces to /sys/bus/fcoe based interfaces. A sysfs infrastructure
> was added to the kernel a few cycles ago, this series builds on that work.
>
> It moves the create, vn2vn_create, destroy, enable and disable interfaces
> from /sys/module/libfcoe/parameters/ to various places under /sys/bus/fcoe/.
> These interfaces simply are not module configurations- they are control
> interfaces.
>
> A second goal of this series is to change the initialization sequence for
> a FCoE device. The result of this series is that interfaces created using
> libfcoe.ko interfaces (i.e. fcoe.ko or bnx2fc.ko) will have the following
> starting steps-
>
> 1) Create/alloc the port
> - Allocate kernel memory and create per-instance sysfs devices
> - No discovery or login
>
> 2) Configure the port
> - Change mode, set ddp_min, etc...
>
> 3) Start the port
> - Begins discovery and/or login (depending on mode)
>
> 4) Destroy the port
> - Logout and free all memory
Robert, Can you please let me now what is the motivation for this change
and what problem are we solving with this approach? Is this primarily to
allow user to set the mode?
I'm concerned that we will be breaking user space compatibility with
this change, as there should be a corresponding fcoemon/fipvlan change
along with this, and existing utilities will not work. Also the way we
start fcoe will be completely different and the user may need to do the
scripting changes, if any.
Thanks,
Bhanu
>
> I'm looking for feedback on using sysfs files as control interfaces that
> the user (application) would write interface names to. I modeled this
> series off of the bonding sysfs interface, but it was suggested to me that
> it might not be a good example. I belive bonding uses two values per-file
> a '+' or a '-" to add or delete and then the ifname apended. I am simply
> writing the ifname to the ctlr_create or ctlr_destroy.
>
> Series compiled and tested against v3.5. libfcoe.ko compile warning fixed
> upstream after v3.5, anyone who compiles this can ignore section mismatch
> warning. Also note that a modified fcoemon is needed to use the fcoe system
> service against this kernel modification. I'd be happy to provide that
> fcoemon code on request.
>
> ---
>
> Robert Love (5):
> libfcoe, fcoe: Allow user to set a ctlr's mode
> libfcoe: Create new libfcoe control interfaces
> fcoe: Use new fcoe_sysfs control interface
> bnx2fc: Use new fcoe_sysfs control interface
> libfcoe, fcoe: Remove libfcoe module parameters
>
>
> Documentation/ABI/testing/sysfs-bus-fcoe | 51 +++++++
> drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 98 ++++++++-----
> drivers/scsi/fcoe/fcoe.c | 229 +++++++++++++++---------------
> drivers/scsi/fcoe/fcoe.h | 9 +
> drivers/scsi/fcoe/fcoe_ctlr.c | 24 +++
> drivers/scsi/fcoe/fcoe_sysfs.c | 139 ++++++++++++++++++
> drivers/scsi/fcoe/fcoe_transport.c | 174 ++++-------------------
> include/scsi/fcoe_sysfs.h | 5 +
> include/scsi/libfcoe.h | 20 ++-
> 9 files changed, 445 insertions(+), 304 deletions(-)
>
^ permalink raw reply
* RE: [PATCH 2/3] ipv6, route: remove BACKTRACK() macro
From: Cong Wang @ 2012-09-11 1:07 UTC (permalink / raw)
To: David Laight; +Cc: netdev, David S. Miller
In-Reply-To: <AE90C24D6B3A694183C094C60CF0A2F6026B6FE6@saturn3.aculab.com>
On Mon, 2012-09-10 at 14:54 +0100, David Laight wrote:
>
> It does, however, seem to avoid replicating some relatively complex logic.
> OTOH goto out of a #define and hidden parameters (rt, fn ...) are not nice.
>
> Maybe the 'while (1)' part can be an inline function?
>
Yeah, actually that goto is the main reason why I think it should be
removed, at least I myself have some difficult to read this code which
jumps out. ;)
^ 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