Macro wrapper for memcpy by rialg · Pull Request #13770 · envoyproxy/envoy

rialg · 2020-10-27T00:26:50Z

Description:

Initial migration from memcpy to SAFE_MEMCPY Macro and MemBlockBuilder. Only a few files were changed, tests and corrections to the check_format script are still pending.

Fixes #9328

Signed-off-by: grial <grial@google.com>

…einterpret_cast Signed-off-by: grial <grial@google.com>

Signed-off-by: grial <grial@google.com>

source/common/common/macros.h

Signed-off-by: grial <grial@google.com>

This reverts commit 6e3a257. Signed-off-by: grial <grial@google.com>

Signed-off-by: grial <grial@google.com>

source/common/common/macros.h

source/server/hot_restarting_base.cc

Signed-off-by: grial <grial@google.com>

…r_impl Signed-off-by: grial <grial@google.com>

rialg

Hi, I failed see how to change line 189 (memcpy(base_ + data_, src + size - copy_size, copy_size);) so as to implement it with either SAFE_MEMCPY or MemBlockBuilder. WDYT?

Signed-off-by: grial <grial@google.com>

repokitteh-read-only · 2021-01-10T09:46:33Z

Retrying Azure Pipelines:
Retried failed jobs in: envoy-presubmit

🐱

Caused by: a #13770 (comment) was created by @grial1.

see: more, trace.

jmarantz · 2021-01-22T13:49:25Z

main merge needed.

Signed-off-by: grial1 <grial@google.com>

jmarantz · 2021-01-22T17:26:53Z

@lizan do you have other comments? It would be good to get this in as it's kind of a conflict-magnet :)

rialg · 2021-01-23T09:09:43Z

/retest

repokitteh-read-only · 2021-01-23T09:09:47Z

Retrying Azure Pipelines:
Retried failed jobs in: envoy-presubmit

🐱

Caused by: a #13770 (comment) was created by @rialg.

see: more, trace.

Signed-off-by: grial1 <grial@google.com>

lizan

Sorry I thought I approved this one, can you fix CI then I can merge.

lizan · 2021-02-05T09:12:24Z

/retest

repokitteh-read-only · 2021-02-05T09:12:28Z

Retrying Azure Pipelines:
Retried failed jobs in: envoy-presubmit

🐱

Caused by: a #13770 (comment) was created by @lizan.

see: more, trace.

jmarantz · 2021-02-24T14:00:06Z

Hi @rialg -- can you 'merge main' and get CI sorted? Then @lizan can merge.

Signed-off-by: rialg <grial@google.com>

rialg · 2021-02-27T16:04:38Z

/retest

repokitteh-read-only · 2021-02-27T16:04:41Z

Retrying Azure Pipelines:
Retried failed jobs in: envoy-presubmit

🐱

Caused by: a #13770 (comment) was created by @rialg.

see: more, trace.

all changes addressed

rialg · 2021-03-21T09:59:18Z

ACK. Thanks @jmarantz!

jmarantz · 2021-03-21T14:21:32Z

And thank you for pushing this all the way through! IIRC there were some follow-ups from this PR. Are you going to be able to pursue those?

rialg · 2021-03-21T16:29:47Z

Of course :). I will start to work on the pending changes on a new branch and submit the PR for reviewing next week, most likely.

…eference to memory that has been already allocated Signed-off-by: rialg <grial@google.com>

grial added 2 commits October 25, 2020 22:39

Macro 'SAFE_MEMCPY added according to comments on issue#9328'

df6d49f

Signed-off-by: grial <grial@google.com>

WIP: SAFE_MEMCPY modified with memmove, and some minor changes made.

6a9d849

Signed-off-by: grial <grial@google.com>

rialg requested a review from mattklein123 as a code owner October 27, 2020 00:26

grial added 8 commits October 27, 2020 09:44

macros.h format fixed

5a29b9a

Signed-off-by: grial <grial@google.com>

testing CI pipeline

814894b

Signed-off-by: grial <grial@google.com>

static_assert deleted from macro SAFE_MEMCPY to avoid troubles with r…

45565c2

…einterpret_cast Signed-off-by: grial <grial@google.com>

list of dependencies changed

2ad12d4

Signed-off-by: grial <grial@google.com>

label corrected in .../mongo_proxy/BUILD

22d2bfa

Signed-off-by: grial <grial@google.com>

casts added and deleted var val included

9d72d11

Signed-off-by: grial <grial@google.com>

format corrected

1b43b53

Signed-off-by: grial <grial@google.com>

cast added to avoid using void* in MemBlockBuilder

0aab7bc

