| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 02 Feb 2012 14:44:51 +0100
From: Ursula Braun <ubraun@...ux.vnet.ibm.com>
To: davem@...emloft.net
Cc: Ursula Braun1 <ursula.braun@...ibm.com>, netdev@...r.kernel.org,
elelueck@...ibm.com
Subject: Re: [PATCH] qeth: Move away from using neighbour entries in
qeth_l3_fill_header()
Dave,
I have tested your qeth patch on top of net-next with ipv4 and ipv6
traffic successfully. I just had to add includes for net/route.h and
net/ip6_fib.h.
Regards, Ursula Braun, IBM Germany, Linux on System z development
> From:
> David Miller <davem@...emloft.net>
> To:
> Einar EL Lueck/Germany/IBM@...DE
> Cc:
> Ursula Braun1/Germany/IBM@...DE, netdev@...r.kernel.org
> Date:
> 01/02/2012 21:49
> Subject:
> [PATCH] qeth: Move away from using neighbour entries in
> qeth_l3_fill_header()
>
>
>
>
> We've moving to a model where dst_entry objects to not have
> a reference to the associated neighbour entry, instead such
> neighbours must be looked up on-demand.
>
> Here in qeth_l3_fill_header() it's actually much simpler to
> use the information in the route itself. The code is
> already conditionalized upon protocol type.
>
> Signed-off-by: David S. Miller <davem@...emloft.net>
> --
> If one of you could test this against net-next, I'd appreciate
> it. I plan to make similar changes to the other dst_get_neighbour*()
> call in this driver.
>
> Thanks!
>
> diff --git a/drivers/s390/net/qeth_l3_main.c
> b/drivers/s390/net/qeth_l3_main.c
> index 9648e4e..6d95c38 100644
> --- a/drivers/s390/net/qeth_l3_main.c
> +++ b/drivers/s390/net/qeth_l3_main.c
> @@ -2832,7 +2832,6 @@ static void qeth_l3_fill_af_iucv_hdr(struct
> qeth_card *card,
> static void qeth_l3_fill_header(struct qeth_card *card, struct qeth_hdr
> *hdr,
> struct sk_buff *skb, int ipv, int
> cast_type)
> {
> - struct neighbour *n = NULL;
> struct dst_entry *dst;
>
> memset(hdr, 0, sizeof(struct qeth_hdr));
> @@ -2855,33 +2854,29 @@ static void qeth_l3_fill_header(struct qeth_card
> *card, struct qeth_hdr *hdr,
>
> rcu_read_lock();
> dst = skb_dst(skb);
> - if (dst)
> - n = dst_get_neighbour_noref(dst);
> if (ipv == 4) {
> + struct rtable *rt = (struct rtable *)
> dst;
> + __be32 *pkey = &ip_hdr(skb)->daddr;
> +
> + if (rt->rt_gateway)
> + pkey = &rt->rt_gateway;
> +
> /* IPv4 */
> hdr->hdr.l3.flags =
> qeth_l3_get_qeth_hdr_flags4(cast_type);
> memset(hdr->hdr.l3.dest_addr, 0, 12);
> - if (n) {
> - *((u32 *)
> (&hdr->hdr.l3.dest_addr[12])) =
> - *((u32 *)
> n->primary_key);
> - } else {
> - /* fill in destination
> address used in ip header */
> - *((u32 *)
> (&hdr->hdr.l3.dest_addr[12])) =
> - ip_hdr(skb)->daddr;
> - }
> + *((__be32 *)
> (&hdr->hdr.l3.dest_addr[12])) = *pkey;
> } else if (ipv == 6) {
> + struct rt6_info *rt = (struct rt6_info *)
> dst;
> + struct in6_addr *pkey =
> &ipv6_hdr(skb)->daddr;
> +
> + if (!ipv6_addr_any(&rt->rt6i_gateway))
> + pkey = &rt->rt6i_gateway;
> +
> /* IPv6 */
> hdr->hdr.l3.flags =
> qeth_l3_get_qeth_hdr_flags6(cast_type);
> if (card->info.type ==
> QETH_CARD_TYPE_IQD)
> hdr->hdr.l3.flags &=
> ~QETH_HDR_PASSTHRU;
> - if (n) {
> - memcpy(hdr->hdr.l3.dest_addr,
> - n->primary_key,
> 16);
> - } else {
> - /* fill in destination
> address used in ip header */
> - memcpy(hdr->hdr.l3.dest_addr,
> - &ipv6_hdr(skb)->daddr, 16);
> - }
> + memcpy(hdr->hdr.l3.dest_addr, pkey, 16);
> } else {
> /* passthrough */
> if ((skb->dev->type == ARPHRD_IEEE802_TR)
> &&
>
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists