* Re: [next-queue PATCH v5 4/5] net/sched: Add support for HW offloading for CBS
From: Vinicius Costa Gomes @ 2017-10-11 21:40 UTC (permalink / raw)
To: Jiri Pirko
Cc: netdev, intel-wired-lan, jhs, xiyou.wangcong, andre.guedes,
ivan.briano, jesus.sanchez-palencia, boon.leong.ong,
richardcochran, henrik, levipearson, rodney.cummings
In-Reply-To: <20171011070751.GC2039@nanopsycho>
Jiri Pirko <jiri@resnulli.us> writes:
[...]
>>+static void disable_cbs_offload(struct net_device *dev,
>>+ struct cbs_sched_data *q)
>>+{
>>+ struct tc_cbs_qopt_offload cbs = { };
>>+ const struct net_device_ops *ops;
>>+ int err;
>>+
>>+ if (!q->offload)
>>+ return;
>>+
>>+ ops = dev->netdev_ops;
>>+ if (!ops->ndo_setup_tc)
>>+ return;
>>+
>>+ cbs.queue = q->queue;
>>+ cbs.enable = 0;
>>+
>>+ err = ops->ndo_setup_tc(dev, TC_SETUP_CBS, &cbs);
>>+ if (err < 0)
>>+ pr_warn("Couldn't disable CBS offload for queue %d\n",
>>+ cbs.queue);
>
> Hmm, you have separete helper for disable, yet you have enable spread
> over cbs_change. Please push the enable code into enable_cbs_offload.
> While you are at it, change the names to cbs_ to maintain the qdisc
> prefix in function names: cbs_offload_enable/cbs_offload_disable
>
Sure.
Cheers,
^ permalink raw reply
* Re: [PATCH RFC 0/3] tun zerocopy stats
From: Willem de Bruijn @ 2017-10-11 21:44 UTC (permalink / raw)
To: Jason Wang
Cc: David Miller, Network Development, Michael S. Tsirkin,
Willem de Bruijn
In-Reply-To: <3ef92f5f-b242-a66a-860f-31da29216dc4@redhat.com>
On Tue, Oct 10, 2017 at 11:15 PM, Jason Wang <jasowang@redhat.com> wrote:
>
>
> On 2017年10月11日 03:11, Willem de Bruijn wrote:
>>
>> On Tue, Oct 10, 2017 at 1:39 PM, David Miller <davem@davemloft.net> wrote:
>>>
>>> From: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
>>> Date: Tue, 10 Oct 2017 11:29:33 -0400
>>>
>>>> If there is a way to expose these stats through vhost_net directly,
>>>> instead of through tun, that may be better. But I did not see a
>>>> suitable interface. Perhaps debugfs.
>>>
>>> Please don't use debugfs, thank you :-)
>>
>> Okay. I'll take a look at tracing for on-demand measurement.
>
>
> This reminds me a past series that adding tracepoints to vhost/net[1]. It
> can count zero/datacopy independently and even contains a sample program to
> show the stats.
Interesting, thanks!
For occasional evaluation, we can also use a bpf kprobe for the time being:
bpf_program = """
#include <uapi/linux/ptrace.h>
#include <bcc/proto.h>
BPF_ARRAY(count, u64, 2);
void inc_counter(struct pt_regs *ctx) {
bool success;
int key;
u64 *val;
success = PT_REGS_PARM2(ctx);
key = success ? 0 : 1;
val = count.lookup(&key);
if (val)
lock_xadd(val, 1);
}
"""
b = bcc.BPF(text=bpf_program)
b.attach_kprobe(event="vhost_zerocopy_callback", fn_name="inc_counter")
time.sleep(5)
print("vhost_zerocopy_callback: Y:%d N:%d" %
(b["count"][ctypes.c_int(0)].value,
b["count"][ctypes.c_int(1)].value))
^ permalink raw reply
* Re: BUG:af_packet fails to TX TSO frames
From: Anton Ivanov @ 2017-10-11 21:55 UTC (permalink / raw)
To: Willem de Bruijn; +Cc: Anton Ivanov, Network Development, David Miller
In-Reply-To: <CAF=yD-+gc5oQ=XT0+yw4Wt_h3rObETti3FvXm+V-nu=87zaMyA@mail.gmail.com>
[snip]
> The test can be run both with and without ring:
>
> psock_txring_vnet -l 8000 -s $src_ip -d $dst_ip -v
> psock_txring_vnet -l 8000 -s $src_ip -d $dst_ip -v -N
>
> both with and without qdisc bypass ('-q').
Thanks, apologies, I was being inpatient. Started reading the source,
saw the tpacket bits and stopped there.
>
>> - this goes via the tpacket_snd
>> which allocs via sock_alloc_send_skb. That results in a non-fragged skb
>> as it calls pskb after that with data_len = 0 asking for a contiguous one.
> but attached the ring slot as fragments in tpacket_fill_skb.
>
>> My stuff is using sendmmsg which ends up via packet_snd which allocs
>> via sock_alloc_send_pskb which is invoked in a way which always creates
>> 2 segments - one for the linear section and one for the rest (and more
>> if needed). It is faster than tpacket by the way (several times).
>>
>> As a comparison tap and other virtual drivers use sock_alloc_send_pskb
>> with non-zero data length which results in multiple frags. The code in
>> packet_snd is in fact identical with tap (+/- some cosmetic differences).
>>
>> That is the difference between the tests and that is why your test works
>> and mine fails.
> All the above test cases work for me, including those that build skbs
> with fragments. Could you try those.
Tried it, works on all of the adapters and hosts where mine fails. I
will step by step hack-in the differences so it behaves same as mine
until I find the culprit.
This will be tomorrow though, it is late here.
The only obvious difference I can see at this point is that I am using
iovs and sending the vnet header as iov[0] and the data in pieces after
that while your code is doing a send() for the whole frame. This should
not make any difference though - it all ends up as an iov internally in
the kernel.
A.
>
^ permalink raw reply
* Re: [RFC net-next 1/4] net: ipv6: Make inet6addr_validator a blocking notifier
From: David Ahern @ 2017-10-11 21:56 UTC (permalink / raw)
To: David Miller; +Cc: netdev, jiri, idosch, kjlx
In-Reply-To: <20171011.141301.998956921662009292.davem@davemloft.net>
On 10/11/17 3:13 PM, David Miller wrote:
> From: David Ahern <dsahern@gmail.com>
> Date: Tue, 10 Oct 2017 09:41:02 -0700
>
>> + /* validator notifier needs to be blocking;
>> + * do not call in softirq context
>> + */
>> + if (!in_softirq()) {
>
> I think we can test this better.
The callchain we are protecting against is
7fff8149d0dd ipv6_add_addr ([kernel.kallsyms])
7fff814a161b addrconf_prefix_rcv ([kernel.kallsyms])
7fff814afb8a ndisc_router_discovery ([kernel.kallsyms])
7fff814b0310 ndisc_rcv ([kernel.kallsyms])
7fff814b62da icmpv6_rcv ([kernel.kallsyms])
7fff81499c37 ip6_input_finish ([kernel.kallsyms])
7fff81499e96 ip6_input ([kernel.kallsyms])
7fff8149a519 ip6_mc_input ([kernel.kallsyms])
7fff81499f9d ip6_rcv_finish ([kernel.kallsyms])
7fff8149a349 ipv6_rcv ([kernel.kallsyms])
7fff813fbe12 __netif_receive_skb_core ([kernel.kallsyms])
7fff813fc04c __netif_receive_skb ([kernel.kallsyms])
7fff813ff97c netif_receive_skb_internal ([kernel.kallsyms])
>
> You should be able to audit the call sites and for each one set the
> value of a new boolean argument properly, and this way you can also
> give the boolean argument a descriptive name.
The safest is an in_atomic() check, but to your point I'll see if the
caller can pass in atomic vs blocking option as a bool.
>
> Furthermore, we can also then pull the inet6_addr allocation out of
> the locking paths and thus use GFP_KERNEL when possible.
>
Yes, I was thinking about that as a follow on -- how far down can the
rcu_read_lock_bh be pushed.
^ permalink raw reply
* Re: BUG:af_packet fails to TX TSO frames
From: Anton Ivanov @ 2017-10-11 22:01 UTC (permalink / raw)
To: Anton Ivanov, Willem de Bruijn; +Cc: Network Development, David Miller
In-Reply-To: <1e9c4f8b-2eb6-24cf-764f-b0a98aa0d044@kot-begemot.co.uk>
[snip]
> This will be tomorrow though, it is late here.
>
> The only obvious difference I can see at this point is that I am using
> iovs and sending the vnet header as iov[0] and the data in pieces after
> that while your code is doing a send() for the whole frame. This should
> not make any difference though - it all ends up as an iov internally in
> the kernel.
Spoke too soon. It is not reporting any errors, but there is nothing
coming out on the actual Ethernet.
Leaving it till tomorrow.
A.
>
> A.
>
>
--
Anton R. Ivanov
Cambridgegreys Limited. Registered in England. Company Number 10273661
^ permalink raw reply
* Re: [PATCH net-next 1/1] veth: tweak creation of veth device
From: David Miller @ 2017-10-11 22:17 UTC (permalink / raw)
To: mrv; +Cc: jhs, netdev
In-Reply-To: <1507666124-8780-1-git-send-email-mrv@mojatatu.com>
From: Roman Mashak <mrv@mojatatu.com>
Date: Tue, 10 Oct 2017 16:08:44 -0400
> When creating veth pair, at first rtnl_new_link() creates veth_dev, i.e.
> one end of the veth pipe, but not registers it; then veth_newlink() gets
> invoked, where peer dev is created _and_ registered, followed by veth_dev
> registration, which may fail if peer information, that is VETH_INFO_PEER
> attribute, has not been provided and the kernel will allocate unique veth
> name.
>
> So, we should ask the kernel to allocate unique name for veth_dev only
> when peer info is not available.
>
> Example:
>
> % ip link dev veth0 type veth
> RTNETLINK answers: File exists
>
> After fix:
> % ip link dev veth0 type veth
> % ip link show dev veth0
> 5: veth0@veth1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
> link/ether f6:ef:8b:96:f4:ec brd ff:ff:ff:ff:ff:ff
> %
>
> Signed-off-by: Roman Mashak <mrv@mojatatu.com>
I'm not so sure about this.
If we specify an explicit tb[IFLA_NAME], we shouldn't completely ignore that
request from the user just because they didn't give any peer information.
I see what happens in this case, the peer gets 'veth0' and then since
the user asked for 'veth0' for the non-peer it conflicts.
Well, too bad. The user must work to orchestrate things such that
this doesn't happen. That means either providing the IFLA_NAME for
both the peer and the non-peer, or specifying neither.
I'm not applying this, sorry.
^ permalink raw reply
* Re: [PATCH] hdlc: Convert timers to use timer_setup()
From: David Miller @ 2017-10-11 22:19 UTC (permalink / raw)
To: keescook; +Cc: khc, netdev, tglx, linux-kernel
In-Reply-To: <20171010220833.GA97664@beast>
From: Kees Cook <keescook@chromium.org>
Date: Tue, 10 Oct 2017 15:08:33 -0700
> In preparation for unconditionally passing the struct timer_list pointer to
> all timer callbacks, switch to using the new timer_setup() and from_timer()
> to pass the timer pointer explicitly. This adds a pointer back to the
> net_device, and drops needless open-coded resetting of the .function and
> .data fields.
>
> Cc: David S. Miller <davem@davemloft.net>
> Cc: Krzysztof Halasa <khc@pm.waw.pl>
> Cc: netdev@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> This requires commit 686fef928bba ("timer: Prepare to change timer
> callback argument type") in v4.14-rc3, but should be otherwise
> stand-alone.
This doesn't apply cleanly to net-next, please respin.
^ permalink raw reply
* Re: [PATCH][bpf-next] bpf: remove redundant variable old_flags
From: Daniel Borkmann @ 2017-10-11 22:19 UTC (permalink / raw)
To: Colin King, Alexei Starovoitov, netdev; +Cc: kernel-janitors, linux-kernel
In-Reply-To: <20171011105623.19998-1-colin.king@canonical.com>
On 10/11/2017 12:56 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Variable old_flags is being assigned but is never read; it is redundant
> and can be removed.
>
> Cleans up clang warning: Value stored to 'old_flags' is never read
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
^ permalink raw reply
* RE: [PATCH] fm10k: mark PM functions as __maybe_unused
From: Keller, Jacob E @ 2017-10-11 22:20 UTC (permalink / raw)
To: Arnd Bergmann, Kirsher, Jeffrey T
Cc: Kwan, Ngai-mint, David S. Miller, Florian Westphal,
intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
In-Reply-To: <20171011135834.3628155-1-arnd@arndb.de>
> -----Original Message-----
> From: Arnd Bergmann [mailto:arnd@arndb.de]
> Sent: Wednesday, October 11, 2017 6:58 AM
> To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>
> Cc: Arnd Bergmann <arnd@arndb.de>; Keller, Jacob E
> <jacob.e.keller@intel.com>; Kwan, Ngai-mint <ngai-mint.kwan@intel.com>;
> David S. Miller <davem@davemloft.net>; Florian Westphal <fw@strlen.de>;
> intel-wired-lan@lists.osuosl.org; netdev@vger.kernel.org; linux-
> kernel@vger.kernel.org
> Subject: [PATCH] fm10k: mark PM functions as __maybe_unused
>
> A cleanup of the PM code left an incorrect #ifdef in place, leading
> to a harmless build warning:
>
> drivers/net/ethernet/intel/fm10k/fm10k_pci.c:2502:12: error: 'fm10k_suspend'
> defined but not used [-Werror=unused-function]
> drivers/net/ethernet/intel/fm10k/fm10k_pci.c:2475:12: error: 'fm10k_resume'
> defined but not used [-Werror=unused-function]
>
> It's easier to use __maybe_unused attributes here, since you
> can't pick the wrong one.
>
Acked-by: Jacob Keller <jacob.e.keller@intel.com>
> Fixes: 8249c47c6ba4 ("fm10k: use generic PM hooks instead of legacy PCIe power
> hooks")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
> b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
> index 1e9ae3197b17..52f8eb3c470e 100644
> --- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
> +++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
> @@ -2463,7 +2463,6 @@ static int fm10k_handle_resume(struct fm10k_intfc
> *interface)
> return err;
> }
>
> -#ifdef CONFIG_PM
> /**
> * fm10k_resume - Generic PM resume hook
> * @dev: generic device structure
> @@ -2472,7 +2471,7 @@ static int fm10k_handle_resume(struct fm10k_intfc
> *interface)
> * suspend or hibernation. This function does not need to handle lower PCIe
> * device state as the stack takes care of that for us.
> **/
> -static int fm10k_resume(struct device *dev)
> +static int __maybe_unused fm10k_resume(struct device *dev)
> {
> struct fm10k_intfc *interface = pci_get_drvdata(to_pci_dev(dev));
> struct net_device *netdev = interface->netdev;
> @@ -2499,7 +2498,7 @@ static int fm10k_resume(struct device *dev)
> * system suspend or hibernation. This function does not need to handle lower
> * PCIe device state as the stack takes care of that for us.
> **/
> -static int fm10k_suspend(struct device *dev)
> +static int __maybe_unused fm10k_suspend(struct device *dev)
> {
> struct fm10k_intfc *interface = pci_get_drvdata(to_pci_dev(dev));
> struct net_device *netdev = interface->netdev;
> @@ -2511,8 +2510,6 @@ static int fm10k_suspend(struct device *dev)
> return 0;
> }
>
> -#endif /* CONFIG_PM */
> -
> /**
> * fm10k_io_error_detected - called when PCI error is detected
> * @pdev: Pointer to PCI device
> @@ -2643,11 +2640,9 @@ static struct pci_driver fm10k_driver = {
> .id_table = fm10k_pci_tbl,
> .probe = fm10k_probe,
> .remove = fm10k_remove,
> -#ifdef CONFIG_PM
> .driver = {
> .pm = &fm10k_pm_ops,
> },
> -#endif /* CONFIG_PM */
> .sriov_configure = fm10k_iov_configure,
> .err_handler = &fm10k_err_handler
> };
> --
> 2.9.0
^ permalink raw reply
* RE: [PATCH] i40e/i40evf: actually use u32 for feature flags
From: Keller, Jacob E @ 2017-10-11 22:21 UTC (permalink / raw)
To: Arnd Bergmann, Kirsher, Jeffrey T
Cc: Duyck, Alexander H, Williams, Mitch A, Sadowski, Filip,
intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
In-Reply-To: <20171011140316.3802721-1-arnd@arndb.de>
> -----Original Message-----
> From: Arnd Bergmann [mailto:arnd@arndb.de]
> Sent: Wednesday, October 11, 2017 7:03 AM
> To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>
> Cc: Arnd Bergmann <arnd@arndb.de>; Keller, Jacob E
> <jacob.e.keller@intel.com>; Duyck, Alexander H
> <alexander.h.duyck@intel.com>; Williams, Mitch A
> <mitch.a.williams@intel.com>; Sadowski, Filip <filip.sadowski@intel.com>; intel-
> wired-lan@lists.osuosl.org; netdev@vger.kernel.org; linux-
> kernel@vger.kernel.org
> Subject: [PATCH] i40e/i40evf: actually use u32 for feature flags
>
> A previous cleanup intended to change the flags variable to 32
> bit instead of 64, but accidentally left out the important
> part of that change, leading to a build error:
>
> drivers/net/ethernet/intel/i40e/i40e_ethtool.o: In function `i40e_set_priv_flags':
> i40e_ethtool.c:(.text+0x1a94): undefined reference to `wrong_size_cmpxchg'
>
> This adds the missing modification.
>
Hah good eyes. I'm guessing this got messed up in a patch re-ordering.
Acked-by: Jacob Keller <jacob.e.keller@intel.com>
> Fixes: b74f571f59a8 ("i40e/i40evf: organize and re-number feature flags")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/net/ethernet/intel/i40e/i40e.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e.h
> b/drivers/net/ethernet/intel/i40e/i40e.h
> index 18c453a3e728..7baf6d8a84dd 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e.h
> @@ -424,7 +424,7 @@ struct i40e_pf {
> #define I40E_HW_PORT_ID_VALID BIT(17)
> #define I40E_HW_RESTART_AUTONEG BIT(18)
>
> - u64 flags;
> + u32 flags;
> #define I40E_FLAG_RX_CSUM_ENABLED BIT(0)
> #define I40E_FLAG_MSI_ENABLED BIT(1)
> #define I40E_FLAG_MSIX_ENABLED BIT(2)
> --
> 2.9.0
^ permalink raw reply
* Re: [PATCH net-next] net: hns3: make local functions static
From: David Miller @ 2017-10-11 22:22 UTC (permalink / raw)
To: weiyongjun1
Cc: yisen.zhuang, salil.mehta, lipeng321, linyunsheng, colin.king,
netdev
In-Reply-To: <1507689323-183009-1-git-send-email-weiyongjun1@huawei.com>
From: Wei Yongjun <weiyongjun1@huawei.com>
Date: Wed, 11 Oct 2017 02:35:23 +0000
> Fixes the following sparse warnings:
>
> drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c:464:5: warning:
> symbol 'hns3_change_all_ring_bd_num' was not declared. Should it be static?
> drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c:477:5: warning:
> symbol 'hns3_set_ringparam' was not declared. Should it be static?
>
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Applied.
^ permalink raw reply
* Re: [PATCH net-next 0/7] Rewrite some existing functionality
From: David Miller @ 2017-10-11 22:22 UTC (permalink / raw)
To: subashab; +Cc: netdev
In-Reply-To: <1507695456-17051-1-git-send-email-subashab@codeaurora.org>
From: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Date: Tue, 10 Oct 2017 22:17:29 -0600
> This series fixes some of the broken rmnet functionality.
> Bridge mode is re-written and made useable and the muxed_ep is converted to hlist.
>
> Patches 1-5 are cleanups in preparation for these changes.
> Patch 6 does the hlist conversion.
> Patch 7 has the implementation of the rmnet bridge mode.
Series applied, thank you.
^ permalink raw reply
* Re: [PATCH net-next 0/7] Rewrite some existing functionality
From: David Miller @ 2017-10-11 22:25 UTC (permalink / raw)
To: subashab; +Cc: netdev
In-Reply-To: <20171011.152259.969926721717992984.davem@davemloft.net>
From: David Miller <davem@davemloft.net>
Date: Wed, 11 Oct 2017 15:22:59 -0700 (PDT)
> From: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
> Date: Tue, 10 Oct 2017 22:17:29 -0600
>
>> This series fixes some of the broken rmnet functionality.
>> Bridge mode is re-written and made useable and the muxed_ep is converted to hlist.
>>
>> Patches 1-5 are cleanups in preparation for these changes.
>> Patch 6 does the hlist conversion.
>> Patch 7 has the implementation of the rmnet bridge mode.
>
> Series applied, thank you.
Actually, I reverted:
drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c: In function ‘rmnet_rx_handler’:
drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c:174:6: warning: ‘rc’ may be used uninitialized in this function [-Wmaybe-uninitialized]
int rc;
^~
Also, the indentation of the switch statement is wrong, the break
statements need to be indented the same as the rest of the code
in their switch statements.
^ permalink raw reply
* Re: [PATCH] r8169: only enable PCI wakeups when WOL is active
From: David Miller @ 2017-10-11 22:26 UTC (permalink / raw)
To: drake; +Cc: nic_swsd, netdev, romieu, linux
In-Reply-To: <20171011045652.6301-1-drake@endlessm.com>
From: Daniel Drake <drake@endlessm.com>
Date: Wed, 11 Oct 2017 12:56:52 +0800
> rtl_init_one() currently enables PCI wakeups if the ethernet device
> is found to be WOL-capable. There is no need to do this when
> rtl8169_set_wol() will correctly enable or disable the same wakeup flag
> when WOL is activated/deactivated.
>
> This works around an ACPI DSDT bug which prevents the Acer laptop models
> Aspire ES1-533, Aspire ES1-732, PackardBell ENTE69AP and Gateway NE533
> from entering S3 suspend - even when no ethernet cable is connected.
>
> On these platforms, the DSDT says that GPE08 is a wakeup source for
> ethernet, but this GPE fires as soon as the system goes into suspend,
> waking the system up immediately. Having the wakeup normally disabled
> avoids this issue in the default case.
>
> With this change, WOL will continue to be unusable on these platforms
> (it will instantly wake up if WOL is later enabled by the user) but we
> do not expect this to be a commonly used feature on these consumer
> laptops. We have separately determined that WOL works fine without any
> ACPI GPEs enabled during sleep, so a DSDT fix or override would be
> possible to make WOL work.
>
> Signed-off-by: Daniel Drake <drake@endlessm.com>
Applied, thank you.
^ permalink raw reply
* Re: [PATCH v2 0/7] net: qrtr: Fixes and support receiving version 2 packets
From: David Miller @ 2017-10-11 22:38 UTC (permalink / raw)
To: bjorn.andersson; +Cc: netdev, linux-kernel, linux-arm-msm, clew
In-Reply-To: <20171011064523.7902-1-bjorn.andersson@linaro.org>
From: Bjorn Andersson <bjorn.andersson@linaro.org>
Date: Tue, 10 Oct 2017 23:45:16 -0700
> On the latest Qualcomm platforms remote processors are sending packets with
> version 2 of the message header. This series starts off with some fixes and
> then refactors the qrtr code to support receiving messages of both version 1
> and version 2.
>
> As all remotes are backwards compatible transmitted packets continues to be
> send as version 1, but some groundwork has been done to make this a per-link
> property.
Series applied, thanks.
^ permalink raw reply
* Re: [jkirsher/next-queue PATCH v4 0/6] tc-flower based cloud filters in i40e
From: Nambiar, Amritha @ 2017-10-11 22:41 UTC (permalink / raw)
To: Jamal Hadi Salim, intel-wired-lan, jeffrey.t.kirsher
Cc: alexander.h.duyck, jiri, netdev, alexander.duyck, xiyou.wangcong
In-Reply-To: <f85aa039-cf16-a25a-5b60-1af747b44f62@mojatatu.com>
On 10/11/2017 5:42 AM, Jamal Hadi Salim wrote:
> On 17-10-10 08:24 PM, Amritha Nambiar wrote:
>> This patch series enables configuring cloud filters in i40e
>> using the tc-flower classifier. The classification function
>> of the filter is to match a packet to a class. cls_flower is
>> extended to offload classid to hardware. The offloaded classid
>> is used direct matched packets to a traffic class on the device.
>> The approach here is similar to the tc 'prio' qdisc which uses
>> the classid for band selection. The ingress qdisc is called ffff:0,
>> so traffic classes are ffff:1 to ffff:8 (i40e has max of 8 TCs).
>> TC0 is minor number 1, TC1 is minor number 2 etc.
>>
>> The cloud filters are added for a VSI and are cleaned up when
>> the VSI is deleted. The filters that match on L4 ports needs
>> enhanced admin queue functions with big buffer support for
>> extended fields in cloud filter commands.
>>
>> Example:
>> # tc qdisc add dev eth0 ingress
>> # ethtool -K eth0 hw-tc-offload on
>>
>> Match Dst IPv4,Dst Port and route to TC1:
>> # tc filter add dev eth0 protocol ip parent ffff: prio 1 flower\
>> dst_ip 192.168.1.1/32 ip_proto udp dst_port 22\
>> skip_sw classid ffff:2
>>
>> # tc filter show dev eth0 parent ffff:
>> filter pref 1 flower chain 0
>> filter pref 1 flower chain 0 handle 0x1 classid ffff:2
>> eth_type ipv4
>> ip_proto udp
>> dst_ip 192.168.1.1
>> dst_port 22
>> skip_sw
>> in_hw
>>
>
> Much much better semantic. Thank you.
> Have you tested many filter mapping to the same classid?
Yes, I have tested mapping different filters to the same classID,
packets matching the flows were assigned the same classID and routed to
the same traffic class in HW.
filter pref 1 flower chain 0
filter pref 1 flower chain 0 handle 0x1 classid ffff:2
dst_mac 3c:fd:fe:a0:d6:70
eth_type ipv4
ip_proto udp
dst_port 12000
in_hw
filter pref 5 flower chain 0
filter pref 5 flower chain 0 handle 0x1 classid ffff:2
eth_type ipv4
ip_proto udp
dst_ip 192.168.1.1
dst_port 12000
in_hw
>
> cheers,
> jamal
>
^ permalink raw reply
* Re: [PATCH] i40e/i40evf: actually use u32 for feature flags
From: Jeff Kirsher @ 2017-10-11 22:46 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Jacob Keller, Alexander Duyck, Mitch Williams, Filip Sadowski,
intel-wired-lan, netdev, linux-kernel
In-Reply-To: <20171011140316.3802721-1-arnd@arndb.de>
On Wed, 2017-10-11 at 16:02 +0200, Arnd Bergmann wrote:
> A previous cleanup intended to change the flags variable to 32
> bit instead of 64, but accidentally left out the important
> part of that change, leading to a build error:
>
> drivers/net/ethernet/intel/i40e/i40e_ethtool.o: In function
> `i40e_set_priv_flags':
> i40e_ethtool.c:(.text+0x1a94): undefined reference to
> `wrong_size_cmpxchg'
>
> This adds the missing modification.
>
> Fixes: b74f571f59a8 ("i40e/i40evf: organize and re-number feature
> flags")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/net/ethernet/intel/i40e/i40e.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
To slow... :-) I had already sent a fix for this on Monday to David.
Check David Miller's net-next tree, it is already there.
^ permalink raw reply
* Re: [PATCH 0/4] net: qcom/emac: various minor fixes
From: David Miller @ 2017-10-11 23:02 UTC (permalink / raw)
To: timur; +Cc: netdev
In-Reply-To: <1507751546-10265-1-git-send-email-timur@codeaurora.org>
From: Timur Tabi <timur@codeaurora.org>
Date: Wed, 11 Oct 2017 14:52:22 -0500
> A set of patches for 4.15 that clean up some code, apply minors fixes,
> and so on. Some of the code also prepares the driver for a future
> version of the EMAC controller.
Series applied, thank you.
^ permalink raw reply
* Re: [PATCH net-next 0/7] Rewrite some existing functionality
From: Subash Abhinov Kasiviswanathan @ 2017-10-11 23:11 UTC (permalink / raw)
To: David Miller; +Cc: netdev
In-Reply-To: <20171011.152518.927596165753645888.davem@davemloft.net>
On 2017-10-11 16:25, David Miller wrote:
> From: David Miller <davem@davemloft.net>
> Date: Wed, 11 Oct 2017 15:22:59 -0700 (PDT)
>
>> From: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
>> Date: Tue, 10 Oct 2017 22:17:29 -0600
>>
>>> This series fixes some of the broken rmnet functionality.
>>> Bridge mode is re-written and made useable and the muxed_ep is
>>> converted to hlist.
>>>
>>> Patches 1-5 are cleanups in preparation for these changes.
>>> Patch 6 does the hlist conversion.
>>> Patch 7 has the implementation of the rmnet bridge mode.
>>
>> Series applied, thank you.
>
> Actually, I reverted:
>
> drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c: In function
> ‘rmnet_rx_handler’:
> drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c:174:6: warning:
> ‘rc’ may be used uninitialized in this function
> [-Wmaybe-uninitialized]
> int rc;
> ^~
>
> Also, the indentation of the switch statement is wrong, the break
> statements need to be indented the same as the rest of the code
> in their switch statements.
Hi David
I'll fix this and upload v2.
Somehow my compiler didnt throw this warning even though i have -Wall
set.
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply
* Re: [Intel-wired-lan] [jkirsher/next-queue PATCH v4 3/6] i40e: Cloud filter mode for set_switch_config command
From: Shannon Nelson @ 2017-10-11 23:30 UTC (permalink / raw)
To: intel-wired-lan, Amritha Nambiar; +Cc: netdev@vger.kernel.org
In-Reply-To: <150768146806.5320.1212910477662310789.stgit@anamdev.jf.intel.com>
On 10/10/2017 5:24 PM, Amritha Nambiar wrote:
> Add definitions for L4 filters and switch modes based on cloud filters
> modes and extend the set switch config command to include the
> additional cloud filter mode.
>
> Signed-off-by: Amritha Nambiar <amritha.nambiar@intel.com>
> Signed-off-by: Kiran Patil <kiran.patil@intel.com>
> ---
> drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 30 ++++++++++++++++++++-
> drivers/net/ethernet/intel/i40e/i40e_common.c | 4 ++-
> drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +
> drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +
> drivers/net/ethernet/intel/i40e/i40e_prototype.h | 2 +
> drivers/net/ethernet/intel/i40e/i40e_type.h | 9 ++++++
> 6 files changed, 44 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
> index 6a5db1b..729976b 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
> @@ -790,7 +790,35 @@ struct i40e_aqc_set_switch_config {
> */
> __le16 first_tag;
> __le16 second_tag;
> - u8 reserved[6];
> + /* Next byte is split into following:
> + * Bit 7 : 0: No action, 1: Switch to mode defined by bits 6:0
> + * Bit 6: 0 : Destination Port, 1: source port
> + * Bit 5..4: L4 type
Can you tweak the formatting on these comments to line up the first
couple of ':'s?
> + * 0: rsvd
> + * 1: TCP
> + * 2: UDP
> + * 3: Both TCP and UDP
> + * Bits 3:0 Mode
> + * 0: default mode
> + * 1: L4 port only mode
> + * 2: non-tunneled mode
> + * 3: tunneled mode
> + */
> +#define I40E_AQ_SET_SWITCH_BIT7_VALID 0x80
> +
> +#define I40E_AQ_SET_SWITCH_L4_SRC_PORT 0x40
> +
> +#define I40E_AQ_SET_SWITCH_L4_TYPE_RSVD 0x00
> +#define I40E_AQ_SET_SWITCH_L4_TYPE_TCP 0x10
> +#define I40E_AQ_SET_SWITCH_L4_TYPE_UDP 0x20
> +#define I40E_AQ_SET_SWITCH_L4_TYPE_BOTH 0x30
> +
> +#define I40E_AQ_SET_SWITCH_MODE_DEFAULT 0x00
> +#define I40E_AQ_SET_SWITCH_MODE_L4_PORT 0x01
> +#define I40E_AQ_SET_SWITCH_MODE_NON_TUNNEL 0x02
> +#define I40E_AQ_SET_SWITCH_MODE_TUNNEL 0x03
> + u8 mode;
> + u8 rsvd5[5];
> };
>
> I40E_CHECK_CMD_LENGTH(i40e_aqc_set_switch_config);
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
> index 1b85eb3..0b3c5b7 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_common.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
> @@ -2402,13 +2402,14 @@ i40e_status i40e_aq_get_switch_config(struct i40e_hw *hw,
> * @hw: pointer to the hardware structure
> * @flags: bit flag values to set
> * @valid_flags: which bit flags to set
> + * @mode: cloud filter mode
> * @cmd_details: pointer to command details structure or NULL
> *
> * Set switch configuration bits
> **/
> enum i40e_status_code i40e_aq_set_switch_config(struct i40e_hw *hw,
> u16 flags,
> - u16 valid_flags,
> + u16 valid_flags, u8 mode,
> struct i40e_asq_cmd_details *cmd_details)
> {
> struct i40e_aq_desc desc;
> @@ -2420,6 +2421,7 @@ enum i40e_status_code i40e_aq_set_switch_config(struct i40e_hw *hw,
> i40e_aqc_opc_set_switch_config);
> scfg->flags = cpu_to_le16(flags);
> scfg->valid_flags = cpu_to_le16(valid_flags);
> + scfg->mode = mode;
> if (hw->flags & I40E_HW_FLAG_802_1AD_CAPABLE) {
> scfg->switch_tag = cpu_to_le16(hw->switch_tag);
> scfg->first_tag = cpu_to_le16(hw->first_tag);
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
> index a760d75..37ca294 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
> @@ -4341,7 +4341,7 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)
> sw_flags = I40E_AQ_SET_SWITCH_CFG_PROMISC;
> valid_flags = I40E_AQ_SET_SWITCH_CFG_PROMISC;
> ret = i40e_aq_set_switch_config(&pf->hw, sw_flags, valid_flags,
> - NULL);
> + 0, NULL);
> if (ret && pf->hw.aq.asq_last_status != I40E_AQ_RC_ESRCH) {
> dev_info(&pf->pdev->dev,
> "couldn't set switch config bits, err %s aq_err %s\n",
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
> index 33a8f429..0539d43 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> @@ -12165,7 +12165,7 @@ static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit)
> u16 valid_flags;
>
> valid_flags = I40E_AQ_SET_SWITCH_CFG_PROMISC;
> - ret = i40e_aq_set_switch_config(&pf->hw, flags, valid_flags,
> + ret = i40e_aq_set_switch_config(&pf->hw, flags, valid_flags, 0,
> NULL);
> if (ret && pf->hw.aq.asq_last_status != I40E_AQ_RC_ESRCH) {
> dev_info(&pf->pdev->dev,
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_prototype.h b/drivers/net/ethernet/intel/i40e/i40e_prototype.h
> index 0150256..92869f5 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_prototype.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e_prototype.h
> @@ -190,7 +190,7 @@ i40e_status i40e_aq_get_switch_config(struct i40e_hw *hw,
> struct i40e_asq_cmd_details *cmd_details);
> enum i40e_status_code i40e_aq_set_switch_config(struct i40e_hw *hw,
> u16 flags,
> - u16 valid_flags,
> + u16 valid_flags, u8 mode,
> struct i40e_asq_cmd_details *cmd_details);
> i40e_status i40e_aq_request_resource(struct i40e_hw *hw,
> enum i40e_aq_resources_ids resource,
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
> index 17a99b5..24589a4 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_type.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
> @@ -283,6 +283,15 @@ struct i40e_hw_capabilities {
> #define I40E_NVM_IMAGE_TYPE_CLOUD 0x2
> #define I40E_NVM_IMAGE_TYPE_UDP_CLOUD 0x3
>
> + /* Cloud filter modes:
> + * Mode1: Filter on L4 port only
> + * Mode2: Filter for non-tunneled traffic
> + * Mode3: Filter for tunnel traffic
> + */
> +#define I40E_NVM_IMAGE_TYPE_MODE1 0x6
> +#define I40E_NVM_IMAGE_TYPE_MODE2 0x7
> +#define I40E_NVM_IMAGE_TYPE_MODE3 0x8
These names aren't very descriptive... out of context these look like
they are describing NVM image types, not message filter types.
> +
> u32 management_mode;
> u32 mng_protocols_over_mctp;
> #define I40E_MNG_PROTOCOL_PLDM 0x2
>
> _______________________________________________
> Intel-wired-lan mailing list
> Intel-wired-lan@osuosl.org
> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
>
^ permalink raw reply
* Re: [Intel-wired-lan] [jkirsher/next-queue PATCH v4 4/6] i40e: Admin queue definitions for cloud filters
From: Shannon Nelson @ 2017-10-11 23:30 UTC (permalink / raw)
To: intel-wired-lan, Amritha Nambiar; +Cc: netdev@vger.kernel.org
In-Reply-To: <150768147360.5320.13399379759470371200.stgit@anamdev.jf.intel.com>
On 10/10/2017 5:24 PM, Amritha Nambiar wrote:
> Add new admin queue definitions and extended fields for cloud
> filter support. Define big buffer for extended general fields
> in Add/Remove Cloud filters command.
>
> v3: Shortened some lengthy struct names.
> v2: Added I40E_CHECK_STRUCT_LEN check to AQ command structs and
> added AQ definitions to i40evf for consistency based on Shannon's
> feedback.
>
> Signed-off-by: Amritha Nambiar <amritha.nambiar@intel.com>
> Signed-off-by: Kiran Patil <kiran.patil@intel.com>
> Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
> ---
> drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 110 ++++++++++++++++++++
> .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 110 ++++++++++++++++++++
> 2 files changed, 216 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
> index 729976b..bcc7986 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
> @@ -1371,14 +1371,16 @@ struct i40e_aqc_add_remove_cloud_filters {
> #define I40E_AQC_ADD_CLOUD_CMD_SEID_NUM_SHIFT 0
> #define I40E_AQC_ADD_CLOUD_CMD_SEID_NUM_MASK (0x3FF << \
> I40E_AQC_ADD_CLOUD_CMD_SEID_NUM_SHIFT)
> - u8 reserved2[4];
> + u8 big_buffer_flag;
> +#define I40E_AQC_ADD_CLOUD_CMD_BB 1
> + u8 reserved2[3];
> __le32 addr_high;
> __le32 addr_low;
> };
>
> I40E_CHECK_CMD_LENGTH(i40e_aqc_add_remove_cloud_filters);
>
> -struct i40e_aqc_add_remove_cloud_filters_element_data {
> +struct i40e_aqc_cloud_filters_element_data {
> u8 outer_mac[6];
> u8 inner_mac[6];
> __le16 inner_vlan;
> @@ -1408,6 +1410,13 @@ struct i40e_aqc_add_remove_cloud_filters_element_data {
> #define I40E_AQC_ADD_CLOUD_FILTER_IMAC 0x000A
> #define I40E_AQC_ADD_CLOUD_FILTER_OMAC_TEN_ID_IMAC 0x000B
> #define I40E_AQC_ADD_CLOUD_FILTER_IIP 0x000C
> +/* 0x0010 to 0x0017 is for custom filters */
> +/* flag to be used when adding cloud filter: IP + L4 Port */
> +#define I40E_AQC_ADD_CLOUD_FILTER_IP_PORT 0x0010
> +/* flag to be used when adding cloud filter: Dest MAC + L4 Port */
> +#define I40E_AQC_ADD_CLOUD_FILTER_MAC_PORT 0x0011
> +/* flag to be used when adding cloud filter: Dest MAC + VLAN + L4 Port */
> +#define I40E_AQC_ADD_CLOUD_FILTER_MAC_VLAN_PORT 0x0012
Short description comments to the side of each line would be more
readable, and maybe don't mind too much the 80 column thing here
#define I40E_AQC_ADD_CLOUD_FILTER_IP_PORT 0x0010/* Dest IP + L4 Port */
#define I40E_AQC_ADD_CLOUD_FILTER_MAC_PORT 0x0011 /* Dest MAC + L4 Port */
#define I40E_AQC_ADD_CLOUD_FILTER_MAC_VLAN_PORT 0x0012 /* Dest MAC +
VLAN + L4 Port */
>
> #define I40E_AQC_ADD_CLOUD_FLAGS_TO_QUEUE 0x0080
> #define I40E_AQC_ADD_CLOUD_VNK_SHIFT 6
> @@ -1442,6 +1451,49 @@ struct i40e_aqc_add_remove_cloud_filters_element_data {
> u8 response_reserved[7];
> };
>
> +I40E_CHECK_STRUCT_LEN(0x40, i40e_aqc_cloud_filters_element_data);
> +
> +/* i40e_aqc_cloud_filters_element_bb is used when
> + * I40E_AQC_CLOUD_CMD_BB flag is set.
> + */
> +struct i40e_aqc_cloud_filters_element_bb {
> + struct i40e_aqc_cloud_filters_element_data element;
> + u16 general_fields[32];
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X10_WORD0 0
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X10_WORD1 1
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X10_WORD2 2
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD0 3
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD1 4
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD2 5
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X12_WORD0 6
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X12_WORD1 7
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X12_WORD2 8
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X13_WORD0 9
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X13_WORD1 10
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X13_WORD2 11
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X14_WORD0 12
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X14_WORD1 13
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X14_WORD2 14
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD0 15
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD1 16
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD2 17
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD3 18
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD4 19
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD5 20
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD6 21
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD7 22
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD0 23
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD1 24
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD2 25
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD3 26
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD4 27
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD5 28
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD6 29
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD7 30
> +};
> +
> +I40E_CHECK_STRUCT_LEN(0x80, i40e_aqc_cloud_filters_element_bb);
> +
> struct i40e_aqc_remove_cloud_filters_completion {
> __le16 perfect_ovlan_used;
> __le16 perfect_ovlan_free;
> @@ -1453,6 +1505,60 @@ struct i40e_aqc_remove_cloud_filters_completion {
>
> I40E_CHECK_CMD_LENGTH(i40e_aqc_remove_cloud_filters_completion);
>
> +/* Replace filter Command 0x025F
> + * uses the i40e_aqc_replace_cloud_filters,
> + * and the generic indirect completion structure
> + */
> +struct i40e_filter_data {
> + u8 filter_type;
> + u8 input[3];
> +};
> +
> +I40E_CHECK_STRUCT_LEN(4, i40e_filter_data);
> +
> +struct i40e_aqc_replace_cloud_filters_cmd {
> + u8 valid_flags;
> +#define I40E_AQC_REPLACE_L1_FILTER 0x0
> +#define I40E_AQC_REPLACE_CLOUD_FILTER 0x1
> +#define I40E_AQC_GET_CLOUD_FILTERS 0x2
> +#define I40E_AQC_MIRROR_CLOUD_FILTER 0x4
> +#define I40E_AQC_HIGH_PRIORITY_CLOUD_FILTER 0x8
> + u8 old_filter_type;
> + u8 new_filter_type;
> + u8 tr_bit;
> + u8 reserved[4];
> + __le32 addr_high;
> + __le32 addr_low;
> +};
> +
> +I40E_CHECK_CMD_LENGTH(i40e_aqc_replace_cloud_filters_cmd);
> +
> +struct i40e_aqc_replace_cloud_filters_cmd_buf {
> + u8 data[32];
> +/* Filter type INPUT codes*/
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_ENTRIES_MAX 3
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_VALIDATED BIT(7)
> +
> +/* Field Vector offsets */
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_MAC_DA 0
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_STAG_ETH 6
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_STAG 7
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_VLAN 8
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_STAG_OVLAN 9
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_STAG_IVLAN 10
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_TUNNLE_KEY 11
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_IMAC 12
> +/* big FLU */
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_IP_DA 14
> +/* big FLU */
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_OIP_DA 15
> +
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_INNER_VLAN 37
> + struct i40e_filter_data filters[8];
> +};
> +
> +I40E_CHECK_STRUCT_LEN(0x40, i40e_aqc_replace_cloud_filters_cmd_buf);
> +
> /* Add Mirror Rule (indirect or direct 0x0260)
> * Delete Mirror Rule (indirect or direct 0x0261)
> * note: some rule types (4,5) do not use an external buffer.
> diff --git a/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
> index 463e331..0c4ff18 100644
> --- a/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
> +++ b/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
> @@ -1339,14 +1339,16 @@ struct i40e_aqc_add_remove_cloud_filters {
> #define I40E_AQC_ADD_CLOUD_CMD_SEID_NUM_SHIFT 0
> #define I40E_AQC_ADD_CLOUD_CMD_SEID_NUM_MASK (0x3FF << \
> I40E_AQC_ADD_CLOUD_CMD_SEID_NUM_SHIFT)
> - u8 reserved2[4];
> + u8 big_buffer_flag;
> +#define I40E_AQC_ADD_CLOUD_CMD_BB 1
> + u8 reserved2[3];
> __le32 addr_high;
> __le32 addr_low;
> };
>
> I40E_CHECK_CMD_LENGTH(i40e_aqc_add_remove_cloud_filters);
>
> -struct i40e_aqc_add_remove_cloud_filters_element_data {
> +struct i40e_aqc_cloud_filters_element_data {
> u8 outer_mac[6];
> u8 inner_mac[6];
> __le16 inner_vlan;
> @@ -1376,6 +1378,13 @@ struct i40e_aqc_add_remove_cloud_filters_element_data {
> #define I40E_AQC_ADD_CLOUD_FILTER_IMAC 0x000A
> #define I40E_AQC_ADD_CLOUD_FILTER_OMAC_TEN_ID_IMAC 0x000B
> #define I40E_AQC_ADD_CLOUD_FILTER_IIP 0x000C
> +/* 0x0010 to 0x0017 is for custom filters */
> +/* flag to be used when adding cloud filter: IP + L4 Port */
> +#define I40E_AQC_ADD_CLOUD_FILTER_IP_PORT 0x0010
> +/* flag to be used when adding cloud filter: Dest MAC + L4 Port */
> +#define I40E_AQC_ADD_CLOUD_FILTER_MAC_PORT 0x0011
> +/* flag to be used when adding cloud filter: Dest MAC + VLAN + L4 Port */
> +#define I40E_AQC_ADD_CLOUD_FILTER_MAC_VLAN_PORT 0x0012
>
> #define I40E_AQC_ADD_CLOUD_FLAGS_TO_QUEUE 0x0080
> #define I40E_AQC_ADD_CLOUD_VNK_SHIFT 6
> @@ -1410,6 +1419,49 @@ struct i40e_aqc_add_remove_cloud_filters_element_data {
> u8 response_reserved[7];
> };
>
> +I40E_CHECK_STRUCT_LEN(0x40, i40e_aqc_cloud_filters_element_data);
> +
> +/* i40e_aqc_cloud_filters_element_bb is used when
> + * I40E_AQC_ADD_CLOUD_CMD_BB flag is set.
> + */
> +struct i40e_aqc_cloud_filters_element_bb {
> + struct i40e_aqc_cloud_filters_element_data element;
> + u16 general_fields[32];
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X10_WORD0 0
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X10_WORD1 1
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X10_WORD2 2
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD0 3
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD1 4
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X11_WORD2 5
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X12_WORD0 6
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X12_WORD1 7
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X12_WORD2 8
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X13_WORD0 9
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X13_WORD1 10
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X13_WORD2 11
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X14_WORD0 12
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X14_WORD1 13
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X14_WORD2 14
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD0 15
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD1 16
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD2 17
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD3 18
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD4 19
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD5 20
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD6 21
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD7 22
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD0 23
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD1 24
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD2 25
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD3 26
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD4 27
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD5 28
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD6 29
> +#define I40E_AQC_ADD_CLOUD_FV_FLU_0X17_WORD7 30
> +};
> +
> +I40E_CHECK_STRUCT_LEN(0x80, i40e_aqc_cloud_filters_element_bb);
> +
> struct i40e_aqc_remove_cloud_filters_completion {
> __le16 perfect_ovlan_used;
> __le16 perfect_ovlan_free;
> @@ -1421,6 +1473,60 @@ struct i40e_aqc_remove_cloud_filters_completion {
>
> I40E_CHECK_CMD_LENGTH(i40e_aqc_remove_cloud_filters_completion);
>
> +/* Replace filter Command 0x025F
> + * uses the i40e_aqc_replace_cloud_filters,
> + * and the generic indirect completion structure
> + */
> +struct i40e_filter_data {
> + u8 filter_type;
> + u8 input[3];
> +};
> +
> +I40E_CHECK_STRUCT_LEN(4, i40e_filter_data);
> +
> +struct i40e_aqc_replace_cloud_filters_cmd {
> + u8 valid_flags;
> +#define I40E_AQC_REPLACE_L1_FILTER 0x0
> +#define I40E_AQC_REPLACE_CLOUD_FILTER 0x1
> +#define I40E_AQC_GET_CLOUD_FILTERS 0x2
> +#define I40E_AQC_MIRROR_CLOUD_FILTER 0x4
> +#define I40E_AQC_HIGH_PRIORITY_CLOUD_FILTER 0x8
> + u8 old_filter_type;
> + u8 new_filter_type;
> + u8 tr_bit;
> + u8 reserved[4];
> + __le32 addr_high;
> + __le32 addr_low;
> +};
> +
> +I40E_CHECK_CMD_LENGTH(i40e_aqc_replace_cloud_filters_cmd);
> +
> +struct i40e_aqc_replace_cloud_filters_cmd_buf {
> + u8 data[32];
> +/* Filter type INPUT codes*/
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_ENTRIES_MAX 3
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_VALIDATED BIT(7)
> +
> +/* Field Vector offsets */
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_MAC_DA 0
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_STAG_ETH 6
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_STAG 7
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_VLAN 8
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_STAG_OVLAN 9
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_STAG_IVLAN 10
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_TUNNLE_KEY 11
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_IMAC 12
> +/* big FLU */
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_IP_DA 14
> +/* big FLU */
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_OIP_DA 15
> +
> +#define I40E_AQC_REPLACE_CLOUD_CMD_INPUT_FV_INNER_VLAN 37
> + struct i40e_filter_data filters[8];
> +};
> +
> +I40E_CHECK_STRUCT_LEN(0x40, i40e_aqc_replace_cloud_filters_cmd_buf);
> +
> /* Add Mirror Rule (indirect or direct 0x0260)
> * Delete Mirror Rule (indirect or direct 0x0261)
> * note: some rule types (4,5) do not use an external buffer.
>
> _______________________________________________
> Intel-wired-lan mailing list
> Intel-wired-lan@osuosl.org
> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
>
^ permalink raw reply
* Re: [Intel-wired-lan] [jkirsher/next-queue PATCH v4 5/6] i40e: Clean up of cloud filters
From: Shannon Nelson @ 2017-10-11 23:30 UTC (permalink / raw)
To: intel-wired-lan, Amritha Nambiar; +Cc: netdev@vger.kernel.org
In-Reply-To: <150768147910.5320.12192807833176784033.stgit@anamdev.jf.intel.com>
On 10/10/2017 5:24 PM, Amritha Nambiar wrote:
> Introduce the cloud filter datastructure and cleanup of cloud
> filters associated with the device.
>
> v2: Moved field comments in struct i40e_cloud_filter to the right.
> Removed hlist_empty check from i40e_cloud_filter_exit()
>
> Signed-off-by: Amritha Nambiar <amritha.nambiar@intel.com>
> ---
> drivers/net/ethernet/intel/i40e/i40e.h | 9 +++++++++
> drivers/net/ethernet/intel/i40e/i40e_main.c | 24 ++++++++++++++++++++++++
> 2 files changed, 33 insertions(+)
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
> index f3c501e..b938bb4a 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e.h
> @@ -253,6 +253,12 @@ struct i40e_fdir_filter {
> u32 fd_id;
> };
>
> +struct i40e_cloud_filter {
> + struct hlist_node cloud_node;
> + unsigned long cookie;
> + u16 seid; /* filter control */
> +};
> +
> #define I40E_ETH_P_LLDP 0x88cc
>
> #define I40E_DCB_PRIO_TYPE_STRICT 0
> @@ -420,6 +426,9 @@ struct i40e_pf {
> struct i40e_udp_port_config udp_ports[I40E_MAX_PF_UDP_OFFLOAD_PORTS];
> u16 pending_udp_bitmap;
>
> + struct hlist_head cloud_filter_list;
> + u16 num_cloud_filters;
> +
> enum i40e_interrupt_policy int_policy;
> u16 rx_itr_default;
> u16 tx_itr_default;
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
> index 0539d43..bcdb16a 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> @@ -6937,6 +6937,26 @@ static void i40e_fdir_filter_exit(struct i40e_pf *pf)
> }
>
> /**
> + * i40e_cloud_filter_exit - Cleans up the Cloud Filters
> + * @pf: Pointer to PF
> + *
> + * This function destroys the hlist where all the Cloud Filters
> + * filters were saved.
Redundant "Cloud Filters filters"
> + **/
> +static void i40e_cloud_filter_exit(struct i40e_pf *pf)
> +{
> + struct i40e_cloud_filter *cfilter;
> + struct hlist_node *node;
> +
> + hlist_for_each_entry_safe(cfilter, node,
> + &pf->cloud_filter_list, cloud_node) {
> + hlist_del(&cfilter->cloud_node);
> + kfree(cfilter);
> + }
> + pf->num_cloud_filters = 0;
> +}
> +
> +/**
> * i40e_close - Disables a network interface
> * @netdev: network interface device structure
> *
> @@ -12195,6 +12215,7 @@ static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit)
> vsi = i40e_vsi_reinit_setup(pf->vsi[pf->lan_vsi]);
> if (!vsi) {
> dev_info(&pf->pdev->dev, "setup of MAIN VSI failed\n");
> + i40e_cloud_filter_exit(pf);
> i40e_fdir_teardown(pf);
> return -EAGAIN;
> }
> @@ -13029,6 +13050,8 @@ static void i40e_remove(struct pci_dev *pdev)
> if (pf->vsi[pf->lan_vsi])
> i40e_vsi_release(pf->vsi[pf->lan_vsi]);
>
> + i40e_cloud_filter_exit(pf);
> +
> /* remove attached clients */
> if (pf->flags & I40E_FLAG_IWARP_ENABLED) {
> ret_code = i40e_lan_del_device(pf);
> @@ -13260,6 +13283,7 @@ static void i40e_shutdown(struct pci_dev *pdev)
>
> del_timer_sync(&pf->service_timer);
> cancel_work_sync(&pf->service_task);
> + i40e_cloud_filter_exit(pf);
> i40e_fdir_teardown(pf);
>
> /* Client close must be called explicitly here because the timer
>
> _______________________________________________
> Intel-wired-lan mailing list
> Intel-wired-lan@osuosl.org
> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
>
^ permalink raw reply
* Re: [Intel-wired-lan] [jkirsher/next-queue PATCH v4 6/6] i40e: Enable cloud filters via tc-flower
From: Shannon Nelson @ 2017-10-11 23:30 UTC (permalink / raw)
To: intel-wired-lan, Amritha Nambiar; +Cc: netdev@vger.kernel.org
In-Reply-To: <150768148418.5320.6338243543224569414.stgit@anamdev.jf.intel.com>
On 10/10/2017 5:24 PM, Amritha Nambiar wrote:
> This patch enables tc-flower based hardware offloads. tc flower
> filter provided by the kernel is configured as driver specific
> cloud filter. The patch implements functions and admin queue
> commands needed to support cloud filters in the driver and
> adds cloud filters to configure these tc-flower filters.
>
> The classification function of the filter is to direct matched
> packets to a traffic class which is set based on the offloaded
> tc-flower classid. The approach here is similar to the tc 'prio'
> qdisc which uses the classid for band selection. The ingress qdisc
> is called ffff:0, so traffic classes are ffff:1 to ffff:8 (i40e
> has max of 8 TCs). TC0 is minor number 1, TC1 is minor number 2 etc.
>
> # tc qdisc add dev eth0 ingress
> # ethtool -K eth0 hw-tc-offload on
>
> Match Dst MAC and route to TC0:
> # tc filter add dev eth0 protocol ip parent ffff:\
> prio 1 flower dst_mac 3c:fd:fe:a0:d6:70 skip_sw\
> classid ffff:1
>
> Match Dst IPv4,Dst Port and route to TC1:
> # tc filter add dev eth0 protocol ip parent ffff:\
> prio 2 flower dst_ip 192.168.3.5/32\
> ip_proto udp dst_port 25 skip_sw\
> classid ffff:2
>
> Match Dst IPv6,Dst Port and route to TC1:
> # tc filter add dev eth0 protocol ipv6 parent ffff:\
> prio 3 flower dst_ip fe8::200:1\
> ip_proto udp dst_port 66 skip_sw\
> classid ffff:2
>
> Delete tc flower filter:
> Example:
>
> # tc filter del dev eth0 parent ffff: prio 3 handle 0x1 flower
> # tc filter del dev eth0 parent ffff:
>
> Flow Director Sideband is disabled while configuring cloud filters
> via tc-flower and until any cloud filter exists.
>
> Unsupported matches when cloud filters are added using enhanced
> big buffer cloud filter mode of underlying switch include:
> 1. source port and source IP
> 2. Combined MAC address and IP fields.
> 3. Not specifying L4 port
>
> These filter matches can however be used to redirect traffic to
> the main VSI (tc 0) which does not require the enhanced big buffer
> cloud filter support.
>
> v4: Use classid to set traffic class for matched packets. Do not
> allow disabling hw-tc-offloads when offloaded tc filters are active.
> v3: Cleaned up some lengthy function names. Changed ipv6 address to
> __be32 array instead of u8 array. Used macro for IP version. Minor
> formatting changes.
> v2:
> 1. Moved I40E_SWITCH_MODE_MASK definition to i40e_type.h
> 2. Moved dev_info for add/deleting cloud filters in else condition
> 3. Fixed some format specifier in dev_err logs
> 4. Refactored i40e_get_capabilities to take an additional
> list_type parameter and use it to query device and function
> level capabilities.
> 5. Fixed parsing tc redirect action to check for the is_tcf_mirred_tc()
> to verify if redirect to a traffic class is supported.
> 6. Added comments for Geneve fix in cloud filter big buffer AQ
> function definitions.
> 7. Cleaned up setup_tc interface to rebase and work with Jiri's
> updates, separate function to process tc cls flower offloads.
> 8. Changes to make Flow Director Sideband and Cloud filters mutually
> exclusive.
>
> Signed-off-by: Amritha Nambiar <amritha.nambiar@intel.com>
> Signed-off-by: Kiran Patil <kiran.patil@intel.com>
> Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>
> Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
> ---
> drivers/net/ethernet/intel/i40e/i40e.h | 45 +
> drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 3
> drivers/net/ethernet/intel/i40e/i40e_common.c | 189 ++++
> drivers/net/ethernet/intel/i40e/i40e_main.c | 913 +++++++++++++++++++-
> drivers/net/ethernet/intel/i40e/i40e_prototype.h | 16
> drivers/net/ethernet/intel/i40e/i40e_type.h | 1
> .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 3
> 7 files changed, 1140 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
> index b938bb4a..c3f1312 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e.h
> @@ -55,6 +55,8 @@
> #include <linux/net_tstamp.h>
> #include <linux/ptp_clock_kernel.h>
> #include <net/pkt_cls.h>
> +#include <net/tc_act/tc_gact.h>
> +#include <net/tc_act/tc_mirred.h>
> #include "i40e_type.h"
> #include "i40e_prototype.h"
> #include "i40e_client.h"
> @@ -253,9 +255,48 @@ struct i40e_fdir_filter {
> u32 fd_id;
> };
>
> +#define IPV4_VERSION 4
> +#define IPV6_VERSION 6
Why bother with yet-another-ip-type name? Just use the existing
ETH_P_IP and ETH_P_IPV6.
> +
> +#define I40E_CLOUD_FIELD_OMAC 0x01
> +#define I40E_CLOUD_FIELD_IMAC 0x02
> +#define I40E_CLOUD_FIELD_IVLAN 0x04
> +#define I40E_CLOUD_FIELD_TEN_ID 0x08
> +#define I40E_CLOUD_FIELD_IIP 0x10
> +
> +#define I40E_CLOUD_FILTER_FLAGS_OMAC I40E_CLOUD_FIELD_OMAC
> +#define I40E_CLOUD_FILTER_FLAGS_IMAC I40E_CLOUD_FIELD_IMAC
> +#define I40E_CLOUD_FILTER_FLAGS_IMAC_IVLAN (I40E_CLOUD_FIELD_IMAC | \
> + I40E_CLOUD_FIELD_IVLAN)
> +#define I40E_CLOUD_FILTER_FLAGS_IMAC_TEN_ID (I40E_CLOUD_FIELD_IMAC | \
> + I40E_CLOUD_FIELD_TEN_ID)
> +#define I40E_CLOUD_FILTER_FLAGS_OMAC_TEN_ID_IMAC (I40E_CLOUD_FIELD_OMAC | \
> + I40E_CLOUD_FIELD_IMAC | \
> + I40E_CLOUD_FIELD_TEN_ID)
> +#define I40E_CLOUD_FILTER_FLAGS_IMAC_IVLAN_TEN_ID (I40E_CLOUD_FIELD_IMAC | \
> + I40E_CLOUD_FIELD_IVLAN | \
> + I40E_CLOUD_FIELD_TEN_ID)
> +#define I40E_CLOUD_FILTER_FLAGS_IIP I40E_CLOUD_FIELD_IIP
> +
> struct i40e_cloud_filter {
> struct hlist_node cloud_node;
> unsigned long cookie;
> + /* cloud filter input set follows */
> + u8 dst_mac[ETH_ALEN];
> + u8 src_mac[ETH_ALEN];
> + __be16 vlan_id;
> + __be32 dst_ip;
> + __be32 src_ip;
> + __be32 dst_ipv6[4];
> + __be32 src_ipv6[4];
You could save a little space by making these unions as done in struct
i40e_aqc_add_remove_cloud_filters_element_data, especially since that's
what you're putting this data into. You might also use the existing
type definitions
struct in6_addr
struct in_addr
> + __be16 dst_port;
> + __be16 src_port;
> + u32 ip_version;
> + u8 ip_proto; /* IPPROTO value */
You might want to re-order these to pack them better and not end up with
so much padding space in the struct.
> + u32 tenant_id;
> + u8 flags;
> +#define I40E_CLOUD_TNL_TYPE_NONE 0xff
> + u8 tunnel_type;
> u16 seid; /* filter control */
> };
>
> @@ -492,6 +533,8 @@ struct i40e_pf {
> #define I40E_FLAG_LINK_DOWN_ON_CLOSE_ENABLED BIT(27)
> #define I40E_FLAG_SOURCE_PRUNING_DISABLED BIT(28)
> #define I40E_FLAG_TC_MQPRIO BIT(29)
> +#define I40E_FLAG_FD_SB_INACTIVE BIT(30)
> +#define I40E_FLAG_FD_SB_TO_CLOUD_FILTER BIT(31)
>
> struct i40e_client_instance *cinst;
> bool stat_offsets_loaded;
> @@ -574,6 +617,8 @@ struct i40e_pf {
> u16 phy_led_val;
>
> u16 override_q_count;
> + u16 last_sw_conf_flags;
> + u16 last_sw_conf_valid_flags;
> };
>
> /**
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
> index bcc7986..06c534c 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
> @@ -1392,6 +1392,9 @@ struct i40e_aqc_cloud_filters_element_data {
> struct {
> u8 data[16];
> } v6;
> + struct {
> + __le16 data[8];
> + } raw_v6;
> } ipaddr;
> __le16 flags;
> #define I40E_AQC_ADD_CLOUD_FILTER_SHIFT 0
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
> index 0b3c5b7..257b0c8 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_common.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
> @@ -5431,5 +5431,194 @@ i40e_add_pinfo_to_list(struct i40e_hw *hw,
>
> status = i40e_aq_write_ppp(hw, (void *)sec, sec->data_end,
> track_id, &offset, &info, NULL);
> +
> + return status;
> +}
> +
> +/**
> + * i40e_aq_add_cloud_filters
> + * @hw: pointer to the hardware structure
> + * @seid: VSI seid to add cloud filters from
> + * @filters: Buffer which contains the filters to be added
> + * @filter_count: number of filters contained in the buffer
> + *
> + * Set the cloud filters for a given VSI. The contents of the
> + * i40e_aqc_cloud_filters_element_data are filled in by the caller
> + * of the function.
> + *
> + **/
> +enum i40e_status_code
> +i40e_aq_add_cloud_filters(struct i40e_hw *hw, u16 seid,
> + struct i40e_aqc_cloud_filters_element_data *filters,
> + u8 filter_count)
> +{
> + struct i40e_aq_desc desc;
> + struct i40e_aqc_add_remove_cloud_filters *cmd =
> + (struct i40e_aqc_add_remove_cloud_filters *)&desc.params.raw;
> + enum i40e_status_code status;
> + u16 buff_len;
> +
> + i40e_fill_default_direct_cmd_desc(&desc,
> + i40e_aqc_opc_add_cloud_filters);
> +
> + buff_len = filter_count * sizeof(*filters);
> + desc.datalen = cpu_to_le16(buff_len);
> + desc.flags |= cpu_to_le16((u16)(I40E_AQ_FLAG_BUF | I40E_AQ_FLAG_RD));
> + cmd->num_filters = filter_count;
> + cmd->seid = cpu_to_le16(seid);
> +
> + status = i40e_asq_send_command(hw, &desc, filters, buff_len, NULL);
> +
> + return status;
> +}
> +
> +/**
> + * i40e_aq_add_cloud_filters_bb
> + * @hw: pointer to the hardware structure
> + * @seid: VSI seid to add cloud filters from
> + * @filters: Buffer which contains the filters in big buffer to be added
> + * @filter_count: number of filters contained in the buffer
> + *
> + * Set the big buffer cloud filters for a given VSI. The contents of the
> + * i40e_aqc_cloud_filters_element_bb are filled in by the caller of the
> + * function.
> + *
> + **/
> +i40e_status
> +i40e_aq_add_cloud_filters_bb(struct i40e_hw *hw, u16 seid,
> + struct i40e_aqc_cloud_filters_element_bb *filters,
> + u8 filter_count)
> +{
> + struct i40e_aq_desc desc;
> + struct i40e_aqc_add_remove_cloud_filters *cmd =
> + (struct i40e_aqc_add_remove_cloud_filters *)&desc.params.raw;
> + i40e_status status;
> + u16 buff_len;
> + int i;
> +
> + i40e_fill_default_direct_cmd_desc(&desc,
> + i40e_aqc_opc_add_cloud_filters);
> +
> + buff_len = filter_count * sizeof(*filters);
> + desc.datalen = cpu_to_le16(buff_len);
> + desc.flags |= cpu_to_le16((u16)(I40E_AQ_FLAG_BUF | I40E_AQ_FLAG_RD));
> + cmd->num_filters = filter_count;
> + cmd->seid = cpu_to_le16(seid);
> + cmd->big_buffer_flag = I40E_AQC_ADD_CLOUD_CMD_BB;
> +
> + for (i = 0; i < filter_count; i++) {
> + u16 tnl_type;
> + u32 ti;
> +
> + tnl_type = (le16_to_cpu(filters[i].element.flags) &
> + I40E_AQC_ADD_CLOUD_TNL_TYPE_MASK) >>
> + I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT;
> +
> + /* For Geneve, the VNI should be placed in offset shifted by a
> + * byte than the offset for the Tenant ID for rest of the
This comment isn't quite clear - maybe s/than/then/ ?
> + * tunnels.
> + */
> + if (tnl_type == I40E_AQC_ADD_CLOUD_TNL_TYPE_GENEVE) {
> + ti = le32_to_cpu(filters[i].element.tenant_id);
> + filters[i].element.tenant_id = cpu_to_le32(ti << 8);
> + }
> + }
> +
> + status = i40e_asq_send_command(hw, &desc, filters, buff_len, NULL);
> +
> + return status;
> +}
> +
> +/**
> + * i40e_aq_rem_cloud_filters
> + * @hw: pointer to the hardware structure
> + * @seid: VSI seid to remove cloud filters from
> + * @filters: Buffer which contains the filters to be removed
> + * @filter_count: number of filters contained in the buffer
> + *
> + * Remove the cloud filters for a given VSI. The contents of the
> + * i40e_aqc_cloud_filters_element_data are filled in by the caller
> + * of the function.
> + *
> + **/
> +enum i40e_status_code
> +i40e_aq_rem_cloud_filters(struct i40e_hw *hw, u16 seid,
> + struct i40e_aqc_cloud_filters_element_data *filters,
> + u8 filter_count)
> +{
> + struct i40e_aq_desc desc;
> + struct i40e_aqc_add_remove_cloud_filters *cmd =
> + (struct i40e_aqc_add_remove_cloud_filters *)&desc.params.raw;
> + enum i40e_status_code status;
> + u16 buff_len;
> +
> + i40e_fill_default_direct_cmd_desc(&desc,
> + i40e_aqc_opc_remove_cloud_filters);
> +
> + buff_len = filter_count * sizeof(*filters);
> + desc.datalen = cpu_to_le16(buff_len);
> + desc.flags |= cpu_to_le16((u16)(I40E_AQ_FLAG_BUF | I40E_AQ_FLAG_RD));
> + cmd->num_filters = filter_count;
> + cmd->seid = cpu_to_le16(seid);
> +
> + status = i40e_asq_send_command(hw, &desc, filters, buff_len, NULL);
> +
> + return status;
> +}
> +
> +/**
> + * i40e_aq_rem_cloud_filters_bb
> + * @hw: pointer to the hardware structure
> + * @seid: VSI seid to remove cloud filters from
> + * @filters: Buffer which contains the filters in big buffer to be removed
> + * @filter_count: number of filters contained in the buffer
> + *
> + * Remove the big buffer cloud filters for a given VSI. The contents of the
> + * i40e_aqc_cloud_filters_element_bb are filled in by the caller of the
> + * function.
> + *
> + **/
> +i40e_status
> +i40e_aq_rem_cloud_filters_bb(struct i40e_hw *hw, u16 seid,
> + struct i40e_aqc_cloud_filters_element_bb *filters,
> + u8 filter_count)
> +{
> + struct i40e_aq_desc desc;
> + struct i40e_aqc_add_remove_cloud_filters *cmd =
> + (struct i40e_aqc_add_remove_cloud_filters *)&desc.params.raw;
> + i40e_status status;
> + u16 buff_len;
> + int i;
> +
> + i40e_fill_default_direct_cmd_desc(&desc,
> + i40e_aqc_opc_remove_cloud_filters);
> +
> + buff_len = filter_count * sizeof(*filters);
> + desc.datalen = cpu_to_le16(buff_len);
> + desc.flags |= cpu_to_le16((u16)(I40E_AQ_FLAG_BUF | I40E_AQ_FLAG_RD));
> + cmd->num_filters = filter_count;
> + cmd->seid = cpu_to_le16(seid);
> + cmd->big_buffer_flag = I40E_AQC_ADD_CLOUD_CMD_BB;
> +
> + for (i = 0; i < filter_count; i++) {
> + u16 tnl_type;
> + u32 ti;
> +
> + tnl_type = (le16_to_cpu(filters[i].element.flags) &
> + I40E_AQC_ADD_CLOUD_TNL_TYPE_MASK) >>
> + I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT;
> +
> + /* For Geneve, the VNI should be placed in offset shifted by a
> + * byte than the offset for the Tenant ID for rest of the
Again, some wording cleanup needed.
> + * tunnels.
> + */
> + if (tnl_type == I40E_AQC_ADD_CLOUD_TNL_TYPE_GENEVE) {
> + ti = le32_to_cpu(filters[i].element.tenant_id);
> + filters[i].element.tenant_id = cpu_to_le32(ti << 8);
> + }
> + }
> +
> + status = i40e_asq_send_command(hw, &desc, filters, buff_len, NULL);
> +
> return status;
> }
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
> index bcdb16a..3f3279e 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> @@ -69,6 +69,15 @@ static int i40e_reset(struct i40e_pf *pf);
> static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired);
> static void i40e_fdir_sb_setup(struct i40e_pf *pf);
> static int i40e_veb_get_bw_info(struct i40e_veb *veb);
> +static int i40e_add_del_cloud_filter(struct i40e_vsi *vsi,
> + struct i40e_cloud_filter *filter,
> + bool add);
> +static int i40e_add_del_cloud_filter_big_buf(struct i40e_vsi *vsi,
> + struct i40e_cloud_filter *filter,
> + bool add);
> +static int i40e_get_capabilities(struct i40e_pf *pf,
> + enum i40e_admin_queue_opc list_type);
> +
>
> /* i40e_pci_tbl - PCI Device ID Table
> *
> @@ -5480,7 +5489,11 @@ int i40e_set_bw_limit(struct i40e_vsi *vsi, u16 seid, u64 max_tx_rate)
> **/
> static void i40e_remove_queue_channels(struct i40e_vsi *vsi)
> {
> + enum i40e_admin_queue_err last_aq_status;
> + struct i40e_cloud_filter *cfilter;
> struct i40e_channel *ch, *ch_tmp;
> + struct i40e_pf *pf = vsi->back;
> + struct hlist_node *node;
> int ret, i;
>
> /* Reset rss size that was stored when reconfiguring rss for
> @@ -5521,6 +5534,29 @@ static void i40e_remove_queue_channels(struct i40e_vsi *vsi)
> "Failed to reset tx rate for ch->seid %u\n",
> ch->seid);
>
> + /* delete cloud filters associated with this channel */
> + hlist_for_each_entry_safe(cfilter, node,
> + &pf->cloud_filter_list, cloud_node) {
> + if (cfilter->seid != ch->seid)
> + continue;
> +
> + hash_del(&cfilter->cloud_node);
> + if (cfilter->dst_port)
> + ret = i40e_add_del_cloud_filter_big_buf(vsi,
> + cfilter,
> + false);
> + else
> + ret = i40e_add_del_cloud_filter(vsi, cfilter,
> + false);
> + last_aq_status = pf->hw.aq.asq_last_status;
> + if (ret)
> + dev_info(&pf->pdev->dev,
> + "Failed to delete cloud filter, err %s aq_err %s\n",
> + i40e_stat_str(&pf->hw, ret),
> + i40e_aq_str(&pf->hw, last_aq_status));
> + kfree(cfilter);
> + }
> +
> /* delete VSI from FW */
> ret = i40e_aq_delete_element(&vsi->back->hw, ch->seid,
> NULL);
> @@ -5972,6 +6008,63 @@ static bool i40e_setup_channel(struct i40e_pf *pf, struct i40e_vsi *vsi,
> }
>
> /**
> + * i40e_validate_and_set_switch_mode - sets up switch mode correctly
> + * @vsi: ptr to VSI which has PF backing
> + *
> + * Sets up switch mode correctly if it needs to be changed and perform
> + * what are allowed modes.
> + **/
> +static int i40e_validate_and_set_switch_mode(struct i40e_vsi *vsi)
> +{
> + u8 mode;
> + struct i40e_pf *pf = vsi->back;
> + struct i40e_hw *hw = &pf->hw;
> + int ret;
> +
> + ret = i40e_get_capabilities(pf, i40e_aqc_opc_list_dev_capabilities);
> + if (ret)
> + return -EINVAL;
> +
> + if (hw->dev_caps.switch_mode) {
> + /* if switch mode is set, support mode2 (non-tunneled for
> + * cloud filter) for now
> + */
> + u32 switch_mode = hw->dev_caps.switch_mode &
> + I40E_SWITCH_MODE_MASK;
> + if (switch_mode >= I40E_NVM_IMAGE_TYPE_MODE1) {
> + if (switch_mode == I40E_NVM_IMAGE_TYPE_MODE2)
> + return 0;
> + dev_err(&pf->pdev->dev,
> + "Invalid switch_mode (%d), only non-tunneled mode for cloud filter is supported\n",
> + hw->dev_caps.switch_mode);
> + return -EINVAL;
> + }
> + }
> +
> + /* Set Bit 7 to be valid */
> + mode = I40E_AQ_SET_SWITCH_BIT7_VALID;
> +
> + /* Set L4type to both TCP and UDP support */
> + mode |= I40E_AQ_SET_SWITCH_L4_TYPE_BOTH;
> +
> + /* Set cloud filter mode */
> + mode |= I40E_AQ_SET_SWITCH_MODE_NON_TUNNEL;
> +
> + /* Prep mode field for set_switch_config */
> + ret = i40e_aq_set_switch_config(hw, pf->last_sw_conf_flags,
> + pf->last_sw_conf_valid_flags,
> + mode, NULL);
> + if (ret && hw->aq.asq_last_status != I40E_AQ_RC_ESRCH)
> + dev_err(&pf->pdev->dev,
> + "couldn't set switch config bits, err %s aq_err %s\n",
> + i40e_stat_str(hw, ret),
> + i40e_aq_str(hw,
> + hw->aq.asq_last_status));
> +
> + return ret;
> +}
> +
> +/**
> * i40e_create_queue_channel - function to create channel
> * @vsi: VSI to be configured
> * @ch: ptr to channel (it contains channel specific params)
> @@ -6750,13 +6843,673 @@ static int i40e_setup_tc(struct net_device *netdev, void *type_data)
> return ret;
> }
>
> +/**
> + * i40e_set_cld_element - sets cloud filter element data
> + * @filter: cloud filter rule
> + * @cld: ptr to cloud filter element data
> + *
> + * This is helper function to copy data into cloud filter element
> + **/
> +static inline void
> +i40e_set_cld_element(struct i40e_cloud_filter *filter,
> + struct i40e_aqc_cloud_filters_element_data *cld)
> +{
> + int i, j;
> + u32 ipa;
> +
> + memset(cld, 0, sizeof(*cld));
> + ether_addr_copy(cld->outer_mac, filter->dst_mac);
> + ether_addr_copy(cld->inner_mac, filter->src_mac);
> +
> + if (filter->ip_version == IPV6_VERSION) {
> +#define IPV6_MAX_INDEX (ARRAY_SIZE(filter->dst_ipv6) - 1)
> + for (i = 0, j = 0; i < 4; i++, j += 2) {
s/4/ARRAY_SIZE(filter->dst_ipv6)/
> + ipa = be32_to_cpu(filter->dst_ipv6[IPV6_MAX_INDEX - i]);
> + ipa = cpu_to_le32(ipa);
> + memcpy(&cld->ipaddr.raw_v6.data[j], &ipa, 4);
s/4/sizeof(ipa)/
> + }
> + } else {
> + ipa = be32_to_cpu(filter->dst_ip);
> + memcpy(&cld->ipaddr.v4.data, &ipa, 4);
s/4/sizeof(ipa)/
> + }
> +
> + cld->inner_vlan = cpu_to_le16(ntohs(filter->vlan_id));
> +
> + /* tenant_id is not supported by FW now, once the support is enabled
> + * fill the cld->tenant_id with cpu_to_le32(filter->tenant_id)
> + */
> + if (filter->tenant_id)
> + return;
> +}
> +
> +/**
> + * i40e_add_del_cloud_filter - Add/del cloud filter
> + * @vsi: pointer to VSI
> + * @filter: cloud filter rule
> + * @add: if true, add, if false, delete
> + *
> + * Add or delete a cloud filter for a specific flow spec.
> + * Returns 0 if the filter were successfully added.
> + **/
> +static int i40e_add_del_cloud_filter(struct i40e_vsi *vsi,
> + struct i40e_cloud_filter *filter, bool add)
> +{
> + struct i40e_aqc_cloud_filters_element_data cld_filter;
> + struct i40e_pf *pf = vsi->back;
> + int ret;
> + static const u16 flag_table[128] = {
> + [I40E_CLOUD_FILTER_FLAGS_OMAC] =
> + I40E_AQC_ADD_CLOUD_FILTER_OMAC,
> + [I40E_CLOUD_FILTER_FLAGS_IMAC] =
> + I40E_AQC_ADD_CLOUD_FILTER_IMAC,
> + [I40E_CLOUD_FILTER_FLAGS_IMAC_IVLAN] =
> + I40E_AQC_ADD_CLOUD_FILTER_IMAC_IVLAN,
> + [I40E_CLOUD_FILTER_FLAGS_IMAC_TEN_ID] =
> + I40E_AQC_ADD_CLOUD_FILTER_IMAC_TEN_ID,
> + [I40E_CLOUD_FILTER_FLAGS_OMAC_TEN_ID_IMAC] =
> + I40E_AQC_ADD_CLOUD_FILTER_OMAC_TEN_ID_IMAC,
> + [I40E_CLOUD_FILTER_FLAGS_IMAC_IVLAN_TEN_ID] =
> + I40E_AQC_ADD_CLOUD_FILTER_IMAC_IVLAN_TEN_ID,
> + [I40E_CLOUD_FILTER_FLAGS_IIP] =
> + I40E_AQC_ADD_CLOUD_FILTER_IIP,
> + };
> +
> + if (filter->flags >= ARRAY_SIZE(flag_table))
> + return I40E_ERR_CONFIG;
> +
> + /* copy element needed to add cloud filter from filter */
> + i40e_set_cld_element(filter, &cld_filter);
> +
> + if (filter->tunnel_type != I40E_CLOUD_TNL_TYPE_NONE)
> + cld_filter.flags = cpu_to_le16(filter->tunnel_type <<
> + I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT);
> +
> + if (filter->ip_version == IPV6_VERSION)
> + cld_filter.flags |= cpu_to_le16(flag_table[filter->flags] |
> + I40E_AQC_ADD_CLOUD_FLAGS_IPV6);
> + else
> + cld_filter.flags |= cpu_to_le16(flag_table[filter->flags] |
> + I40E_AQC_ADD_CLOUD_FLAGS_IPV4);
> +
> + if (add)
> + ret = i40e_aq_add_cloud_filters(&pf->hw, filter->seid,
> + &cld_filter, 1);
> + else
> + ret = i40e_aq_rem_cloud_filters(&pf->hw, filter->seid,
> + &cld_filter, 1);
> + if (ret)
> + dev_dbg(&pf->pdev->dev,
> + "Failed to %s cloud filter using l4 port %u, err %d aq_err %d\n",
> + add ? "add" : "delete", filter->dst_port, ret,
> + pf->hw.aq.asq_last_status);
> + else
> + dev_info(&pf->pdev->dev,
> + "%s cloud filter for VSI: %d\n",
> + add ? "Added" : "Deleted", filter->seid);
> + return ret;
> +}
> +
> +/**
> + * i40e_add_del_cloud_filter_big_buf - Add/del cloud filter using big_buf
> + * @vsi: pointer to VSI
> + * @filter: cloud filter rule
> + * @add: if true, add, if false, delete
> + *
> + * Add or delete a cloud filter for a specific flow spec using big buffer.
> + * Returns 0 if the filter were successfully added.
> + **/
> +static int i40e_add_del_cloud_filter_big_buf(struct i40e_vsi *vsi,
> + struct i40e_cloud_filter *filter,
> + bool add)
> +{
> + struct i40e_aqc_cloud_filters_element_bb cld_filter;
> + struct i40e_pf *pf = vsi->back;
> + int ret;
> +
> + /* Both (src/dst) valid mac_addr are not supported */
> + if ((is_valid_ether_addr(filter->dst_mac) &&
> + is_valid_ether_addr(filter->src_mac)) ||
> + (is_multicast_ether_addr(filter->dst_mac) &&
> + is_multicast_ether_addr(filter->src_mac)))
> + return -EINVAL;
> +
> + /* Make sure port is specified, otherwise bail out, for channel
> + * specific cloud filter needs 'L4 port' to be non-zero
> + */
> + if (!filter->dst_port)
> + return -EINVAL;
> +
> + /* adding filter using src_port/src_ip is not supported at this stage */
> + if (filter->src_port || filter->src_ip ||
> + !ipv6_addr_any((struct in6_addr *)&filter->src_ipv6))
> + return -EINVAL;
Another good reason to use the existing definitions in your new struct
> +
> + /* copy element needed to add cloud filter from filter */
> + i40e_set_cld_element(filter, &cld_filter.element);
> +
> + if (is_valid_ether_addr(filter->dst_mac) ||
> + is_valid_ether_addr(filter->src_mac) ||
> + is_multicast_ether_addr(filter->dst_mac) ||
> + is_multicast_ether_addr(filter->src_mac)) {
> + /* MAC + IP : unsupported mode */
> + if (filter->dst_ip)
> + return -EINVAL;
> +
> + /* since we validated that L4 port must be valid before
> + * we get here, start with respective "flags" value
> + * and update if vlan is present or not
> + */
> + cld_filter.element.flags =
> + cpu_to_le16(I40E_AQC_ADD_CLOUD_FILTER_MAC_PORT);
> +
> + if (filter->vlan_id) {
> + cld_filter.element.flags =
> + cpu_to_le16(I40E_AQC_ADD_CLOUD_FILTER_MAC_VLAN_PORT);
> + }
> +
> + } else if (filter->dst_ip || filter->ip_version == IPV6_VERSION) {
> + cld_filter.element.flags =
> + cpu_to_le16(I40E_AQC_ADD_CLOUD_FILTER_IP_PORT);
> + if (filter->ip_version == IPV6_VERSION)
> + cld_filter.element.flags |=
> + cpu_to_le16(I40E_AQC_ADD_CLOUD_FLAGS_IPV6);
> + else
> + cld_filter.element.flags |=
> + cpu_to_le16(I40E_AQC_ADD_CLOUD_FLAGS_IPV4);
> + } else {
> + dev_err(&pf->pdev->dev,
> + "either mac or ip has to be valid for cloud filter\n");
> + return -EINVAL;
> + }
> +
> + /* Now copy L4 port in Byte 6..7 in general fields */
> + cld_filter.general_fields[I40E_AQC_ADD_CLOUD_FV_FLU_0X16_WORD0] =
> + be16_to_cpu(filter->dst_port);
> +
> + if (add) {
> + /* Validate current device switch mode, change if necessary */
> + ret = i40e_validate_and_set_switch_mode(vsi);
> + if (ret) {
> + dev_err(&pf->pdev->dev,
> + "failed to set switch mode, ret %d\n",
> + ret);
> + return ret;
> + }
> +
> + ret = i40e_aq_add_cloud_filters_bb(&pf->hw, filter->seid,
> + &cld_filter, 1);
> + } else {
> + ret = i40e_aq_rem_cloud_filters_bb(&pf->hw, filter->seid,
> + &cld_filter, 1);
> + }
> +
> + if (ret)
> + dev_dbg(&pf->pdev->dev,
> + "Failed to %s cloud filter(big buffer) err %d aq_err %d\n",
> + add ? "add" : "delete", ret, pf->hw.aq.asq_last_status);
> + else
> + dev_info(&pf->pdev->dev,
> + "%s cloud filter for VSI: %d, L4 port: %d\n",
> + add ? "add" : "delete", filter->seid,
> + ntohs(filter->dst_port));
> + return ret;
> +}
> +
> +/**
> + * i40e_parse_cls_flower - Parse tc flower filters provided by kernel
> + * @vsi: Pointer to VSI
> + * @cls_flower: Pointer to struct tc_cls_flower_offload
> + * @filter: Pointer to cloud filter structure
> + *
> + **/
> +static int i40e_parse_cls_flower(struct i40e_vsi *vsi,
> + struct tc_cls_flower_offload *f,
> + struct i40e_cloud_filter *filter)
> +{
> + struct i40e_pf *pf = vsi->back;
> + u16 addr_type = 0;
> + u8 field_flags = 0;
> +
> + if (f->dissector->used_keys &
> + ~(BIT(FLOW_DISSECTOR_KEY_CONTROL) |
> + BIT(FLOW_DISSECTOR_KEY_BASIC) |
> + BIT(FLOW_DISSECTOR_KEY_ETH_ADDRS) |
> + BIT(FLOW_DISSECTOR_KEY_VLAN) |
> + BIT(FLOW_DISSECTOR_KEY_IPV4_ADDRS) |
> + BIT(FLOW_DISSECTOR_KEY_IPV6_ADDRS) |
> + BIT(FLOW_DISSECTOR_KEY_PORTS) |
> + BIT(FLOW_DISSECTOR_KEY_ENC_KEYID))) {
> + dev_err(&pf->pdev->dev, "Unsupported key used: 0x%x\n",
> + f->dissector->used_keys);
> + return -EOPNOTSUPP;
> + }
> +
> + if (dissector_uses_key(f->dissector, FLOW_DISSECTOR_KEY_ENC_KEYID)) {
> + struct flow_dissector_key_keyid *key =
> + skb_flow_dissector_target(f->dissector,
> + FLOW_DISSECTOR_KEY_ENC_KEYID,
> + f->key);
> +
> + struct flow_dissector_key_keyid *mask =
> + skb_flow_dissector_target(f->dissector,
> + FLOW_DISSECTOR_KEY_ENC_KEYID,
> + f->mask);
> +
> + if (mask->keyid != 0)
> + field_flags |= I40E_CLOUD_FIELD_TEN_ID;
> +
> + filter->tenant_id = be32_to_cpu(key->keyid);
> + }
> +
> + if (dissector_uses_key(f->dissector, FLOW_DISSECTOR_KEY_BASIC)) {
> + struct flow_dissector_key_basic *key =
> + skb_flow_dissector_target(f->dissector,
> + FLOW_DISSECTOR_KEY_BASIC,
> + f->key);
> +
> + filter->ip_proto = key->ip_proto;
> + }
> +
> + if (dissector_uses_key(f->dissector, FLOW_DISSECTOR_KEY_ETH_ADDRS)) {
> + struct flow_dissector_key_eth_addrs *key =
> + skb_flow_dissector_target(f->dissector,
> + FLOW_DISSECTOR_KEY_ETH_ADDRS,
> + f->key);
> +
> + struct flow_dissector_key_eth_addrs *mask =
> + skb_flow_dissector_target(f->dissector,
> + FLOW_DISSECTOR_KEY_ETH_ADDRS,
> + f->mask);
> +
> + /* use is_broadcast and is_zero to check for all 0xf or 0 */
> + if (!is_zero_ether_addr(mask->dst)) {
> + if (is_broadcast_ether_addr(mask->dst)) {
> + field_flags |= I40E_CLOUD_FIELD_OMAC;
> + } else {
> + dev_err(&pf->pdev->dev, "Bad ether dest mask %pM\n",
> + mask->dst);
> + return I40E_ERR_CONFIG;
> + }
> + }
> +
> + if (!is_zero_ether_addr(mask->src)) {
> + if (is_broadcast_ether_addr(mask->src)) {
> + field_flags |= I40E_CLOUD_FIELD_IMAC;
> + } else {
> + dev_err(&pf->pdev->dev, "Bad ether src mask %pM\n",
> + mask->src);
> + return I40E_ERR_CONFIG;
> + }
> + }
> + ether_addr_copy(filter->dst_mac, key->dst);
> + ether_addr_copy(filter->src_mac, key->src);
> + }
> +
> + if (dissector_uses_key(f->dissector, FLOW_DISSECTOR_KEY_VLAN)) {
> + struct flow_dissector_key_vlan *key =
> + skb_flow_dissector_target(f->dissector,
> + FLOW_DISSECTOR_KEY_VLAN,
> + f->key);
> + struct flow_dissector_key_vlan *mask =
> + skb_flow_dissector_target(f->dissector,
> + FLOW_DISSECTOR_KEY_VLAN,
> + f->mask);
> +
> + if (mask->vlan_id) {
> + if (mask->vlan_id == VLAN_VID_MASK) {
> + field_flags |= I40E_CLOUD_FIELD_IVLAN;
> +
> + } else {
> + dev_err(&pf->pdev->dev, "Bad vlan mask 0x%04x\n",
> + mask->vlan_id);
> + return I40E_ERR_CONFIG;
> + }
> + }
> +
> + filter->vlan_id = cpu_to_be16(key->vlan_id);
> + }
> +
> + if (dissector_uses_key(f->dissector, FLOW_DISSECTOR_KEY_CONTROL)) {
> + struct flow_dissector_key_control *key =
> + skb_flow_dissector_target(f->dissector,
> + FLOW_DISSECTOR_KEY_CONTROL,
> + f->key);
> +
> + addr_type = key->addr_type;
> + }
> +
> + if (addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) {
> + struct flow_dissector_key_ipv4_addrs *key =
> + skb_flow_dissector_target(f->dissector,
> + FLOW_DISSECTOR_KEY_IPV4_ADDRS,
> + f->key);
> + struct flow_dissector_key_ipv4_addrs *mask =
> + skb_flow_dissector_target(f->dissector,
> + FLOW_DISSECTOR_KEY_IPV4_ADDRS,
> + f->mask);
> +
> + if (mask->dst) {
> + if (mask->dst == cpu_to_be32(0xffffffff)) {
> + field_flags |= I40E_CLOUD_FIELD_IIP;
> + } else {
> + dev_err(&pf->pdev->dev, "Bad ip dst mask 0x%08x\n",
> + be32_to_cpu(mask->dst));
> + return I40E_ERR_CONFIG;
> + }
> + }
> +
> + if (mask->src) {
> + if (mask->src == cpu_to_be32(0xffffffff)) {
> + field_flags |= I40E_CLOUD_FIELD_IIP;
> + } else {
> + dev_err(&pf->pdev->dev, "Bad ip src mask 0x%08x\n",
> + be32_to_cpu(mask->dst));
> + return I40E_ERR_CONFIG;
> + }
> + }
> +
> + if (field_flags & I40E_CLOUD_FIELD_TEN_ID) {
> + dev_err(&pf->pdev->dev, "Tenant id not allowed for ip filter\n");
> + return I40E_ERR_CONFIG;
> + }
> + filter->dst_ip = key->dst;
> + filter->src_ip = key->src;
> + filter->ip_version = IPV4_VERSION;
> + }
> +
> + if (addr_type == FLOW_DISSECTOR_KEY_IPV6_ADDRS) {
> + struct flow_dissector_key_ipv6_addrs *key =
> + skb_flow_dissector_target(f->dissector,
> + FLOW_DISSECTOR_KEY_IPV6_ADDRS,
> + f->key);
> + struct flow_dissector_key_ipv6_addrs *mask =
> + skb_flow_dissector_target(f->dissector,
> + FLOW_DISSECTOR_KEY_IPV6_ADDRS,
> + f->mask);
> +
> + /* src and dest IPV6 address should not be LOOPBACK
> + * (0:0:0:0:0:0:0:1), which can be represented as ::1
> + */
> + if (ipv6_addr_loopback(&key->dst) ||
> + ipv6_addr_loopback(&key->src)) {
> + dev_err(&pf->pdev->dev,
> + "Bad ipv6, addr is LOOPBACK\n");
> + return I40E_ERR_CONFIG;
> + }
> + if (!ipv6_addr_any(&mask->dst) || !ipv6_addr_any(&mask->src))
> + field_flags |= I40E_CLOUD_FIELD_IIP;
> +
> + memcpy(&filter->src_ipv6, &key->src.s6_addr32,
> + sizeof(filter->src_ipv6));
> + memcpy(&filter->dst_ipv6, &key->dst.s6_addr32,
> + sizeof(filter->dst_ipv6));
> +
> + /* mark it as IPv6 filter, to be used later */
> + filter->ip_version = IPV6_VERSION;
> + }
> +
> + if (dissector_uses_key(f->dissector, FLOW_DISSECTOR_KEY_PORTS)) {
> + struct flow_dissector_key_ports *key =
> + skb_flow_dissector_target(f->dissector,
> + FLOW_DISSECTOR_KEY_PORTS,
> + f->key);
> + struct flow_dissector_key_ports *mask =
> + skb_flow_dissector_target(f->dissector,
> + FLOW_DISSECTOR_KEY_PORTS,
> + f->mask);
> +
> + if (mask->src) {
> + if (mask->src == cpu_to_be16(0xffff)) {
> + field_flags |= I40E_CLOUD_FIELD_IIP;
> + } else {
> + dev_err(&pf->pdev->dev, "Bad src port mask 0x%04x\n",
Consider using %pI4
> + be16_to_cpu(mask->src));
> + return I40E_ERR_CONFIG;
> + }
> + }
> +
> + if (mask->dst) {
> + if (mask->dst == cpu_to_be16(0xffff)) {
> + field_flags |= I40E_CLOUD_FIELD_IIP;
> + } else {
> + dev_err(&pf->pdev->dev, "Bad dst port mask 0x%04x\n",
Consider using %pI4
> + be16_to_cpu(mask->dst));
> + return I40E_ERR_CONFIG;
> + }
> + }
> +
> + filter->dst_port = key->dst;
> + filter->src_port = key->src;
> +
> + switch (filter->ip_proto) {
> + case IPPROTO_TCP:
> + case IPPROTO_UDP:
> + break;
> + default:
> + dev_err(&pf->pdev->dev,
> + "Only UDP and TCP transport are supported\n");
> + return -EINVAL;
> + }
> + }
> + filter->flags = field_flags;
> + return 0;
> +}
> +
> +/**
> + * i40e_handle_tclass: Forward to a traffic class on the device
> + * @vsi: Pointer to VSI
> + * @tc: traffic class index on the device
> + * @filter: Pointer to cloud filter structure
> + *
> + **/
> +static int i40e_handle_tclass(struct i40e_vsi *vsi, u32 tc,
> + struct i40e_cloud_filter *filter)
> +{
> + struct i40e_channel *ch, *ch_tmp;
> +
> + /* direct to a traffic class on the same device */
> + if (tc == 0) {
> + filter->seid = vsi->seid;
> + return 0;
> + } else if (vsi->tc_config.enabled_tc & BIT(tc)) {
> + if (!filter->dst_port) {
> + dev_err(&vsi->back->pdev->dev,
> + "Specify destination port to direct to traffic class that is not default\n");
> + return -EINVAL;
> + }
> + if (list_empty(&vsi->ch_list))
> + return -EINVAL;
> + list_for_each_entry_safe(ch, ch_tmp, &vsi->ch_list,
> + list) {
> + if (ch->seid == vsi->tc_seid_map[tc])
> + filter->seid = ch->seid;
> + }
> + return 0;
> + }
> + dev_err(&vsi->back->pdev->dev, "TC is not enabled\n");
> + return -EINVAL;
> +}
> +
> +/**
> + * i40e_configure_clsflower - Configure tc flower filters
> + * @vsi: Pointer to VSI
> + * @cls_flower: Pointer to struct tc_cls_flower_offload
> + *
> + **/
> +static int i40e_configure_clsflower(struct i40e_vsi *vsi,
> + struct tc_cls_flower_offload *cls_flower)
> +{
> + u32 tc = TC_H_MIN(cls_flower->classid) - 1;
> + struct i40e_cloud_filter *filter = NULL;
> + struct i40e_pf *pf = vsi->back;
> + int err = 0;
> +
> + if (tc >= I40E_MAX_TRAFFIC_CLASS) {
> + dev_err(&vsi->back->pdev->dev, "Invalid traffic class\n");
> + return -EINVAL;
> + }
> +
> + if (test_bit(__I40E_RESET_RECOVERY_PENDING, pf->state) ||
> + test_bit(__I40E_RESET_INTR_RECEIVED, pf->state))
> + return -EBUSY;
> +
> + if (pf->fdir_pf_active_filters ||
> + (!hlist_empty(&pf->fdir_filter_list))) {
> + dev_err(&vsi->back->pdev->dev,
> + "Flow Director Sideband filters exists, turn ntuple off to configure cloud filters\n");
> + return -EINVAL;
> + }
> +
> + if (vsi->back->flags & I40E_FLAG_FD_SB_ENABLED) {
> + dev_err(&vsi->back->pdev->dev,
> + "Disable Flow Director Sideband, configuring Cloud filters via tc-flower\n");
> + vsi->back->flags &= ~I40E_FLAG_FD_SB_ENABLED;
> + vsi->back->flags |= I40E_FLAG_FD_SB_TO_CLOUD_FILTER;
> + }
> +
> + filter = kzalloc(sizeof(*filter), GFP_KERNEL);
> + if (!filter)
> + return -ENOMEM;
> +
> + filter->cookie = cls_flower->cookie;
> +
> + err = i40e_parse_cls_flower(vsi, cls_flower, filter);
> + if (err < 0)
> + goto err;
> +
> + err = i40e_handle_tclass(vsi, tc, filter);
> + if (err < 0)
> + goto err;
> +
> + /* Add cloud filter */
> + if (filter->dst_port)
> + err = i40e_add_del_cloud_filter_big_buf(vsi, filter, true);
> + else
> + err = i40e_add_del_cloud_filter(vsi, filter, true);
> +
> + if (err) {
> + dev_err(&pf->pdev->dev,
> + "Failed to add cloud filter, err %s\n",
> + i40e_stat_str(&pf->hw, err));
> + err = i40e_aq_rc_to_posix(err, pf->hw.aq.asq_last_status);
> + goto err;
> + }
> +
> + /* add filter to the ordered list */
> + INIT_HLIST_NODE(&filter->cloud_node);
> +
> + hlist_add_head(&filter->cloud_node, &pf->cloud_filter_list);
> +
> + pf->num_cloud_filters++;
> +
> + return err;
> +err:
> + kfree(filter);
> + return err;
> +}
> +
> +/**
> + * i40e_find_cloud_filter - Find the could filter in the list
> + * @vsi: Pointer to VSI
> + * @cookie: filter specific cookie
> + *
> + **/
> +static struct i40e_cloud_filter *i40e_find_cloud_filter(struct i40e_vsi *vsi,
> + unsigned long *cookie)
> +{
> + struct i40e_cloud_filter *filter = NULL;
> + struct hlist_node *node2;
> +
> + hlist_for_each_entry_safe(filter, node2,
> + &vsi->back->cloud_filter_list, cloud_node)
> + if (!memcmp(cookie, &filter->cookie, sizeof(filter->cookie)))
> + return filter;
> + return NULL;
> +}
> +
> +/**
> + * i40e_delete_clsflower - Remove tc flower filters
> + * @vsi: Pointer to VSI
> + * @cls_flower: Pointer to struct tc_cls_flower_offload
> + *
> + **/
> +static int i40e_delete_clsflower(struct i40e_vsi *vsi,
> + struct tc_cls_flower_offload *cls_flower)
> +{
> + struct i40e_cloud_filter *filter = NULL;
> + struct i40e_pf *pf = vsi->back;
> + int err = 0;
> +
> + filter = i40e_find_cloud_filter(vsi, &cls_flower->cookie);
> +
> + if (!filter)
> + return -EINVAL;
> +
> + hash_del(&filter->cloud_node);
> +
> + if (filter->dst_port)
> + err = i40e_add_del_cloud_filter_big_buf(vsi, filter, false);
> + else
> + err = i40e_add_del_cloud_filter(vsi, filter, false);
> + if (err) {
> + kfree(filter);
> + dev_err(&pf->pdev->dev,
> + "Failed to delete cloud filter, err %s\n",
> + i40e_stat_str(&pf->hw, err));
> + return i40e_aq_rc_to_posix(err, pf->hw.aq.asq_last_status);
> + }
> +
> + kfree(filter);
Put this before your if (err) and you can take it out of the {} block
> + pf->num_cloud_filters--;
> +
> + if (!pf->num_cloud_filters)
> + if ((pf->flags & I40E_FLAG_FD_SB_TO_CLOUD_FILTER) &&
> + !(pf->flags & I40E_FLAG_FD_SB_INACTIVE)) {
> + pf->flags |= I40E_FLAG_FD_SB_ENABLED;
> + pf->flags &= ~I40E_FLAG_FD_SB_TO_CLOUD_FILTER;
> + pf->flags &= ~I40E_FLAG_FD_SB_INACTIVE;
> + }
> + return 0;
> +}
> +
> +/**
> + * i40e_setup_tc_cls_flower - flower classifier offloads
> + * @netdev: net device to configure
> + * @type_data: offload data
> + **/
> +static int i40e_setup_tc_cls_flower(struct net_device *netdev,
> + struct tc_cls_flower_offload *cls_flower)
> +{
> + struct i40e_netdev_priv *np = netdev_priv(netdev);
> + struct i40e_vsi *vsi = np->vsi;
> +
> + if (!is_classid_clsact_ingress(cls_flower->common.classid) ||
> + cls_flower->common.chain_index)
> + return -EOPNOTSUPP;
> +
> + switch (cls_flower->command) {
> + case TC_CLSFLOWER_REPLACE:
> + return i40e_configure_clsflower(vsi, cls_flower);
> + case TC_CLSFLOWER_DESTROY:
> + return i40e_delete_clsflower(vsi, cls_flower);
> + case TC_CLSFLOWER_STATS:
> + return -EOPNOTSUPP;
> + default:
> + return -EINVAL;
> + }
> +}
> +
> static int __i40e_setup_tc(struct net_device *netdev, enum tc_setup_type type,
> void *type_data)
> {
> - if (type != TC_SETUP_MQPRIO)
> + switch (type) {
> + case TC_SETUP_MQPRIO:
> + return i40e_setup_tc(netdev, type_data);
> + case TC_SETUP_CLSFLOWER:
> + return i40e_setup_tc_cls_flower(netdev, type_data);
> + default:
> return -EOPNOTSUPP;
> -
> - return i40e_setup_tc(netdev, type_data);
> + }
> }
>
> /**
> @@ -6954,6 +7707,13 @@ static void i40e_cloud_filter_exit(struct i40e_pf *pf)
> kfree(cfilter);
> }
> pf->num_cloud_filters = 0;
> +
> + if ((pf->flags & I40E_FLAG_FD_SB_TO_CLOUD_FILTER) &&
> + !(pf->flags & I40E_FLAG_FD_SB_INACTIVE)) {
> + pf->flags |= I40E_FLAG_FD_SB_ENABLED;
> + pf->flags &= ~I40E_FLAG_FD_SB_TO_CLOUD_FILTER;
> + pf->flags &= ~I40E_FLAG_FD_SB_INACTIVE;
> + }
> }
>
> /**
> @@ -8061,7 +8821,8 @@ static int i40e_reconstitute_veb(struct i40e_veb *veb)
> * i40e_get_capabilities - get info about the HW
> * @pf: the PF struct
> **/
> -static int i40e_get_capabilities(struct i40e_pf *pf)
> +static int i40e_get_capabilities(struct i40e_pf *pf,
> + enum i40e_admin_queue_opc list_type)
> {
> struct i40e_aqc_list_capabilities_element_resp *cap_buf;
> u16 data_size;
> @@ -8076,9 +8837,8 @@ static int i40e_get_capabilities(struct i40e_pf *pf)
>
> /* this loads the data into the hw struct for us */
> err = i40e_aq_discover_capabilities(&pf->hw, cap_buf, buf_len,
> - &data_size,
> - i40e_aqc_opc_list_func_capabilities,
> - NULL);
> + &data_size, list_type,
> + NULL);
> /* data loaded, buffer no longer needed */
> kfree(cap_buf);
>
> @@ -8095,26 +8855,44 @@ static int i40e_get_capabilities(struct i40e_pf *pf)
> }
> } while (err);
>
> - if (pf->hw.debug_mask & I40E_DEBUG_USER)
> - dev_info(&pf->pdev->dev,
> - "pf=%d, num_vfs=%d, msix_pf=%d, msix_vf=%d, fd_g=%d, fd_b=%d, pf_max_q=%d num_vsi=%d\n",
> - pf->hw.pf_id, pf->hw.func_caps.num_vfs,
> - pf->hw.func_caps.num_msix_vectors,
> - pf->hw.func_caps.num_msix_vectors_vf,
> - pf->hw.func_caps.fd_filters_guaranteed,
> - pf->hw.func_caps.fd_filters_best_effort,
> - pf->hw.func_caps.num_tx_qp,
> - pf->hw.func_caps.num_vsis);
> -
> + if (pf->hw.debug_mask & I40E_DEBUG_USER) {
> + if (list_type == i40e_aqc_opc_list_func_capabilities) {
> + dev_info(&pf->pdev->dev,
> + "pf=%d, num_vfs=%d, msix_pf=%d, msix_vf=%d, fd_g=%d, fd_b=%d, pf_max_q=%d num_vsi=%d\n",
> + pf->hw.pf_id, pf->hw.func_caps.num_vfs,
> + pf->hw.func_caps.num_msix_vectors,
> + pf->hw.func_caps.num_msix_vectors_vf,
> + pf->hw.func_caps.fd_filters_guaranteed,
> + pf->hw.func_caps.fd_filters_best_effort,
> + pf->hw.func_caps.num_tx_qp,
> + pf->hw.func_caps.num_vsis);
> + } else if (list_type == i40e_aqc_opc_list_dev_capabilities) {
> + dev_info(&pf->pdev->dev,
> + "switch_mode=0x%04x, function_valid=0x%08x\n",
> + pf->hw.dev_caps.switch_mode,
> + pf->hw.dev_caps.valid_functions);
> + dev_info(&pf->pdev->dev,
> + "SR-IOV=%d, num_vfs for all function=%u\n",
> + pf->hw.dev_caps.sr_iov_1_1,
> + pf->hw.dev_caps.num_vfs);
> + dev_info(&pf->pdev->dev,
> + "num_vsis=%u, num_rx:%u, num_tx=%u\n",
> + pf->hw.dev_caps.num_vsis,
> + pf->hw.dev_caps.num_rx_qp,
> + pf->hw.dev_caps.num_tx_qp);
> + }
> + }
> + if (list_type == i40e_aqc_opc_list_func_capabilities) {
> #define DEF_NUM_VSI (1 + (pf->hw.func_caps.fcoe ? 1 : 0) \
> + pf->hw.func_caps.num_vfs)
> - if (pf->hw.revision_id == 0 && (DEF_NUM_VSI > pf->hw.func_caps.num_vsis)) {
> - dev_info(&pf->pdev->dev,
> - "got num_vsis %d, setting num_vsis to %d\n",
> - pf->hw.func_caps.num_vsis, DEF_NUM_VSI);
> - pf->hw.func_caps.num_vsis = DEF_NUM_VSI;
> + if (pf->hw.revision_id == 0 &&
> + pf->hw.func_caps.num_vsis < DEF_NUM_VSI) {
> + dev_info(&pf->pdev->dev,
> + "got num_vsis %d, setting num_vsis to %d\n",
> + pf->hw.func_caps.num_vsis, DEF_NUM_VSI);
> + pf->hw.func_caps.num_vsis = DEF_NUM_VSI;
> + }
> }
> -
> return 0;
> }
>
> @@ -8156,6 +8934,7 @@ static void i40e_fdir_sb_setup(struct i40e_pf *pf)
> if (!vsi) {
> dev_info(&pf->pdev->dev, "Couldn't create FDir VSI\n");
> pf->flags &= ~I40E_FLAG_FD_SB_ENABLED;
> + pf->flags |= I40E_FLAG_FD_SB_INACTIVE;
> return;
> }
> }
> @@ -8178,6 +8957,48 @@ static void i40e_fdir_teardown(struct i40e_pf *pf)
> }
>
> /**
> + * i40e_rebuild_cloud_filters - Rebuilds cloud filters for VSIs
> + * @vsi: PF main vsi
> + * @seid: seid of main or channel VSIs
> + *
> + * Rebuilds cloud filters associated with main VSI and channel VSIs if they
> + * existed before reset
> + **/
> +static int i40e_rebuild_cloud_filters(struct i40e_vsi *vsi, u16 seid)
> +{
> + struct i40e_cloud_filter *cfilter;
> + struct i40e_pf *pf = vsi->back;
> + struct hlist_node *node;
> + i40e_status ret;
> +
> + /* Add cloud filters back if they exist */
> + if (hlist_empty(&pf->cloud_filter_list))
> + return 0;
Is this necessary? Doesn't hlist_for_each_entry_safe() do the right
thing if the list is empty?
> +
> + hlist_for_each_entry_safe(cfilter, node, &pf->cloud_filter_list,
> + cloud_node) {
> + if (cfilter->seid != seid)
> + continue;
> +
> + if (cfilter->dst_port)
> + ret = i40e_add_del_cloud_filter_big_buf(vsi, cfilter,
> + true);
> + else
> + ret = i40e_add_del_cloud_filter(vsi, cfilter, true);
> +
> + if (ret) {
> + dev_dbg(&pf->pdev->dev,
> + "Failed to rebuild cloud filter, err %s aq_err %s\n",
> + i40e_stat_str(&pf->hw, ret),
> + i40e_aq_str(&pf->hw,
> + pf->hw.aq.asq_last_status));
> + return ret;
> + }
> + }
> + return 0;
> +}
> +
> +/**
> * i40e_rebuild_channels - Rebuilds channel VSIs if they existed before reset
> * @vsi: PF main vsi
> *
> @@ -8216,6 +9037,13 @@ static int i40e_rebuild_channels(struct i40e_vsi *vsi)
> credits,
> ch->seid);
> }
> + ret = i40e_rebuild_cloud_filters(vsi, ch->seid);
> + if (ret) {
> + dev_dbg(&vsi->back->pdev->dev,
> + "Failed to rebuild cloud filters for channel VSI %u\n",
> + ch->seid);
> + return ret;
> + }
> }
> return 0;
> }
> @@ -8382,7 +9210,7 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)
> i40e_verify_eeprom(pf);
>
> i40e_clear_pxe_mode(hw);
> - ret = i40e_get_capabilities(pf);
> + ret = i40e_get_capabilities(pf, i40e_aqc_opc_list_func_capabilities);
> if (ret)
> goto end_core_reset;
>
> @@ -8503,6 +9331,10 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired)
> vsi->seid);
> }
>
> + ret = i40e_rebuild_cloud_filters(vsi, vsi->seid);
> + if (ret)
> + goto end_unlock;
> +
> /* PF Main VSI is rebuild by now, go ahead and rebuild channel VSIs
> * for this main VSI if they exist
> */
> @@ -9425,6 +10257,7 @@ static int i40e_init_msix(struct i40e_pf *pf)
> (pf->num_fdsb_msix == 0)) {
> dev_info(&pf->pdev->dev, "Sideband Flowdir disabled, not enough MSI-X vectors\n");
> pf->flags &= ~I40E_FLAG_FD_SB_ENABLED;
> + pf->flags |= I40E_FLAG_FD_SB_INACTIVE;
> }
> if ((pf->flags & I40E_FLAG_VMDQ_ENABLED) &&
> (pf->num_vmdq_msix == 0)) {
> @@ -9542,6 +10375,7 @@ static int i40e_init_interrupt_scheme(struct i40e_pf *pf)
> I40E_FLAG_FD_SB_ENABLED |
> I40E_FLAG_FD_ATR_ENABLED |
> I40E_FLAG_VMDQ_ENABLED);
> + pf->flags |= I40E_FLAG_FD_SB_INACTIVE;
>
> /* rework the queue expectations without MSIX */
> i40e_determine_queue_usage(pf);
> @@ -10282,9 +11116,13 @@ bool i40e_set_ntuple(struct i40e_pf *pf, netdev_features_t features)
> /* Enable filters and mark for reset */
> if (!(pf->flags & I40E_FLAG_FD_SB_ENABLED))
> need_reset = true;
> - /* enable FD_SB only if there is MSI-X vector */
> - if (pf->num_fdsb_msix > 0)
> + /* enable FD_SB only if there is MSI-X vector and no cloud
> + * filters exist
> + */
> + if (pf->num_fdsb_msix > 0 && !pf->num_cloud_filters) {
> pf->flags |= I40E_FLAG_FD_SB_ENABLED;
> + pf->flags &= ~I40E_FLAG_FD_SB_INACTIVE;
> + }
> } else {
> /* turn off filters, mark for reset and clear SW filter list */
> if (pf->flags & I40E_FLAG_FD_SB_ENABLED) {
> @@ -10293,6 +11131,8 @@ bool i40e_set_ntuple(struct i40e_pf *pf, netdev_features_t features)
> }
> pf->flags &= ~(I40E_FLAG_FD_SB_ENABLED |
> I40E_FLAG_FD_SB_AUTO_DISABLED);
> + pf->flags |= I40E_FLAG_FD_SB_INACTIVE;
> +
> /* reset fd counters */
> pf->fd_add_err = 0;
> pf->fd_atr_cnt = 0;
> @@ -10354,6 +11194,12 @@ static int i40e_set_features(struct net_device *netdev,
> else
> i40e_vlan_stripping_disable(vsi);
>
> + if (!(features & NETIF_F_HW_TC) && pf->num_cloud_filters) {
> + dev_err(&pf->pdev->dev,
> + "Offloaded tc filters active, can't turn hw_tc_offload off");
> + return -EINVAL;
> + }
> +
> need_reset = i40e_set_ntuple(pf, features);
>
> if (need_reset)
> @@ -10873,7 +11719,8 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)
> netdev->vlan_features |= hw_enc_features | NETIF_F_TSO_MANGLEID;
>
> if (!(pf->flags & I40E_FLAG_MFP_ENABLED))
> - netdev->hw_features |= NETIF_F_NTUPLE;
> + netdev->hw_features |= NETIF_F_NTUPLE | NETIF_F_HW_TC;
> +
> hw_features = hw_enc_features |
> NETIF_F_HW_VLAN_CTAG_TX |
> NETIF_F_HW_VLAN_CTAG_RX;
> @@ -12178,8 +13025,10 @@ static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit)
> */
>
> if ((pf->hw.pf_id == 0) &&
> - !(pf->flags & I40E_FLAG_TRUE_PROMISC_SUPPORT))
> + !(pf->flags & I40E_FLAG_TRUE_PROMISC_SUPPORT)) {
> flags = I40E_AQ_SET_SWITCH_CFG_PROMISC;
> + pf->last_sw_conf_flags = flags;
> + }
>
> if (pf->hw.pf_id == 0) {
> u16 valid_flags;
> @@ -12195,6 +13044,7 @@ static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit)
> pf->hw.aq.asq_last_status));
> /* not a fatal problem, just keep going */
> }
> + pf->last_sw_conf_valid_flags = valid_flags;
> }
>
> /* first time setup */
> @@ -12292,6 +13142,7 @@ static void i40e_determine_queue_usage(struct i40e_pf *pf)
> I40E_FLAG_DCB_ENABLED |
> I40E_FLAG_SRIOV_ENABLED |
> I40E_FLAG_VMDQ_ENABLED);
> + pf->flags |= I40E_FLAG_FD_SB_INACTIVE;
> } else if (!(pf->flags & (I40E_FLAG_RSS_ENABLED |
> I40E_FLAG_FD_SB_ENABLED |
> I40E_FLAG_FD_ATR_ENABLED |
> @@ -12306,6 +13157,7 @@ static void i40e_determine_queue_usage(struct i40e_pf *pf)
> I40E_FLAG_FD_ATR_ENABLED |
> I40E_FLAG_DCB_ENABLED |
> I40E_FLAG_VMDQ_ENABLED);
> + pf->flags |= I40E_FLAG_FD_SB_INACTIVE;
> } else {
> /* Not enough queues for all TCs */
> if ((pf->flags & I40E_FLAG_DCB_CAPABLE) &&
> @@ -12329,6 +13181,7 @@ static void i40e_determine_queue_usage(struct i40e_pf *pf)
> queues_left -= 1; /* save 1 queue for FD */
> } else {
> pf->flags &= ~I40E_FLAG_FD_SB_ENABLED;
> + pf->flags |= I40E_FLAG_FD_SB_INACTIVE;
> dev_info(&pf->pdev->dev, "not enough queues for Flow Director. Flow Director feature is disabled\n");
> }
> }
> @@ -12632,7 +13485,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> dev_warn(&pdev->dev, "This device is a pre-production adapter/LOM. Please be aware there may be issues with your hardware. If you are experiencing problems please contact your Intel or hardware representative who provided you with this hardware.\n");
>
> i40e_clear_pxe_mode(hw);
> - err = i40e_get_capabilities(pf);
> + err = i40e_get_capabilities(pf, i40e_aqc_opc_list_func_capabilities);
> if (err)
> goto err_adminq_setup;
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_prototype.h b/drivers/net/ethernet/intel/i40e/i40e_prototype.h
> index 92869f5..3bb6659 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_prototype.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e_prototype.h
> @@ -283,6 +283,22 @@ i40e_status i40e_aq_query_switch_comp_bw_config(struct i40e_hw *hw,
> struct i40e_asq_cmd_details *cmd_details);
> i40e_status i40e_aq_resume_port_tx(struct i40e_hw *hw,
> struct i40e_asq_cmd_details *cmd_details);
> +i40e_status
> +i40e_aq_add_cloud_filters_bb(struct i40e_hw *hw, u16 seid,
> + struct i40e_aqc_cloud_filters_element_bb *filters,
> + u8 filter_count);
> +enum i40e_status_code
> +i40e_aq_add_cloud_filters(struct i40e_hw *hw, u16 vsi,
> + struct i40e_aqc_cloud_filters_element_data *filters,
> + u8 filter_count);
> +enum i40e_status_code
> +i40e_aq_rem_cloud_filters(struct i40e_hw *hw, u16 vsi,
> + struct i40e_aqc_cloud_filters_element_data *filters,
> + u8 filter_count);
> +i40e_status
> +i40e_aq_rem_cloud_filters_bb(struct i40e_hw *hw, u16 seid,
> + struct i40e_aqc_cloud_filters_element_bb *filters,
> + u8 filter_count);
> i40e_status i40e_read_lldp_cfg(struct i40e_hw *hw,
> struct i40e_lldp_variables *lldp_cfg);
> /* i40e_common */
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
> index 24589a4..5577b6f 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_type.h
> +++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
> @@ -291,6 +291,7 @@ struct i40e_hw_capabilities {
> #define I40E_NVM_IMAGE_TYPE_MODE1 0x6
> #define I40E_NVM_IMAGE_TYPE_MODE2 0x7
> #define I40E_NVM_IMAGE_TYPE_MODE3 0x8
> +#define I40E_SWITCH_MODE_MASK 0xF
>
> u32 management_mode;
> u32 mng_protocols_over_mctp;
> diff --git a/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
> index 0c4ff18..31135bd 100644
> --- a/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
> +++ b/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
> @@ -1360,6 +1360,9 @@ struct i40e_aqc_cloud_filters_element_data {
> struct {
> u8 data[16];
> } v6;
> + struct {
> + __le16 data[8];
> + } raw_v6;
> } ipaddr;
> __le16 flags;
> #define I40E_AQC_ADD_CLOUD_FILTER_SHIFT 0
>
> _______________________________________________
> Intel-wired-lan mailing list
> Intel-wired-lan@osuosl.org
> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
>
^ permalink raw reply
* [PATCH next] ipvlan: always use the current L2 addr of the master
From: Mahesh Bandewar @ 2017-10-12 0:16 UTC (permalink / raw)
To: Netdev; +Cc: Eric Dumazet, David Miller, Mahesh Bandewar, Mahesh Bandewar
From: Mahesh Bandewar <maheshb@google.com>
If the underlying master ever changes its L2 (e.g. bonding device),
then make sure that the IPvlan slaves always emit packets with the
current L2 of the master instead of the stale mac addr which was
copied during the device creation. The problem can be seen with
following script -
#!/bin/bash
# Create a vEth pair
ip link add dev veth0 type veth peer name veth1
ip link set veth0 up
ip link set veth1 up
ip link show veth0
ip link show veth1
# Create an IPvlan device on one end of this vEth pair.
ip link add link veth0 dev ipvl0 type ipvlan mode l2
ip link show ipvl0
# Change the mac-address of the vEth master.
ip link set veth0 address 02:11:22:33:44:55
Fixes: 2ad7bf363841 ("ipvlan: Initial check-in of the IPVLAN driver.")
Signed-off-by: Mahesh Bandewar <maheshb@google.com>
---
drivers/net/ipvlan/ipvlan_main.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index c74893c1e620..5832091680f4 100644
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -407,7 +407,7 @@ static int ipvlan_hard_header(struct sk_buff *skb, struct net_device *dev,
* while the packets use the mac-addr on the physical device.
*/
return dev_hard_header(skb, phy_dev, type, daddr,
- saddr ? : dev->dev_addr, len);
+ saddr ? : phy_dev->dev_addr, len);
}
static const struct header_ops ipvlan_header_ops = {
@@ -730,6 +730,11 @@ static int ipvlan_device_event(struct notifier_block *unused,
ipvlan_adjust_mtu(ipvlan, dev);
break;
+ case NETDEV_CHANGEADDR:
+ list_for_each_entry(ipvlan, &port->ipvlans, pnode)
+ ether_addr_copy(ipvlan->dev->dev_addr, dev->dev_addr);
+ break;
+
case NETDEV_PRE_TYPE_CHANGE:
/* Forbid underlying device to change its type. */
return NOTIFY_BAD;
--
2.15.0.rc0.271.g36b669edcc-goog
^ permalink raw reply related
* Re: BUG:af_packet fails to TX TSO frames
From: Willem de Bruijn @ 2017-10-12 0:19 UTC (permalink / raw)
To: Anton Ivanov; +Cc: Anton Ivanov, Network Development, David Miller
In-Reply-To: <40e87e75-742f-3542-b79e-1e7fee9b4485@cambridgegreys.com>
On Wed, Oct 11, 2017 at 6:01 PM, Anton Ivanov
<anton.ivanov@cambridgegreys.com> wrote:
> [snip]
>
>> This will be tomorrow though, it is late here.
>>
>> The only obvious difference I can see at this point is that I am using
>> iovs and sending the vnet header as iov[0] and the data in pieces after
>> that while your code is doing a send() for the whole frame. This should
>> not make any difference though - it all ends up as an iov internally in
>> the kernel.
>
> Spoke too soon. It is not reporting any errors, but there is nothing
> coming out on the actual Ethernet.
It works for me on various platforms. On the receiver, drop these fake
tcp packets in iptables and read them with tcpdump
iptables -A PREROUTING -t raw -p tcp --dport 9 -j DROP
tcpdump src $src_ip
Note that not all combinations of flags are supported by the kernel
and that some flags have non-obvious behavior (disable a feature, in
place of enable it).
Specifically, mtu sized packets either must not pass a vnet_hdr or
must pass one with gso explicitly disabled ('-G').
psock_txring_vnet -s $src_ip $dst_ip -l 1400
psock_txring_vnet -s $src_ip $dst_ip -l 1400 -v -G
psock_txring_vnet -s $src_ip $dst_ip -l 1400 -N
psock_txring_vnet -s $src_ip $dst_ip -l 1400 -N -v -G
Conversely, packets that exceed mtu have to have the gso flags in the
virtio_net_hdr:
psock_txring_vnet -s $src_ip $dst_ip -l 4400 -v
psock_txring_vnet -s $src_ip $dst_ip -l 4400 -N -v
When sending a large packet, but not passing a virtio_net_hdr along
('-v'), the test fails with
psock_txring_vnet: send: Message too long
When passing a header along, but not disabling gso, the packet is
indeed dropped silently.
I verified correct segmentation with three modes of ethtool
ethtool -K eth0 tso off gso off
ethtool -K eth0 tso off gso on
ethtool -K eth0 tso on gso on
by reading tcpdump on the sender.
The receive side results are the same with dev_queue_xmit and
packet_direct_xmit ('-q') mode. With direct_xmit, the packets are not
observed on the send side.
^ 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