Signed-off-by: grial <grial@google.com>

mattklein123 assigned jmarantz Oct 28, 2020

Initializing Span before calling appendData

d34e261

Signed-off-by: grial <grial@google.com>

jmarantz reviewed Oct 28, 2020

View reviewed changes

source/common/common/macros.h Outdated Show resolved Hide resolved

grial added 7 commits October 29, 2020 09:55

Span constructor corrected

6e3a257

Signed-off-by: grial <grial@google.com>

Revert "Span constructor corrected"

d4b3c50

This reverts commit 6e3a257. Signed-off-by: grial <grial@google.com>

Span constructor corrected

34d9ecb

Signed-off-by: grial <grial@google.com>

style corrected.

50eee3c

Signed-off-by: grial <grial@google.com>

SAFE_MACRO modified to assert input arrays' sizes

1bc7916

Signed-off-by: grial <grial@google.com>

Get size of the array

d68aa9e

Signed-off-by: grial <grial@google.com>

use of envoy ASSERT macro in SAFE_MEMCPY

4d331cd

Signed-off-by: grial <grial@google.com>

jmarantz reviewed Oct 30, 2020

View reviewed changes

source/common/common/macros.h Outdated Show resolved Hide resolved

jmarantz reviewed Oct 30, 2020

View reviewed changes

source/server/hot_restarting_base.cc Outdated Show resolved Hide resolved

grial added 5 commits October 30, 2020 19:49

Use static_assert again in SAFE_MEMCPY. Changes in proxy_protocol.cc

5372f86

Signed-off-by: grial <grial@google.com>

proxy protocol header parse changed

5517c53

Signed-off-by: grial <grial@google.com>

getSockAddr public method added to PipeInstance

455ceb7

Signed-off-by: grial <grial@google.com>

comparison corrected in for loop

d188a94

Signed-off-by: grial <grial@google.com>

reinterpret_cast deleted from dns_parser. Some changes added to buffe…

b20de9a

…r_impl Signed-off-by: grial <grial@google.com>

rialg commented Oct 31, 2020

View reviewed changes

buffer BUILD file changed

cfb8145

Signed-off-by: grial <grial@google.com>

jmarantz previously approved these changes Jan 11, 2021

View reviewed changes

Base automatically changed from master to main January 15, 2021 23:01

merge conflicts resolved

8bc497b

Signed-off-by: grial1 <grial@google.com>

rialg dismissed jmarantz’s stale review via 8bc497b January 22, 2021 17:00

jmarantz previously approved these changes Jan 22, 2021

View reviewed changes

merge conflicts resolved

2cd8aaf

Signed-off-by: grial1 <grial@google.com>

rialg dismissed jmarantz’s stale review via 2cd8aaf February 2, 2021 16:53

lizan previously approved these changes Feb 5, 2021

View reviewed changes

merge conflicts resolved

ddeed70

Signed-off-by: rialg <grial@google.com>

rialg dismissed lizan’s stale review via ddeed70 February 26, 2021 18:07

jmarantz approved these changes Mar 16, 2021

View reviewed changes

jmarantz merged commit 7852c7b into envoyproxy:main Mar 16, 2021

rialg deleted the issue-9328 branch March 21, 2021 09:57

rialg mentioned this pull request Mar 26, 2021

Embedding MemBlockBuilder into the data representation for Buffer::Instance #15701

Closed

rialg pushed a commit to rialg/envoy that referenced this pull request Mar 27, 2021

Pending changes from envoyproxy#13770: Allow the client to supply a r…

09127fa

…eference to memory that has been already allocated Signed-off-by: rialg <grial@google.com>

Conversation

rialg commented Oct 27, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rialg left a comment

Choose a reason for hiding this comment

Uh oh!

repokitteh-read-only bot commented Jan 10, 2021

Uh oh!

jmarantz commented Jan 22, 2021

Uh oh!

jmarantz commented Jan 22, 2021

Uh oh!

rialg commented Jan 23, 2021

Uh oh!

repokitteh-read-only bot commented Jan 23, 2021

Uh oh!

lizan left a comment

Choose a reason for hiding this comment

Uh oh!

lizan commented Feb 5, 2021

Uh oh!

repokitteh-read-only bot commented Feb 5, 2021

Uh oh!

jmarantz commented Feb 24, 2021

Uh oh!

rialg commented Feb 27, 2021

Uh oh!

repokitteh-read-only bot commented Feb 27, 2021

Uh oh!

rialg commented Mar 21, 2021

Uh oh!

jmarantz commented Mar 21, 2021

Uh oh!

rialg commented Mar 21, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants