Skip to content

misc: fastrpc: avoid duplicate DMA mappings in fastrpc_create_maps() #1437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jianping (Jianping-Li) wants to merge 1 commit into
base: tech/mm/fastrpc
Choose a base branch
from
Open

misc: fastrpc: avoid duplicate DMA mappings in fastrpc_create_maps() #1437

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions drivers/misc/fastrpc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,9 +992,9 @@ static int fastrpc_map_attach(struct fastrpc_user *fl, int fd,
}

static int fastrpc_map_create(struct fastrpc_user *fl, int fd,
u64 len, u32 attr, struct fastrpc_map **ppmap)
u64 len, u32 attr, struct fastrpc_map **ppmap, bool take_ref)
{
if (!fastrpc_map_lookup(fl, fd, ppmap, true))
if (!fastrpc_map_lookup(fl, fd, ppmap, take_ref))
return 0;

return fastrpc_map_attach(fl, fd, len, attr, ppmap);
Expand Down Expand Up @@ -1068,23 +1068,23 @@ static int fastrpc_create_maps(struct fastrpc_invoke_ctx *ctx)
int i, err;

for (i = 0; i < ctx->nscalars; ++i) {
bool take_ref = true;

if (ctx->args[i].fd == 0 || ctx->args[i].fd == -1 ||
ctx->args[i].length == 0)
continue;

if (i < ctx->nbufs)
err = fastrpc_map_create(ctx->fl, ctx->args[i].fd,
ctx->args[i].length, ctx->args[i].attr, &ctx->maps[i]);
else
err = fastrpc_map_attach(ctx->fl, ctx->args[i].fd,
ctx->args[i].length, ctx->args[i].attr, &ctx->maps[i]);
if (i >= ctx->nbufs)
take_ref = false;

err = fastrpc_map_create(ctx->fl, ctx->args[i].fd, ctx->args[i].length,
ctx->args[i].attr, &ctx->maps[i], take_ref);
if (err) {
dev_err(dev, "Error Creating map %d\n", err);
return -EINVAL;
}

}

return 0;
}

Expand Down Expand Up @@ -1613,7 +1613,7 @@ static int fastrpc_init_create_process(struct fastrpc_user *fl,
fl->pd = USER_PD;

if (init.filelen && init.filefd) {
err = fastrpc_map_create(fl, init.filefd, init.filelen, 0, &map);
err = fastrpc_map_create(fl, init.filefd, init.filelen, 0, &map, true);
if (err)
goto err;
}
Expand Down Expand Up @@ -2240,7 +2240,7 @@ static int fastrpc_req_mem_map(struct fastrpc_user *fl, char __user *argp)
return -EFAULT;

/* create SMMU mapping */
err = fastrpc_map_create(fl, req.fd, req.length, 0, &map);
err = fastrpc_map_create(fl, req.fd, req.length, 0, &map, true);
if (err) {
dev_err(dev, "failed to map buffer, fd = %d\n", req.fd);
return err;
Expand Down