Skip to main content

Browse the archive

Revision b837913fc2d9061bf9b8c0dd6bf2d24e2f98b84a authored by jacek.tomaka@poczta.fm on 23 April 2018, 16:14:25 UTC, committed by Thomas Gleixner on 26 April 2018, 19:42:44 UTC 
x86/cpu/intel: Add missing TLB cpuid values
 
Make kernel print the correct number of TLB entries on Intel Xeon Phi 7210
(and others)

Before:
[ 0.320005] Last level dTLB entries: 4KB 0, 2MB 0, 4MB 0, 1GB 0
After:
[ 0.320005] Last level dTLB entries: 4KB 256, 2MB 128, 4MB 128, 1GB 16

The entries do exist in the official Intel SMD but the type column there is
incorrect (states "Cache" where it should read "TLB"), but the entries for
the values 0x6B, 0x6C and 0x6D are correctly described as 'Data TLB'.

Signed-off-by: Jacek Tomaka <jacek.tomaka@poczta.fm>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20180423161425.24366-1-jacekt@dugeo.com
1 parent da6fa7e
Raw File
utils.c 
/* Utility routines
 *
 * Copyright (C) 2015 Red Hat, Inc. All Rights Reserved.
 * Written by David Howells (dhowells@redhat.com)
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public Licence
 * as published by the Free Software Foundation; either version
 * 2 of the Licence, or (at your option) any later version.
 */

#include <linux/ip.h>
#include <linux/ipv6.h>
#include <linux/udp.h>
#include "ar-internal.h"

/*
 * Fill out a peer address from a socket buffer containing a packet.
 */
int rxrpc_extract_addr_from_skb(struct rxrpc_local *local,
				struct sockaddr_rxrpc *srx,
				struct sk_buff *skb)
{
	memset(srx, 0, sizeof(*srx));

	switch (ntohs(skb->protocol)) {
	case ETH_P_IP:
		if (local->srx.transport.family == AF_INET6) {
			srx->transport_type = SOCK_DGRAM;
			srx->transport_len = sizeof(srx->transport.sin6);
			srx->transport.sin6.sin6_family = AF_INET6;
			srx->transport.sin6.sin6_port = udp_hdr(skb)->source;
			srx->transport.sin6.sin6_addr.s6_addr32[2] = htonl(0xffff);
			srx->transport.sin6.sin6_addr.s6_addr32[3] = ip_hdr(skb)->saddr;
		} else {
			srx->transport_type = SOCK_DGRAM;
			srx->transport_len = sizeof(srx->transport.sin);
			srx->transport.sin.sin_family = AF_INET;
			srx->transport.sin.sin_port = udp_hdr(skb)->source;
			srx->transport.sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
		}
		return 0;

#ifdef CONFIG_AF_RXRPC_IPV6
	case ETH_P_IPV6:
		srx->transport_type = SOCK_DGRAM;
		srx->transport_len = sizeof(srx->transport.sin6);
		srx->transport.sin6.sin6_family = AF_INET6;
		srx->transport.sin6.sin6_port = udp_hdr(skb)->source;
		srx->transport.sin6.sin6_addr = ipv6_hdr(skb)->saddr;
		return 0;
#endif

	default:
		pr_warn_ratelimited("AF_RXRPC: Unknown eth protocol %u\n",
				    ntohs(skb->protocol));
		return -EAFNOSUPPORT;
	}
}
back to top