81895a65ec
Rather than incurring a division or requesting too many random bytes for
the given range, use the prandom_u32_max() function, which only takes
the minimum required bytes from the RNG and avoids divisions. This was
done mechanically with this coccinelle script:
@basic@
expression E;
type T;
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32";
typedef u64;
@@
(
- ((T)get_random_u32() % (E))
+ prandom_u32_max(E)
|
- ((T)get_random_u32() & ((E) - 1))
+ prandom_u32_max(E * XXX_MAKE_SURE_E_IS_POW2)
|
- ((u64)(E) * get_random_u32() >> 32)
+ prandom_u32_max(E)
|
- ((T)get_random_u32() & ~PAGE_MASK)
+ prandom_u32_max(PAGE_SIZE)
)
@multi_line@
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32";
identifier RAND;
expression E;
@@
- RAND = get_random_u32();
... when != RAND
- RAND %= (E);
+ RAND = prandom_u32_max(E);
// Find a potential literal
@literal_mask@
expression LITERAL;
type T;
identifier get_random_u32 =~ "get_random_int|prandom_u32|get_random_u32";
position p;
@@
((T)get_random_u32()@p & (LITERAL))
// Add one to the literal.
@script:python add_one@
literal << literal_mask.LITERAL;
RESULT;
@@
value = None
if literal.startswith('0x'):
value = int(literal, 16)
elif literal[0] in '123456789':
value = int(literal, 10)
if value is None:
print("I don't know how to handle %s" % (literal))
cocci.include_match(False)
elif value == 2**32 - 1 or value == 2**31 - 1 or value == 2**24 - 1 or value == 2**16 - 1 or value == 2**8 - 1:
print("Skipping 0x%x for cleanup elsewhere" % (value))
cocci.include_match(False)
elif value & (value + 1) != 0:
print("Skipping 0x%x because it's not a power of two minus one" % (value))
cocci.include_match(False)
elif literal.startswith('0x'):
coccinelle.RESULT = cocci.make_expr("0x%x" % (value + 1))
else:
coccinelle.RESULT = cocci.make_expr("%d" % (value + 1))
// Replace the literal mask with the calculated result.
@plus_one@
expression literal_mask.LITERAL;
position literal_mask.p;
expression add_one.RESULT;
identifier FUNC;
@@
- (FUNC()@p & (LITERAL))
+ prandom_u32_max(RESULT)
@collapse_ret@
type T;
identifier VAR;
expression E;
@@
{
- T VAR;
- VAR = (E);
- return VAR;
+ return E;
}
@drop_var@
type T;
identifier VAR;
@@
{
- T VAR;
... when != VAR
}
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Yury Norov <yury.norov@gmail.com>
Reviewed-by: KP Singh <kpsingh@kernel.org>
Reviewed-by: Jan Kara <jack@suse.cz> # for ext4 and sbitmap
Reviewed-by: Christoph Böhmwalder <christoph.boehmwalder@linbit.com> # for drbd
Acked-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Heiko Carstens <hca@linux.ibm.com> # for s390
Acked-by: Ulf Hansson <ulf.hansson@linaro.org> # for mmc
Acked-by: Darrick J. Wong <djwong@kernel.org> # for xfs
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
107 lines
3.4 KiB
C
107 lines
3.4 KiB
C
/*
|
|
* Copyright (c) 2016 Hisilicon Limited.
|
|
*
|
|
* This software is available to you under a choice of one of two
|
|
* licenses. You may choose to be licensed under the terms of the GNU
|
|
* General Public License (GPL) Version 2, available from the file
|
|
* COPYING in the main directory of this source tree, or the
|
|
* OpenIB.org BSD license below:
|
|
*
|
|
* Redistribution and use in source and binary forms, with or
|
|
* without modification, are permitted provided that the following
|
|
* conditions are met:
|
|
*
|
|
* - Redistributions of source code must retain the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer.
|
|
*
|
|
* - Redistributions in binary form must reproduce the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer in the documentation and/or other materials
|
|
* provided with the distribution.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
#include <linux/pci.h>
|
|
#include <rdma/ib_addr.h>
|
|
#include <rdma/ib_cache.h>
|
|
#include "hns_roce_device.h"
|
|
|
|
static inline u16 get_ah_udp_sport(const struct rdma_ah_attr *ah_attr)
|
|
{
|
|
u32 fl = ah_attr->grh.flow_label;
|
|
u16 sport;
|
|
|
|
if (!fl)
|
|
sport = prandom_u32_max(IB_ROCE_UDP_ENCAP_VALID_PORT_MAX + 1 -
|
|
IB_ROCE_UDP_ENCAP_VALID_PORT_MIN) +
|
|
IB_ROCE_UDP_ENCAP_VALID_PORT_MIN;
|
|
else
|
|
sport = rdma_flow_label_to_udp_sport(fl);
|
|
|
|
return sport;
|
|
}
|
|
|
|
int hns_roce_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr,
|
|
struct ib_udata *udata)
|
|
{
|
|
struct rdma_ah_attr *ah_attr = init_attr->ah_attr;
|
|
const struct ib_global_route *grh = rdma_ah_read_grh(ah_attr);
|
|
struct hns_roce_dev *hr_dev = to_hr_dev(ibah->device);
|
|
struct hns_roce_ah *ah = to_hr_ah(ibah);
|
|
int ret = 0;
|
|
|
|
if (hr_dev->pci_dev->revision == PCI_REVISION_ID_HIP08 && udata)
|
|
return -EOPNOTSUPP;
|
|
|
|
ah->av.port = rdma_ah_get_port_num(ah_attr);
|
|
ah->av.gid_index = grh->sgid_index;
|
|
|
|
if (rdma_ah_get_static_rate(ah_attr))
|
|
ah->av.stat_rate = IB_RATE_10_GBPS;
|
|
|
|
ah->av.hop_limit = grh->hop_limit;
|
|
ah->av.flowlabel = grh->flow_label;
|
|
ah->av.udp_sport = get_ah_udp_sport(ah_attr);
|
|
ah->av.sl = rdma_ah_get_sl(ah_attr);
|
|
ah->av.tclass = get_tclass(grh);
|
|
|
|
memcpy(ah->av.dgid, grh->dgid.raw, HNS_ROCE_GID_SIZE);
|
|
memcpy(ah->av.mac, ah_attr->roce.dmac, ETH_ALEN);
|
|
|
|
/* HIP08 needs to record vlan info in Address Vector */
|
|
if (hr_dev->pci_dev->revision == PCI_REVISION_ID_HIP08) {
|
|
ret = rdma_read_gid_l2_fields(ah_attr->grh.sgid_attr,
|
|
&ah->av.vlan_id, NULL);
|
|
if (ret)
|
|
return ret;
|
|
|
|
ah->av.vlan_en = ah->av.vlan_id < VLAN_N_VID;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
int hns_roce_query_ah(struct ib_ah *ibah, struct rdma_ah_attr *ah_attr)
|
|
{
|
|
struct hns_roce_ah *ah = to_hr_ah(ibah);
|
|
|
|
memset(ah_attr, 0, sizeof(*ah_attr));
|
|
|
|
rdma_ah_set_sl(ah_attr, ah->av.sl);
|
|
rdma_ah_set_port_num(ah_attr, ah->av.port);
|
|
rdma_ah_set_static_rate(ah_attr, ah->av.stat_rate);
|
|
rdma_ah_set_grh(ah_attr, NULL, ah->av.flowlabel,
|
|
ah->av.gid_index, ah->av.hop_limit, ah->av.tclass);
|
|
rdma_ah_set_dgid_raw(ah_attr, ah->av.dgid);
|
|
|
|
return 0;
|
|
}
|